This commit is contained in:
parent
258a99bc36
commit
eb17167feb
|
@ -1,9 +1,9 @@
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "iconfont"; /* Project id 2794390 */
|
font-family: "iconfont"; /* Project id 2794390 */
|
||||||
src: url('iconfont.woff2?t=1723099371232') format('woff2'),
|
src: url('iconfont.woff2?t=1723186593107') format('woff2'),
|
||||||
url('iconfont.woff?t=1723099371232') format('woff'),
|
url('iconfont.woff?t=1723186593107') format('woff'),
|
||||||
url('iconfont.ttf?t=1723099371232') format('truetype'),
|
url('iconfont.ttf?t=1723186593107') format('truetype'),
|
||||||
url('iconfont.svg?t=1723099371232#iconfont') format('svg');
|
url('iconfont.svg?t=1723186593107#iconfont') format('svg');
|
||||||
}
|
}
|
||||||
|
|
||||||
.iconfont {
|
.iconfont {
|
||||||
|
@ -14,6 +14,10 @@
|
||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.icon-xiangzuo:before {
|
||||||
|
content: "\e64d";
|
||||||
|
}
|
||||||
|
|
||||||
.icon-kechengziyuan1:before {
|
.icon-kechengziyuan1:before {
|
||||||
content: "\e647";
|
content: "\e647";
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -5,6 +5,13 @@
|
||||||
"css_prefix_text": "icon-",
|
"css_prefix_text": "icon-",
|
||||||
"description": "",
|
"description": "",
|
||||||
"glyphs": [
|
"glyphs": [
|
||||||
|
{
|
||||||
|
"icon_id": "6176588",
|
||||||
|
"name": "向左",
|
||||||
|
"font_class": "xiangzuo",
|
||||||
|
"unicode": "e64d",
|
||||||
|
"unicode_decimal": 58957
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"icon_id": "3053509",
|
"icon_id": "3053509",
|
||||||
"name": "课程资源",
|
"name": "课程资源",
|
||||||
|
@ -630,7 +637,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"icon_id": "22779610",
|
"icon_id": "22779610",
|
||||||
"name": "数译_教学管理",
|
"name": "教学管理",
|
||||||
"font_class": "shuyi_jiaoxueguanli",
|
"font_class": "shuyi_jiaoxueguanli",
|
||||||
"unicode": "e678",
|
"unicode": "e678",
|
||||||
"unicode_decimal": 59000
|
"unicode_decimal": 59000
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
/>
|
/>
|
||||||
<missing-glyph />
|
<missing-glyph />
|
||||||
|
|
||||||
|
<glyph glyph-name="xiangzuo" unicode="" d="M774.89 725L399.08 380.75l375.81-344.21a39.28 39.28 0 0 0 13.11-29c0-36.51-48.19-54.79-76.38-29L335.8 322.8c-34.94 32-34.94 83.9 0 115.9l375.82 344.22c28.19 25.81 76.38 7.53 76.38-29A39.3 39.3 0 0 0 774.89 725z" horiz-adv-x="1024" />
|
||||||
|
|
||||||
<glyph glyph-name="kechengziyuan1" unicode="" d="M530.299631 315.712191a54.537462 54.537462 0 0 0-34.299976 12.187492L19.862486 563.299519l-3.749997 3.749997a55.187462 55.187462 0 0 0 0 77.949946l3.749997 3.749998L495.687155 883.836796A54.537462 54.537462 0 0 0 530.299631 895.999288a54.562462 54.562462 0 0 0 34.299976-12.162492l476.137169-235.424836 3.749997-3.749998a55.199962 55.199962 0 0 0 0-77.949945l-3.749997-3.749998-476.137169-235.399836a54.562462 54.562462 0 0 0-34.299976-11.849992z m-455.874683 289.999798l455.874683-225.449843 455.874683 225.437343-455.874683 225.749843z m0 0M530.299631 94.012346a54.574962 54.574962 0 0 0-34.299976 12.162491L24.537483 339.149675a31.174978 31.174978 0 1 0 27.749981 55.812461l474.899669-234.849836 3.112498-1.874999 3.124998 1.874999 474.887169 235.112336a31.174978 31.174978 0 0 0 27.749981-55.812461L564.599607 105.862337a54.562462 54.562462 0 0 0-34.299976-11.849991z m0 0M530.299631-128a54.862462 54.862462 0 0 0-34.299976 12.149992L24.537483 116.46233a31.174978 31.174978 0 1 0 27.749981 55.812461l474.899669-233.862337 3.112498-1.874999 3.124998 1.874999 474.887169 235.112336a31.724978 31.724978 0 1 0 27.749981-57.06246L564.599607-115.850008a55.199962 55.199962 0 0 0-34.299976-12.149992z m0 0" horiz-adv-x="1060" />
|
<glyph glyph-name="kechengziyuan1" unicode="" d="M530.299631 315.712191a54.537462 54.537462 0 0 0-34.299976 12.187492L19.862486 563.299519l-3.749997 3.749997a55.187462 55.187462 0 0 0 0 77.949946l3.749997 3.749998L495.687155 883.836796A54.537462 54.537462 0 0 0 530.299631 895.999288a54.562462 54.562462 0 0 0 34.299976-12.162492l476.137169-235.424836 3.749997-3.749998a55.199962 55.199962 0 0 0 0-77.949945l-3.749997-3.749998-476.137169-235.399836a54.562462 54.562462 0 0 0-34.299976-11.849992z m-455.874683 289.999798l455.874683-225.449843 455.874683 225.437343-455.874683 225.749843z m0 0M530.299631 94.012346a54.574962 54.574962 0 0 0-34.299976 12.162491L24.537483 339.149675a31.174978 31.174978 0 1 0 27.749981 55.812461l474.899669-234.849836 3.112498-1.874999 3.124998 1.874999 474.887169 235.112336a31.174978 31.174978 0 0 0 27.749981-55.812461L564.599607 105.862337a54.562462 54.562462 0 0 0-34.299976-11.849991z m0 0M530.299631-128a54.862462 54.862462 0 0 0-34.299976 12.149992L24.537483 116.46233a31.174978 31.174978 0 1 0 27.749981 55.812461l474.899669-233.862337 3.112498-1.874999 3.124998 1.874999 474.887169 235.112336a31.724978 31.724978 0 1 0 27.749981-57.06246L564.599607-115.850008a55.199962 55.199962 0 0 0-34.299976-12.149992z m0 0" horiz-adv-x="1060" />
|
||||||
|
|
||||||
<glyph glyph-name="tubiaozhizuomobanyihuifu-" unicode="" d="M695.48 353.85m-15 0a15 15 0 1 1 30 0 15 15 0 1 1-30 0ZM586.39 17.63A28.63 28.63 0 0 0 557.76-11H122.39V424.37A28.63 28.63 0 0 0 151 453h156.39v79H152A108.63 108.63 0 0 1 43.39 423.37V-91h514.37a108.63 108.63 0 0 1 108.63 108.63V174h-80zM359.39 749v-523h523a100 100 0 0 1 100 100V849h-523a100 100 0 0 1-100-100z m523-443h-443V749a20 20 0 0 0 20 20h443v-443a20 20 0 0 0-20-20zM751.9 339h102a15.5 15.5 0 0 1 15.5 15.5V581.9a5.25 5.25 0 0 1-1.54 3.75c-13 12.72-28.46 3.75-28.46-8.84v-202.64a5.17 5.17 0 0 0-5.17-5.17H746.8a5.25 5.25 0 0 1-3.75-1.54c-12.71-12.95-3.74-28.46 8.85-28.46z" horiz-adv-x="1024" />
|
<glyph glyph-name="tubiaozhizuomobanyihuifu-" unicode="" d="M695.48 353.85m-15 0a15 15 0 1 1 30 0 15 15 0 1 1-30 0ZM586.39 17.63A28.63 28.63 0 0 0 557.76-11H122.39V424.37A28.63 28.63 0 0 0 151 453h156.39v79H152A108.63 108.63 0 0 1 43.39 423.37V-91h514.37a108.63 108.63 0 0 1 108.63 108.63V174h-80zM359.39 749v-523h523a100 100 0 0 1 100 100V849h-523a100 100 0 0 1-100-100z m523-443h-443V749a20 20 0 0 0 20 20h443v-443a20 20 0 0 0-20-20zM751.9 339h102a15.5 15.5 0 0 1 15.5 15.5V581.9a5.25 5.25 0 0 1-1.54 3.75c-13 12.72-28.46 3.75-28.46-8.84v-202.64a5.17 5.17 0 0 0-5.17-5.17H746.8a5.25 5.25 0 0 1-3.75-1.54c-12.71-12.95-3.74-28.46 8.85-28.46z" horiz-adv-x="1024" />
|
||||||
|
|
Before Width: | Height: | Size: 262 KiB After Width: | Height: | Size: 262 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,5 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<el-dialog v-model="dialogVisible" center top="10vh" width="600px" :show-close="false" append-to-body style="border-radius: 10px; padding: 10px 15px;">
|
<el-dialog v-model="dialogVisible" center top="10vh" width="600px" :show-close="false" append-to-body
|
||||||
|
:z-index="999999" style="border-radius: 10px; padding: 10px 15px;">
|
||||||
<template #header>
|
<template #header>
|
||||||
<div class="homerwork-header flex">
|
<div class="homerwork-header flex">
|
||||||
<span>{{ title }}</span>
|
<span>{{ title }}</span>
|
||||||
|
|
|
@ -1,72 +1,123 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="homework-content">
|
<div class="page-homework">
|
||||||
<div class="homework-top">
|
|
||||||
<h3 class="title">{{ lesson }}</h3>
|
<transition name="slide" @before-enter="beforeEnter" @enter="enter" @leave="leave">
|
||||||
<div class="grade">{{ usertore.edusubject}}</div>
|
<div v-if="showLeft" class="homework homework-content">
|
||||||
</div>
|
<div class="homework-top flex">
|
||||||
<div class="homework-list" v-loading="loading">
|
<div>
|
||||||
<el-scrollbar height="360px">
|
<h3 class="title">{{ lesson }}</h3>
|
||||||
<ul>
|
<div class="grade">{{ usertore.edusubject }}</div>
|
||||||
<li class="item flex" v-for="item in dataList" :key="item.id">
|
</div>
|
||||||
<div class="item-left flex">
|
<!-- <i class="iconfont icon-xiangyou"></i> -->
|
||||||
<svg class="icon homework-icon" aria-hidden="true">
|
</div>
|
||||||
<use xlink:href="#icon-zuoye2"></use>
|
<div class="homework-list" v-loading="loading">
|
||||||
</svg>
|
<el-scrollbar height="360px">
|
||||||
<div class="item-info flex">
|
<ul>
|
||||||
<span class="item-name">{{ item.uniquekey }}</span>
|
<!--资源-->
|
||||||
<div class="item-student">
|
<li class="item flex" v-for="item in resourceList" :key="item.id">
|
||||||
<span class="item-option">作业</span>
|
<div class="item-left flex">
|
||||||
<span>{{ item.worktype }}</span>
|
<FileImage :size="50" :file-name="item.fileShowName" />
|
||||||
|
<div class="item-info flex">
|
||||||
|
<span class="item-name">{{ item.fileShowName }}</span>
|
||||||
|
<div class="item-student">
|
||||||
|
<span class="item-option">{{ item.fileFlag }}</span>
|
||||||
|
<span>{{ item.fileSuffix }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</li>
|
||||||
</div>
|
<!--作业-->
|
||||||
<el-button color="#349d44" @click="sendHomework(item)">推送</el-button>
|
<li class="item flex" v-for="item in dataList" :key="item.id">
|
||||||
</li>
|
<div class="item-left flex">
|
||||||
</ul>
|
<svg class="icon homework-icon" aria-hidden="true">
|
||||||
</el-scrollbar>
|
<use xlink:href="#icon-zuoye2"></use>
|
||||||
</div>
|
</svg>
|
||||||
<SetHomework v-model="setDialog" :title="'推送作业'" :entpcourseid="entpcourseid" :row="curRow" @on-close="closeHomework" />
|
<div class="item-info flex">
|
||||||
|
<span class="item-name">{{ item.uniquekey }}</span>
|
||||||
|
<div class="item-student">
|
||||||
|
<span class="item-option">作业</span>
|
||||||
|
<span>{{ item.worktype }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<el-button color="#349d44" @click="sendHomework(item)">推送</el-button>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</el-scrollbar>
|
||||||
|
</div>
|
||||||
|
<SetHomework v-model="setDialog" :title="'推送作业'" :entpcourseid="entpcourseid" :row="curRow"
|
||||||
|
@on-close="closeHomework" />
|
||||||
|
</div>
|
||||||
|
<div class="homework" @click="showLeft = !showLeft" v-else>
|
||||||
|
<div class="unit-top flex">
|
||||||
|
<div class="unit-top-left">
|
||||||
|
<i class="iconfont icon-xiangzuo"></i>
|
||||||
|
<span>返回</span>
|
||||||
|
</div>
|
||||||
|
<span class="unit-top-center">选择目录</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<!-- <Lesson/> -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</transition>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onMounted } from 'vue';
|
import { ref, onMounted, toRaw } from 'vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import useUserStore from '@/store/modules/user'
|
import useUserStore from '@/store/modules/user'
|
||||||
import { homeworklist } from '@/api/teaching/classwork'
|
import { homeworklist } from '@/api/teaching/classwork'
|
||||||
import { getSmarttalkPage } from '@/api/file'
|
import { getSmarttalkPage, getPrepareById } from '@/api/file'
|
||||||
import SetHomework from '@/views/prepare/container/set-homework.vue'
|
import SetHomework from '@/views/prepare/container/set-homework.vue'
|
||||||
|
import FileImage from '@/components/file-image/index.vue'
|
||||||
import { ipcMsgSend } from '@/utils/tool'
|
import { ipcMsgSend } from '@/utils/tool'
|
||||||
|
import { useToolState } from '@/store/modules/tool'
|
||||||
|
import { asyncLocalFile } from '@/utils/talkFile'
|
||||||
|
import Lesson from './lesson.vue';
|
||||||
|
|
||||||
|
const { ipcRenderer } = window.electron || {}
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const usertore = useUserStore().user
|
const usertore = useUserStore().user
|
||||||
|
const toolStore = useToolState()
|
||||||
const entpcourseid = ref('')
|
const entpcourseid = ref('')
|
||||||
const lesson = ref('')
|
const lesson = ref('')
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
|
const showLeft = ref(true)
|
||||||
//作业数据
|
//作业数据
|
||||||
const dataList = ref([])
|
const dataList = ref([])
|
||||||
const setDialog = ref(false)
|
const setDialog = ref(false)
|
||||||
|
// 资源数据
|
||||||
|
const resourceList = ref([])
|
||||||
|
|
||||||
//
|
//
|
||||||
const curRow = ref('')
|
const curRow = ref('')
|
||||||
|
|
||||||
|
|
||||||
const sendHomework = (row)=>{
|
const sendHomework = (row) => {
|
||||||
curRow.value = row
|
curRow.value = row
|
||||||
setTimeout(()=>{
|
setTimeout(() => {
|
||||||
ipcMsgSend('tool-sphere:set:ignore', false)
|
ipcMsgSend('tool-sphere:set:ignore', false)
|
||||||
},200)
|
}, 200)
|
||||||
setDialog.value = true
|
setDialog.value = true
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
const closeHomework = ()=>{
|
const closeHomework = () => {
|
||||||
ipcMsgSend('tool-sphere:set:ignore', true)
|
ipcMsgSend('tool-sphere:set:ignore', true)
|
||||||
setDialog.value = false
|
setDialog.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取资源数据
|
// 获取资源数据
|
||||||
const getResource = ()=>{
|
const getResource = () => {
|
||||||
// getSmarttalkPage().then()
|
let data = toRaw(toolStore.curSubjectNode)
|
||||||
|
data.orderByColumn = 'uploadTime'
|
||||||
|
data.isAsc = 'desc'
|
||||||
|
data.pageSize = 500
|
||||||
|
getSmarttalkPage(data).then(res => {
|
||||||
|
resourceList.value = res.rows
|
||||||
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取作业数据
|
// 获取作业数据
|
||||||
|
@ -78,7 +129,6 @@ const getHomework = () => {
|
||||||
edituserid: usertore.userId,
|
edituserid: usertore.userId,
|
||||||
pageSize: 100
|
pageSize: 100
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
console.log(res.rows)
|
|
||||||
//以下代码 参照AIx web端 作业布置
|
//以下代码 参照AIx web端 作业布置
|
||||||
let list = []
|
let list = []
|
||||||
for (var i = 0; i < res.rows.length; i++) {
|
for (var i = 0; i < res.rows.length; i++) {
|
||||||
|
@ -139,22 +189,58 @@ const getHomework = () => {
|
||||||
loading.value = false
|
loading.value = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
function beforeEnter(el) {
|
||||||
|
el.style.transform = 'translateX(100%)';
|
||||||
|
}
|
||||||
|
|
||||||
|
function enter(el, done) {
|
||||||
|
el.offsetHeight; // trigger reflow
|
||||||
|
el.style.transition = 'transform 0.5s ease';
|
||||||
|
el.style.transform = 'translateX(0)';
|
||||||
|
done();
|
||||||
|
}
|
||||||
|
|
||||||
|
function leave(el, done) {
|
||||||
|
el.style.transition = 'transform 0.5s ease';
|
||||||
|
el.style.transform = 'translateX(-100%)';
|
||||||
|
done();
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
console.log(route.query)
|
|
||||||
entpcourseid.value = route.query.entpcourseid
|
entpcourseid.value = route.query.entpcourseid
|
||||||
lesson.value = route.query.label
|
lesson.value = route.query.label
|
||||||
getHomework()
|
getHomework()
|
||||||
|
setTimeout(() => {
|
||||||
|
getResource()
|
||||||
|
}, 5000)
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
.page-homework {
|
||||||
|
position: relative;
|
||||||
|
height: 435px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.homework {
|
||||||
|
width: 100%;
|
||||||
|
position: absolute;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
.homework-content {
|
.homework-content {
|
||||||
padding: 0 15px;
|
padding: 0 15px;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
|
||||||
.homework-top {
|
.homework-top {
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
|
||||||
|
.icon-xiangyou {
|
||||||
|
font-size: 26px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
|
@ -200,8 +286,37 @@ onMounted(() => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.slide-enter-active,
|
||||||
|
.slide-leave-active {
|
||||||
|
transition: transform 0.5s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slide-enter,
|
||||||
|
.slide-leave-to
|
||||||
|
|
||||||
|
/* .slide-leave-active in <2.1.8 */
|
||||||
|
{
|
||||||
|
transform: translateX(100%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.unit-top {
|
||||||
|
color: #fff;
|
||||||
|
padding: 10px 0;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
.unit-top-left {
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
.icon-xiangzuo {
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.unit-top-center{
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
</style>
|
</style>
|
|
@ -0,0 +1,129 @@
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<el-tree ref="refTree" :data="treeData" :props="defaultProps" node-key="id"
|
||||||
|
:default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
|
||||||
|
@node-click="handleNodeClick">
|
||||||
|
<template #default="{ node }">
|
||||||
|
<span :title="node.label" class="tree-label">{{ node.label }}</span>
|
||||||
|
</template>
|
||||||
|
</el-tree>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import { ref, onMounted, nextTick, markRaw, toRaw } from 'vue'
|
||||||
|
import { useToolState } from '@/store/modules/tool'
|
||||||
|
|
||||||
|
|
||||||
|
const toolStore = useToolState()
|
||||||
|
const treeData = ref([])
|
||||||
|
const defaultProps = {
|
||||||
|
children: 'children',
|
||||||
|
label: 'label',
|
||||||
|
class: 'textbook-tree'
|
||||||
|
}
|
||||||
|
// 当前选中的节点ID
|
||||||
|
const currentNodeId = ref(0)
|
||||||
|
// 当前选中的节点名称
|
||||||
|
const currentNodeName = ref('')
|
||||||
|
// 默认展开的节点
|
||||||
|
const defaultExpandedKeys = ref([])
|
||||||
|
// tree
|
||||||
|
const refTree = ref(null)
|
||||||
|
// 教材ID
|
||||||
|
const curBookId = ref('')
|
||||||
|
//
|
||||||
|
const evaluationList = ref([])
|
||||||
|
|
||||||
|
const getTreeData = () => {
|
||||||
|
evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
|
||||||
|
|
||||||
|
//上册
|
||||||
|
let volumeOne = evaluationList.value.filter(item => item.level == 1 && item.semester == '上册')
|
||||||
|
//下册
|
||||||
|
let volumeTwo = evaluationList.value.filter(item => item.level == 1 && item.semester == '下册')
|
||||||
|
//数据过滤
|
||||||
|
console.log(volumeOne,1)
|
||||||
|
console.log(volumeTwo,2)
|
||||||
|
let upData = transData(volumeOne)
|
||||||
|
let downData = transData(volumeTwo)
|
||||||
|
console.log(upData)
|
||||||
|
console.log(downData)
|
||||||
|
if(upData.length && downData.length){
|
||||||
|
treeData.value = [...upData,...downData]
|
||||||
|
}
|
||||||
|
else if(upData.length || downData.length){
|
||||||
|
treeData.value = upData.length ? upData : downData
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
treeData.value = []
|
||||||
|
return
|
||||||
|
}
|
||||||
|
nextTick(() => {
|
||||||
|
let defaultKey
|
||||||
|
if(toolStore.curSubjectNode.levelSecondId){
|
||||||
|
defaultKey = toolStore.curSubjectNode.levelSecondId
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
defaultKey = toolStore.curSubjectNode.levelFirstId
|
||||||
|
}
|
||||||
|
defaultExpandedKeys.value = defaultKey
|
||||||
|
// currentNode.data = getLastLevelData(treeData.value)[0]
|
||||||
|
// currentNodeId.value = getLastLevelData(treeData.value)[0].id
|
||||||
|
// currentNodeName.value = getLastLevelData(treeData.value)[0].label
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleNodeClick = ()=>{}
|
||||||
|
|
||||||
|
const transData = (data) => {
|
||||||
|
let ary = []
|
||||||
|
data.forEach(item => {
|
||||||
|
let obj = {}
|
||||||
|
console.log(item.rootid, '==========>',curBookId.value)
|
||||||
|
if (item.rootid == curBookId.value) {
|
||||||
|
obj.label = item.itemtitle
|
||||||
|
obj.id = item.id
|
||||||
|
obj.itemtitle = item.itemtitle
|
||||||
|
obj.edudegree = item.edudegree
|
||||||
|
obj.edustage = item.edustage
|
||||||
|
obj.edusubject = item.edusubject
|
||||||
|
let ary2 = []
|
||||||
|
evaluationList.value.forEach(el => {
|
||||||
|
let obj2 = {}
|
||||||
|
if (item.id == el.parentid) {
|
||||||
|
obj2 = {
|
||||||
|
label: el.itemtitle,
|
||||||
|
id: el.id,
|
||||||
|
itemtitle : el.itemtitle,
|
||||||
|
edudegree : el.edudegree,
|
||||||
|
edustage : el.edustage,
|
||||||
|
edusubject : el.edusubject,
|
||||||
|
}
|
||||||
|
ary2.push(obj2)
|
||||||
|
}
|
||||||
|
obj.children = ary2
|
||||||
|
})
|
||||||
|
ary.push(obj)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return ary
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
onMounted(()=>{
|
||||||
|
// console.log(toolStore.curSubjectNode,111)
|
||||||
|
|
||||||
|
// let data = toRaw(toolStore.curSubjectNode)
|
||||||
|
// console.log(data,222)
|
||||||
|
|
||||||
|
|
||||||
|
// curBookId.value = toolStore.curSubjectNode.textbookId
|
||||||
|
// getTreeData()
|
||||||
|
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped></style>
|
Loading…
Reference in New Issue