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

Reviewed-on: #304

src/main/store.js

@@ -13,6 +13,7 @@ const defaultData = {
     showBoardAll: false,    // 全屏画板-是否显示
     isPdfWin: false,        // pdf窗口是否打开
     isToolWin: false,       // 工具窗口是否打开
+    isTaskWin: false,       // 批改窗口是否打开
     curSubjectNode: {
       querySearch: {}       // 查询资源所需参数
     },

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

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2794390 */
-  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');
+  src: url('iconfont.woff2?t=1728543886557') format('woff2'),
+       url('iconfont.woff?t=1728543886557') format('woff'),
+       url('iconfont.ttf?t=1728543886557') format('truetype'),
+       url('iconfont.svg?t=1728543886557#iconfont') format('svg');
 }
 
 .iconfont {
@@ -14,6 +14,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-A1:before {
+  content: "\e635";
+}
+
+.icon-A:before {
+  content: "\e6ef";
+}
+
+.icon--kejian:before {
+  content: "\e6a3";
+}
+
 .icon-a-1_jiaoxuefansi:before {
   content: "\e6cd";
 }

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

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "11657531",
+      "name": "A",
+      "font_class": "A1",
+      "unicode": "e635",
+      "unicode_decimal": 58933
+    },
+    {
+      "icon_id": "12688893",
+      "name": "A",
+      "font_class": "A",
+      "unicode": "e6ef",
+      "unicode_decimal": 59119
+    },
+    {
+      "icon_id": "6571029",
+      "name": "课件",
+      "font_class": "-kejian",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
     {
       "icon_id": "37027693",
       "name": "教学反思",

src/renderer/src/assets/iconfont/iconfont.svg

@@ -14,6 +14,12 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="A1" unicode="&#58933;" d="M449 339h121.5L507.5 505.5zM782 834H242C143 834 62 753 62 654v-540c0-99 81-180 180-180h540c99 0 180 81 180 180V654c0 99-81 180-180 180z m-139.5-675l-40.5 103.5H422L381.5 159H287L462.5 609H557l180-450h-94.5z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="A" unicode="&#59119;" d="M841.589844 779.507813a65.917969 65.917969 0 0 0 65.917969-65.917969v-659.179688a65.917969 65.917969 0 0 0-65.917969-65.917969H182.410156a65.917969 65.917969 0 0 0-65.917969 65.917969V713.589844a65.917969 65.917969 0 0 0 65.917969 65.917969h659.179688z m0-49.438477H182.410156a16.479492 16.479492 0 0 1-16.21582-13.513183L165.930664 713.589844v-659.179688a16.479492 16.479492 0 0 1 13.513183-16.21582L182.410156 37.930664h659.179688a16.479492 16.479492 0 0 1 16.21582 13.513183L858.069336 54.410156V713.589844a16.479492 16.479492 0 0 1-13.513183 16.21582L841.589844 730.069336zM539.059326 614.712891l188.85498-461.425782h-69.543456l-53.822022 139.746094H411.606933L360.916016 153.287109H296.118652l177.1875 461.425782h65.786133z m-34.277344-48.449707c-5.899658-29.597168-14.172364-58.996582-24.884033-88.165284L429.207031 342.80127h156.456299l-48.153076 127.781982-4.779053 12.689209a1170.900879 1170.900879 0 0 0-27.982178 82.990723z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="-kejian" unicode="&#59043;" d="M873.813333 638.293333c27.306667 0 47.786667-30.72 47.786667-64.853333v-436.906667c0-42.666667-27.306667-75.093333-64.853333-75.093333H573.44c-23.893333 0-44.373333-22.186667-44.373333-46.08h-29.013334c0 23.893333-18.773333 46.08-44.373333 46.08H175.786667C136.533333 63.146667 102.4 93.866667 102.4 136.533333V573.44c0 34.133333 27.306667 64.853333 54.613333 64.853333h716.8zM457.386667 97.28c23.893333 0 44.373333-10.24 58.026666-27.306667 13.653333 17.066667 34.133333 27.306667 58.026667 27.306667h281.6c17.066667 0 30.72 15.36 30.72 40.96V573.44c0 10.24-3.413333 18.773333-6.826667 25.6-3.413333 3.413333-5.12 5.12-6.826666 5.12h-716.8c-6.826667 0-18.773333-15.36-18.773334-30.72v-436.906667c0-22.186667 18.773333-40.96 39.253334-40.96h281.6zM837.973333 660.48c0 34.133333-22.186667 64.853333-54.613333 64.853333H609.28c-40.96 0-75.093333-23.893333-93.866667-58.026666-18.773333 34.133333-54.613333 58.026667-93.866666 58.026666H247.466667c-32.426667 0-61.44-30.72-61.44-64.853333l6.826666-494.933333c0-29.013333 23.893333-51.2 52.906667-51.2h213.333333c23.893333 0 44.373333-22.186667 44.373334-46.08h29.013333c0 23.893333 18.773333 46.08 44.373333 46.08h211.626667c29.013333 0 52.906667 23.893333 52.906667 52.906666V660.48zM293.546667 513.706667c-8.533333 0-17.066667 8.533333-17.066667 20.48s6.826667 20.48 17.066667 20.48h158.72c8.533333 0 17.066667-8.533333 17.066666-20.48s-6.826667-20.48-17.066666-20.48h-158.72zM293.546667 426.666667c-8.533333 0-17.066667 8.533333-17.066667 20.48s6.826667 20.48 17.066667 20.48h158.72c8.533333 0 17.066667-8.533333 17.066666-20.48s-6.826667-20.48-17.066666-20.48h-158.72zM293.546667 339.626667c-8.533333 0-17.066667 8.533333-17.066667 20.48s6.826667 20.48 17.066667 20.48h158.72c8.533333 0 17.066667-8.533333 17.066666-20.48s-6.826667-20.48-17.066666-20.48h-158.72zM583.68 513.706667c-8.533333 0-17.066667 8.533333-17.066667 20.48s6.826667 20.48 17.066667 20.48h158.72c8.533333 0 17.066667-8.533333 17.066667-20.48s-6.826667-20.48-17.066667-20.48h-158.72zM583.68 426.666667c-8.533333 0-17.066667 8.533333-17.066667 20.48s6.826667 20.48 17.066667 20.48h158.72c8.533333 0 17.066667-8.533333 17.066667-20.48s-6.826667-20.48-17.066667-20.48h-158.72zM583.68 339.626667c-8.533333 0-17.066667 8.533333-17.066667 20.48s6.826667 20.48 17.066667 20.48h158.72c8.533333 0 17.066667-8.533333 17.066667-20.48s-6.826667-20.48-17.066667-20.48h-158.72z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="a-1_jiaoxuefansi" unicode="&#59085;" d="M410.8288 6.4512h195.9936v-63.2832H410.8288zM833.2288 645.4272A348.16 348.16 0 0 1 593.92 832.8192 347.4432 347.4432 0 0 1 509.952 844.8h0.512a311.0912 311.0912 0 0 1-78.4384-10.24 365.8752 365.8752 0 0 1-182.1696-96.6656 345.088 345.088 0 0 1-80.6912-370.4832 366.4896 366.4896 0 0 1 115.3024-155.7504 163.84 163.84 0 0 0 43.8272-54.272A180.224 180.224 0 0 0 342.1184 87.04v-13.5168h327.68v18.432a142.5408 142.5408 0 0 0 18.432 70.0416 163.84 163.84 0 0 0 48.3328 56.6272 357.2736 357.2736 0 0 1 96.8704 121.856 338.6368 338.6368 0 0 1 34.6112 151.3472 348.16 348.16 0 0 1-34.816 153.6z m-25.7024-153.6A278.6304 278.6304 0 0 0 699.392 268.1856a239.8208 239.8208 0 0 1-62.2592-74.4448 233.0624 233.0624 0 0 1-20.48-56.6272h-209.92a224.1536 224.1536 0 0 1-78.4384 126.464 274.7392 274.7392 0 0 0-94.6176 128.7168 303.3088 303.3088 0 0 0-13.824 158.1056 270.5408 270.5408 0 0 0 78.4384 146.7392 305.152 305.152 0 0 0 147.5584 81.3056c20.48 0 43.8272 2.2528 64.6144 2.2528h-0.512a333.9264 333.9264 0 0 0 66.9696-6.7584 283.3408 283.3408 0 0 0 117.6576-56.6272 294.8096 294.8096 0 0 0 82.944-101.6832A305.5616 305.5616 0 0 0 807.5264 496.64zM385.024 578.56a27.8528 27.8528 0 0 1 0-55.7056 27.8528 27.8528 0 1 1 0 55.7056zM385.024 469.6064a27.8528 27.8528 0 0 1 0-55.7056 27.8528 27.8528 0 1 1 0 55.7056zM456.704 467.456h206.6432v-55.6032H456.704zM456.704 578.6624h206.6432v-55.5008H456.704z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="iconfontzhizuobiaozhunbduan3-1" unicode="&#65711;" d="M381.8288 877.098511c42.635029 11.310603 86.403882 17.002232 130.205481 17.002232 68.479651 0 135.072325-13.469779 197.999516-40.101323l-8.362458-369.71439L381.8288 877.098511 381.8288 877.098511zM71.201134 640.609379c22.278399 38.284955 49.218982 73.313749 80.134085 104.090707 48.393173 48.396243 104.980983 85.958744 168.285774 111.666242l255.614725-267.305999L71.201134 640.609379 71.201134 640.609379zM18.900977 253.724934c-11.276834 42.463114-17.000186 86.234013-17.000186 130.276089 0 68.548212 13.502525 135.140886 40.099277 197.933001l369.749182-8.293897L18.900977 253.724934 18.900977 253.724934zM255.39011-56.798355c-38.010709 22.1423-72.968895 49.079812-104.021122 80.134085-48.428989 48.325635-85.993536 104.911398-111.664196 168.283728l267.302929 255.513418L255.39011-56.798355 255.39011-56.798355zM512.034281-126.100744c-68.481697 0-135.072325 13.470803-197.999516 40.031738l8.362458 369.71439 319.843562-392.81348C599.535147-120.411161 555.80211-126.100744 512.034281-126.100744L512.034281-126.100744zM448.830797 178.903855l504.036631-51.54905c-22.107507-37.940101-48.976458-72.900334-80.167854-104.019075-48.327682-48.464805-104.980983-86.029352-168.283728-111.734804L448.830797 178.903855 448.830797 178.903855zM612.320335 194.292334l392.81348 319.915193c11.276834-42.499953 16.966417-86.302575 16.966417-130.206504 0-68.753897-13.502525-135.282103-40.066531-198.002586L612.320335 194.292334 612.320335 194.292334zM768.60989 824.764586c37.975916-22.038946 73.004711-48.942689 104.089683-80.0645 48.464805-48.326659 86.027305-104.980983 111.664196-168.284751l-267.302929-255.580956L768.60989 824.764586 768.60989 824.764586z"  horiz-adv-x="1024" />

src/renderer/src/components/file-image/index.vue

@@ -34,7 +34,7 @@ const getFileTypeIcon = () => {
     gif: 'icon-gif',
     txt: 'icon-txt',
     rar: 'icon-rar',
-    apt: 'icon-lunwen'
+    apt: 'icon-A'
   }
   if (iconObj[name]) {
     return '#' + iconObj[name]

src/renderer/src/components/set-homework/index.vue

@@ -276,6 +276,7 @@ const cloneDialog = (formEl) => {
   expandedKeys.value = []
   formEl.resetFields()
   model.value = false
+  emit('on-close')
 }
 
 onMounted(() => {

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

@@ -80,9 +80,7 @@ import { updateUserInfo } from '@/api/system/user'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
 import { sessionStore } from '@/utils/store'
-import { useToolState } from '@/store/modules/tool'
 
-const toolState = useToolState();
 let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
 const { ipcRenderer } = window.electron || {}
 const userStore = useUserStore()
@@ -153,7 +151,8 @@ function handleCommand(command) {
 
 function logout() {
   const hasClass = sessionStore.has('activeClass.id')
-  if (hasClass || toolState.isToolWin) return ElMessage.warning('当前正在上课，请先结束上课')
+  const  hasTool = sessionStore.get('isToolWin')
+  if (hasClass || hasTool) return ElMessage.warning('当前正在上课，请先结束上课')
   ElMessageBox.confirm('确认退出系统吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',

src/renderer/src/plugins/shareStore.js

@@ -10,6 +10,8 @@ import _ from 'lodash'
 // import { diff } from 'jsondiffpatch'
 // const Remote = isNode?require('@electron/remote'):{}  // 远程模块
 
+const exArrs = ['subject'] // 不需要同步key-排除
+
 export function shareStorePlugin({store}) {
   store.$subscribe((mutation, state) => { // 自动同步
     // mutation 变量包含了变化前后的状态
@@ -54,6 +56,7 @@ function stateSync(storeName, key, value, state) {
 // 同步数据-发送给主线程-单独($subscribe-监听使用)
 function stateSyncWatch(storeName, newState) {
   const oldState = sessionStore.store // 旧数据
+  exArrs.forEach(k => Object.keys(oldState).includes(k) && (delete oldState[k]))
   const diffData = findDifferences(oldState, newState)
   if(!_.keys(diffData).length) return // 没有变化就终止执行
   // 数据处理: 找出差异
@@ -62,35 +65,36 @@ function stateSyncWatch(storeName, newState) {
     let pinaValue = {} // store pina状态管理需要的数据格式
     // 数据转换处理
     for(const key in diffData) {
-      const value = diffData[key] || null
+      const value = diffData[key]
       const newValue = {} // 重新组装pinia需要的数据 {a:{b:1}} 这种
       const keyArr = key.split('.') || []
       keyArr.reduce((o,c,i)=>{o[c] = i === keyArr.length-1 ? value : {};return o[c]}, newValue)
       // 合并数据 loadsh _.merge() 函数
       _.merge(pinaValue, newValue)
     }
-
+    const piniaArr = _.toPairs(pinaValue) // 对象转换为数组 {a:1} toPairs [['a',1]]
+    const setData = (key, value) => {
+      // 无数据就终止执行
+      if (!key) return
+      // 更新本地数据-session
+      // 直接获取当前最新值(整体更新)，上面获取到value是差异值，并不能知道删除还是新增
+      const newValAll = _.get(newState, key)
+      const oldValAll = sessionStore.get(key)
+      // 没变化也终止执行
+      if (_.isEqual(oldValAll, newValAll)) return
+      // 更新本地数据-session
+      sessionStore.set(key, newValAll)
+  
+      // 数据处理: pina-store
+      const jsonStr = JSON.stringify(pinaValue) // 从新组装-json数据
+      // 通知主线程更新
+      ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr)
+      // console.log('======',key, value, jsonStr )
+    }
     // 数据处理: electron-store
-    const [key, value] = _.toPairs(pinaValue)[0] // 对象转换为数组 {a:1} toPairs [['a',1]]
-    // 无数据就终止执行
-    if (!key || !value) return
-    
-    // 更新本地数据-session
-    // 直接获取当前最新值(整体更新)，上面获取到value是差异值，并不能知道删除还是新增
-    const newValAll = _.get(newState, key)
-    const oldValAll = sessionStore.get(key)
-    
-    // 没变化也终止执行
-    if (_.isEqual(oldValAll, newValAll)) return
-
-    // 更新本地数据-session
-    sessionStore.set(key, newValAll)
-
-    // 数据处理: pina-store
-    const jsonStr = JSON.stringify(pinaValue) // 从新组装-json数据
-    // 通知主线程更新
-    ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr)
-    // console.log('======',key, value, jsonStr )
+    for(let [key, value] of piniaArr) {
+      setData(key, value)
+    }
   } catch (error) {
     console.log('state-change-error', error)
   }

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

@@ -193,7 +193,7 @@ const tableRadio = reactive({
 const loading_dt_table = ref(false)
 const isopen_dtwk_table = ref(false)
 
-// zdg: 作业概况
+// zdg: 逐题分析
 const classWorkActiveData = reactive({
   quizlist: [], // 当前习题列表
   studentList: [], // 当前课程-所有学生
@@ -536,7 +536,7 @@ const escapeHtmlQuotes = (str) => {
   return result;
 }
 
-//#region 作业概况
+//#region 逐题分析
 // 查看学生-作业概览
 const workHandle = (type) => {
   // 关闭右侧批阅ui
@@ -571,11 +571,11 @@ const getWorkFeedList = async() =>{
 //#endregion
 
 
-//#regin 作业报告
+//#regin 整体分析
 /*
   author: yangws
   time: 2024-8-06 16:35:33
-  function:作业报告的处理
+  function: 整体分析的处理
 */
 const handleClassOverviewOpen = (type) =>{
   // 关闭右侧批阅ui
@@ -643,12 +643,12 @@ const closeDialog = () => {
 watch(classWorkAnalysis, (newVal, oldVal) => {
   if(newVal.view != 'quizStats'){
     console.log('关闭zdg: 定时执行')
-    clearInterval(classWorkActiveData.timerId) // 关闭定时器 作业概况的
+    clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
   }
 })
 
 onUnmounted(() => {
-  clearInterval(classWorkActiveData.timerId) // 关闭定时器 作业概况的
+  clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
 })
 
 defineExpose({

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="12">
+    <el-col class="left" :span="14">
       <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,9 +54,9 @@
         </template>
       </el-collapse>
     </el-col>
-    <el-col class="right" :span="12">
+    <el-col class="right" :span="10">
       <div class="c-item">
-        <div class="title">答题情况</div>
+        <div class="title">提交情况</div>
         <div class="respond">
           <el-space wrap>
             <!-- <template v-for="it in 11"> -->
@@ -114,7 +114,9 @@ colorArr = [
 ]
 
 // === 初始加载完 ===
-onMounted(() => {})
+onMounted(() => {
+  activeTopic.value = dataList.value.map((_, index) => index + 1);
+})
 
 // === 方法(methods) ===
 
@@ -311,7 +313,7 @@ watchEffect(() => { initData() })
   background: #F2F3F5;
   height: 100%;
   margin: 0 !important;
-  .left{padding-left: 0 !important;}
+  .left{padding-left: 0 !important; height: 100%;}
   .right{padding-right: 0 !important;}
   .c-item{
     padding: 10px;
@@ -360,7 +362,7 @@ watchEffect(() => { initData() })
       margin-bottom: 10px;
     }
     .respond{
-      height: calc(70vh - 65px);
+      height: calc(100% - 65px);
       overflow: auto;
       .el-space{padding: 5px;}
       .card-warp{

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

@@ -180,7 +180,7 @@ const tableRadio = reactive({
 const loading_dt_table = ref(false)
 const isopen_dtwk_table = ref(false)
 
-// zdg: 作业概况
+// zdg: 逐题分析
 const classWorkActiveData = reactive({
   quizlist: [], // 当前习题列表
   studentList: [], // 当前课程-所有学生
@@ -528,7 +528,7 @@ const escapeHtmlQuotes = (str) => {
   return result;
 }
 
-//#region 作业概况
+//#region 逐题分析
 // 查看学生-作业概览
 const workHandle = (type) => {
   // 关闭右侧批阅ui
@@ -563,11 +563,11 @@ const getWorkFeedList = async() =>{
 //#endregion
 
 
-//#regin 作业报告
+//#regin 整体分析
 /*
   author: yangws
   time: 2024-8-06 16:35:33
-  function:作业报告的处理
+  function: 整体分析的处理
 */
 const handleClassOverviewOpen = (type) =>{
   // 关闭右侧批阅ui
@@ -645,12 +645,12 @@ onMounted(() => {
 watch(classWorkAnalysis, (newVal, oldVal) => {
   if(newVal.view != 'quizStats'){
     console.log('关闭zdg: 定时执行')
-    clearInterval(classWorkActiveData.timerId) // 关闭定时器 作业概况的
+    clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
   }
 })
 
 onUnmounted(() => {
-  clearInterval(classWorkActiveData.timerId) // 关闭定时器 作业概况的
+  clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
 })
 
 // defineExpose({

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

@@ -183,10 +183,10 @@ const clickMenu = ({isOuter, path, disabled, id}) =>{
       // 头部 教材分析打开外部链接需要当前章节ID
       const { id, rootid } = sessionStore.get('subject.curNode')
       if(fullPath.indexOf('?') == -1){
-        fullPath += `?unitId=${id}&bookeId=${rootid}`
+        fullPath += `?unitId=${id}&bookId=${rootid}`
       }
       else{
-         fullPath += `&unitId=${id}&bookeId=${rootid}`
+        fullPath += `&unitId=${id}&bookId=${rootid}`
       }
     }
     fullPath = fullPath.replaceAll('//', '/')

src/renderer/src/views/login/index.vue

@@ -2,7 +2,7 @@
   <div class="login-container">
     <div class="box-item desc">
       <div class="welcome">
-        <p>欢迎登录 {{homeTitle}}</p>
+        <p>欢迎登录 {{ homeTitle }}</p>
       </div>
       <img class="welcome-img" :src="leftBg2" />
     </div>
@@ -14,46 +14,28 @@
           <el-input v-model.trim="loginForm.username" placeholder="请输入用户名" />
         </el-form-item>
         <el-form-item prop="password" style="margin-bottom: 15px">
-          <el-input
-            v-model="loginForm.password"
-            autocomplete="on"
-            type="password"
-            placeholder="请输入密码"
-          />
+          <el-input v-model="loginForm.password" autocomplete="on" type="password" placeholder="请输入密码" />
         </el-form-item>
         <div class="flex mb-5">
-          <el-checkbox v-model="loginForm.rememberMe" >记住密码</el-checkbox>
-           <!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
+          <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
+          <!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
         </div>
 
         <el-form-item>
-          <el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)"
-            >登录</el-button
-          >
+          <el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)">登录</el-button>
         </el-form-item>
         <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
-           <a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
-           |
-           <a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
+          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
+          |
+          <a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
         </div>
       </el-form>
     </div>
   </div>
-  <el-dialog
-    v-model="showDownLoading"
-    width="500"
-    :show-close="false"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    align-center
-  >
-    <el-progress
-      :text-inside="true"
-      :stroke-width="22"
-      :percentage="downloadProp"
-      :show-text="false"
-      status="success"
-    />
+  <el-dialog v-model="showDownLoading" width="500" :show-close="false" :close-on-click-modal="false"
+    :close-on-press-escape="false" align-center>
+    <el-progress :text-inside="true" :stroke-width="22" :percentage="downloadProp" :show-text="false"
+      status="success" />
   </el-dialog>
   <!--选择学科-->
   <SelectSubject v-model="isSubject" :login-data="loginForm" />
@@ -69,6 +51,7 @@ import leftBg2 from '@/assets/images/login/left-bg2.png'
 import WindowTools from '@/components/window-tools/index.vue'
 import SelectSubject from '@/components/select-subject/index.vue'
 import Register from './components/Register.vue'
+import { sessionStore } from '@/utils/store'
 
 const { session } = require('@electron/remote')
 const downloadProp = ref(0)
@@ -99,7 +82,7 @@ ipcRenderer.on('update-app-progress', (e, prop) => {
   showDownLoading.value = prop !== 100
 })
 // 打开弹窗
-const RegisterModel = type =>{
+const RegisterModel = type => {
   RegModel.value.OpenModel(type)
 }
 //登录
@@ -168,6 +151,13 @@ const setCookie = (name, value) => {
 
 onMounted(() => {
   localStorage.clear()
+  sessionStore.set('subject', {   
+    bookList: null, 
+    curBook: null, 
+    curNode: null, 
+    defaultExpandedKeys: [], 
+    subjectTree: [] 
+  })
   getCookie()
 })
 </script>
@@ -179,6 +169,7 @@ onMounted(() => {
   align-items: center;
   justify-content: center;
   -webkit-app-region: drag;
+
   .box-item {
     width: 444px;
     height: 520px;

src/renderer/src/views/prepare/container/file-list-item.vue

@@ -86,10 +86,16 @@
                     <span>布置</span>
                   </el-button>
                 </div>
+                <div class="item-popover-item">
+                  <el-button text @click="reSetHomeWork(item, index)">
+                    <i class="iconfont icon-bianji"></i>
+                    <span>编辑</span>
+                  </el-button>
+                </div>
                 <div class="item-popover-item">
                   <el-button text @click="deleteHomework(item)">
                     <i class="iconfont icon-shanchu"></i>
-                    <span>删除</span>
+                    <span style="color: red;">删除</span>
                   </el-button>
                 </div>
               </template>
@@ -110,7 +116,7 @@
                 <div class="item-popover-item" v-if="userInfo.userId === Number(item.createUserId)">
                   <el-button text @click="deleteTalk(item)">
                     <i class="iconfont icon-shanchu"></i>
-                    <span>删除</span>
+                    <span style="color: red;">删除</span>
                   </el-button>
                 </div>
                 <div class="item-popover-item">
@@ -168,7 +174,7 @@ export default {
       }
     }
   },
-  emits: { 'on-move': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null,'on-filearg': null },
+  emits: { 'on-move': null, 'on-delete': null, 'on-set': null, 'on-reSet': null, 'on-delhomework': null,'on-filearg': null },
   data() {
     return {
       listenList: [],
@@ -275,6 +281,10 @@ export default {
     setHomeWork(item) {
       this.$emit('on-set', item)
     },
+    // 编辑
+    reSetHomeWork(item) {
+      this.$emit('on-reSet', item)
+    },
     // 删除作业
     deleteHomework(item){
       this.$emit('on-delhomework', item)

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -76,7 +76,7 @@
                 <div class="item-popover-item">
                   <el-button text @click="deleteTalk(item)">
                     <i class="iconfont icon-shanchu"></i>
-                    <span>删除</span>
+                    <span style="color: red;">删除</span>
                   </el-button>
                 </div>
               </template>

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

@@ -116,22 +116,20 @@
             </el-checkbox-group>
           </el-tab-pane>
           <el-tab-pane label="作业" name="作业">
-<!--            <div class="prepare-body-header">
+           <div class="prepare-body-header">
               <div>
                 <label style="font-size: 15px">共{{ currentWorkList.length }}个作业</label>&nbsp;
-                <el-button size="small" @click="handleOutLink('feedback')">作业反馈</el-button>
-                <el-button size="small" @click="handleOutLink('homeWork')">布置作业</el-button>
+                <el-button size="small" @click="handleOutLink('homeWork')">作业设计</el-button>
               </div>
-            </div>-->
+            </div>
             <div class="prepare-work-wrap">
               <file-list-item
                 v-for="(item, index) in currentWorkList"
                 :key="index"
                 :item="item"
                 :index="index"
-                @on-move="onMoveSingleFile"
-                @on-delete="deleteTalk"
                 @on-set="openSet"
+                @on-reSet="openReSet"
                 @on-delhomework="delhomework"
               >
               </file-list-item>
@@ -596,6 +594,7 @@ export default {
     openReserv() {
       this.$refs['reservDialog'].openDialog()
     },
+
     // 打开外部链接
     handleOutLink(key) {
       if (key == 'homeWork') {
@@ -609,12 +608,15 @@ export default {
         let unitId = this.uploadData.levelSecondId
           ? this.uploadData.levelSecondId
           : this.uploadData.levelFirstId
-        if (key == 'gk') {
-          fullPath += `?unitId=${unitId}`
-        } else {
-          fullPath += `&unitId=${unitId}`
+        let bookId = this.uploadData.textbookId;
+        if(fullPath.indexOf('?') == -1){
+          fullPath += `?unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask`
+        }
+        else{
+          fullPath += `&unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask`
         }
       }
+
       // 通知主进程
       ipcRenderer.send('openWindow', {
         key,
@@ -632,6 +634,27 @@ export default {
       this.row = row
       this.setDialog = true
     },
+    // 打开作业编辑窗口
+    openReSet(row) {
+      // 新窗口打开标识
+      this.isOpenHomework = true;
+      // key 对应的 linkConfig.js 外部链接配置
+      let configObj = outLink()['homeWork']
+      let fullPath = configObj.fullPath
+
+      let unitId = this.uploadData.levelSecondId
+          ? this.uploadData.levelSecondId
+          : this.uploadData.levelFirstId
+      let bookId = this.uploadData.textbookId;
+      fullPath += `&unitId=${unitId}&bookId=${bookId}&courseWorkId=${row.id}`
+
+      // 通知主进程
+      ipcRenderer.send('openWindow', {
+        key: 'homeWork',
+        fullPath: fullPath,
+        cookieData: { ...configObj.data }
+      })
+    },  
     // 删除作业
     delhomework(item) {
       this.isLoading = true
@@ -874,6 +897,7 @@ export default {
       width: 100%;
       flex: 1;
       overflow: auto;
+      margin-top: 10px;
     }
     .prepare-body-main {
       flex: 1;

src/renderer/src/views/resource/container/resoure-list.vue

@@ -61,7 +61,7 @@
                     @click="delRow(item)"
                   >
                     <i class="iconfont icon-shanchu"></i>
-                    <span>删除</span>
+                    <span style="color: red;">删除</span>
                   </div>
                   <div class="item-popover-item" @click="downloadFile(item)">
                     <i class="iconfont icon-xiazai"></i>

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

@@ -8,7 +8,7 @@
             <h3 class="title">{{ lesson }}</h3>
             <div class="grade">{{ usertore.edusubject }}</div>
           </div>
-          <i class="iconfont icon-xiangyou"  @click="showLeft = !showLeft"></i>
+          <!-- <i class="iconfont icon-xiangyou"  @click="showLeft = !showLeft"></i> -->
         </div>
         <div class="homework-list" v-loading="loading">
           <el-scrollbar height="360px">

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

@@ -220,13 +220,13 @@ const sideChange = async o => {
         await imChatRef.value?.imChatObj?.imChat?.sendMsgClosed() // 发送下课消息
         // const elMsg = ElMessage.warning({duration:0,message:'正在下课...'})
         const elMsg = ElLoading.service({lock: true, text: '正在下课...', background: 'rgba(0, 0, 0, 0.7)'})
+        // toolStore.isToolWin = false
+        toolStore.resetDef() // 重置状态
+        await classManageApi.endClass(route.query.reservId)
         // 延迟2秒后关闭窗口，如果马上解散群，会导致群组不存在
         setTimeout(async() => {
-          // toolStore.isToolWin = false
-          toolStore.resetDef() // 重置状态
           await imChatRef.value?.deleteGroup()  // 解散群
           await imChatRef.value?.logout()       // 退出im
-          await classManageApi.endClass(route.query.reservId)
           elMsg.close()
           ipcMsgSend('tool-sphere:close')       // 关闭窗口
         }, 500);