Merge pull request 'baigl' (#281) from baigl into main

Reviewed-on: #281

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "",
   "main": "./out/main/index.js",
   "author": "example.com",

src/main/index.js

@@ -280,14 +280,10 @@ function handleAll() {
   })
   // 用于监听-状态管理变化-同步所有窗口
   ipcMain.handle('pinia-state-change', (e, storeName, jsonStr) => {
-    console.log('pinia-state-change-1', storeName, jsonStr)
 
     for(const curWin of BrowserWindow.getAllWindows()){
       const id = curWin.webContents.id
       const bool = id !== e.sender.id && !curWin.isDestroyed()
-      if (id === e.sender.id) {
-        console.log('pinia-state-change-2', 'windows-send', curWin.type)
-      }
       if (bool) { // 除了消息发送窗口和销毁的窗口 其他都发送
         curWin.webContents.send('pinia-state-set', storeName, jsonStr)
       }

src/main/store.js

@@ -14,14 +14,14 @@ const defaultData = {
     isPdfWin: false,        // pdf窗口是否打开
     isToolWin: false,       // 工具窗口是否打开
     curSubjectNode: {
-      data: {},              // 当前教材节点 （包含当前教材 单元）
       querySearch: {}       // 查询资源所需参数
     },
-    subject: {
+    subject: {    // 不走同步 Pinia
       bookList: null, // 教材列表
       curBook: null, // 当前选中的教材
       curNode: null, // 当前选中的节点
       defaultExpandedKeys: [], //展开的节点
+      subjectTree: [] // "树结构" 章节
     }
   },
   local: { // 本地(永久localStorage)

src/renderer/public/pdfjs-dist/web/viewer.html

@@ -294,7 +294,7 @@ See https://github.com/adobe-type-tools/cmap-resources
                 </span>
                 <span id="numPages" class="toolbarLabel"></span>
               </div>
-              <div id="toolbarViewerRight" style="display: none;">
+              <div id="toolbarViewerRight">
                 <div id="editorModeButtons" class="splitToolbarButton toggled" role="radiogroup">
                   <button id="editorHighlight" class="toolbarButton" hidden="true" disabled="disabled" title="Highlight" role="radio" aria-checked="false" aria-controls="editorHighlightParamsToolbar" tabindex="31" data-l10n-id="pdfjs-editor-highlight-button">
                     <span data-l10n-id="pdfjs-editor-highlight-button-label">Highlight</span>

src/renderer/src/api/classTask/index.js

@@ -72,7 +72,21 @@ export function updateClasswork(data) {
   })
 }
 
-
+// 删除classworkeval
+export function delClassworkeval(id) {
+  return request({
+    url: '/education/classworkeval/' + id,
+    method: 'delete'
+  })
+}
+// 新增classworkeval
+export function addClassworkeval(data) {
+  return request({
+    url: '/education/classworkeval',
+    method: 'post',
+    data: data
+  })
+}
 
 // 查询evaluationclue列表
 export function listEvaluationclue(query) {

src/renderer/src/assets/iconfont/iconfont.css

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2794390 */
-  src: url('iconfont.woff2?t=1725847033097') format('woff2'),
-       url('iconfont.woff?t=1725847033097') format('woff'),
-       url('iconfont.ttf?t=1725847033097') format('truetype'),
-       url('iconfont.svg?t=1725847033097#iconfont') format('svg');
+  src: url('iconfont.woff2?t=1727403518918') format('woff2'),
+       url('iconfont.woff?t=1727403518918') format('woff'),
+       url('iconfont.ttf?t=1727403518918') format('truetype'),
+       url('iconfont.svg?t=1727403518918#iconfont') format('svg');
 }
 
 .iconfont {
@@ -14,38 +14,98 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-a-1_jiaoxuefansi:before {
+  content: "\e6cd";
+}
+
+.icon-iconfontzhizuobiaozhunbduan3-1:before {
+  content: "\100af";
+}
+
+.icon-gongzuotai_xuanzhong:before {
+  content: "\e605";
+}
+
+.icon-yijianfankui:before {
+  content: "\e8a1";
+}
+
+.icon-zuoyesheji:before {
+  content: "\e619";
+}
+
+.icon-jihua:before {
+  content: "\e601";
+}
+
+.icon-xueqingfenxi:before {
+  content: "\e68a";
+}
+
+.icon-zuoyebuzhi:before {
+  content: "\e607";
+}
+
+.icon-zuoyepigai:before {
+  content: "\ec35";
+}
+
+.icon-jiaocai1:before {
+  content: "\e781";
+}
+
+.icon-yanjiushi:before {
+  content: "\e70a";
+}
+
+.icon-zuzhi:before {
+  content: "\e63b";
+}
+
+.icon-zhiliang:before {
+  content: "\e642";
+}
+
+.icon-jiaoxueshijian:before {
+  content: "\e676";
+}
+
+.icon-kebiao:before {
+  content: "\e67a";
+}
+
+.icon-yanjiuyuan:before {
+  content: "\e6bf";
+}
+
+.icon-kaoshi:before {
+  content: "\eb14";
+}
+
+.icon-iconfontzhizuobiaozhunbduan36:before {
+  content: "\e6eb";
+}
+
+.icon-ziyuanku:before {
+  content: "\eb01";
+}
+
+.icon-yanjiushi-2:before {
+  content: "\100b0";
+}
+
+.icon-fasong:before {
+  content: "\e692";
+}
+
 .icon-aijiqiren:before {
   content: "\e73c";
 }
 
-.icon-saoyisao:before {
-  content: "\e691";
-}
-
-.icon-jiaoxuezhiliangfenxi:before {
-  content: "\e690";
-}
-
-.icon-jiaoxuejihua:before {
-  content: "\e7e9";
-}
-
 .icon-tongji:before {
   content: "\e68f";
 }
 
-.icon-pigai:before {
-  content: "\e68d";
-}
-
-.icon-jiaoxuefansi:before {
-  content: "\e6b2";
-}
-
-.icon-kaoshi:before {
-  content: "\e68a";
-}
-
 .icon-yiwen:before {
   content: "\e687";
 }
@@ -174,10 +234,6 @@
   content: "\e642";
 }
 
-.icon-organization-framework-line:before {
-  content: "\e9fe";
-}
-
 .icon-jiaocai:before {
   content: "\e67b";
 }
@@ -246,10 +302,6 @@
   content: "\eb13";
 }
 
-.icon-fankui:before {
-  content: "\e738";
-}
-
 .icon-tiku:before {
   content: "\e621";
 }
@@ -270,10 +322,6 @@
   content: "\e61c";
 }
 
-.icon-jiaoxuefenxi:before {
-  content: "\e605";
-}
-
 .icon-wenjianjia:before {
   content: "\ec17";
 }
@@ -298,14 +346,6 @@
   content: "\e675";
 }
 
-.icon-yanjiushi:before {
-  content: "\e607";
-}
-
-.icon-gongzuotai:before {
-  content: "\e676";
-}
-
 .icon-lunwen:before {
   content: "\e60e";
 }
@@ -322,10 +362,6 @@
   content: "\e6fe";
 }
 
-.icon-pengyouquan1:before {
-  content: "\e635";
-}
-
 .icon-beike1:before {
   content: "\e61b";
 }
@@ -346,10 +382,6 @@
   content: "\e612";
 }
 
-.icon-fankui1:before {
-  content: "\e6fa";
-}
-
 .icon-shezhi:before {
   content: "\e614";
 }
@@ -394,10 +426,6 @@
   content: "\e654";
 }
 
-.icon-kecheng:before {
-  content: "\e619";
-}
-
 .icon-bianji1:before {
   content: "\e61d";
 }
@@ -426,10 +454,6 @@
   content: "\e79a";
 }
 
-.icon-xueqingfenxi:before {
-  content: "\e67a";
-}
-
 .icon-check:before {
   content: "\e622";
 }
@@ -546,10 +570,6 @@
   content: "\e636";
 }
 
-.icon-ziyuanfenxi:before {
-  content: "\e637";
-}
-
 .icon-shoucang1:before {
   content: "\e638";
 }
@@ -566,10 +586,6 @@
   content: "\e772";
 }
 
-.icon-xiezuo1:before {
-  content: "\e63b";
-}
-
 .icon-fenxi1:before {
   content: "\e63c";
 }
@@ -798,10 +814,6 @@
   content: "\e672";
 }
 
-.icon-jiaoxueziyuan:before {
-  content: "\e601";
-}
-
 .icon-beike:before {
   content: "\e6c2";
 }

src/renderer/src/assets/iconfont/iconfont.json

