bug修复,以及代码优化

This commit is contained in:
zdg 2024-09-19 12:02:31 +08:00
parent c58322ca0b
commit 0ef5ef424f
5 changed files with 64 additions and 84 deletions

View File

@ -66,9 +66,10 @@ function stateSyncWatch(storeName, newState) {
const keyArr = key.split('.') || []
keyArr.reduce((o,c,i)=>{o[c] = i === keyArr.length-1 ? value : {};return o[c]}, newValue)
const jsonStr = JSON.stringify(newValue) // 从新组装-json数据
// // 更新本地数据-session
// 更新本地数据-session
// console.log('state-change-update:', key, value)
sessionStore.set(key, value)
// // 通知主线程更新
// 通知主线程更新
ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr)
// console.log('======',key, value, jsonStr )
}

View File

@ -119,71 +119,22 @@ onMounted(() => {
*/
const open = async (id) => {
visible.value = true
// apt
if (id) await getAptInfo(id)
//
// myClassActive.value = {
// "createBy": null,
// "createTime": null,
// "updateBy": null,
// "updateTime": null,
// "remark": null,
// "id": 14740,
// "idarray": null,
// "jsonarray": null,
// "entpid": 255,
// "parentid": 14741,
// "linkids": "",
// "linklist": "",
// "entpcourseid": 7300,
// "entpcourseidarray": null,
// "evalid": 39952,
// "evaltitle": " ",
// "coursetitle": " ",
// "classid": 0,
// "ppttype": "file",
// "title": " ",
// "fileidx": 0,
// "fileurl": "",
// "pathfile": null,
// "filetype": "ppt",
// "filesize": null,
// "datacontent": "",
// "filekey": "",
// "filetag": "",
// "dflag": 0,
// "status": "",
// "edituserid": 2781,
// "editusername": "",
// "edituserheadimgurl": "/profile/avatar/2024/08/12/blob_20240812152930A001.jpeg",
// "edituserentpname": "AIx",
// "editstudentid": null,
// "editstudentname": null,
// "timestamp": "2024-09-10 15:07:20",
// "token": null,
// "base64Code": null,
// "orderby": null,
// "childcount": 4,
// "commentlikecount": 0,
// "commenttextcount": 0,
// "commentusecount": 0,
// "commentvisitcount": 90,
// "unixstamp": null,
// "classworkcount": 0,
// "classworklist": "",
// "authjson": "",
// "defaultslide": null
// }
//
getClassList()
// im-chat
// nextTick(async() => {
// chat = await imChatRef.value?.initImChat()
// })
if (id) {
//
reset()
// apt
await getAptInfo(id)
//
getClassList()
// im-chat
nextTick(async() => {
chat = await imChatRef.value?.initImChat()
})
}
}
//
const handleClose = async () => {
reset() //
await chat?.logout()
chat = null
}
@ -204,6 +155,15 @@ const initData = () => {
{ label: '故障备用', prop: 'backup', show: false },
]
}
//
const reset = () => {
// -
classForm.form = {}
teacherForm.form = { classcourseid: 0 }
dt.isCreate = false
dt.isHistory = false
dt.atCourse = {}
}
// APT
const getAptInfo = async (id) => {
const res = await Http_Entpcoursefile.getEntpcoursefile(id)

View File

@ -52,7 +52,8 @@
</div>
</div>
<div class="prepare-body-main-item-btn">
<el-button type="primary" @click="clickStartClass(item)">上课</el-button>
<el-button v-if="activeClassId==item.id" type="success" @click="clickStartClass(item)">上课中</el-button>
<el-button v-else type="primary" @click="clickStartClass(item)">上课</el-button>
</div>
<div class="prepare-body-main-item-tool">
<el-popover
@ -65,18 +66,20 @@
<template #default>
<div style="width: 100%">
<div class="item-popover" @click="closePopver(index)">
<div v-if="userInfo.userId === Number(item.createUserId)" class="item-popover-item">
<el-button text @click="editTalk(item, index)">
<i class="iconfont icon-bianji"></i>
<span>标签</span>
</el-button>
</div>
<div v-if="userInfo.userId === Number(item.createUserId)" class="item-popover-item">
<el-button text @click="deleteTalk(item)">
<i class="iconfont icon-shanchu"></i>
<span>删除</span>
</el-button>
</div>
<template v-if="userInfo.userId === Number(item.createUserId)">
<div class="item-popover-item">
<el-button text @click="editTalk(item, index)">
<i class="iconfont icon-bianji"></i>
<span>标签</span>
</el-button>
</div>
<div class="item-popover-item">
<el-button text @click="deleteTalk(item)" :disabled="activeClassId==item.id">
<i class="iconfont icon-shanchu"></i>
<span>删除</span>
</el-button>
</div>
</template>
</div>
</div>
</template>
@ -98,6 +101,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
import useUserStore from '@/store/modules/user'
import outLink from '@/utils/linkConfig'
import { sessionStore } from '@/utils/store'
const { ipcRenderer } = window.electron || {}
export default {
@ -115,6 +119,10 @@ export default {
default: function () {
return 0
}
},
activeClassId: { // id
type: String,
default: ''
}
},
emits: { 'on-start-class': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null,'on-filearg': null },

View File

@ -20,6 +20,7 @@
:key="index"
:item="item"
:index="index"
:activeClassId="activeClass?.id"
@on-delete="deleteTalk"
@on-start-class="startClass"
>
@ -192,7 +193,7 @@ import { getClassInfo, getSelfReserv } from '@/api/classManage'
import { useGetHomework } from '@/hooks/useGetHomework'
import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile'
import ClassReserv from '@/views/classManage/classReserv.vue'
import classStart from '@/views/desktop/container/class-start.vue' //
import classStart from './container/class-start.vue' //
const toolStore = useToolState()
const fs = require('fs')
@ -246,7 +247,9 @@ export default {
//
setDialog: false,
row: '',
isOpenHomework: false
isOpenHomework: false,
//
activeClass: null,
}
},
computed: {
@ -272,6 +275,9 @@ export default {
})
this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
// this.initReserv()
// zdg:
this.activeClass = sessionStore.get('activeClass') || null
},
mounted() {
this.$watch(
@ -298,15 +304,20 @@ export default {
// },
methods: {
startClass(item) {
console.log(item)
// console.log(item, sessionStore)
if(item.fileFlag === '课件') {
// ()
const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
if (id && id == item.id) return ElMessage.warning('当前正在上课,请勿重复操作')
this.openReserv()
}
if(item.fileFlag === 'apt') {
//TODO apt
const { fileId: aptId } = item
this.$refs.calssRef.open(aptId)
//TODO apt - fileId: aptId
this.$refs.calssRef.open(item.fileId)
}
// -store
sessionStore.set('activeClass', item)
this.activeClass = item
},
initReserv(id) {
getClassInfo(id).then((res) => {

View File

@ -10,7 +10,7 @@
<upvote-vue ref="upvoteRef" type="2"></upvote-vue>
<!-- im-chat 聊天组件 -->
<im-chat ref="imChatRef" @change="chatChange" isGroup />
<im-chat ref="imChatRef" @change="chatChange" group />
<!-- 底部工具栏 -->
<div class="tool-bottom-all" @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">