Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

src/renderer/src/layout/components/Header.vue

@@ -153,7 +153,7 @@ function handleCommand(command) {
 
 function logout() {
   const hasClass = sessionStore.has('activeClass.id')
-  if (hasClass || toolState.isToolWin) return ElMessage.warning('当前正在上课，请先结结束上课')
+  if (hasClass || toolState.isToolWin) return ElMessage.warning('当前正在上课，请先结束上课')
   ElMessageBox.confirm('确认退出系统吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',

src/renderer/src/views/classTask/classTask.vue

@@ -377,6 +377,7 @@ const  closeDialog = () => {
   getStudentClassWorkDataPolling()
 }
 
+const openDialogTime = ref(null);//弹窗
 /**
  * 开启新批改弹窗
  * @param item 作业对象
@@ -386,12 +387,15 @@ const onClickItem = (item) => {
   clearInterval(pollingST.value)
   // itemDialogRef.value.openDialog(item)
 
-  // 新跳转子窗口链接
+  if(openDialogTime.value) return;
-  // 1、本地缓存item数据，2、打开子窗口 3、子窗口加载item数据
+  clearTimeout(openDialogTime.value)
-  // localStorage.setItem('teachClassWorkItem', JSON.stringify(item))
+  openDialogTime.value = setTimeout(() => {
-  sessionStore.set('teachClassWorkItem', item)
+    openDialogTime.value = null;
-  toolState.isTaskWin=true //设置打开批改窗口
+    toolState.isTaskWin=true; // 设置打开批改窗口
-  createWindow('open-taskwin',{url:'/teachClassTask'})
+    sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
+    // 调用新窗口批改页面
+    createWindow('open-taskwin',{url:'/teachClassTask'})
+  }, 1000)
 }
 
 

src/renderer/src/views/desktop/container/work-trend.vue

@@ -67,14 +67,20 @@ const getHomework = async () => {
     loading.value = false
   }
 }
+
+const openDialogTime = ref(null);//弹窗
 // 批改作业
 const onClickItem = (item) => {
   console.log('开启弹窗')
-  // itemDialogRef.value.openDialog(item)
+  if(openDialogTime.value) return;
-  // 调用新窗口批改页面
+  clearTimeout(openDialogTime.value)
-  sessionStore.set('teachClassWorkItem', item)
+  openDialogTime.value = setTimeout(() => {
-  toolState.isTaskWin=true //设置打开批改窗口
+    openDialogTime.value = null;
-  createWindow('open-taskwin',{url:'/teachClassTask'})
+    toolState.isTaskWin=true; // 设置打开批改窗口
+    sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
+    // 调用新窗口批改页面
+    createWindow('open-taskwin',{url:'/teachClassTask'})
+  }, 1000)
 }
 
 const tagType = (time) => {