@@ -5,6 +5,153 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "37027693",
+      "name": "教学反思",
+      "font_class": "a-1_jiaoxuefansi",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "41983432",
+      "name": "朋友圈-copy",
+      "font_class": "iconfontzhizuobiaozhunbduan3-1",
+      "unicode": "100af",
+      "unicode_decimal": 65711
+    },
+    {
+      "icon_id": "9478557",
+      "name": "工作台_选中",
+      "font_class": "gongzuotai_xuanzhong",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "2076317",
+      "name": " 意见反馈",
+      "font_class": "yijianfankui",
+      "unicode": "e8a1",
+      "unicode_decimal": 59553
+    },
+    {
+      "icon_id": "2468169",
+      "name": "作业指导书",
+      "font_class": "zuoyesheji",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    },
+    {
+      "icon_id": "3865266",
+      "name": "计划",
+      "font_class": "jihua",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "4308245",
+      "name": "学情概览",
+      "font_class": "xueqingfenxi",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "5113507",
+      "name": "教学中心_作业批改",
+      "font_class": "zuoyebuzhi",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    },
+    {
+      "icon_id": "5767879",
+      "name": "执行反馈",
+      "font_class": "zuoyepigai",
+      "unicode": "ec35",
+      "unicode_decimal": 60469
+    },
+    {
+      "icon_id": "10992961",
+      "name": "课程标准",
+      "font_class": "jiaocai1",
+      "unicode": "e781",
+      "unicode_decimal": 59265
+    },
+    {
+      "icon_id": "11744086",
+      "name": "策略研究 选中",
+      "font_class": "yanjiushi",
+      "unicode": "e70a",
+      "unicode_decimal": 59146
+    },
+    {
+      "icon_id": "12732492",
+      "name": "组织",
+      "font_class": "zuzhi",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "18909227",
+      "name": "质量管理",
+      "font_class": "zhiliang",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
+    {
+      "icon_id": "21156217",
+      "name": "培训",
+      "font_class": "jiaoxueshijian",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "33378945",
+      "name": "课程标准",
+      "font_class": "kebiao",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "33722029",
+      "name": "研究院",
+      "font_class": "yanjiuyuan",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "35203493",
+      "name": "考试 (3)",
+      "font_class": "kaoshi",
+      "unicode": "eb14",
+      "unicode_decimal": 60180
+    },
+    {
+      "icon_id": "1236933",
+      "name": "朋友圈",
+      "font_class": "iconfontzhizuobiaozhunbduan36",
+      "unicode": "e6eb",
+      "unicode_decimal": 59115
+    },
+    {
+      "icon_id": "40912837",
+      "name": "智慧图书馆",
+      "font_class": "ziyuanku",
+      "unicode": "eb01",
+      "unicode_decimal": 60161
+    },
+    {
+      "icon_id": "41983489",
+      "name": "策略研究 选中-copy",
+      "font_class": "yanjiushi-2",
+      "unicode": "100b0",
+      "unicode_decimal": 65712
+    },
+    {
+      "icon_id": "34833984",
+      "name": "发送",
+      "font_class": "fasong",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
     {
       "icon_id": "34666608",
       "name": "ai机器人",
@@ -12,27 +159,6 @@
       "unicode": "e73c",
       "unicode_decimal": 59196
     },
-    {
-      "icon_id": "12657402",
-      "name": "资源库",
-      "font_class": "saoyisao",
-      "unicode": "e691",
-      "unicode_decimal": 59025
-    },
-    {
-      "icon_id": "6513175",
-      "name": "教学质量分析",
-      "font_class": "jiaoxuezhiliangfenxi",
-      "unicode": "e690",
-      "unicode_decimal": 59024
-    },
-    {
-      "icon_id": "38447338",
-      "name": "教学计划",
-      "font_class": "jiaoxuejihua",
-      "unicode": "e7e9",
-      "unicode_decimal": 59369
-    },
     {
       "icon_id": "8455509",
       "name": "统计",
@@ -40,27 +166,6 @@
       "unicode": "e68f",
       "unicode_decimal": 59023
     },
-    {
-      "icon_id": "5969226",
-      "name": "批改",
-      "font_class": "pigai",
-      "unicode": "e68d",
-      "unicode_decimal": 59021
-    },
-    {
-      "icon_id": "36295514",
-      "name": "教学反思",
-      "font_class": "jiaoxuefansi",
-      "unicode": "e6b2",
-      "unicode_decimal": 59058
-    },
-    {
-      "icon_id": "21088705",
-      "name": "考试",
-      "font_class": "kaoshi",
-      "unicode": "e68a",
-      "unicode_decimal": 59018
-    },
     {
       "icon_id": "20574719",
       "name": "疑问",
@@ -285,13 +390,6 @@
       "unicode": "e642",
       "unicode_decimal": 58946
     },
-    {
-      "icon_id": "6235034",
-      "name": "组织框架",
-      "font_class": "organization-framework-line",
-      "unicode": "e9fe",
-      "unicode_decimal": 59902
-    },
     {
       "icon_id": "10900222",
       "name": "教材",
@@ -411,13 +509,6 @@
       "unicode": "eb13",
       "unicode_decimal": 60179
     },
-    {
-      "icon_id": "577336",
-      "name": "反馈",
-      "font_class": "fankui",
-      "unicode": "e738",
-      "unicode_decimal": 59192
-    },
     {
       "icon_id": "1447760",
       "name": "题库",
@@ -453,13 +544,6 @@
       "unicode": "e61c",
       "unicode_decimal": 58908
     },
-    {
-      "icon_id": "4686996",
-      "name": "教学分析",
-      "font_class": "jiaoxuefenxi",
-      "unicode": "e605",
-      "unicode_decimal": 58885
-    },
     {
       "icon_id": "4893191",
       "name": "文件夹",
@@ -502,20 +586,6 @@
       "unicode": "e675",
       "unicode_decimal": 58997
     },
-    {
-      "icon_id": "7327280",
-      "name": "研究室",
-      "font_class": "yanjiushi",
-      "unicode": "e607",
-      "unicode_decimal": 58887
-    },
-    {
-      "icon_id": "7905547",
-      "name": "工作台",
-      "font_class": "gongzuotai",
-      "unicode": "e676",
-      "unicode_decimal": 58998
-    },
     {
       "icon_id": "9023128",
       "name": "论文",
@@ -544,13 +614,6 @@
       "unicode": "e6fe",
       "unicode_decimal": 59134
     },
-    {
-      "icon_id": "16364339",
-      "name": "朋友圈",
-      "font_class": "pengyouquan1",
-      "unicode": "e635",
-      "unicode_decimal": 58933
-    },
     {
       "icon_id": "37075078",
       "name": "备课",
@@ -586,13 +649,6 @@
       "unicode": "e612",
       "unicode_decimal": 58898
     },
-    {
-      "icon_id": "2680657",
-      "name": "反馈",
-      "font_class": "fankui1",
-      "unicode": "e6fa",
-      "unicode_decimal": 59130
-    },
     {
       "icon_id": "4520331",
       "name": "设置",
@@ -670,13 +726,6 @@
       "unicode": "e654",
       "unicode_decimal": 58964
     },
-    {
-      "icon_id": "6560965",
-      "name": "课程",
-      "font_class": "kecheng",
-      "unicode": "e619",
-      "unicode_decimal": 58905
-    },
     {
       "icon_id": "6682548",
       "name": "编辑",
@@ -726,13 +775,6 @@
       "unicode": "e79a",
       "unicode_decimal": 59290
     },
-    {
-      "icon_id": "8225912",
-      "name": "学情分析",
-      "font_class": "xueqingfenxi",
-      "unicode": "e67a",
-      "unicode_decimal": 59002
-    },
     {
       "icon_id": "9922803",
       "name": "check",
@@ -936,13 +978,6 @@
       "unicode": "e636",
       "unicode_decimal": 58934
     },
-    {
-      "icon_id": "39506557",
-      "name": "资源分析",
-      "font_class": "ziyuanfenxi",
-      "unicode": "e637",
-      "unicode_decimal": 58935
-    },
     {
       "icon_id": "3267408",
       "name": "收藏",
@@ -971,13 +1006,6 @@
       "unicode": "e772",
       "unicode_decimal": 59250
     },
-    {
-      "icon_id": "6837777",
-      "name": "写作",
-      "font_class": "xiezuo1",
-      "unicode": "e63b",
-      "unicode_decimal": 58939
-    },
     {
       "icon_id": "7171145",
       "name": "粮食动态决策分析系统",
@@ -1377,13 +1405,6 @@
       "unicode": "e672",
       "unicode_decimal": 58994
     },
-    {
-      "icon_id": "15841963",
-      "name": "教学资源",
-      "font_class": "jiaoxueziyuan",
-      "unicode": "e601",
-      "unicode_decimal": 58881
-    },
     {
       "icon_id": "5562910",
       "name": "备课",

src/renderer/src/components/PdfJs/index.vue

@@ -21,7 +21,6 @@ const fileUrl = getAppInstallUrl('pdfjs-dist/web/viewer.html', 'user', '\\out\\r
 onMounted(() => {
     /** 将传入的pdf地址进行编码，防止中文识别错误 */
     pdfUrl.value = fileUrl + encodeURIComponent(props.url)
-    console.log('组件',pdfUrl.value);
 })
 </script>
 

src/renderer/src/components/choose-textbook/index.vue

@@ -181,6 +181,8 @@ onMounted( async () => {
 
     // 章节"树"
     treeData.value = useSubject.getTreeData(curBook.data.id)
+    sessionStore.set('subject.subjectTree',useSubject.getTreeData(curBook.data.id))
+    
     nextTick(() =>{
       // 默认展开 选中
       if(sessionStore.get('subject.curNode')){

src/renderer/src/components/common/cForm.vue

@@ -145,7 +145,6 @@ export default {
     }
   },
   created() {
-    window.test = this
     this.slotKeys = Object.keys(this.$slots)
   },
   methods: {

src/renderer/src/components/pdf/index copy.vue

@@ -285,7 +285,7 @@ onMounted(async () => {
     canvas2.canvas.setWidth(window.innerWidth / 2 - 100)
     // canvas2.canvas.isDrawingMode=false
     canvas1FabricVue.value = canvas2
-    window.test = { canvas1, canvas2 }
+    // window.test = { canvas1, canvas2 }
     emit('update:numPagesTotal', pdf.numPages)
 
     if (props.pdfObj.allPageData.length) {

src/renderer/src/components/pdf/index.vue

@@ -294,7 +294,7 @@ onMounted(async () => {
     canvas2.canvas.setWidth(window.innerWidth / 2 - 100)
     // canvas2.canvas.isDrawingMode=false
     canvas1FabricVue.value = canvas2
-    window.test = { canvas1, canvas2 }
+    // window.test = { canvas1, canvas2 }
     emit('update:numPagesTotal', pdf.numPages)
 
     if (props.pdfObj.allPageData.length) {

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

@@ -9,7 +9,14 @@
         <ul class="flex">
           <li class="flex" :class="[activeId == menu.path ? 'active-li' : '', menu.disabled ? 'disabled' : '']"
             v-for="menu in headerMenus" :key="menu.id" @click="clickMenu(menu)">
-            <i class="iconfont" :class="menu.icon"></i>
+            <div class="icon-box">
+            
+              
+                <svg class="icon iconfont" aria-hidden="true">
+                  <use :xlink:href="menu.icon"></use>
+                </svg>
+              
+            </div>
             <span class="text">{{ menu.name }}</span>
           </li>
         </ul>
@@ -89,25 +96,25 @@ const headerMenus = [
   {
     name: '工作台',
     id: 1,
-    icon: 'icon-gongzuotai',
+    icon: '#icon-gongzuotai_xuanzhong',
     path: '/home'
   },
   {
     name: '研究室',
     id: 2,
-    icon: 'icon-yanjiushi',
+    icon: '#icon-yanjiushi-2',
     disabled: true
   },
   {
     name: '资源库',
     id: 3,
-    icon: 'icon-saoyisao',
+    icon: '#icon-ziyuanku',
     path: '/resource'
   },
   {
     name: '朋友圈',
     id: 4,
-    icon: 'icon-pengyouquan1',
+    icon: '#icon-iconfontzhizuobiaozhunbduan3-1',
     disabled: true
   }
 ]
@@ -245,10 +252,19 @@ onMounted(() => {
       li {
         cursor: pointer;
         flex-direction: column;
-        border-radius: 8px;
-        margin: 0 10px;
-
+        border-radius: 5px;
+        padding: 5px 8px;
+        height: 60px;
+        align-items: center;
+        .icon-box{
+          width: 100%;
+          height: 35px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
         .text {
+          margin-top: 3px;
           font-size: 13px;
           font-weight: bold;
         }
@@ -257,24 +273,9 @@ onMounted(() => {
           font-size: 26px;
         }
 
-        .icon-resource {
-          color: #f99b53;
-        }
-
-        .icon-homepage {
-          color: #0a84ff;
-        }
-
-        .icon-prepare {
-          color: #b088e8;
-        }
-
-        .icon-teach {
-          color: #367dea;
-        }
-
         &:hover {
           color: #409eff;
+          background-color: #fff
         }
       }
 
@@ -284,11 +285,13 @@ onMounted(() => {
 
         &:hover {
           color: #bfbfbf;
+          background: none;
         }
       }
 
       .active-li {
         color: #409eff;
+        background-color: #fff
       }
     }
   }

src/renderer/src/layout/index.vue

@@ -50,7 +50,10 @@ const goBack = () =>{
 <style lang="scss" scoped>
 .el-container {
   height: 100%;
-  background: url(@/assets/images/login/login-bg.png) no-repeat center;
+  // background: url(@/assets/images/login/login-bg.png) no-repeat center;
+  // background: #EAEFF8;
+  background: linear-gradient(to bottom right, #cce6ff 0%, #79d0fc 100%);
+  // background: linear-gradient(to top, #a6e3e9, #e3fdfd);
   background-size: cover;
 }
 

src/renderer/src/router/index.js

@@ -15,6 +15,11 @@ export const constantRoutes = [
     // component: ()=> import('../login/index.vue'),
     hidden: true
   },
+  {
+    path: '/teachClassTask',
+    component: () => import('@/views/classTask/teachClassTask.vue'),
+    hidden: true
+  },
   {
     path: '/',
     component: Layout,

src/renderer/src/store/modules/tool.js

@@ -6,6 +6,9 @@ import { sessionStore } from '@/utils/store'
 
 // 默认数据
 const defData = sessionStore.store || {}
+const exArrs = ['subject']
+exArrs.forEach(k => Object.keys(defData).includes(k) && (delete defData[k]))
+
 // 延时
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 
@@ -15,8 +18,8 @@ export const useToolState = defineStore('tool', {
     showBoardAll: false,    // 全屏画板-是否显示
     isPdfWin: false,        // pdf窗口是否打开
     isToolWin: false,       // 工具窗口是否打开
+    isTaskWin: false,      // 批改窗口是否打开
     curSubjectNode: {
-      data: {},             // 当前教材节点 （包含当前教材 单元）
       querySearch: {}       // 查询资源所需参数
     },
     ...defData              // 默认数据-覆盖上面的配置(不要删除, 会导致新窗口-获取状态失败)

src/renderer/src/utils/tool.js

@@ -112,6 +112,7 @@ export function ipcHandle(fn,key, cb) {
  */
 let wins_tool = null
 let winPdf=null
+let winChild=null
 export const createWindow = async (type, data) => {
   switch(type) {
     case 'tool-sphere': { // 创建-悬浮球
@@ -169,6 +170,36 @@ export const createWindow = async (type, data) => {
       winPdf=win
       break
     }
+    case 'open-taskwin': { //作业批改-web
+      if(winChild){    //判断是否已经打开
+        winChild.focus();
+        return
+      }
+      const option = data.option||{}
+      const defOption = {
+        // width: 1280,// 1920,
+        // height: 720,// 1080,
+        width: 1450,
+        minWidth: 1200,
+        height: 800,
+        minHeight: 700,
+        frame: true,       // 要创建无边框窗口
+        // resizable: true,    // 禁止窗口大小缩放
+        alwaysOnTop: false, // 窗口是否总是显示在其他窗口之前
+        title:'子窗口',
+        show: false, //创建时窗口不可见
+        maximizable: true,
+        autoHideMenuBar: true,// 自动隐藏菜单栏
+      }
+      data.isConsole = true // 是否开启控制台
+      data.option = {...defOption, ...option}
+      winChild = await toolWindow(data)
+      winChild.type = type  // 唯一标识
+      winChild.show()
+      winChild.setFullScreen(false) // 设置窗口为全屏
+      eventHandles(type, winChild) // 事件监听处理
+      return winChild
+    }
     default:
       break
   }
@@ -246,6 +277,7 @@ const eventHandles = (type, win) => {
       if(onClosed) onClosed() // 自定义关闭事件
       win = null
       wins_tool = null
+      winChild=null
     })
 
     // 新窗口-创建事件(如:主进程加载远程服务)
@@ -304,6 +336,27 @@ const eventHandles = (type, win) => {
       }
         publicMethods(on) // 加载公共方法
       break}
+    case 'open-taskwin': { // -子窗口
+      // 监听窗口的激活事件
+      win.on('focus', async () => {
+        toolState.isTaskWin=true
+        win&&win.reload(); //刷新该窗口
+      });
+      // 监听窗口关闭事件
+      win.on('closed', function () {
+        console.log('关闭窗口')
+        // 设置状态(再次设置-防止未设置到)
+        if(toolState.isTaskWin) toolState.isTaskWin = false
+        winChild=null
+        win&&win.destroy()
+      });
+      const on = {
+        onClosed: () => {
+        }
+      }
+      publicMethods(on) // 加载公共方法
+      break;
+    }
     default:
       break
   }

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

@@ -57,24 +57,28 @@
         ></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 {sessionStore, createWindow} from '@/utils/tool'
+
+
+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([])
@@ -85,6 +89,8 @@ const classWorkList = ref([])
 const total = ref(0)
 const loading = ref(false)
 
+
+
 const activeDataList = computed(() => {
   return classWorkList.value 
 })
@@ -209,7 +215,9 @@ const getClassWorkList = async () => {
 /**
  * 3、获取多个班级学生作业数据
  */
-const getStudentClassWorkData = () => {
+const getStudentClassWorkData = async() => {
+  // const { chapterId } = await useGetHomework(props.bookobj.node)
+    // this.entpcourseid = chapterId
   if(classTaskStore.classListIds.length>0){
     // listClassworkdataByDeadDate({
     //   edituserid: userStore.userId,   // 老师的id
@@ -323,9 +331,6 @@ const getStudentClassWorkData = () => {
 }
 
 
-
-const toolStore = useToolState()
-
 // 将标签中的双引号增加转义
 const escapeHtmlQuotes = (str) => {
   // 后端已replace双引号, 故前端不用在处理
@@ -339,7 +344,7 @@ const pollingST = ref(null) //轮询定时器标识
 onMounted(() => {
   getData() // 加载数据
   // 轮询查询
-  getStudentClassWorkDataPolling()
+  closeDialog();
 })
 
 // 轮询查询 学生作业进度
@@ -353,13 +358,25 @@ const getStudentClassWorkDataPolling = () => {
 }
 
 const  closeDialog = () => {
-  console.log('关闭弹窗,开启作业进度轮询')
+  clearInterval(pollingST.value) // 关闭轮询
   getStudentClassWorkDataPolling()
 }
+
+/**
+ * 开启新批改弹窗
+ * @param item 作业对象
+ */
 const onClickItem = (item) => {
   console.log('开启弹窗,关闭作业进度轮询')
   clearInterval(pollingST.value)
-  itemDialogRef.value.openDialog(item)
+  // itemDialogRef.value.openDialog(item)
+
+  // 新跳转子窗口链接
+  // 1、本地缓存item数据，2、打开子窗口 3、子窗口加载item数据
+  // localStorage.setItem('teachClassWorkItem', JSON.stringify(item))
+  sessionStore.set('teachClassWorkItem', item)
+  toolState.isTaskWin=true //设置打开批改窗口
+  createWindow('open-taskwin',{url:'/teachClassTask'})
 }
 
 
@@ -413,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
     }
   }
@@ -423,9 +445,13 @@ const getStudentVisible = async () => {
 
 
 watch(
-  () => [dataList, toolStore.isToolWin],
+  () => [dataList, toolState.isTaskWin],
   () => {
-    console.log('====', toolStore)
+    console.log('=监听到批改窗口打开了===', toolState.isTaskWin)
+    if(!toolState.isTaskWin){
+
+      closeDialog();// 开启轮询
+    }
   }
 )
 watch(tabActive, (newVal,oldVal)=>{

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

@@ -16,9 +16,9 @@
       <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
         <el-col :span="12" style="padding-left: 20px; text-align: left;">
           <div class="unit-top-left" @click="isCollapse = !isCollapse">
-            <i v-if="!isCollapse" class="iconfont icon-xiangzuo"></i>
+            <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
             <span>课程目录</span>
-            <i v-if="isCollapse" class="iconfont icon-xiangyou"></i>
+            <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
           </div>
         </el-col>
         <el-col :span="12">
@@ -132,8 +132,8 @@
 
         <div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
           <div style="display: flex">
-            <el-button v-if="currentTag=='习题训练'" style="margin-right: auto" type="primary"
-                :disabled="checkTaskAssigned(currentWorkEdit.currentTask)" @click="handleWorkEdit2ClassWorkQuizAdd">添加作业</el-button>
+            <!-- <el-button v-if="currentTag=='习题训练'" style="margin-right: auto" type="primary"
+                :disabled="checkTaskAssigned(currentWorkEdit.currentTask)" @click="handleWorkEdit2ClassWorkQuizAdd">添加作业</el-button> -->
             <el-button type="primary" style="margin-left: auto" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"
                 @click="submitStudy('submit')">确 定</el-button>
           </div>
@@ -155,7 +155,7 @@
 
 <script setup>
 import { onMounted, ref, toRaw,watch, reactive, getCurrentInstance } from 'vue'
-import { ElMessage } from 'element-plus'
+import { useRouter } from 'vue-router'
 
 import ChooseTextbook from '@/components/choose-textbook/index.vue'
 import { homeworklist, delClasswork } from '@/api/teaching/classwork'
@@ -168,6 +168,7 @@ import { getCurrentTime } from '@/utils/date'
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore().user
 const { proxy } = getCurrentInstance()
+const router = useRouter()
 
 const props = defineProps({
   initDataProps: {
@@ -267,7 +268,7 @@ const getTaskList = async () => {
   const { chapterId } = await useGetHomework(courseObj.node)
     // this.entpcourseid = chapterId
   // 新版查询方式
-  homeworklist({entpcourseid: chapterId, orderby: "concat(deaddate,uniquekey) DESC" , edituserid: userStore.userId, pageSize: 100}).then(res => {
+  homeworklist({entpcourseid: chapterId, orderby: "deaddate DESC" , edituserid: userStore.userId, pageSize: 500}).then(res => {
     let model = [];
     let mission = [];
 
@@ -353,7 +354,6 @@ const getTaskList = async () => {
       }
       list.push(item);
     }
-    console.log(list,'========================')
     taskList.value = list;
     loading.value = false;
   })
@@ -369,20 +369,21 @@ const handleWorkTitleEdit = (row, index) => {
 };
 
 
-// 编辑作业内容
+// 作业内容-查看详情
 const handleWorkEdit = (row, index) =>{
+  console.log(row, index)
   workEdit.value = true
-  // this.currentTask = row;
-  // this.currentIndex = index;
+  currentWorkEdit.currentTask = row;
+  // currentWorkEdit.currentIndex = index;
   currentTag.value = row.worktype;
-  this.attainmentList = row.workcodesList?.attlist;
-  this.courseQualityList = row.workcodesList?.qualist;
+  // this.attainmentList = row.workcodesList?.attlist;
+  // this.courseQualityList = row.workcodesList?.qualist;
   if (row.worktype == '框架梳理') {
     this.$nextTick(()=>{
       this.getFlowData()
     })
   }
-  // if (currentTag.value.worktype == '学科定位') {
+  // if (row.worktype == '学科定位') {
   //   // TODO 后续需要再迁
   //   rootid:entpcoursework里的id  rootid: row.entpcourseworklistarray[0].id,
   //   listEvaluationclue({ cluegroup: 'graph', edusubject: this.courseObj.edusubject, pageSize: 1000 }).then((res) => {
@@ -398,7 +399,8 @@ const handleWorkEdit = (row, index) =>{
   // }
 
   // // 课标研读 目标设定 教材研读 框架梳理 学科定位
-  if (currentTag.value.worktype == '习题训练') {
+  if (row.worktype == '习题训练') {
+    console.log('习题训练')
     var idlist = JSON.parse('['+row.entpcourseworklist+']');
     var ids = [];
     for (var i=0; i<idlist.length; i++) {
@@ -426,14 +428,14 @@ const handleWorkEdit = (row, index) =>{
           }
         });
       });
-
+      console.log(workConfObj.quizlist,'workConfObj.quizlist');
       // 格式化试题信息
       processList(workConfObj.quizlist);
     })
   }
 
   // 常规作业、课堂展示
-  if(currentTag.value.worktype == '常规作业' || row.worktype == '课堂展示'){
+  if(row.worktype == '常规作业' || row.worktype == '课堂展示'){
     console.log(row,'常规作业-课堂展示');
       // 老师布置的附件 workcodes ？？ 与批改哪里这个字段值不一样
     if(row.workcodes != ''){
@@ -449,44 +451,138 @@ const handleWorkEdit = (row, index) =>{
     }
   }
 };
+// 作业内容编辑-跳转到设计界面-传参
+let classtaskObj = reactive({
+  id: '', //
+  uniquekey: '', // 设计中的标题
+  title: '', // 设计中的说明
+  worktype: '', // 设计中的作业类型
+  quizlist: [], // 设计中的试题列表
+})
+// 作业内容编辑-跳转到设计界面
+const newHandleWorkEdit2ClassWorkQuizAdd =(row, index) =>{
+  // this.newWorkSpace = true;
+  // this.newWorkSpaceEdit = true;
+  // this.currentTask = row;
+  // this.currentIndex = index;
+  // this.currentTag = row.worktype;
+  // this.attainmentList = row.workcodesList?.attlist;
+  // this.courseQualityList = row.workcodesList?.qualist;
 
-// 作业内容编辑-确认
-const submitWorkTitle = () => {
-  console.log(taskList.value)
-  console.log(currentWorkEdit)
-  // ? taskList是新组合的，有的变成子项了， 根据currentIndex获取不到，下面判断暂弃！
-  // if (taskList.value[currentWorkEdit.currentIndex].title == currentWorkEdit.currentTitle) {
-  //   currentWorkEdit.workTitleEdit = false;
+  // 更新新任务中的各数据
+  // this.classWorkForm.uniquekey = this.currentTask.uniquekey;
+  // this.classWorkForm.title = this.currentTask.title;
+  // 更新新任务中作业类型
+  // this.classWorkForm.worktype = this.currentTask.worktype;
+
+  //重新更新[新任务]中右侧列表数据
+  var listCourseWork = [];
+  for (var i=0; i < row.entpcourseworklistarray.length; i++) {
+    listCourseWork.push(row.entpcourseworklistarray[i]);
+  }
+
+
+  
+  if (listCourseWork.length > 0) {
+    classtaskObj.id= row.id; // 
+    classtaskObj.uniquekey= row.uniquekey; // 设计中的标题
+    classtaskObj.title= row.title; // 设计中的说明
+    classtaskObj.worktype= row.worktype; // 设计中的作业类型
+    classtaskObj.quizlist= []; // 设计中的试题列表
+    
+
+    if (row.worktype == '框架梳理') {
+      // 框架梳理对应只有一个内容
+      // let queryParams = {}
+      // queryParams.id = listCourseWork[0].id;
+      // queryParams.ppttype = '教材分析';
+      // queryParams.title = '框架梳理';
+      // queryParams.filetype = 'draw';
+      // const res = await getEvaluationclue(listCourseWork[0].id);
+      // if ( res.data==null || res.data==undefined ) {
       //   return;
       // }
-  taskList.value&&taskList.value.forEach((item)=>{
-    if(item.children.length>0){
-      item.children.map(_item=>{
-        if(_item.title == currentWorkEdit.currentTitle){
+      // this.chooseWorkLists = [];
+      // res.data.worktype = '框架梳理';
+      // res.data.score = listCourseWork[0].score;
+      // this.chooseWorkLists.push(res.data);
+    }
+    else if (row.worktype == '习题训练') {
+      const ids = listCourseWork.map(item => item.id).join(",");
+      listEntpcoursework({ids: ids, pageSize: 50}).then(idres => {
+        // for (var i=0; i<idres.rows.length; i++) {
+        //   idres.rows[i].titletext = idres.rows[i].title.replace(/<[^>]+>/g, '');
+        // }
+        
+        // 格式化试题
+        if(idres.rows&&idres.rows.length > 0){
+          processList(idres.rows);
+          //重新将task中的分值更新
+          row.entpcourseworklistarray.forEach(item => {
+            const quizItem = idres.rows.find(quiz => quiz.id === item.id);
+            if (quizItem) {
+              quizItem.score = item.score;
+              quizItem.scoreOrigin = item.score;
+            }
+          });
+
+          classtaskObj.quizlist = idres.rows;
+          // 跳转作业设计 页面
+          router.push({
+            path: '/newClassTask',
+            query: {
+              classtaskObj: JSON.stringify(classtaskObj),
+            }
+          })
+          
+        }
+      })
+    } 
+    else if (this.classWorkForm.worktype == '课堂展示') {
+      
+      // const workcodes = JSON.parse(this.currentTask.workcodes);
+      // const jsonString = JSON.stringify(workcodes.json);
+      
+      // await this.$nextTick();
+      // this.isShowBoard = true
+      // this.whiteboardObj = jsonString;
+    }
+    else if (this.classWorkForm.worktype == '常规作业') {
+      // this.fileHomeworkList = [];
+      // if(isJson(this.currentTask.workcodes)){
+      //   this.fileHomeworkList = JSON.parse(this.currentTask.workcodes);
+      // }
+    }
+
+    
+    
+    
+
+   
+  }
+};
+
+
+
+
+// 作业说明编辑-确认
+const submitWorkTitle = () => {
+  if(currentWorkEdit.currentTask.title == currentWorkEdit.currentTitle){
     currentWorkEdit.workTitleEdit = false;
     return;
   }
-      })
-    }else{
-      if(item.title == currentWorkEdit.currentTitle){
-        currentWorkEdit.workTitleEdit = false;
-        return;
-      }
-    }
-  })
-  console.log('有更改！')
+
   // 有修改时才进行更新
-  taskList.value[currentWorkEdit.currentIndex].title = currentWorkEdit.currentTitle;
-  updateClasswork({id: taskList.value[currentWorkEdit.currentIndex].id, title: currentWorkEdit.currentTitle}).then(response => {
-    ElMessage("修改成功");
+  updateClasswork({id: currentWorkEdit.currentTask.id, title: currentWorkEdit.currentTitle}).then(response => {
+    proxy.$modal.msgSuccess("修改成功");
     currentWorkEdit.workTitleEdit = false;
-    //this.getClassWorkAllList();
+    // 刷新列表，重新获取数据
+    getTaskList();
   });
 };
 
 // 当前是否为已推送作业
 const checkTaskAssigned = (row) => {
-  console.log(row,'checkTaskAssigned')
   // 只要有一个taskconfig的id不为0，就是已推送过任务了
   let bAssigned = false;
   for (let i=0; i<row.taskconfig.length; i++) {

src/renderer/src/views/classTask/container/item-dialog-score.vue

@@ -1,8 +1,8 @@
 <template>
-  <el-form ref="classWorkFormScoreRef" :model="classWorkFormScore">
+  <el-form ref="classWorkFormScoreRef" :model="classWorkFormScore" style="height: 100%">
     <!-- <div class="teacher_content" :style="{ height: dialogProps.maxheight + 'px' }"> -->
-    <div class="teacher_content" :style="{ height: '72vh' }">
-      <div style="font-size: 18px; width: 100%; padding: 5px 10px" class="sticky">
+    <div class="teacher_content" :style="{ height: '100%' }">
+      <div style="font-size: 18px; width: 100%; padding: 5px 10px; flex: 0 0 auto;">
         {{ classWorkFormScore.name }} 答题详情
       </div>
       <div class="teacher_content_con">
@@ -24,7 +24,7 @@
                   <!-- 习题训练 -->
                   <div v-if="dialogProps.studentObj.worktype == '习题训练'">
                     <el-row>
-                      <el-col :span="24" style="padding: 10px">
+                      <el-col :span="24" style="padding: 10px;text-align: left;">
                         <!-- 题源、题目标题、题目选项 -->
                         <span>{{ quItem.worktag }}</span>
                         <span style="margin-left: 4px" v-html="quItem.titleFormat"></span>
@@ -924,6 +924,7 @@ defineExpose({
 
 <style scoped>
 .teacher_content {
+  height: 100%;
   display: flex;
   flex-direction: column;
   justify-content: space-around;
@@ -935,11 +936,16 @@ defineExpose({
   width: 100%;
   height: 100%;
   overflow-y: auto;
+  
 }
 .tacher_conten_foot {
   width: 100%;
 }
 
+.card-header{
+  text-align: left;
+}
+
 .image_list {
   display: flex;
   flex-wrap: nowrap;
@@ -985,4 +991,8 @@ defineExpose({
   background-color: red;
   color: white;
 }
+
+.card-header{
+  align-items: left;
+}
 </style>

src/renderer/src/views/classTask/container/item-dialog.vue

@@ -234,7 +234,7 @@ const openDialog = (data) => {
   classWorkAnalysis.activeQuizAnalysisData = []
 
   classWorkAnalysis.row = data
-  window.test = this
+  // window.test = this
   // zdg: 学生列表
   const studentArr = data.classworkdatastudentids
     ? JSON.parse(`[${data.classworkdatastudentids}]`)

src/renderer/src/views/classTask/container/newTask/taskTypeView.vue

@@ -250,7 +250,7 @@ import { ElMessage } from 'element-plus'
 import { useToolState } from '@/store/modules/tool'
 import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
 import { addClassworkReturnId } from '@/api/teaching/classwork'
-import { updateClasswork, listEvaluationclue,readFile } from '@/api/classTask'
+import { updateClasswork, listEvaluationclue,readFile, listClassworkeval,delClassworkeval,addClassworkeval } from '@/api/classTask'
 import { listEvaluation } from '@/api/subject'
 import { listEntpcoursefile } from '@/api/education/entpcoursefile'
 import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
@@ -273,9 +273,9 @@ const props = defineProps({
     type: Object,
     default: () => ({})
   },
-  uniquekey: {
-    type: String,
-    default: ''
+  propsformobj: {
+    type: Object,
+    default: () =>({})
   }
 })
 
@@ -356,10 +356,11 @@ const workResource = reactive({
   entpCourseWorkTotal: 0, // 习题总数
 }); // 作业资源
 let classWorkForm =  reactive({
-  uniquekey: props.uniquekey, // 作业唯一标识 作业名称
-  worktype: '习题训练', //作业类型
-  title: '',// 作业说明
-  quizlist: [], // 作业习题列表内容
+  id: props.propsformobj.id,
+  uniquekey: props.propsformobj.uniquekey, // 作业唯一标识 作业名称
+  worktype: props.propsformobj.worktype?props.propsformobj.worktype: '习题训练', //作业类型
+  title: props.propsformobj.title?props.propsformobj.title:'',// 作业说明
+  quizlist: props.propsformobj.quizlist?props.propsformobj.quizlist:[] // 作业习题列表内容
 }); // 提交的作业内容
 const chooseWorkLists = ref([]); // 框架梳理、？课堂展示
 const whiteboardObj = ref(''); // 作业资源 - 课堂展示 白板
@@ -385,7 +386,8 @@ const changeFormType = (val) => {
   classWorkForm.worktype = val;
 }
 
-
+console.log(props.propsformobj)
+console.log(classWorkForm,'==============zizujian===================')
 /**
      * @desc: 根据查询参数查询试题
      * @return: {*}
@@ -662,169 +664,6 @@ const handleClassWorkSave = async () => {
   await nextTick(); // 确保DOM更新完成
   proxy.$refs["classWorkFormRef"].validate(async valid => {
     if (valid) {
-      if (classWorkForm.id != null) {
-        // 当前为[编辑]状态下点进来得处理
-        updateClasswork(classWorkForm).then(response => {
-          ElMessage("修改成功");
-          // this.workConfDialogOpen = false;
-          //这里分离了，所以不需要更新表单数据了
-          // this.getClassWorkAllList(); // 更新表单数据
-        });
-      } else {
-        // 当前为[编辑]状态下点进来得处理  newWorkSpaceEdit true 为编辑状态
-        if(newWorkSpaceEdit.value ) {
-
-          // 0.右侧作业资源添加检测
-          if (this.currentTag == '习题训练') {
-            if (this.classWorkForm.quizlist.length == 0) {
-              ElMessage.error('请先添加作业资源!');
-              return;
-            }
-          }
-          else if (this.currentTag == '课堂展示' || this.currentTag == '常规作业') {
-            // 不做校验
-
-          }
-          else {
-            if (this.chooseWorkLists.length == 0) {
-              ElMessage.error('请先添加作业资源!');
-              return;
-            }
-          }
-
-          // 基础参数
-          let classWorkParams = {
-            id: this.currentTask.id,
-            uniquekey: this.classWorkForm.uniquekey,    // 更新[作业名称]
-            //title: classWorkForm.title,             // 更新[作业说明]
-          }
-          // 根据作业类型分类处理
-          if (this.currentTag=='习题训练'){
-            
-            // console.log(this.workConfObj.quizlist);
-            // console.log(this.currentTask);
-            // console.log(this.classWorkList);
-            
-            // 1.判断当前添加的作业是否与原来不同
-            let needUplEval = false;
-            if (this.classWorkForm.quizlist.length !== this.currentTask.entpcourseworklistarray.length) {
-              needUplEval = true;
-            }
-            else {
-              // 只要有一个不一致则说明需要更新
-
-              // for (let cur of this.classWorkForm.quizlist){
-              //   let isSame = false;
-              //   for (let last of this.currentTask.entpcourseworklistarray) {
-              //     if (last.id === cur.id && last.score === cur.score){
-              //       isSame = true;
-              //       break;
-              //     }
-              //   }
-              //   if (!isSame) {
-              //     needUplEval = true;
-              //     break;
-              //   }
-              // }
-              needUplEval = this.classWorkForm.quizlist.some(cur => 
-                !this.currentTask.entpcourseworklistarray.some(last => 
-                  last.id === cur.id && last.score === cur.score
-                )
-              );
-            }
-            
-            // 2.需要重新更新eval的数据
-            if (needUplEval) {
-              // 说明: 因试题分值也需修改, 故无法通过按钮的增长删除来处理, 故将原作业全部删除后再重新添加
-              // 2.1.先查询该workid下所有的id
-              let arrEvalids = [];
-              const wevalres = await listClassworkeval({'workid': this.currentTask.id});
-              wevalres.rows.forEach(element => {
-                arrEvalids.push(element.id);
-              });
-              const ids = arrEvalids.join(',');
-              
-              // 2.2.删除原作业
-              const delRes = await delClassworkeval(ids);
-
-              // 2.3.重新添加新作业
-              for(let i=0; i<this.classWorkForm.quizlist.length; i++){
-                const addRes = await addClassworkeval({
-                  'workid': this.currentTask.id,
-                  'entpcourseworkid': this.classWorkForm.quizlist[i].id,
-                  'workdataid': 0,
-                  'score': this.classWorkForm.quizlist[i].score}
-                );
-              }
-            }
-
-            // 3.更新作业任务信息
-            // const evalid = this.homeworkLesson.length==0 ? '' : this.homeworkLesson.length==1 ? this.homeworkLesson[0] : this.homeworkLesson[1];
-            // const formObj = {
-            //   id: this.currentTask.id,
-            //   uniquekey: this.classWorkForm.uniquekey,    // 更新[作业名称]
-            //   // warn: 这里需确认是否可支持修改当前作业任务更换单元章节
-            //   //evalid = evalid,        // 更新[作业范围]
-            // }
-            // let res = await updateClasswork(formObj);
-
-          }
-          else if (this.currentTag=='框架梳理') {
-            // 1.先查询该workid下所有的id
-            const wevalres = await listClassworkeval({'workid': this.currentTask.id});
-            if (wevalres.rows.length == 0) {
-              ElMessage.error('未找到原框架梳理任务，请或退出重试');
-              return;
-            }
-
-            // 2.更新作业任务下的框架梳理
-            let needUplEval = false;
-            if (this.chooseWorkLists.length !== this.currentTask.entpcourseworklistarray.length) {
-              needUplEval = true;
-            }
-            else {
-              // 只要有一个不一致则说明需要更新
-              needUplEval = this.chooseWorkLists.some(cur => 
-                !this.currentTask.entpcourseworklistarray.some(last => 
-                  last.id === cur.id && last.score === cur.score
-                )
-              );
-            }
-            if (needUplEval) {
-              const uplParams = {
-                id: wevalres.rows[0].id,
-                entpcourseworkid: this.chooseWorkLists[0].id,
-                score: this.chooseWorkLists[0].score,
-              }
-              let res = await updateClassworkeval(uplParams);
-            }
-
-          }
-          else if (this.currentTag=='课堂展示') {
-            
-
-          }
-          else if (this.currentTag=='常规作业') {
-            // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
-            classWorkParams.workcodes = JSON.stringify(this.fileHomeworkList);
-          }
-
-          // 3.更新作业任务本身
-          let res = await updateClasswork(classWorkParams);
-          this.fileHomeworkList = [];
-          this.chooseWorkLists = [];
-          
-          // 4.操作完成后重新更新表单数据
-          //这里分离了，所以不需要更新表单数据了
-          // this.getClassWorkAllList();
-
-          this.classWorkForm.worktype = "习题训练";
-          this.newWorkSpace = false;
-          this.newWorkSpaceEdit = false;
-          this.workEdit = false;
-          return;
-        }
-
       //
       const { chapterId } = await useGetHomework(props.bookobj.node)
       // this.entpcourseid = chapterId
@@ -852,9 +691,20 @@ const handleClassWorkSave = async () => {
         status: '10', //2024-09-11 作业布置分离后的  新模版数据； 之前老版本为空
         edituserid: userStore.userId, // 当前用户id
         entpcourseworklist: '', // 选择的 习题训练 list  需要转字符串
-        
       };
 
+
+      // 当前为[编辑]状态下点进来得处理  newWorkSpaceEdit true 为编辑状态
+      if(classWorkForm.id != '' ) {// 编辑状态 有id
+
+        editWork(cform); // 编辑作业
+        return;
+      }
+
+      
+
+      
+
       if (classWorkForm.worktype === "课堂展示") {
         boardLoading.value = true
         let canvasJson = proxy.$refs.boardref.getCanvasJson()
@@ -869,7 +719,7 @@ const handleClassWorkSave = async () => {
             ElMessage({ type: 'success', message: '作业设计成功!'});
             // 重置提交表单
             classWorkForm.worktype = "课堂展示";
-              classWorkForm.uniquekey = props.uniquekey, // 作业唯一标识 作业名称
+            classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
             classWorkForm.title = "";
             classWorkForm.quizlist = [], // 作业习题列表内容
 
@@ -901,7 +751,7 @@ const handleClassWorkSave = async () => {
             ElMessage({ type: 'success', message: '作业设计成功!'});
             // 重置提交表单
             classWorkForm.worktype = "常规作业";
-              classWorkForm.uniquekey = props.uniquekey, // 作业唯一标识 作业名称
+            classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
             classWorkForm.title = "";
             classWorkForm.quizlist = [], // 作业习题列表内容
 
@@ -954,7 +804,7 @@ const handleClassWorkSave = async () => {
           ElMessage({ type: 'success', message: '作业设计成功!'});
           // 重置提交表单
           classWorkForm.worktype = "习题训练";
-            classWorkForm.uniquekey = props.uniquekey, // 作业唯一标识 作业名称
+          classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
           classWorkForm.title = "";
           classWorkForm.quizlist = [], // 作业习题列表内容
 
@@ -974,10 +824,178 @@ const handleClassWorkSave = async () => {
         })
       }
     }
-    }
   });
 };
 
+const editWork = async (cform) =>{
+  // 基础参数
+  cform.id= classWorkForm.id;
+
+  // 0.右侧作业资源添加检测
+  if (classWorkForm.worktype == '习题训练') {
+    if (classWorkForm.quizlist.length == 0) {
+      ElMessage.error('请先添加作业资源!');
+      return;
+    }
+  }else if (classWorkForm.worktype == '课堂展示' || classWorkForm.worktype == '常规作业') {
+    // 不做校验
+
+  }else {
+    if (chooseWorkLists.value.length == 0) {
+      // 框架梳理
+      ElMessage.error('请先添加作业资源!');
+      return;
+    }
+  }
+
+
+  // 根据作业类型分类处理
+  if (classWorkForm.worktype=='习题训练'){
+    
+    // 1.判断当前添加的作业是否与原来不同（跟父组件传来的值对比）
+    let needUplEval = false;
+    if (classWorkForm.quizlist.length !== props.propsformobj.quizlist.length) {
+      needUplEval = true;
+    }else {
+      // 只要有一个不一致则说明需要更新
+      needUplEval = classWorkForm.quizlist.some(cur => 
+        !props.propsformobj.quizlist.some(last => 
+          last.id === cur.id && last.score === cur.score
+        )
+      );
+    }
+
+    //新方法更新
+    if(needUplEval){
+      // 正常新任务
+      var ll = [];
+      for (var i=0; i< classWorkForm.quizlist.length; i++) {
+        // 更新 题目分值
+        ll.push({'id': classWorkForm.quizlist[i].id, 'score': classWorkForm.quizlist[i].score});
+      }
+      //  习题训练 右侧选择的资源list
+      if (ll.length > 0) {
+        cform.entpcourseworklist = JSON.stringify(ll);
+      } else {
+        cform.entpcourseworklist = '';
+      }
+      console.log(cform,'提交的数据');
+      if(cform.entpcourseworklist == '') return ElMessage({ type: 'warning', message: '请先添加作业资源!'});
+      
+      addClassworkReturnId(cform).then(workres => {
+        ElMessage({ type: 'success', message: '修改设计成功!'});
+        // 重置提交表单
+        classWorkForm.worktype = "习题训练";
+        classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
+        classWorkForm.title = "";
+        classWorkForm.quizlist = [], // 作业习题列表内容
+
+        // 情况选择的资源缓存
+        chooseWorkLists.value = [];
+        whiteboardObj.value = ''; // ? // 清空白板
+        // refresh the list
+        //这里分离了，所以不需要更新表单数据了
+        // this.getClassWorkAllList();
+
+        // TODO 后续看是否跳转到 作业布置页面
+
+        //TODO 下面3个后续看是啥
+        // this.newWorkSpace = false;
+        // this.newWorkSpaceEdit = false;
+        // this.workEdit = false;
+      })
+    }
+    
+    // 2.需要重新更新eval的数据
+    // if (needUplEval) {
+      // 说明: 因试题分值也需修改, 故无法通过按钮的增长删除来处理, 故将原作业全部删除后再重新添加
+      // 2.1.先查询该workid下所有的id
+      // let arrEvalids = [];
+      // const wevalres = await listClassworkeval({'workid': classWorkForm.id});
+      // wevalres.rows.forEach(element => {
+      //   arrEvalids.push(element.id);
+      // });
+      // const ids = arrEvalids.join(',');
+      
+      // // 2.2.删除原作业
+      // const delRes = await delClassworkeval(ids);
+
+      // // 2.3.重新添加新作业
+      // for(let i=0; i< classWorkForm.quizlist.length; i++){
+      //   const addRes = await addClassworkeval({
+      //     'workid': classWorkForm.id,
+      //     'entpcourseworkid': classWorkForm.quizlist[i].id,
+      //     'workdataid': 0,
+      //     'score': classWorkForm.quizlist[i].score}
+      //   );
+      // }
+    // }
+
+    // 3.更新作业任务信息
+    // const evalid = this.homeworkLesson.length==0 ? '' : this.homeworkLesson.length==1 ? this.homeworkLesson[0] : this.homeworkLesson[1];
+    // const formObj = {
+    //   id: this.currentTask.id,
+    //   uniquekey: this.classWorkForm.uniquekey,    // 更新[作业名称]
+    //   // warn: 这里需确认是否可支持修改当前作业任务更换单元章节
+    //   //evalid = evalid,        // 更新[作业范围]
+    // }
+    // let res = await updateClasswork(cform);
+
+  }
+  // else if (classWorkForm.worktype=='框架梳理') {
+  //   // 1.先查询该workid下所有的id
+  //   const wevalres = await listClassworkeval({'workid': this.currentTask.id});
+  //   if (wevalres.rows.length == 0) {
+  //     ElMessage.error('未找到原框架梳理任务，请或退出重试');
+  //     return;
+  //   }
+
+  //   // 2.更新作业任务下的框架梳理
+  //   let needUplEval = false;
+  //   if (this.chooseWorkLists.length !== this.currentTask.entpcourseworklistarray.length) {
+  //     needUplEval = true;
+  //   }else {
+  //     // 只要有一个不一致则说明需要更新
+  //     needUplEval = this.chooseWorkLists.some(cur => 
+  //       !this.currentTask.entpcourseworklistarray.some(last => 
+  //         last.id === cur.id && last.score === cur.score
+  //       )
+  //     );
+  //   }
+  //   if (needUplEval) {
+  //     const uplParams = {
+  //       id: wevalres.rows[0].id,
+  //       entpcourseworkid: this.chooseWorkLists[0].id,
+  //       score: this.chooseWorkLists[0].score,
+  //     }
+  //     let res = await updateClassworkeval(uplParams);
+  //   }
+
+  // }else if (classWorkForm.worktype=='课堂展示') {
+    
+
+  // }else if (classWorkForm.worktype=='常规作业') {
+  //   // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
+  //   classWorkParams.workcodes = JSON.stringify(this.fileHomeworkList);
+  // }
+
+  // // 3.更新作业任务本身
+  // let res = await updateClasswork(cform);
+  // this.fileHomeworkList = [];
+  // this.chooseWorkLists = [];
+
+  // // 4.操作完成后重新更新表单数据
+  // //这里分离了，所以不需要更新表单数据了
+  // // this.getClassWorkAllList();
+
+  // this.classWorkForm.worktype = "习题训练";
+  // this.newWorkSpace = false;
+  // this.newWorkSpaceEdit = false;
+  // this.workEdit = false;
+}
+
+
+
 onMounted(() => {
 })
 

src/renderer/src/views/classTask/container/quizStats.vue

@@ -1,6 +1,6 @@
 <template>
   <el-row class="c-warp" :gutter="10">
-    <el-col class="left" :span="16">
+    <el-col class="left" :span="12">
       <el-collapse class="c-item" v-model="activeTopic" accordion>
         <template v-for="(item, index) in dataList">
           <el-collapse-item class="collapse-item" :name="index+1" :id="'collapse-'+(index+1)">
@@ -54,7 +54,7 @@
         </template>
       </el-collapse>
     </el-col>
-    <el-col class="right" :span="8">
+    <el-col class="right" :span="12">
       <div class="c-item">
         <div class="title">答题情况</div>
         <div class="respond">

src/renderer/src/views/classTask/container/task-item.vue

@@ -14,7 +14,6 @@
          |  截止时间：{{ item.deaddate }}  | {{ 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,60 +67,8 @@ 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)
-    }
-  })
-}
-const startClassR = (item) => {
-  // startClass(item.id).then((res) => {
-  //   if (res.data === true) {
-  //     item.status = '上课中'
-  //     openLesson()
-  //   }
-  // })
-  item.status = '上课中'
-  openLesson()
-}
-// const toolStore = useToolState()
-let wins = null;
-// 上课-工具类悬浮
-const openLesson = () => {
-  // startClass(props.item.id)
-  listEntpcourse({
-    evalid: props.item.ex2,
-    edituserid: useUserStore().user.userId,
-    pageSize: 500
-  }).then(async res=>{
-    if (res.rows[0].id) {
-      wins = await createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + res.rows[0].id + "&reservId=" + props.item.id })
-    }
-  })
-}
-const endClassR = (item) => {
-  endClass(item.id).then((res) => {
-    if (res.data === true) {
-      ElMessage({
-        message: '下课成功',
-        type: 'success'
-      })
-      item.status = '已结束'
-    }
-  })
-}
+
+
 </script>
 <style scoped lang="scss">
 .class-reserv-item {

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

@@ -16,9 +16,9 @@
       <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
         <el-col :span="12" style="padding-left: 20px; text-align: left;">
           <div class="unit-top-left" @click="isCollapse = !isCollapse">
-            <i v-if="!isCollapse" class="iconfont icon-xiangzuo"></i>
+            <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
             <span>课程目录</span>
-            <i v-if="isCollapse" class="iconfont icon-xiangyou"></i>
+            <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
           </div>
         </el-col>
         <el-col :span="12">
@@ -30,27 +30,33 @@
         </el-col>
       </el-row>
       <!-- 作业类型:内容 -->
-      <task-type-view :bookobj="courseObj" :uniquekey="classWorkForm.uniquekey" style="flex: 1; overflow: hidden;"/>
+      <task-type-view :bookobj="courseObj" :propsformobj="classWorkForm" style="flex: 1; overflow: hidden;"/>
     </div>
   </div>
 </template>
 
 <script setup>
 import { onMounted, ref, toRaw,watch, reactive } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
+
 import ChooseTextbook from '@/components/choose-textbook/index.vue'
 import TaskTypeView from '@/views/classTask/container/newTask/taskTypeView.vue'
 import { getCurrentTime } from '@/utils/date'
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore().user
+const route = useRoute();
 
+const classtaskObj = route.query.classtaskObj;//作业布置的内容对象
 // ---------------------------------------------------
 const classWorkForm =  reactive({
-  // uniquekey:  userStore.edusubject+'-' + getCurrentTime('MMDD')+'-'+(this.taskList.length+1),
-  uniquekey:  userStore.edusubject+'-' + getCurrentTime('MMDD')+'-'+(1),
-  
+  id: classtaskObj? JSON.parse(classtaskObj).id : '', // 设计中的id
+  uniquekey: classtaskObj? JSON.parse(classtaskObj).uniquekey : userStore.edusubject+'-' + getCurrentTime('MMDD')+'-'+(1), // 设计中的标题
+  title: classtaskObj? JSON.parse(classtaskObj).title : '', // 设计中的说明
+  worktype: classtaskObj? JSON.parse(classtaskObj).worktype : '', // 设计中的作业类型
+  quizlist: classtaskObj? JSON.parse(classtaskObj).quizlist : [], // 设计中的试题列表
 })
-const isCollapse = ref(false)
 
+const isCollapse = ref(false)
 
 const courseObj = reactive({
   // 课程相关参数: 教材id,单元id,章节id,课程名称
@@ -89,18 +95,15 @@ const getData = (data) => {
 }
 
 onMounted(() => {
-  init()
+  // init()
   // sourceStore.getCreate()
 })
 
-const init = () => {
-  classWorkForm.uniquekey = userStore.edusubject+'-' + getCurrentTime('MMDD')+'-'+(1);
+// const init = () => {
+//   classWorkForm.uniquekey = userStore.edusubject+'-' + getCurrentTime('MMDD')+'-'+(1);
 
-}
+// }
 
-// watch(() => sourceStore.query.fileSource,() => {
-//   sourceStore.query.fileSource === '第三方'?isThird.value = true:isThird.value = false
-// })
 </script>
 
 <style lang="scss" scoped>

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

@@ -0,0 +1,785 @@
+<template>
+  <div class="teachClassTask">
+    <div class="teachClassTask_header">
+      <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
+        <div style="flex: 1">
+          {{ classWorkAnalysis.title }}答题情况
+          <el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
+            classWorkAnalysis.worktype
+          }}</el-tag>
+        </div>
+        <!-- classWorkAnalysis.entpcourseworklistarray 当前学习任务所包含的试题ID -->
+        <div
+          v-if="classWorkAnalysis.entpcourseworklistarray.length > 0"
+          style="margin: 0 auto; flex: 1"
+        >
+          <el-button-group style="margin-bottom: 10px">
+            <el-button
+              :type="classWorkAnalysis.view == 'studentview' ? 'success' : ''"
+              @click="classWorkAnalysis.view = 'studentview'"
+              >作业批阅</el-button
+            >
+            <el-button
+              v-if="classWorkAnalysis.row.worktype == '习题训练'"
+              :type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
+              @click="workHandle('quizStats')"
+              >作业概况</el-button
+            >
+            <el-button
+              v-if="classWorkAnalysis.row.worktype == '习题训练'"
+              :type="classWorkAnalysis.view == 'report' ? 'success' : ''"
+              @click="handleClassOverviewOpen('report')"
+              >作业报告</el-button
+            >
+          </el-button-group>
+        </div>
+        <div style="flex: 1">
+          <!-- <div
+            style="float: right; padding: 0 10px; cursor: pointer"
+            icon="el-icon-close"
+            @click="closeDialog"
+          >
+            x
+          </div> -->
+        </div>
+      </div>
+    </div>
+    <div class="teachClassTask_content">
+      <!-- 如果当前学习没有试题  :height="mainHeight"  height:73vh;-->
+      <div
+        v-if="classWorkAnalysis.view == 'studentview'"
+        style="width: 100%; "
+        class="clwk_dialog_view"
+      >
+        <div class="view_table">
+          <el-radio-group
+            v-model="tableRadio.value"
+            style="margin-bottom: 1px"
+            @change="tableRadioChange"
+          >
+            <el-radio-button :value="1" :label="'已交' + '（' + tableRadio.num1 + '）'" />
+            <el-radio-button :value="0" :label="'未交' + '（' + tableRadio.num0 + '）'" />
+          </el-radio-group>
+          <!-- 学生列表：classWorkAnalysis.classworkdata; 已交未交：tableRadio.list  -->
+          <el-table
+            v-loading="loading_dt_table"
+            :data="tableRadio.list"
+            row-key="id"
+            style="height: 69vh;"
+            highlight-current-row
+            @row-click="getStudentClassWorkDataDetail"
+          >
+            <el-table-column type="index" label="序号" width="52" reserve-selection align="center" />
+            <el-table-column label="姓名" prop="studentname" width="100" align="center" />
+            <el-table-column label="提交时间" prop="updatedate" width="170" align="center" />
+            <el-table-column label="批阅状态" prop="teacherRating" align="center" width="120" sortable>
+              <template #default="scope">
+                <template v-if="scope.row.teacherRating == 0"
+                  ><span style="color: #2196f3">待批阅</span></template
+                >
+                <!-- 1-优 2-优减 3-良 4-良减 5-差 -->
+                <template v-if="scope.row.teacherRating == 1"
+                  ><el-tag type="danger">优</el-tag></template
+                >
+                <template v-if="scope.row.teacherRating == 2"
+                  ><el-tag type="danger">优-</el-tag></template
+                >
+                <template v-if="scope.row.teacherRating == 3"
+                  ><el-tag type="warning">良</el-tag></template
+                >
+                <template v-if="scope.row.teacherRating == 4"
+                  ><el-tag type="info">良-</el-tag></template
+                >
+                <template v-if="scope.row.teacherRating == 5"
+                  ><el-tag type="info">差</el-tag></template
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+
+        <div class="view_teachrting">
+          <div class="classwork-score">
+            <div v-if="classWorkAnalysis.activeStudentQuizlist.length == 0">
+              <el-empty
+                description="点击左侧表格学生信息可查看批阅详情"
+                style="width: 100%; height: 500px"
+              ></el-empty>
+            </div>
+            <div v-else style="height: 100%;">
+              <div v-if="isopen_dtwk_table" style="height: 100%;">
+                <div v-show="classWorkAnalysis.activeStudentQuizlist.length > 0" style="height: 100%;">
+                  <item-dialog-score
+                    ref="classWorkAnalysisScoreDialogRef"
+                    @class_work_score_submit="onClassWorkScoreSubmit"
+                  />
+                </div>
+              </div>
+              <div v-else>
+                <el-empty
+                  description="点击左侧表格学生信息可查看批阅详情"
+                  style="width: 100%; height: 500px"
+                ></el-empty>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 作业概况 -->
+      <div v-else-if="classWorkAnalysis.view == 'quizStats'" style="width: 100%;">
+        <quiz-stats :active-data="classWorkActiveData" style="width: 100%;height: 100%;"/>
+      </div>
+
+      <!-- 作业报告-->
+      <div v-else-if="classWorkAnalysis.view == 'report'" style="width: 100%;overflow-y: scroll">
+        <!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
+        <ClassOverview :table-list="overviewData" style="width: 100%;"></ClassOverview>
+      </div>
+
+    </div>
+</div>
+</template>
+<script setup name="itemDialogRef">
+import { ref, defineExpose, onMounted, reactive, computed, watch, onUnmounted, nextTick, getCurrentInstance } from 'vue'
+import { listClassworkdata, listEntpcoursework, listClassworkeval } from '@/api/classTask'
+import useUserStore from '@/store/modules/user'
+import { ElMessage } from 'element-plus'
+import { getCurrentTime, getAfterMinutes } from '@/utils/date'
+import { processList } from '@/hooks/useProcessList'
+import ItemDialogScore from '@/views/classTask/container/item-dialog-score.vue'
+// zdg: 组件导入
+import quizStats from '@/views/classTask/container/quizStats.vue'
+import ClassOverview from '@/views/classTask/container/classOverview.vue'
+import {sessionStore} from '@/utils/tool'
+
+const { proxy } = getCurrentInstance()
+const emit = defineEmits(['cle-click'])
+const props = defineProps({
+  bookId: {
+    type: Number,
+    default: 0
+  },
+})
+const mainHeight = ref(document.documentElement.clientHeight - 110)
+const classWorkAnalysis = reactive({
+  open: false,
+  entpcourseworklistarray: [], // 当前学习任务所包含的试题ID
+})
+const tableRadio = reactive({
+  value: '1', // 已交
+  list: [], // 已交list
+  num1: 0, // 已交人数
+  num0: 0 // 未交人数
+}) // 批阅 是否已交
+const loading_dt_table = ref(false)
+const isopen_dtwk_table = ref(false)
+
+// zdg: 作业概况
+const classWorkActiveData = reactive({
+  quizlist: [], // 当前习题列表
+  studentList: [], // 当前课程-所有学生
+  workFeedList: [], // 当前课程-所有学生反馈数据
+  timerId: 0 // 定时器id
+})
+//所选学生题目- 答题题目分析与评价
+const classWorkAnalysisScore = reactive({
+  studentObj: {}, // 当前学生的作业题型等信息
+  studentQuizAllList: [], // 选择学生的回答list
+  quizlist: [] // 选择学生的题目list
+})
+
+ //查看学生概况数据
+ const overviewData = ref([])
+
+// watch(
+//   // () => props.currentNode,
+//   (newValue, oldValue) => {
+//     form.name = newValue.label
+//   }
+// )
+const openDialog = (data) => {
+  console.log(data, '点击的item答题情况')
+
+  classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
+  classWorkAnalysis.worktype = data.worktype
+  classWorkAnalysis.workclass = data.workclass
+  // 重置学生列表
+  tableRadio.list = []
+  tableRadio.value = '1'
+  tableRadio.num0 = 0
+  tableRadio.num1 = 0
+
+  classWorkAnalysis.open = true
+  // 默认显示是学生作业反馈
+  classWorkAnalysis.view = 'studentview'
+  // 当前学习任务所包含的试题ID
+  classWorkAnalysis.entpcourseworklistarray = data.entpcourseworklistarray
+  // 默认选中的学生
+  classWorkAnalysis.activeStudentQuizlist = []
+  // 默认选中的试题
+  classWorkAnalysis.activeQuizAnalysisData = []
+
+  classWorkAnalysis.row = data
+  window.test = this
+  // zdg: 学生列表
+  const studentArr = data.classworkdatastudentids
+    ? JSON.parse(`[${data.classworkdatastudentids}]`)
+    : []
+  classWorkActiveData.studentList = studentArr
+  /** 学生完成情况分析--获取作业学生list数据 */
+  getClassWorkStudentList(data.id)
+
+  // 课程列表idlist
+  var ids = []
+  for (var i = 0; i < data.entpcourseworklistarray.length; i++) {
+    ids.push(data.entpcourseworklistarray[i].id)
+  }
+  // 课程作业列表
+  listEntpcoursework({ ids: ids.join(','), pageSize: 500 }).then((idres) => {
+    for (var i = 0; i < idres.rows.length; i++) {
+      // //新增了 复合题、主观题（背景+小题目） 题目标题优化一下 .replace(/!@#\$%/g,'')
+      idres.rows[i].titletext = idres.rows[i].title.replace(/!@#\$%/g, '')
+    }
+    classWorkAnalysis.quizlist = idres.rows
+    classWorkActiveData.quizlist = idres.rows // zdg: 作业概览组件使用
+
+    // 统计每个题目的正误率
+    // 这个学习任务所有题目+所有学生的答题数据 , pageSize: 100
+    listClassworkeval({ workid: data.id, pageSize: 1000 }).then((wevalres) => {
+      for (var i = 0; i < classWorkAnalysis.quizlist.length; i++) {
+        // 分析每一道题目
+        var scoingCount = 0
+        var feedcount = 0
+        // 全部人数
+        var evalCount = 0
+        for (var w = 0; w < wevalres.rows.length; w++) {
+          if (wevalres.rows[w].entpcourseworkid == classWorkAnalysis.quizlist[i].id) {
+            evalCount++
+
+            // 只统计有回答的题目
+            if (wevalres.rows[w].feedcontent != '') {
+              // 已经作答的人数
+              feedcount++
+              // 简单判断正误
+              if (wevalres.rows[w].feedcontent == wevalres.rows[w].rightanswer) {
+                wevalres.rows[w].scoingStatus = true
+                scoingCount++
+                // 学生回答与参考答案一样，则：得分=分值
+                wevalres.rows[w].teacherRating = wevalres.rows[w].score
+              } else {
+                wevalres.rows[w].scoingStatus = false
+              }
+            }
+          }
+        }
+        classWorkAnalysis.quizlist[i].evalCount = evalCount
+        // 作答人数
+        classWorkAnalysis.quizlist[i].feedcount = feedcount
+        // 得分率  这里优化一下（没回答会是NaN%） scoingRate
+        if (scoingCount == 0 && feedcount == 0) {
+          classWorkAnalysis.quizlist[i].scoingRate = '0%'
+        } else {
+          classWorkAnalysis.quizlist[i].scoingRate =
+            ((scoingCount / feedcount) * 100).toFixed(0) + '%'
+        }
+      }
+      // zdg: 所有反馈数据
+      const getStudentid = (workdataid) => {
+        // 获取学生id
+        const classworkdata = (classWorkAnalysis.classworkdata || []).find(
+          (o) => o.id === workdataid
+        )
+        return classworkdata ? classworkdata.studentid : ''
+      }
+      wevalres.rows.forEach((o) => {
+        o.studentid = getStudentid(o.workdataid)
+      })
+      classWorkActiveData.workFeedList = wevalres.rows
+    })
+  })
+
+  console.log(classWorkAnalysis, '点击进度后获得的数据')
+}
+
+
+
+
+
+
+//#region 学生完成情况分析
+/** 1、获取作业学生列表 */
+const getClassWorkStudentList = (rowId) => {
+  // 本地保存这个rowid，老师批改后续中使用
+  localStorage.setItem('activeClassWorkRowId', rowId)
+  // 先清空表格中的数据
+  classWorkAnalysis.classworkdata = []
+  // 加载中_
+  loading_dt_table.value = true
+  // 找当前学习任务的classworkdata数据
+  listClassworkdata({ classworkid: rowId, pageSize: 100 })
+    .then((response) => {
+      for (var i = 0; i < response.rows.length; i++) {
+        if (response.rows[i].entpcourseworklist != '') {
+          response.rows[i].entpcourseworkarray = JSON.parse(
+            '[' + response.rows[i].entpcourseworklist + ']'
+          )
+        } else {
+          response.rows[i].entpcourseworkarray = []
+        }
+
+        // 老师批阅状态 默认0 未批改
+        response.rows[i].teacherRating = 0
+
+        // 计算每个学生的得分率
+        if (
+          response.rows[i].classworkevallist != '' &&
+          response.rows[i].classworkevallist != null &&
+          response.rows[i].classworkevallist != 'null'
+        ) {
+          // 将标签中双引号改为转义, 测试数据: "{\"id\":172910, \"feedcontent\":\"毛泽东，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"},{\"id\":172911, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363100, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"}"
+          // 常规作业（去除【】前后引号）.replace(/"(\[.*\])"/g, '$1'); ：eg: "feedcontent\":\"[{\"name\":\"Bliss.jpg\",\"url\":\"https://wzyzoss.3b8daa474.jpg\"}]\",
+          // json转换会报错； .replace(/""/g, '"')   eg:  ""宇宙环境安全""
+          response.rows[i].classworkevallist = escapeHtmlQuotes(response.rows[i].classworkevallist)
+          console.log('学生完成情况分析classworkevallist', response.rows[i].classworkevallist)
+          const evalarray = JSON.parse('[' + response.rows[i].classworkevallist + ']')
+          var scoingCount = 0
+          var feedcount = 0
+          for (var e = 0; e < evalarray.length; e++) {
+            if (evalarray[e].feedcontent != '') {
+              feedcount++
+              // 与答案对比正误。注意注意，这里仅限单选题
+              if (evalarray[e].feedcontent == evalarray[e].rightanswer) {
+                scoingCount++
+              }
+            }
+          }
+          console.log(evalarray, 'evalarray------------------------------------')
+          if (feedcount > 0) {
+            // 多个题目的总得分率: 正确题数/（题目数*100）
+            response.rows[i].scoingRate = ((scoingCount / feedcount) * 100).toFixed(0) + '%'
+          } else {
+            response.rows[i].scoingRate = '0%'
+          }
+          // 批阅状态  优良类 :注意：这里题目中的评价都是一样的，所以取第一个
+          if (evalarray[0].rating != '') {
+            response.rows[i].teacherRating = evalarray[0].rating
+          }
+        } else {
+          response.rows[i].scoingRate = '0%'
+        }
+      }
+      classWorkAnalysis.classworkdata = response.rows
+      loading_dt_table.value = false
+
+      // 默认获取已交的学生列表
+      tableRadio.list =
+        classWorkAnalysis.classworkdata &&
+        classWorkAnalysis.classworkdata.filter((item) => item.finishtimelength != '0')
+      tableRadio.value = '1'
+      tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length
+      tableRadio.num1 = tableRadio.list.length
+    })
+    .catch(() => {
+      loading_dt_table.value = false
+    })
+}
+/** 2、查看某一个学生的学习任务完成详情*/
+const getStudentClassWorkDataDetail = (row) => {
+  // 这里取出的是学生完成情况
+  // 具体的题目数据在this.classWorkAnalysis.quizlist里
+  console.log(row, '点击了左侧学生')
+  //更新到待批改的学生信息中
+  classWorkAnalysisScore.studentObj = row
+  listClassworkeval({ workdataid: row.id, pageSize: 100 })
+    .then((wevalres) => {
+      for (var i = 0; i < classWorkAnalysis.quizlist.length; i++) {
+        // 分析每一道题目
+        for (var w = 0; w < wevalres.rows.length; w++) {
+          if (wevalres.rows[w].entpcourseworkid == classWorkAnalysis.quizlist[i].id) {
+            wevalres.rows[w].quiztitle = classWorkAnalysis.quizlist[i].title
+            wevalres.rows[w].quiztitletext = classWorkAnalysis.quizlist[i].title.replace(
+              /<[^>]*>/g,
+              ''
+            )
+            wevalres.rows[w].score = wevalres.rows[w].score ? wevalres.rows[w].score : 0
+
+            // 参考答案  去除下html标签
+            wevalres.rows[w].rightanswer =
+              wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
+                ? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
+                : wevalres.rows[w].rightanswer
+            // 学生回答 去除下html标签
+            wevalres.rows[w].feedcontent =
+              wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
+                ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
+                : wevalres.rows[w].feedcontent
+
+            if (classWorkAnalysis.row.worktype == '常规作业') {
+              wevalres.rows[w].feedcontent = JSON.parse(wevalres.rows[w].feedcontent)
+            }
+            if (wevalres.rows[w].feedcontent != '') {
+              if (wevalres.rows[w].feedcontent == wevalres.rows[w].rightanswer) {
+                wevalres.rows[w].scoingStatus = true
+                // 学生回答与参考答案一样，则：得分=分值
+                wevalres.rows[w].teacherRating = wevalres.rows[w].score
+              } else {
+                wevalres.rows[w].scoingStatus = false
+              }
+            } else {
+              wevalres.rows[w].scoingStatus = ''
+            }
+            // 计算得分
+          }
+          // "回答" prop="feedcontent" width="200" align="center"></el-table-column>
+          // <el-table-column label="参考答案" prop="rightanswer"
+          //新增了 复合题、主观题（背景+小题目） 题目标题优化一下
+          wevalres.rows[w].worktitle = wevalres.rows[w].worktitle.replace(/!@#\$%/g, '')
+
+          // 将feedcontent中的\r替换为<br />
+          wevalres.rows[w].feedcontent = wevalres.rows[w].feedcontent.replace(/(?<!\\)\n/g, '<br />');    //替换\n而不替换\\n 为 \\n
+        }
+      }
+      classWorkAnalysis.activeStudentQuizlist = wevalres.rows
+      // 加载右边表格
+      isopen_dtwk_table.value = true
+      // 加载右边评语区域
+      if (wevalres.rows.length > 0) {
+        handleClassWorkAnalysissScoreOpen(row)
+      } else {
+        ElMessage({
+          type: 'warning',
+          message: '未获取到答题信息，请稍后再看，或者联系管理员查看情况！'
+        })
+      }
+    })
+    .catch(() => {
+      console.log('获取答题情况失败')
+      ElMessage({
+        type: 'warning',
+        message: '未获取到答题信息！'
+      })
+    })
+}
+/** 3、教师批改后返回的方法*/
+const onClassWorkScoreSubmit = () => {
+  console.log('批改后返回的方法')
+  loading_dt_table.value = true
+  isopen_dtwk_table.value = false
+  // 1、清空答题情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
+  //  - 左侧学生列表
+  classWorkAnalysis.classworkdata = []
+  classWorkAnalysis.activeStudentQuizlist = []
+  // 2、刷新左侧学生列表数据，更新批改状态
+  const rowid = localStorage.getItem('activeClassWorkRowId')
+  getClassWorkStudentList(rowid)
+}
+// 查看并批改一个学生的题目作答(答题题目分析与评价)
+const handleClassWorkAnalysissScoreOpen = (row) => {
+  console.log(row, '所选点击的信息')
+
+  // 当前学生的回答list
+  classWorkAnalysisScore.studentQuizAllList = classWorkAnalysis.activeStudentQuizlist
+  // 当前学生的所有题目list
+  classWorkAnalysisScore.quizlist = classWorkAnalysis.quizlist
+  // 格式化试题格式信息
+  processList(classWorkAnalysisScore.quizlist)
+  // 屏幕高度
+  classWorkAnalysisScore.maxheight = mainHeight.value - 100
+
+  // 防止组件未渲染完成 调用里面方法报错
+  nextTick(() => {
+    proxy.$refs.classWorkAnalysisScoreDialogRef.acceptParams(classWorkAnalysisScore)
+  })
+}
+//#endregion
+
+/** 批阅：已交未交事件 */
+const tableRadioChange = (e) => {
+  // 关闭右侧批阅ui
+  isopen_dtwk_table.value = false;
+  console.log(e,'??????')
+  console.log("学生列表：", classWorkAnalysis.classworkdata)
+  if(e=='1'){
+    tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength != '0')
+    tableRadio.value = '1';
+    tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
+    tableRadio.num1 = tableRadio.list.length;
+  }else if(e=='0'){
+    tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength == '0')
+    tableRadio.value = '0';
+    tableRadio.num0 = tableRadio.list.length;
+    tableRadio.num1 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
+  }
+}
+
+// 将标签中的双引号增加转义
+const escapeHtmlQuotes = (str) => {
+  // 后端已replace双引号, 故前端不用在处理
+  const regex1 = /\\+/g;  // 匹配多个反斜杠
+  let result = str.replace(regex1, '\\');
+  result = str.replace(/(?<!\\)\n/g, '<br />');    //替换\n而不替换\\n 为 \\n
+
+  return result;
+}
+
+//#region 作业概况
+// 查看学生-作业概览
+const workHandle = (type) => {
+  // 关闭右侧批阅ui
+  isopen_dtwk_table.value = false;
+  classWorkAnalysis.view = type
+  const isClose = type != 'quizStats' && !! classWorkActiveData.timerId
+  const isOpen = type == 'quizStats' && !classWorkActiveData.timerId
+  if (isClose) clearInterval(classWorkActiveData.timerId) // 关闭定时器
+  if (isOpen) {
+    // 轮询 更新学生作答数据
+    classWorkActiveData.timerId = setInterval(() => {
+      console.log('zdg: 定时执行')
+      getWorkFeedList()
+    }, 20 * 1000);
+  }
+}
+// 获取学生答题回馈数据-更新
+const getWorkFeedList = async() =>{
+  const workid = classWorkAnalysis.row.id
+  const res = await listClassworkeval({workid, isFinish: 1, pageSize: 1000})
+  const getStudentid = (workdataid) => { // 获取学生id
+    const classworkdata = (classWorkAnalysis.classworkdata||[]).find(o => o.id === workdataid)
+    return classworkdata ? classworkdata.studentid : ''
+  }
+  res.rows.forEach(o => { o.studentid = getStudentid(o.workdataid) })
+  classWorkActiveData.workFeedList = res.rows
+}
+//#endregion
+
+
+//#regin 作业报告
+/*
+  author: yangws
+  time: 2024-8-06 16:35:33
+  function:作业报告的处理
+*/
+const handleClassOverviewOpen = (type) =>{
+  // 关闭右侧批阅ui
+  isopen_dtwk_table.value = false;
+  classWorkAnalysis.view = type
+  const data = classWorkAnalysis.row
+  //获取所有学生列表
+  listClassworkdata({classworkid: data.id, pageSize: 100}).then((response) => {
+    if(response.code === 200){
+      response.rows.forEach(item => {
+        let rightAnswer = 0
+        let answers = 0
+        if(!item.classworkevallist) return
+        // 使用正则表达式替换字符串值中的双引号为单引号
+        let replacedString = item.classworkevallist.replace(/""/g, "\"");
+        // 将标签中双引号改为转义, 测试数据: "{\"id\":172907, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358520, \"feedcontent\":\"④①⑤③②\", \"score\":4, \"rightanswer\":\"④①⑤③②\"},{\"id\":172908, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358521, \"feedcontent\":\"气壮山威，鲲鹏展翅楚云飞\", \"score\":4, \"rightanswer\":\"志远天高，春风杨柳麓山青\"},{\"id\":172909, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363096, \"feedcontent\":\"《红烛》化用“蜡矩”这一古典意象，赋予它新的含义，赞美了红烛以“蜡炬成灰”来点亮世界的奉献精神。\", \"score\":4, \"rightanswer\":\"《立在地球边上放号》中，全诗采用间接抒情的方式，描绘了太平洋的浪潮，吟唱了一曲惊心动魄的力的颂歌，意在赞美摧毁旧世界、创造新生活的“五四”精神。\"},{\"id\":172910, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363098, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"},{\"id\":172911, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363100, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"}"
+        replacedString = escapeHtmlQuotes(item.classworkevallist);
+        let allTopic
+        try{
+          allTopic = JSON.parse(`[${item.classworkevallist}]`)
+        }catch{
+          allTopic = JSON.parse(`[${replacedString}]`)
+        }
+        if(item.classworkevallist != ''){
+          allTopic.forEach(itemTopic => {
+            if(itemTopic.feedcontent != ''){
+              answers ++
+              //正确答案，仅限单选题
+              if(itemTopic.feedcontent === itemTopic.rightanswer){
+                rightAnswer ++
+              }
+            }
+          })
+          rightAnswer > 0?item.scoingRate = (rightAnswer/answers * 100).toFixed(0):item.scoingRate = ''
+        }else{
+          item.scoingRate = ''
+        }
+        //获得总分
+        const point = allTopic.reduce((acc, cur) => {
+          if(cur.rating !== 0){
+            return acc + cur.teacherRating;
+          }
+        },0)
+        // item.chapter = this.courseObj.evalid
+        item.point = point || 0
+        item.rating = allTopic[0].rating
+
+      })
+      overviewData.value = [...response.rows]
+    }
+  })
+}
+
+//#endregion
+
+const onBeforeClose = () =>{
+  console.log('非正常关闭dialog?esc、dialog外部区域')
+  closeDialog()
+}
+const closeDialog = () => {
+  classWorkAnalysis.open = false
+  emit('cle-click')
+}
+
+onMounted(() => {
+  
+  // const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
+  const data = sessionStore.get('teachClassWorkItem');
+  // console.log(data,'????????????????????' )
+  if(data){
+    openDialog(data)
+  }
+})
+
+watch(classWorkAnalysis, (newVal, oldVal) => {
+  if(newVal.view != 'quizStats'){
+    console.log('关闭zdg: 定时执行')
+    clearInterval(classWorkActiveData.timerId) // 关闭定时器 作业概况的
+  }
+})
+
+onUnmounted(() => {
+  clearInterval(classWorkActiveData.timerId) // 关闭定时器 作业概况的
+})
+
+// defineExpose({
+// })
+</script>
+
+<style src="@/assets/styles/JYStyle.css"></style>
+
+<style scoped lang="scss">
+.teachClassTask{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .teachClassTask_header{
+    flex: 0 0 auto;
+  }
+
+  .teachClassTask_content{
+    flex: 1;
+    height: 100%;
+    overflow: hidden;
+    display: flex;
+    justify-content: center;
+    overflow: hidden;
+
+    .clwk_dialog_view {
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      overflow: hidden;
+    }
+    .view_table {
+      flex: 0 0 auto;
+      height: 100%;
+      overflow: hidden;
+    }
+    .view_teachrting {
+      flex: 1;
+      height: 100%;
+      /*overflow-y: auto; */
+      overflow: hidden;
+
+      .classwork-score{
+        // overflow-y: auto;
+        height: 100%;
+      }
+    }
+  }
+}
+
+
+
+
+
+
+
+// .clwk_dialog {
+  
+// }
+
+// .clwk_dialog {
+//   display: flex;
+//   justify-content: center;
+//   overflow: hidden;
+// }
+// .clwk_dialog .el-dialog {
+//   margin: 0 auto !important;
+//   height: 85%!important;
+//   overflow: hidden;
+// }
+// .clwk_dialog .el-dialog__header {
+//   /* position: absolute;
+//   top: 0;
+//   left: 0; */
+//   width: 100%!important;
+// }
+// .clwk_dialog .el-dialog__body {
+//   position: absolute;
+//   left: 0;
+//   top: 15px;
+//   bottom: 1px;
+//   right:0;
+//   padding:5px;
+//   z-index:1;
+//   display: flex;
+//   flex-direction: column;
+//   overflow: hidden;
+//   /* overflow:hidden;
+//   overflow-y: auto; */
+// }
+// .clwk_dialog .el-dialog__footer{
+//   position: absolute;
+//   bottom: 10px;
+//   right: 10px;
+// }
+// .clwk_dialog .classwork-score{
+//   overflow-y: auto;
+// }
+</style>
+
+<style scoped>
+/* .clwk_dialog {
+  display: flex;
+  justify-content: center;
+  overflow: hidden;
+}
+.clwk_dialog .el-dialog {
+  margin: 0 auto !important;
+  height: 85%!important;
+  overflow: hidden;
+}
+.clwk_dialog .el-dialog__header {
+  /* position: absolute;
+  top: 0;
+  left: 0; 
+  width: 100%!important;
+}
+.clwk_dialog .el-dialog__body {
+  position: absolute;
+  left: 0;
+  top: 15px;
+  bottom: 1px;
+  right:0;
+  padding:5px;
+  z-index:1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  /* overflow:hidden;
+  overflow-y: auto; 
+}
+.clwk_dialog .el-dialog__footer{
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+}
+.clwk_dialog .classwork-score{
+  overflow-y: auto;
+} */
+</style>

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

@@ -28,20 +28,20 @@
         </ul>
       </el-scrollbar>
     </div>
-    <item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog>
   </div>
 </template>
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, watch } from 'vue'
 import useUserStore from '@/store/modules/user'
 import { homeworklist } from '@/api/teaching/classwork'
 import { getCurrentTime, getTomorrow } from '@/utils/date'
-import ItemDialog from '@/views/classTask/container/item-dialog.vue'
+import {sessionStore, createWindow} from '@/utils/tool'
+import { useToolState } from '@/store/modules/tool'
 
 const user = useUserStore().user
+const toolState = useToolState();
 const loading = ref(false)
 const homeworkList = ref([])
-const itemDialogRef = ref(null)
 
 // 获取作业
 const getHomework = async () => {
@@ -70,12 +70,11 @@ const getHomework = async () => {
 // 批改作业
 const onClickItem = (item) => {
   console.log('开启弹窗')
-  itemDialogRef.value.openDialog(item)
-}
-// 批阅关闭
-const closeDialog = () => {
-  console.log('关闭弹窗,查询一下作业数据，更新界面')
-  getHomework()
+  // itemDialogRef.value.openDialog(item)
+  // 调用新窗口批改页面
+  sessionStore.set('teachClassWorkItem', item)
+  toolState.isTaskWin=true //设置打开批改窗口
+  createWindow('open-taskwin',{url:'/teachClassTask'})
 }
 
 const tagType = (time) => {
@@ -86,6 +85,16 @@ const tagType = (time) => {
 onMounted(() => {
   getHomework()
 })
+
+watch(
+  () => [toolState.isTaskWin],
+  () => {
+    console.log('=监听到批改窗口是否关闭了===', toolState.isTaskWin)
+    if(!toolState.isTaskWin){
+      getHomework()// 更新数据
+    }
+  }
+)
 </script>
 
 <style lang="scss" scoped>

src/renderer/src/views/desktop/index.vue

@@ -9,7 +9,16 @@
               <div class="item-content">
                 <ul class="flex con-ul">
                   <li v-for="menu in item.list" :key="menu.id" @click="clickMenu(menu)" class="flex item-menu" :class="menu.disabled ? 'menu-disabled' : ''">
+                    <div class="icon-box">
+                      <template v-if="menu.disabled">
                         <i class="iconfont" :class="menu.icon"></i>
+                      </template>
+                      <template v-else>
+                        <svg class="icon iconfont icon-svg" aria-hidden="true">
+                          <use :xlink:href="menu.icon"></use>
+                        </svg>
+                      </template>
+                    </div>
                     <span>{{ menu.name }}</span>
                   </li>
                 </ul>
@@ -60,19 +69,19 @@ const menuList = [{
     list: [
       {
         name: '课标分析',
-        icon: 'icon-kecheng',
+        icon: '#icon-kebiao',
         path: '/standardanalysis?',
         id: '1-1'
       },
       {
         name: '教材分析',
-        icon: 'icon-jiaocaixuanze',
+        icon: '#icon-jiaocaixuanze',
         path: '/textbookAnalysis',
         id: '1-2'
       },
       {
         name: '考试分析',
-        icon: 'icon-kaoshi',
+        icon: '#icon-kaoshi',
         path: '/examReport',
         id: '1-3'
       },
@@ -84,13 +93,13 @@ const menuList = [{
       },
       {
         name: '教学实践',
-        icon: 'icon-jiaoxuefenxi',
+        icon: '#icon-jiaoxueshijian',
         path: '/prepare',
         id: '1-5'
       },
       {
         name: '教学反思',
-        icon: 'icon-jiaoxuefansi',
+        icon: 'icon-a-1_jiaoxuefansi',
         disabled: true,
         id: '1-6'
       },
@@ -103,7 +112,7 @@ const menuList = [{
     list: [
       {
         name: '作业设计',
-        icon: 'icon-jiaoxuefansi',
+        icon: '#icon-zuoyesheji',
         isOuter: true,
         path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask',
         // path: '/newClassTask',
@@ -111,7 +120,7 @@ const menuList = [{
       },
       {
         name: '作业布置',
-        icon: 'icon-xiezuo1',
+        icon: '#icon-zuoyebuzhi',
         isOuter: true,
         path: '/teaching/classtaskassign?titleName=作业布置',
         // path: '/classTaskAssign',
@@ -119,7 +128,7 @@ const menuList = [{
       },
       {
         name: '作业批改',
-        icon: 'icon-pigai',
+        icon: '#icon-zuoyepigai',
         path: '/classTask',
         id: '2-3'
       },
@@ -138,25 +147,25 @@ const menuList = [{
     list: [
       {
         name: '教学计划',
-        icon: 'icon-jiaoxuejihua',
+        icon: 'icon-jihua',
         disabled: true,
         id: '3-1'
       },
       {
         name: '教学组织',
-        icon: 'icon-organization-framework-line',
+        icon: 'icon-zuzhi',
         disabled: true,
         id: '3-2'
       },
       {
         name: '教学质量',
-        icon: 'icon-jiaoxuezhiliangfenxi',
+        icon: 'icon-zhiliang',
         disabled: true,
         id: '3-3'
       },
       {
         name: '教学反馈',
-        icon: 'icon-fankui',
+        icon: 'icon-yijianfankui',
         disabled: true,
         id: '3-4'
       },
@@ -276,20 +285,37 @@ onMounted(async ()=>{
       padding: 10px 0;
       .con-ul{
         justify-content: space-around;
+        
         .item-menu{
           cursor: pointer;
           flex-direction: column;
           font-size: 14px;
+          align-items: center;
+          .icon-box{
+            width: 100%;
+            height: 45px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 5px;
+          }
           .iconfont{
             font-size: 28px;
             color: #707070;
+            // font-weight: bold;
+          }
+          .icon-svg{
+            height: 42px;
             font-weight: bold;
           }
           &:hover{
-            color: #409EFF;
+            // color: #409EFF;
             .iconfont{
               color: #409EFF;
             }
+            .icon-box{
+              background-color: #F2F2F2;
+            }
           }
         }
         .menu-disabled{
@@ -303,6 +329,9 @@ onMounted(async ()=>{
             .iconfont{
               color: #bfbfbf;
             }
+            .icon-box{
+              background-color: #fff;
+            }
           }
         }
       }
@@ -324,7 +353,9 @@ onMounted(async ()=>{
     align-items: center;
   }
   .item-content{
+    border-radius: 5px;
     background: #fff;
+    box-sizing: border-box;
     flex: 1;
     .chart-box{
       height: 100%;

src/renderer/src/views/login/components/Register.vue

@@ -44,7 +44,6 @@
             v-model="ruleForm.address"
             :options="regionData"
              @change="handleChange"
-            :props="{checkStrictly: true}"
           />
       </el-form-item>
       <el-form-item label="学校" prop="school" v-if="activeIndex==2">
@@ -241,15 +240,16 @@ const handleClose = () => {
         confirmPassword:'',
         class:[],
         discipline:[],
-              school:[],
+        school:[100,255,279],
+        address:["50","5001","500101"]
       }
     Object.assign(ruleForm, restValue);
     schoolSubject.value=[]
     gradeTree.value=[]
   if (ruleFormRef.value) ruleFormRef.value.resetFields()
    removeToken();
-  activeIndex.value=1
   dialogVisible.value=false
+   activeIndex.value=1
 }
 
 const nextStep = (formEl) => {
@@ -346,13 +346,14 @@ const submitForm = async (formEl) => {
               confirmPassword:'',
               class:[],
               discipline:[],
-              school:[],
+              school:[100,255,279],
+              address:["50","5001","500101"]
             }
             schoolSubject.value=[]
             gradeTree.value=[]
             Object.assign(ruleForm, restValue);
-            activeIndex.value=1
             dialogVisible.value=false 
+            activeIndex.value=1
           }else{
             ElMessage.error(res.msg)
           }
@@ -495,7 +496,7 @@ const gradeName = (key) =>{
 }
  onMounted(()=>{
    //默认给到地区重庆
-   ruleForm.address = ['50']
+   ruleForm.address = ["50","5001","500101"]
    //默认给到学校的值
    ruleForm.school = [100,255,279]
  })

src/renderer/src/views/prepare/index.vue

@@ -583,11 +583,7 @@ export default {
       this.uploadData.levelSecondId = cata[1]
       this.uploadData.levelThirdId = cata[2]
       this.uploadData.textbookId = data.textBook.curBookId
-      toolStore.curSubjectNode.data = data
-      // 不要同时修改共享数据，这样只会触发一次
-      this.$nextTick(() => {
       toolStore.curSubjectNode.querySearch = this.uploadData
-      })
       this.initHomeWork()
       await this.asyncAllFile()
     },

src/renderer/src/views/teach/standardAnalysis/index.vue

@@ -7,7 +7,7 @@
           <el-image class="imges" :src="bookInfo ? bookInfo.avartar : ''" />
         </div>
         <div class="stand-head-right">
-          <div class="stand-head-right-tit">{{booktitle}}</div>
+          <div class="stand-head-right-tit">{{bookInfo ? bookInfo.bookName : ''}}</div>
           <i class="iconfont icon-yidongdaozu stand-head-right-icon" @click="dialogVisible = true"></i>
           <div class="stand-head-right-row">
             <div class="stand-head-right-row-time">更新2024.9.10</div>
@@ -68,11 +68,11 @@
         </div>
       </div>
     </div>
-    <el-dialog v-model="dialogVisible" title="切换教材" append-to-body  width="550">
+    <el-dialog v-model="dialogVisible" title="切换课标" append-to-body  width="550">
       <div class="booklist">
         <div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item,idx)">
           <el-image class="bookimg" :src="item.avartar" />
-          <div class="bookname">{{item.fileurl.replace('.txt', '')}}</div>
+          <div class="bookname">{{item.bookName}}</div>
         </div>
       </div>
     </el-dialog>
@@ -105,7 +105,6 @@ const headref = ref(null);
 const searchref = ref(null);
 const listHeight = ref(0);
 const dialogVisible = ref(false);
-const booktitle = ref('');
 const bookInfo = ref(null);
 const booksel = ref(0);
 const bookList = ref([])
@@ -246,23 +245,24 @@ const getAllSubject = async () => {
   const { rows } = await listEvaluation({ itemkey: "subject", pageSize: 500 })
   const { edustage, edusubject } = userStore.user;
   rows && rows.map(item => {
-    if(item.edustage === edustage && item.edusubject === edusubject){
-      bookInfo.value = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar}
+    if(edustage === item.edustage  && item.edusubject === edusubject){
+      bookInfo.value = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar,bookName: bookNameFormat(item.edustage,item.edusubject)}
     }
     if(item.fileurl !== ''){
-      bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
+      bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar,bookName: bookNameFormat(item.edustage,item.edusubject)})
     }
   })
   const textselidx = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
   booksel.value = textselidx
-  booktitle.value = bookList.value[textselidx].fileurl.replace('.txt','')
   const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + bookList.value[textselidx].fileurl.replace('.txt','.pdf')
   await loadPdfAnimation(filePath)
 }
+const bookNameFormat = (edustage,edusubject) => {
+  return `${edustage}-${edusubject}`
+}
 const bookChange = async (item, idx) => {
   booksel.value = idx
   bookInfo.value = {...item}
-  booktitle.value = item.fileurl.replace('.txt','')
   pdfUrl.value = '';
   const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + item.fileurl.replace('.txt','.pdf')
   await loadPdfAnimation(filepath)
@@ -539,9 +539,9 @@ onMounted(async () => {
       width: 130px;
       height: 180px;
     }
-    .name{
+    .bookname{
       font-size: 14px;
-      color: #3b3b3b;
+      text-align: center;
     }
   }
   .item:hover{

src/renderer/src/views/textbookAnalysis/index.vue

@@ -244,19 +244,17 @@ const getData = (data) => {
 // 获取学科
 const getAllSubject = async () => {
   const { edustage, edusubject } = userStore.user;
-  const { rows } = await listEvaluation({ itemkey: "version", edustage, edusubject, pageSize: 500 })
-  rows && rows.map(item => {
-    if(item.edustage === edustage && item.edusubject === edusubject){
-      bookInfo.value = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar}
-    }
+  const { rows } = await listEvaluation({ itemkey: "version", edustage, edusubject, orderby: 'orderidx asc', pageSize: 500 })
+  const dataList = [];
+  rows && rows.map((item,idx) => {
     if(item.fileurl !== ''){
-      bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
+      dataList.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
     }
   })
-  const textselidx = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
-  booksel.value = textselidx
-  booktitle.value = bookList.value[textselidx].fileurl.replace('.txt','')
-  const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + bookList.value[textselidx].fileurl.replace('.txt','.pdf')
+  bookList.value = dataList
+  bookInfo.value = {...dataList[0],avartar: dataList[0].avartar}
+  booktitle.value = dataList[0].fileurl.replace('.txt','')
+  const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + dataList[0].fileurl.replace('.txt','.pdf')
   await loadPdfAnimation(filePath)  
 }
 const bookChange = async (item, idx) => {

src/renderer/src/views/tool/components/homework.vue

@@ -62,7 +62,7 @@
           <span class="unit-top-center">选择目录</span>
         </div>
         <div class="unit-content">
-          <Lesson @changeChapter="changeChapter" />
+          <Lesson @changeChapter="changeChapter" :curNode="curNode.data" />
         </div>
       </div>
     </transition>
@@ -70,19 +70,20 @@
 </template>
 
 <script setup>
-import { ref, onMounted, toRaw } from 'vue';
+import { ref, onMounted, toRaw, nextTick, reactive } from 'vue';
 import { useRoute } from 'vue-router';
 import useUserStore from '@/store/modules/user'
 import { getSmarttalkPage } from '@/api/file'
 import SetHomework from '@/components/set-homework/index.vue'
 import FileImage from '@/components/file-image/index.vue'
 import { useGetHomework } from '@/hooks/useGetHomework'
-import { ipcMsgSend, ipcMsgSend2, ipcMsgInvoke } from '@/utils/tool'
+import { ipcMsgSend, ipcMsgInvoke } from '@/utils/tool'
 import { useToolState } from '@/store/modules/tool'
 import Lesson from './lesson.vue';
 import { parseCataByNode } from '@/utils/talkFile'
 import MsgEnum from '@/plugins/imChat/msgEnum' // 消息枚举
 import { createHomework } from '../createHomework'
+import { sessionStore } from '@/utils/store'
 
 const route = useRoute();
 const usertore = useUserStore().user
@@ -99,6 +100,10 @@ const resourceList = ref([])
 //当前点击的数据
 const curRow = ref('')
 
+const curNode = reactive({
+  data: {}
+})
+
 const sendHomework = (row) => {
   curRow.value = row
   setTimeout(() => {
@@ -118,6 +123,7 @@ const successHomework = (data)=>{
 }
 // 章节目录change
 const changeChapter = async (data)=>{
+  curNode.data = data
   const { res } = await useGetHomework(data)
   dataList.value = res
   let cata = parseCataByNode(data)
@@ -177,10 +183,10 @@ const getResource = () => {
 
 //获取作业数据
 const getHomework = async () => {
-  const data = toRaw(toolStore.curSubjectNode).data.node
+
   loading.value = true
   try {
-    const { res } = await useGetHomework(data)
+    const { res } = await useGetHomework(curNode.data)
     dataList.value = res
   } finally {
     loading.value = false
@@ -203,13 +209,16 @@ function leave(el, done) {
   done();
 }
 
-onMounted(() => {
+onMounted(async () => {
+  await nextTick()
   entpcourseid.value = route.query.entpcourseid
   lesson.value = route.query.label
-  setTimeout(()=>{
+  // 当前节点  mounted 的时候从缓存里拿
+  curNode.data = sessionStore.get('subject.curNode')
   getHomework()
   getResource()
-  },200)
+
+  
 })
 </script>
 

src/renderer/src/views/tool/components/lesson.vue

@@ -2,7 +2,7 @@
 
   <el-scrollbar>
     <el-tree ref="refTree" :data="treeData" :props="defaultProps" node-key="id"
-      :default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
+      :default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNode.data.id" highlight-current
       @node-click="handleNodeClick">
       <template #default="{ node }">
         <span :title="node.label" class="tree-label">{{ node.label }}</span>
@@ -13,133 +13,60 @@
 </template>
 
 <script setup>
-import { ref, onMounted, nextTick, toRaw } from 'vue'
+import { ref, reactive, onMounted, toRaw, watch } from 'vue'
 import { useToolState } from '@/store/modules/tool'
+import { sessionStore } from '@/utils/store'
+import { cloneDeep } from 'lodash' 
 
 const emit = defineEmits(['changeChapter'])
+const props = defineProps(['curNode'])
+
 const toolStore = useToolState()
 const treeData = ref([])
 const defaultProps = {
   children: 'children',
-  label: 'label',
+  label: 'itemtitle',
   class: 'textbook-tree'
 }
-// 当前选中的节点ID
-const currentNodeId = ref(0)
-// 当前选中的节点名称
-const currentNodeName = ref('')
+const currentNode = reactive({
+  data: {}
+})
+
+watch(() => props.curNode , (newVal) =>{
+  currentNode.data = newVal
+  console.log(currentNode.data)
+},
+{deep: true, immediate: true})
+
 // 默认展开的节点
 const defaultExpandedKeys = ref([])
 // tree
 const refTree = ref(null)
-// 教材ID
-const curBookId = ref('')
-// 
-const evaluationList = ref([])
 
-const getTreeData = () => {
-  evaluationList.value = JSON.parse(localStorage.getItem('unitList'))
-
-    //上册
-        /**
-   * 不区分上下册
-   * 2024/08/20调整
-   */
-  let volumeOne = evaluationList.value.filter(item => item.level == 1)
-
-  //数据过滤
-
-  let upData = transData(volumeOne)
-  if(upData.length){
-    treeData.value = [...upData]
-  }
-  else{
-    treeData.value = []
-    return
-  }
-  nextTick(() => {
-    let defaultKey
-    if(toolStore.curSubjectNode.querySearch.levelSecondId){
-      defaultKey = toolStore.curSubjectNode.querySearch.levelSecondId
-    }
-    else{
-      defaultKey = toolStore.curSubjectNode.querySearch.levelFirstId
-    }
-    currentNodeId.value  = defaultKey
-  })
-
-}
-
-const handleNodeClick = (data, node) => {
+const handleNodeClick = (data) => {
   /**
    * data : 当前节点数据
-   * node : 当前节点对象 包含当前节点所有数据  parent属性 指向父节点Node对象
    */
+   currentNode.data = data
+  let nodeData = cloneDeep(toRaw(data));
  
-  const nodeData = data;
-  const parentNode = node.parent.data;
-
-  if (Array.isArray(parentNode)) {
-    nodeData.parentNode = null
+ //增加一个label 之前取的label
+ nodeData.label = nodeData.itemtitle
+ // 父级节点 如果当前是一级节点 父级则为null
+ let parent = {
+   id: nodeData.parentid,
+   label: nodeData.parenttitle,
+   itemtitle: nodeData.parenttitle
  } 
-  else {
+ const parentNode = nodeData.parentid ?  parent : null
  nodeData.parentNode = parentNode
-  }
 
-  emit('changeChapter', toRaw(nodeData))
+ emit('changeChapter', nodeData)
 }
 
-
-   // 根据教材章节单元ID 查询作业列表所需ID
-  const  getChapterId = () => {
-    return listEntpcourse({
-      evalid: this.uploadData.levelSecondId,
-      edituserid: this.userStore.userId,
-      pageSize: 500
-    })
-  }
-
-const transData = (data) => {
-  let ary = []
-  data.forEach(item => {
-    let obj = {}
-    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(()=>{
-  setTimeout(()=>{
-    let data = toRaw(toolStore.curSubjectNode)
-    curBookId.value = data.data.textBook.curBookId
-    getTreeData()
-  },500)
-  
+  treeData.value = sessionStore.get('subject.subjectTree')
+  defaultExpandedKeys.value = sessionStore.get('subject.defaultExpandedKeys')
 })
 </script>
 

src/renderer/src/views/tool/sphere.vue

@@ -84,8 +84,8 @@ const btnList = [                 // 工具栏按钮列表
 // === 页面加载完毕 ===
 onMounted(async() => {
   if (!electron) return // 浏览器端
-  window.test = sessionStore
-  window.test1 = toolStore
+  // window.test = sessionStore
+  // window.test1 = toolStore
   getClassInfo()        // 获取课堂详情 ex3
   resetStatus()       // 开启重置状态-监听
 })