二期:BUG修复
This commit is contained in:
parent
fe26d348fc
commit
f334adfda9
|
@ -5,7 +5,12 @@
|
||||||
<div class="header-top flex">
|
<div class="header-top flex">
|
||||||
<div class="textbook-img">
|
<div class="textbook-img">
|
||||||
<el-image style="width: 80px; height: 110px" :src="curBookImg" @click="navtoPdf" />
|
<el-image style="width: 80px; height: 110px" :src="curBookImg" @click="navtoPdf" />
|
||||||
<el-progress v-if="downloadNum>0 && downloadNum < 100" style="position:absolute;left: 0;z-index: 999;" type="circle" :percentage="downloadNum" />
|
<el-progress
|
||||||
|
v-if="downloadNum > 0 && downloadNum < 100"
|
||||||
|
style="position: absolute; left: 0; z-index: 999"
|
||||||
|
type="circle"
|
||||||
|
:percentage="downloadNum"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="top-item">
|
<div class="top-item">
|
||||||
<el-button class="btn" @click="handleOutLink('standard')">课标研读</el-button>
|
<el-button class="btn" @click="handleOutLink('standard')">课标研读</el-button>
|
||||||
|
@ -13,7 +18,12 @@
|
||||||
<el-button class="btn" @click="handleOutLink('gk')">高考研读</el-button>
|
<el-button class="btn" @click="handleOutLink('gk')">高考研读</el-button>
|
||||||
<el-button class="btn" @click="handleOutLink('aiModel')">教学大模型</el-button>
|
<el-button class="btn" @click="handleOutLink('aiModel')">教学大模型</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-button :type="!curClassReserv.id?'info' : 'primary'" :disabled="!curClassReserv.id" class="to-class-btn" @click="openLesson">
|
<el-button
|
||||||
|
:type="!curClassReserv.id ? 'info' : 'primary'"
|
||||||
|
:disabled="!curClassReserv.id"
|
||||||
|
class="to-class-btn"
|
||||||
|
@click="openLesson"
|
||||||
|
>
|
||||||
<label><i class="iconfont icon-lingdang"></i>上课</label>
|
<label><i class="iconfont icon-lingdang"></i>上课</label>
|
||||||
<label>{{ curClassReserv.classDay }} {{ getWeekday1(curClassReserv.classDay) }}</label>
|
<label>{{ curClassReserv.classDay }} {{ getWeekday1(curClassReserv.classDay) }}</label>
|
||||||
<label>{{ curClassReserv.startTime }}-{{ curClassReserv.endTime }}</label>
|
<label>{{ curClassReserv.startTime }}-{{ curClassReserv.endTime }}</label>
|
||||||
|
@ -26,7 +36,13 @@
|
||||||
<el-popover placement="top-start" :width="250" trigger="hover">
|
<el-popover placement="top-start" :width="250" trigger="hover">
|
||||||
<template #default>
|
<template #default>
|
||||||
<div>
|
<div>
|
||||||
<el-button v-if="lastAsyncAllTime" type="success" size="small" :icon="Check" circle />
|
<el-button
|
||||||
|
v-if="lastAsyncAllTime"
|
||||||
|
type="success"
|
||||||
|
size="small"
|
||||||
|
:icon="Check"
|
||||||
|
circle
|
||||||
|
/>
|
||||||
{{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }}
|
{{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -44,26 +60,67 @@
|
||||||
<el-button @click="handleOutLink('feedback')">作业反馈</el-button>
|
<el-button @click="handleOutLink('feedback')">作业反馈</el-button>
|
||||||
<el-button @click="handleOutLink('homeWork')">布置作业</el-button>
|
<el-button @click="handleOutLink('homeWork')">布置作业</el-button>
|
||||||
<el-button @click="isDialogOpen = true">上传资料</el-button>
|
<el-button @click="isDialogOpen = true">上传资料</el-button>
|
||||||
<el-button type="primary" style="margin-left: 10px" @click="createFile">新建课件</el-button>
|
<el-button type="primary" style="margin-left: 10px" @click="createFile"
|
||||||
|
>新建课件</el-button
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<el-checkbox-group v-model="checkFileList" class="prepare-body-main"
|
<el-checkbox-group
|
||||||
:style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }">
|
v-model="checkFileList"
|
||||||
<file-list-item v-for="(item, index) in currentFileList" :key="index" :item="item" :index="index"
|
class="prepare-body-main"
|
||||||
@on-move="onMoveSingleFile" @on-delete="deleteTalk" @on-set="openSet" @on-delhomework="delhomework">
|
:style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
|
||||||
<el-checkbox label="" :value="item" v-if="!item.uniquekey" />
|
>
|
||||||
|
<file-list-item
|
||||||
|
v-for="(item, index) in currentFileList"
|
||||||
|
:key="index"
|
||||||
|
:item="item"
|
||||||
|
:index="index"
|
||||||
|
@on-move="onMoveSingleFile"
|
||||||
|
@on-delete="deleteTalk"
|
||||||
|
@on-set="openSet"
|
||||||
|
@on-delhomework="delhomework"
|
||||||
|
>
|
||||||
|
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
|
||||||
|
</file-list-item>
|
||||||
|
<file-list-item
|
||||||
|
v-for="(item, index) in currentWorkList"
|
||||||
|
:key="index"
|
||||||
|
:item="item"
|
||||||
|
:index="index"
|
||||||
|
@on-move="onMoveSingleFile"
|
||||||
|
@on-delete="deleteTalk"
|
||||||
|
@on-set="openSet"
|
||||||
|
@on-delhomework="delhomework"
|
||||||
|
>
|
||||||
|
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
|
||||||
</file-list-item>
|
</file-list-item>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
<file-oper-batch v-show="checkFileList.length > 0"
|
<file-oper-batch
|
||||||
|
v-show="checkFileList.length > 0"
|
||||||
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
|
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
|
||||||
:choose="checkFileList" :check-all="isCheckAll" @click-delete="clickDelete" @click-move="clickMove"
|
:choose="checkFileList"
|
||||||
@cancel="checkFileList = []" @click-choose="clickChoose"></file-oper-batch>
|
:check-all="isCheckAll"
|
||||||
|
@click-delete="clickDelete"
|
||||||
|
@click-move="clickMove"
|
||||||
|
@cancel="checkFileList = []"
|
||||||
|
@click-choose="clickChoose"
|
||||||
|
></file-oper-batch>
|
||||||
</div>
|
</div>
|
||||||
<MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" />
|
<MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" />
|
||||||
<uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
|
<uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
|
||||||
<SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :row="row" @on-close="closeHomework" />
|
<SetHomework
|
||||||
|
v-model="setDialog"
|
||||||
|
:entpcourseid="entpcourseid"
|
||||||
|
:row="row"
|
||||||
|
@on-close="closeHomework"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<reserv ref="reservDialog" @add-success="initReserv" :current-node="currentNode" :book-id="uploadData.textbookId"></reserv>
|
<reserv
|
||||||
|
ref="reservDialog"
|
||||||
|
:current-node="currentNode"
|
||||||
|
:book-id="uploadData.textbookId"
|
||||||
|
@add-success="initReserv"
|
||||||
|
></reserv>
|
||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup>
|
||||||
import { Check } from '@element-plus/icons-vue'
|
import { Check } from '@element-plus/icons-vue'
|
||||||
|
@ -118,6 +175,7 @@ export default {
|
||||||
fileList: [],
|
fileList: [],
|
||||||
currentNode: {},
|
currentNode: {},
|
||||||
currentFileList: [],
|
currentFileList: [],
|
||||||
|
currentWorkList: [],
|
||||||
curBookPath: '',
|
curBookPath: '',
|
||||||
curClassReserv: {},
|
curClassReserv: {},
|
||||||
downloadNum: 0,
|
downloadNum: 0,
|
||||||
|
@ -165,9 +223,12 @@ export default {
|
||||||
this.initReserv()
|
this.initReserv()
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.$watch(()=>toolStore.isToolWin,(newD, oldD)=>{
|
this.$watch(
|
||||||
|
() => toolStore.isToolWin,
|
||||||
|
(newD, oldD) => {
|
||||||
setTimeout(this.initReserv, 500)
|
setTimeout(this.initReserv, 500)
|
||||||
})
|
}
|
||||||
|
)
|
||||||
},
|
},
|
||||||
// activated() {
|
// activated() {
|
||||||
// if (this.uploadData.textbookId !== null) {
|
// if (this.uploadData.textbookId !== null) {
|
||||||
|
@ -360,7 +421,6 @@ export default {
|
||||||
toolStore.curSubjectNode.querySearch = this.uploadData
|
toolStore.curSubjectNode.querySearch = this.uploadData
|
||||||
this.initHomeWork()
|
this.initHomeWork()
|
||||||
await this.asyncAllFile()
|
await this.asyncAllFile()
|
||||||
|
|
||||||
},
|
},
|
||||||
async initHomeWork() {
|
async initHomeWork() {
|
||||||
if (this.timerId) {
|
if (this.timerId) {
|
||||||
|
@ -371,8 +431,7 @@ export default {
|
||||||
let { rows } = await this.getChapterId()
|
let { rows } = await this.getChapterId()
|
||||||
if (rows.length > 0) {
|
if (rows.length > 0) {
|
||||||
this.entpcourseid = rows[0].id
|
this.entpcourseid = rows[0].id
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
await this.createEntpcourse()
|
await this.createEntpcourse()
|
||||||
let { rows } = await this.getChapterId()
|
let { rows } = await this.getChapterId()
|
||||||
this.entpcourseid = rows[0].id
|
this.entpcourseid = rows[0].id
|
||||||
|
@ -385,23 +444,23 @@ export default {
|
||||||
// 创建新的entpcourse
|
// 创建新的entpcourse
|
||||||
createEntpcourse() {
|
createEntpcourse() {
|
||||||
// 参照 web AIx 传入参数
|
// 参照 web AIx 传入参数
|
||||||
var cform = {};
|
var cform = {}
|
||||||
cform.entpid = this.userStore.deptId;
|
cform.entpid = this.userStore.deptId
|
||||||
cform.level = 1;
|
cform.level = 1
|
||||||
cform.parentid = 0;
|
cform.parentid = 0
|
||||||
cform.dictid = 0;
|
cform.dictid = 0
|
||||||
cform.evalid = this.currentNode.id;
|
cform.evalid = this.currentNode.id
|
||||||
cform.evalparentid = 0;
|
cform.evalparentid = 0
|
||||||
cform.edusubject = this.currentNode.edusubject;
|
cform.edusubject = this.currentNode.edusubject
|
||||||
cform.edudegree = this.currentNode.edudegree;
|
cform.edudegree = this.currentNode.edudegree
|
||||||
cform.edustage = this.currentNode.edustage;
|
cform.edustage = this.currentNode.edustage
|
||||||
cform.coursetype = '课标学科';
|
cform.coursetype = '课标学科'
|
||||||
cform.coursetitle = this.currentNode.itemtitle;
|
cform.coursetitle = this.currentNode.itemtitle
|
||||||
cform.coursedesc = '';
|
cform.coursedesc = ''
|
||||||
cform.status = '';
|
cform.status = ''
|
||||||
cform.dflag = 0;
|
cform.dflag = 0
|
||||||
cform.edituserid = this.userStore.userId;
|
cform.edituserid = this.userStore.userId
|
||||||
cform.createblankfile = 'yes';
|
cform.createblankfile = 'yes'
|
||||||
return addEntpcourse(cform)
|
return addEntpcourse(cform)
|
||||||
},
|
},
|
||||||
openReserv() {
|
openReserv() {
|
||||||
|
@ -500,7 +559,7 @@ export default {
|
||||||
// 去重
|
// 去重
|
||||||
let ary = uniqBy([...this.currentFileList, ...list], 'id')
|
let ary = uniqBy([...this.currentFileList, ...list], 'id')
|
||||||
// 深度克隆
|
// 深度克隆
|
||||||
this.currentFileList = cloneDeep(ary)
|
this.currentWorkList = cloneDeep(ary)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getWeekday1(date) {
|
getWeekday1(date) {
|
||||||
|
@ -516,12 +575,14 @@ export default {
|
||||||
// 删除作业
|
// 删除作业
|
||||||
delhomework(item) {
|
delhomework(item) {
|
||||||
this.isLoading = true
|
this.isLoading = true
|
||||||
delClasswork(item.id).then(async res => {
|
delClasswork(item.id)
|
||||||
|
.then(async (res) => {
|
||||||
ElMessage.success('操作成功')
|
ElMessage.success('操作成功')
|
||||||
this.isLoading = false
|
this.isLoading = false
|
||||||
await this.asyncAllFile()
|
await this.asyncAllFile()
|
||||||
this.getHomeWorkList()
|
this.getHomeWorkList()
|
||||||
}).catch(() => {
|
})
|
||||||
|
.catch(() => {
|
||||||
this.isLoading = false
|
this.isLoading = false
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
@ -542,7 +603,15 @@ export default {
|
||||||
const toolStore = useToolState()
|
const toolStore = useToolState()
|
||||||
if (toolStore.isToolWin) return this.$message.error('您当前已开始上课,请勿重复操作')
|
if (toolStore.isToolWin) return this.$message.error('您当前已开始上课,请勿重复操作')
|
||||||
startClass(this.curClassReserv.id)
|
startClass(this.curClassReserv.id)
|
||||||
createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + this.entpcourseid +'&label=' + this.currentNode.label+ "&reservId=" + this.curClassReserv.id })
|
createWindow('tool-sphere', {
|
||||||
|
url:
|
||||||
|
'/tool/sphere?entpcourseid=' +
|
||||||
|
this.entpcourseid +
|
||||||
|
'&label=' +
|
||||||
|
this.currentNode.label +
|
||||||
|
'&reservId=' +
|
||||||
|
this.curClassReserv.id
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue