From 2e1fe84bcda813e4c8367a71990d9e33b02f31ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Fri, 27 Sep 2024 12:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=89=B9=E6=94=B9--=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E6=9C=AA=E6=8F=90=E4=BA=A4=EF=BC=8C=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E6=89=B9=E9=98=85=E5=90=8E=E6=89=B9=E9=98=85=E6=95=B0=E6=9C=AA?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/utils/tool.js                |  8 +++++--
 .../src/views/classTask/classTask.vue         | 22 ++++++++++++-------
 .../views/classTask/container/task-item.vue   | 19 ----------------
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js
index 50cc23c..d1a2869 100644
--- a/src/renderer/src/utils/tool.js
+++ b/src/renderer/src/utils/tool.js
@@ -177,8 +177,12 @@ export const createWindow = async (type, data) => {
       }
       const option = data.option||{}
       const defOption = {
-        width: 1280,// 1920,
-        height: 720,// 1080,
+        // width: 1280,// 1920,
+        // height: 720,// 1080,
+        width: 1450,
+        minWidth: 1200,
+        height: 800,
+        minHeight: 700,
         frame: true,       // 要创建无边框窗口
         // resizable: true,    // 禁止窗口大小缩放
         alwaysOnTop: false, // 窗口是否总是显示在其他窗口之前
diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue
index e6c35e3..93d1970 100644
--- a/src/renderer/src/views/classTask/classTask.vue
+++ b/src/renderer/src/views/classTask/classTask.vue
@@ -57,21 +57,20 @@
         ></el-empty>
       </div>
     </div>
-    <item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog>
+    <!-- <item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog> -->
   </el-container>
 </template>
 
 <script setup>
-import { ref, onMounted, onUnmounted, computed, watch, reactive } from 'vue'
-import { listByDeadDate, listClassworkdataByDeadDate, listClassworkdata } from '@/api/classTask'
+import { ref, onMounted, onUnmounted, computed, watch } from 'vue'
+import { listByDeadDate, listClassworkdata } from '@/api/classTask'
 
 import TaskItem from '@/views/classTask/container/task-item.vue'
-import ItemDialog from '@/views/classTask/container/item-dialog.vue'
+// import ItemDialog from '@/views/classTask/container/item-dialog.vue'
 import { useToolState } from '@/store/modules/tool'
 import { getCurrentTime, getTomorrow } from '@/utils/date'
 import useUserStore from '@/store/modules/user'
 import useClassTaskStore from "@/store/modules/classTask";
-import { useGetHomework } from '@/hooks/useGetHomework'
 import {sessionStore, createWindow} from '@/utils/tool'
 
 
@@ -79,7 +78,7 @@ const toolState = useToolState();
 
 const classTaskStore = useClassTaskStore()
 const userStore = useUserStore().user
-const itemDialogRef = ref(null)
+// const itemDialogRef = ref(null)
 const tabOptions = ref(['进行中', '已结束'])
 const tabActive = ref('进行中')
 const dataList = ref([])
@@ -345,7 +344,7 @@ const pollingST = ref(null) //轮询定时器标识
 onMounted(() => {
   getData() // 加载数据
   // 轮询查询
-  getStudentClassWorkDataPolling()
+  closeDialog();
 })
 
 // 轮询查询 学生作业进度
@@ -359,6 +358,7 @@ const getStudentClassWorkDataPolling = () => {
 }
 
 const  closeDialog = () => {
+  clearInterval(pollingST.value) // 关闭轮询
   getStudentClassWorkDataPolling()
 }
 
@@ -430,6 +430,11 @@ const getStudentVisible = async () => {
       // 更新批阅数
       classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
     } else {
+      // 学生未完成，但是老师批改了？
+      if(curWork && curWork.workdataresultcount == 0){
+        // 更新批改数
+        classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
+      }
       classWorkList.value[t].finishpercent = 0
     }
   }
@@ -442,8 +447,9 @@ const getStudentVisible = async () => {
 watch(
   () => [dataList, toolState.isTaskWin],
   () => {
-    console.log('=监听到批改窗口打开了===', toolState)
+    console.log('=监听到批改窗口打开了===', toolState.isTaskWin)
     if(!toolState.isTaskWin){
+
       closeDialog();// 开启轮询
     }
   }
diff --git a/src/renderer/src/views/classTask/container/task-item.vue b/src/renderer/src/views/classTask/container/task-item.vue
index d445e98..9e5207b 100644
--- a/src/renderer/src/views/classTask/container/task-item.vue
+++ b/src/renderer/src/views/classTask/container/task-item.vue
@@ -14,7 +14,6 @@
         &nbsp;|&nbsp; 截止时间：{{ item.deaddate }} &nbsp;|&nbsp;{{ tabactive }}
       </div>
     </div>
-    <!-- <el-switch v-model="value1" active-text="云同步"> </el-switch> -->
     <div class="class-reserv-item-tool">
       <span>
         <span v-if="item.workdataresultcount!=0" style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultcount }}</span>
@@ -68,24 +67,6 @@ const props = defineProps({
     default: () => ''
   }
 })
-import { ref, reactive } from 'vue'
-const value1 = ref(true);
-const basePath = import.meta.env.VITE_APP_BUILD_BASE_PATH
-const toolStore = useToolState() // 获取状态管理-tool
-const openEdit = () => {
-  emit('openEdit', props.item)
-}
-const deleteReserv = () => {
-  deleteSmartReserv([props.item.id]).then((res) => {
-    if (res.data === true) {
-      ElMessage({
-        message: '删除成功',
-        type: 'success'
-      })
-      emit('deleteReserv', props.item)
-    }
-  })
-}
 
 
 </script>