From 1cc7007852a5083fef7d615fbe9e10b0368e591c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Fri, 13 Sep 2024 14:02:05 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=86=E7=A6=BB?=
 =?UTF-8?q?=E5=90=8E=20=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/classTask/classTask.vue                 | 2 ++
 .../src/views/classTask/container/item-dialog-score.vue        | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue
index d02ba7f..e83d9da 100644
--- a/src/renderer/src/views/classTask/classTask.vue
+++ b/src/renderer/src/views/classTask/classTask.vue
@@ -213,6 +213,7 @@ const getStudentClassWorkData = () => {
       edustage: userStore.edustage,// 学段
       edusubject: userStore.edusubject,//学科
       deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
+      status: '1', // 作业状态：1-已发布
       orderby: "uniquekey DESC",
       pageSize: 1000
     }).then((res) => {
@@ -369,6 +370,7 @@ const getStudentVisible = async () => {
     edustage: userStore.edustage,// 学段
     edusubject: userStore.edusubject,//学科
     deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
+    status: '1', // 作业状态：1-已发布
     orderby: 'uniquekey DESC',
     pageSize: 100
   })
diff --git a/src/renderer/src/views/classTask/container/item-dialog-score.vue b/src/renderer/src/views/classTask/container/item-dialog-score.vue
index 31d0e34..bc12572 100644
--- a/src/renderer/src/views/classTask/container/item-dialog-score.vue
+++ b/src/renderer/src/views/classTask/container/item-dialog-score.vue
@@ -150,6 +150,7 @@
                             :min-scale="0.2"
                             :preview-src-list="stuItem.imagefile"
                             :initial-index="4"
+                            fit="contain"
                           />
                         </div>
                       </el-col>
@@ -233,6 +234,7 @@
                                     .map((item) => item.url)
                                 "
                                 :initial-index="4"
+                                fit="contain"
                               />
                             </div>
                           </div>
@@ -276,6 +278,7 @@
                               .map((item) => item.url)
                           "
                           :initial-index="4"
+                          fit="contain"
                         />
                       </div>
                     </div>

From 490add5467d9a1fc467bee0f9423f96f49917414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Fri, 13 Sep 2024 16:27:09 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E5=B7=A5=E4=BD=9C=E5=8A=A8=E6=80=81=E7=9A=84=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=EF=BC=8C=20=E6=96=B0=E5=A2=9E=E5=8F=AF=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=B9=B6=E5=BC=B9=E6=A1=86=E6=89=B9=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/desktop/container/work-trend.vue    | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/views/desktop/container/work-trend.vue b/src/renderer/src/views/desktop/container/work-trend.vue
index 7e8a36b..b9a77c6 100644
--- a/src/renderer/src/views/desktop/container/work-trend.vue
+++ b/src/renderer/src/views/desktop/container/work-trend.vue
@@ -34,7 +34,7 @@
           </template>
           <!--作业-->
           <template v-if="type == 3 || type == -1">
-            <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id">
+            <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id"  @click="onClickItem(item)">
               <div class="class-left flex">
                 <div class="class-name flex">
                   <span class="name">{{ item.uniquekey }}</span>
@@ -52,6 +52,7 @@
         </ul>
       </el-scrollbar>
     </div>
+    <item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog>
   </div>
 </template>
 <script setup>
@@ -59,13 +60,15 @@ import { ref, onMounted } from 'vue'
 import useUserStore from '@/store/modules/user'
 import { getSelfReserv } from '@/api/classManage'
 import { homeworklist } from '@/api/teaching/classwork'
-import { getCurrentTime } from '@/utils/date'
+import { getCurrentTime, getTomorrow } from '@/utils/date'
+import ItemDialog from '@/views/classTask/container/item-dialog.vue'
 
 const type = ref(-1)
 const user = useUserStore().user
 const loading = ref(false)
 const classList = ref([])
 const homeworkList = ref([])
+const itemDialogRef = ref(null)
 
 // 获取上课
 const getClass = async () => {
@@ -84,15 +87,34 @@ const getHomework = async () => {
   loading.value = true
   const { edustage, edusubject } = user
   try {
-    const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, orderby: 'uniquekey DESC', pageSize: 500 })
-    homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey)
+    const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), orderby: 'uniquekey DESC', pageSize: 500 })
+    // 只展示进行中的
+    homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey&& getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate )
     homeworkList.value.forEach((item) => {
       item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
+      // 如果是习题训练任务，则检查一共有多少道
+      if (item.entpcourseworklist != '') {
+        item.entpcourseworklistarray = JSON.parse(
+          '[' + item.entpcourseworklist + ']'
+        )
+      } else {
+        item.entpcourseworklistarray = []
+      }
     })
   } finally {
     loading.value = false
   }
 }
+// 批改作业
+const onClickItem = (item) => {
+  console.log('开启弹窗')
+  itemDialogRef.value.openDialog(item)
+}
+// 批阅关闭
+const  closeDialog = () => {
+  console.log('关闭弹窗,查询一下作业数据，更新界面')
+  getHomework()
+}
 
 const tagType = (time) => {
   return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'

From 87539517963f26f7f858908becd6d83a89eb861d Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 13 Sep 2024 17:03:30 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E3=80=81?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/upload-dialog/index.vue    | 17 +++-
 src/renderer/src/utils/resourceDict.js        | 25 +++---
 .../views/desktop/container/work-trend.vue    | 77 +++++--------------
 src/renderer/src/views/desktop/index.vue      | 20 ++---
 .../resource/container/resoure-search.vue     | 22 +++---
 src/renderer/src/views/resource/store.js      |  8 +-
 6 files changed, 72 insertions(+), 97 deletions(-)

diff --git a/src/renderer/src/components/upload-dialog/index.vue b/src/renderer/src/components/upload-dialog/index.vue
index ea86172..358ab5c 100644
--- a/src/renderer/src/components/upload-dialog/index.vue
+++ b/src/renderer/src/components/upload-dialog/index.vue
@@ -49,7 +49,6 @@
 import { ref, watch } from 'vue'
 import FileImage from '@/components/file-image/index.vue'
 import { ElMessage } from 'element-plus'
-import { resourceType } from '@/utils/resourceDict'
 import { getFileSuffix, getFileName } from '@/utils/ruoyi'
 
 const props = defineProps({
@@ -58,6 +57,22 @@ const props = defineProps({
     default: false
   },
 })
+const resourceType = ref([
+  {
+    label: '素材',
+    value: '素材'
+  },
+
+  {
+    label: '课件',
+    value: '课件'
+  },
+
+  {
+    label: '教案',
+    value: '教案'
+  }
+])
 const dialogValue = ref(false)
 const limit = ref(5)
 // 定义要发送的emit事件
diff --git a/src/renderer/src/utils/resourceDict.js b/src/renderer/src/utils/resourceDict.js
index 9a26a2b..c86aaf8 100644
--- a/src/renderer/src/utils/resourceDict.js
+++ b/src/renderer/src/utils/resourceDict.js
@@ -1,14 +1,14 @@
 export const tabs = [
   {
-    label: '平台资源',
+    label: '平台',
     value: '平台'
   },
   {
-    label: '校本资源',
+    label: '校本',
     value: '校本'
   },
   {
-    label: '第三方资源',
+    label: '第三方',
     value: '第三方'
   },
 ]
@@ -57,18 +57,23 @@ export const  resourceFormat = [
 // 资源类型
 export const resourceType = [
   {
-    label: '素材',
-    value: '素材'
+    label: '课例库',
+    value: "'apt','课件','教案'"
+  },
+  {
+    label: '作业库',
+    value: '作业',
+    disabled: true
   },
 
   {
-    label: '课件',
-    value: '课件'
+    label: '素材库',
+    value: "'素材'"
   },
-
   {
-    label: '教案',
-    value: '教案'
+    label: '习题库',
+    value: '习题',
+    disabled: true
   }
 ]
 // 年级划分
diff --git a/src/renderer/src/views/desktop/container/work-trend.vue b/src/renderer/src/views/desktop/container/work-trend.vue
index 7e8a36b..d3fe981 100644
--- a/src/renderer/src/views/desktop/container/work-trend.vue
+++ b/src/renderer/src/views/desktop/container/work-trend.vue
@@ -1,54 +1,29 @@
 <template>
   <div class="desktop-work-item">
     <div class="item-title flex">
-      <span>工作动态</span>
-      <el-radio-group v-model="type" @change="changeTab">
+      <span class="title">工作动态</span>
+      <el-radio-group v-model="type">
         <el-radio-button label="全部" :value="-1" />
-        <el-radio-button label="备课" :value="1" disabled  />
-        <el-radio-button label="上课" :value="2" disabled />
-        <el-radio-button label="作业" :value="3" />
       </el-radio-group>
     </div>
     <div class="item-content" v-loading="loading">
       <el-scrollbar height="500px">
         <ul>
-           <!--上课-->
-          <template v-if="type == 2 || type == -1">
-            <li class="flex class-item" v-for="item in classList" :key="item.id">
-              <div class="class-left flex">
-                <div class="class-name flex">
-                  <span class="name">{{ item.className }}</span>
-                </div>
-                <div class="class-time"> {{ item.classDay }}&nbsp;{{ item.startTime }} ~ {{ item.classDay }}&nbsp;{{
-                  item.endTime }}</div>
-                <div class="class-grade">
-                  <span v-for="(tag, index) in item.classItemList" :key="index" style="margin-left: 5px">
-                    {{ index === 0 ? tag.name : '、' + tag.name }}
-                  </span>
-                </div>
-              </div>
-              <div class="class-right">
-                <el-button type="primary" size="small">上课</el-button>
-              </div>
-            </li>
-          </template>
           <!--作业-->
-          <template v-if="type == 3 || type == -1">
-            <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id">
-              <div class="class-left flex">
-                <div class="class-name flex">
-                  <span class="name">{{ item.uniquekey }}</span>
-                  <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
-                    getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag>
-                </div>
-                <div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div>
+          <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id">
+            <div class="class-left flex">
+              <div class="class-name flex">
+                <span class="name">{{ item.uniquekey }}</span>
+                <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
+                  getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag>
               </div>
-              <div class="class-right">
-                <div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdatacount }}</div>
-                <div>已交</div>
-              </div>
-            </li>
-          </template>
+              <div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div>
+            </div>
+            <div class="class-right">
+              <div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdatacount }}</div>
+              <div>已交</div>
+            </div>
+          </li>
         </ul>
       </el-scrollbar>
     </div>
@@ -85,6 +60,7 @@ const getHomework = async () => {
   const { edustage, edusubject } = user
   try {
     const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, orderby: 'uniquekey DESC', pageSize: 500 })
+    console.log(rows,'rows')
     homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey)
     homeworkList.value.forEach((item) => {
       item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
@@ -97,22 +73,7 @@ const getHomework = async () => {
 const tagType = (time) => {
   return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
 }
-// 切换
-const changeTab = (val) =>{
-  switch(val){
-    case -1:
-      // getClass()
-      getHomework()
-      break;
-    case 1:
-      break;
-    case 2:
-      getClass()
-      break;
-    default: 
-      getHomework()
-  }
-}
+
 
 onMounted(() => {
   // getClass()
@@ -132,7 +93,9 @@ onMounted(() => {
     font-weight: bold;
     margin-bottom: 10px;
     align-items: center;
-    justify-content: space-between;
+    .title{
+      margin-right: 5px;
+    }
   }
 
   .item-content {
diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index 97bb4aa..9e5479f 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -3,7 +3,7 @@
     <el-row :gutter="20">
     <el-col :span="17">
       <el-row :gutter="20">
-        <el-col :span="12" v-for="item in menuList">
+        <el-col :span="item.span" v-for="item in menuList" :key="item.id">
           <div class="desktop-item">
             <div class="item-title">{{ item.name }}</div>
             <div class="item-content">
@@ -54,6 +54,8 @@ let chartInstance = null
 
 const menuList = [{
     name: '教学分析',
+    span: 24,
+    id: 1,
     list: [
       {
         name: '课标分析',
@@ -77,16 +79,6 @@ const menuList = [{
         icon: 'icon-xueqingfenxi',
         disabled: true
       },
-      {
-        name: '资源分析',
-        icon: 'icon-ziyuanfenxi',
-        disabled: true
-      }
-    ]
-  },
-  {
-    name: '课程教学',
-    list: [
       {
         name: '教学设计',
         icon: 'icon-jiaoxuesheji',
@@ -95,7 +87,7 @@ const menuList = [{
       {
         name: '教学实施',
         icon: 'icon-jiaoxuefenxi',
-        path: '/classReserv'
+        path: '/prepare'
       },
       {
         name: '教学反思',
@@ -106,6 +98,8 @@ const menuList = [{
   },
   {
     name: '作业管理',
+    span: 12,
+    id: 2,
     list: [
       {
         name: '作业设计',
@@ -131,6 +125,8 @@ const menuList = [{
   },
   {
     name: '教学管控',
+    span: 12,
+    id: 3,
     list: [
       {
         name: '教学计划',
diff --git a/src/renderer/src/views/resource/container/resoure-search.vue b/src/renderer/src/views/resource/container/resoure-search.vue
index 6f94391..9d3344e 100644
--- a/src/renderer/src/views/resource/container/resoure-search.vue
+++ b/src/renderer/src/views/resource/container/resoure-search.vue
@@ -2,9 +2,9 @@
   <div class="resoure-search">
     <el-row justify="space-between">
       <el-col :span="12" class="tab-btns flex">
-        <el-button text v-for="item in sourceStore.tabs" :key="item.id"
-          :type="sourceStore.query.fileSource == item.value ? 'primary' : ''"
-          @click="sourceStore.changeTab(item.value)">{{ item.label
+        <el-button text v-for="item in sourceStore.resourceTypeList" :key="item.id"
+          :type="sourceStore.query.fileFlags == item.value ? 'primary' : ''"
+          @click="sourceStore.changeType(item.value)" :disabled="item.disabled">{{ item.label
           }}</el-button>
       </el-col>
 
@@ -19,7 +19,7 @@
     </el-row>
 
 <!--    第三方资源筛选-->
-    <el-row class="resoure-btns" v-if="isThird">
+    <!-- <el-row class="resoure-btns" v-if="isThird">
       <el-col :span="24" class="query-row flex">
         <div class="flex row-left">
           <el-button v-for="item in coursewareTypeList" :key="item.id"
@@ -29,8 +29,8 @@
           </el-button>
         </div>
       </el-col>
-    </el-row>
-    <el-row class="resoure-btns" v-else>
+    </el-row> -->
+    <el-row class="resoure-btns">
       <el-col :span="24" class="query-row flex">
         <div class="flex row-left"> <el-select v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
             style="width: 110px">
@@ -38,9 +38,9 @@
               :value="item.value" />
           </el-select>
           <div class="line"></div>
-          <el-button v-for="item in sourceStore.resourceTypeList" :key="item.id"
-            :type="sourceStore.query.fileFlag == item.value ? 'primary' : ''" round
-            @click="sourceStore.changeType(item.value)">{{
+          <el-button v-for="item in sourceStore.tabs" :key="item.id"
+            :type="sourceStore.query.fileSource == item.value ? 'primary' : ''"
+            @click="sourceStore.changeTab(item.value)">{{
             item.label }}</el-button>
         </div>
         <div>
@@ -81,12 +81,12 @@ watch(() => sourceStore.query.fileSource,() => {
 </script>
 <style lang="scss" scoped>
 .resoure-search {
-  padding: 20px;
+  padding: 15px;
   border-bottom: solid #f1f1f1 1px;
 
   .tab-btns {
     .el-button {
-      font-size: 16px;
+      font-size: 18px;
     }
   }
 
diff --git a/src/renderer/src/views/resource/store.js b/src/renderer/src/views/resource/store.js
index b3c3ea3..f1228fb 100644
--- a/src/renderer/src/views/resource/store.js
+++ b/src/renderer/src/views/resource/store.js
@@ -8,10 +8,6 @@ import { hasPermission } from '@/utils/hasPermission'
 const userStore = useUserStore()
 
 const resourceTypeList = [
-  {
-    label: '全部',
-    value: ''
-  },
   ...resourceType
 ]
 const resourceFormatList = [
@@ -54,7 +50,7 @@ export default defineStore('resource', {
       //资源格式  mp3 ppt ...
       fileSuffix: -1,
       // 资源类型 课件 素材 教案
-      fileFlag: '',
+      fileFlags: resourceType[0].value,
       fileRoot: '资源',
       fileName: '',
       orderByColumn: 'uploadTime',
@@ -123,7 +119,7 @@ export default defineStore('resource', {
       this.handleQuery()
     },
     changeType(val) {
-      this.query.fileFlag = val
+      this.query.fileFlags = val
       this.handleQuery()
     },
     thirdChangeType(val) {

From 8063783284b7958d5a0c22ca97508a2778d9f7c1 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 13 Sep 2024 17:19:17 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/desktop/container/work-trend.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/renderer/src/views/desktop/container/work-trend.vue b/src/renderer/src/views/desktop/container/work-trend.vue
index d3fe981..158d136 100644
--- a/src/renderer/src/views/desktop/container/work-trend.vue
+++ b/src/renderer/src/views/desktop/container/work-trend.vue
@@ -59,8 +59,7 @@ const getHomework = async () => {
   loading.value = true
   const { edustage, edusubject } = user
   try {
-    const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, orderby: 'uniquekey DESC', pageSize: 500 })
-    console.log(rows,'rows')
+    const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, status: '1' ,orderby: 'uniquekey DESC', pageSize: 500 })
     homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey)
     homeworkList.value.forEach((item) => {
       item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length

From f49cba5e3692466d6aa5f89c459b0b8b47bed0b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Sat, 14 Sep 2024 10:14:40 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E6=94=BE=E5=BC=80=E4=BD=9C=E4=B8=9A=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E3=80=81=E4=BD=9C=E4=B8=9A=E5=B8=83=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E5=A4=96=E9=83=A8=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=9B=E6=89=B9=E9=98=85=E7=95=8C=E9=9D=A2=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/classTask/classTask.vue         |   6 +-
 .../classTask/container/item-dialog-score.vue | 180 +++++++++---------
 src/renderer/src/views/desktop/index.vue      |  13 +-
 3 files changed, 104 insertions(+), 95 deletions(-)

diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue
index e83d9da..c33fa61 100644
--- a/src/renderer/src/views/classTask/classTask.vue
+++ b/src/renderer/src/views/classTask/classTask.vue
@@ -140,7 +140,7 @@ const getClassWorkList = () => {
       edustage: userStore.edustage,// 学段
       edusubject: userStore.edusubject,//学科
       deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
-      orderby: 'uniquekey DESC',
+      orderby: 'concat(deaddate,uniquekey) DESC',
       pageSize: 100
     }).then((response) => {
       for (var i = 0; i < response.rows.length; i++) {
@@ -214,7 +214,7 @@ const getStudentClassWorkData = () => {
       edusubject: userStore.edusubject,//学科
       deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
       status: '1', // 作业状态：1-已发布
-      orderby: "uniquekey DESC",
+      orderby: "concat(deaddate,uniquekey) DESC",
       pageSize: 1000
     }).then((res) => {
       for (var t = 0; t < classWorkList.value.length; t++) {
@@ -371,7 +371,7 @@ const getStudentVisible = async () => {
     edusubject: userStore.edusubject,//学科
     deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
     status: '1', // 作业状态：1-已发布
-    orderby: 'uniquekey DESC',
+    orderby: 'concat(deaddate,uniquekey) DESC',
     pageSize: 100
   })
   const curWorkList = response.rows
diff --git a/src/renderer/src/views/classTask/container/item-dialog-score.vue b/src/renderer/src/views/classTask/container/item-dialog-score.vue
index bc12572..44e84de 100644
--- a/src/renderer/src/views/classTask/container/item-dialog-score.vue
+++ b/src/renderer/src/views/classTask/container/item-dialog-score.vue
@@ -317,102 +317,102 @@
             </el-card>
           </div>
         </div>
-      </div>
 
-      <!-- 批改评价与评语 -->
-      <div class="tacher_conten_foot">
-        <el-row style="padding: 1% 4%; border: 2px dotted">
-          <el-col :span="24" style="display: flex; flex-direction: column">
-            <el-row>
-              <el-col :span="14">
-                <div style="display: flex; margin: 10px auto">
-                  <span style="display: flex; align-items: center">
-                    <span v-if="dialogProps.studentObj.worktype == '习题训练'">
-                      <span>得分： </span>
-                      <span style="margin: 0; color: red">{{
-                        classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)
-                      }}</span>
-                      <span>分</span>
-                    </span>
-                    <span v-else>
-                      <span>得分： </span>
-                      <span v-if="classWorkFormScore.teacherRating.length > 0">
-                        <el-input-number
-                          v-model="classWorkFormScore.teacherRating[0].score"
-                          :controls="false"
-                          type="number"
-                          :min="0"
-                          :max="classWorkFormScore.teacherRating[0].maxScore"
-                          size="small"
-                          style="width: 60px"
-                          @change="handleChange"
-                        ></el-input-number>
+        <!-- 批改评价与评语 -->
+        <div class="tacher_conten_foot">
+          <el-row style="padding: 1% 4%; border: 2px dotted">
+            <el-col :span="24" style="display: flex; flex-direction: column">
+              <el-row>
+                <el-col :span="14">
+                  <div style="display: flex; margin: 10px auto">
+                    <span style="display: flex; align-items: center">
+                      <span v-if="dialogProps.studentObj.worktype == '习题训练'">
+                        <span>得分： </span>
+                        <span style="margin: 0; color: red">{{
+                          classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)
+                        }}</span>
+                        <span>分</span>
+                      </span>
+                      <span v-else>
+                        <span>得分： </span>
+                        <span v-if="classWorkFormScore.teacherRating.length > 0">
+                          <el-input-number
+                            v-model="classWorkFormScore.teacherRating[0].score"
+                            :controls="false"
+                            type="number"
+                            :min="0"
+                            :max="classWorkFormScore.teacherRating[0].maxScore"
+                            size="small"
+                            style="width: 60px"
+                            @change="handleChange"
+                          ></el-input-number>
+                        </span>
+                        <span>分</span>
                       </span>
-                      <span>分</span>
                     </span>
-                  </span>
-                  <div class="score-container">
-                    <div
-                      v-for="(score, index) in teacherRatingList"
-                      :key="index"
-                      :class="[
-                        'score-circle',
-                        { active: classWorkFormScore.rating == score.ratingKey }
-                      ]"
-                      @click="selectScore(score)"
-                    >
-                      {{ score.ratingValue }}
+                    <div class="score-container">
+                      <div
+                        v-for="(score, index) in teacherRatingList"
+                        :key="index"
+                        :class="[
+                          'score-circle',
+                          { active: classWorkFormScore.rating == score.ratingKey }
+                        ]"
+                        @click="selectScore(score)"
+                      >
+                        {{ score.ratingValue }}
+                      </div>
                     </div>
                   </div>
-                </div>
-              </el-col>
-              <el-col :span="10" style="display: flex; align-items: center">
-                <el-select
-                  v-model="value"
-                  placeholder="常用评语"
-                  style="width: 240px"
-                  @change="onSelectOption"
-                >
-                  <el-option
-                    v-for="item in cities"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                  <template #footer>
-                    <el-button v-if="!isAdding" text bg size="small" @click="onAddOption">
-                      新增常用语
-                    </el-button>
-                    <template v-else>
-                      <el-input
-                        v-model="optionName"
-                        class="option-input"
-                        placeholder="输入新的常用语"
-                        size="small"
-                      />
-                      <el-button type="primary" size="small" @click="onConfirm"> 确定 </el-button>
-                      <el-button size="small" @click="clear">取消</el-button>
+                </el-col>
+                <el-col :span="10" style="display: flex; align-items: center">
+                  <el-select
+                    v-model="value"
+                    placeholder="常用评语"
+                    style="width: 240px"
+                    @change="onSelectOption"
+                  >
+                    <el-option
+                      v-for="item in cities"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                    <template #footer>
+                      <el-button v-if="!isAdding" text bg size="small" @click="onAddOption">
+                        新增常用语
+                      </el-button>
+                      <template v-else>
+                        <el-input
+                          v-model="optionName"
+                          class="option-input"
+                          placeholder="输入新的常用语"
+                          size="small"
+                        />
+                        <el-button type="primary" size="small" @click="onConfirm"> 确定 </el-button>
+                        <el-button size="small" @click="clear">取消</el-button>
+                      </template>
                     </template>
-                  </template>
-                </el-select>
-              </el-col>
-            </el-row>
-          </el-col>
-          <el-col :span="24" style="display: flex; flex-direction: column">
-            <el-form-item label="评语说明">
-              <el-col :span="15" style="padding: 0px">
-                <el-input
-                  v-model="classWorkFormScore.teacherremark"
-                  type="textarea"
-                  rows="3"
-                  placeholder="请输入评语说明"
-                />
-              </el-col>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div style="margin: 10px">
-          <el-button type="primary" @click="onClassWorkFormScoreSave">批阅确认</el-button>
+                  </el-select>
+                </el-col>
+              </el-row>
+            </el-col>
+            <el-col :span="24" style="display: flex; flex-direction: column">
+              <el-form-item label="评语说明">
+                <el-col :span="15" style="padding: 0px">
+                  <el-input
+                    v-model="classWorkFormScore.teacherremark"
+                    type="textarea"
+                    rows="1"
+                    placeholder="请输入评语说明"
+                  />
+                </el-col>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div style="margin: 10px">
+            <el-button type="primary" @click="onClassWorkFormScoreSave">批阅确认</el-button>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index 97bb4aa..f77fec4 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -110,12 +110,14 @@ const menuList = [{
       {
         name: '作业设计',
         icon: 'icon-jiaoxuefansi',
-        disabled: true
+        isOuter: true,
+        path: '/teaching/classtaskassign?titleName=作业布置&&openDialog=newClassTask'
       },
       {
         name: '作业布置',
         icon: 'icon-xiezuo1',
-        disabled: true
+        isOuter: true,
+        path: '/teaching/classtaskassign?titleName=作业布置'
       },
       {
         name: '作业批改',
@@ -161,6 +163,13 @@ const clickMenu = ({isOuter, path, disabled}) =>{
   // 弹窗
   if(isOuter){
     let configObj = outLink().getBaseData()
+    console.log(configObj,'????????????????????????????')
+    //----- 测试使用 
+    configObj.fullPath = 'https://192.168.2.120:7860/'
+    configObj.data.domain = '192.168.2.120'
+    configObj.data.url = 'http://192.168.2.120:7860/'
+    console.log(configObj,'?????测试地址???????????????????????')
+    //-------
     let fullPath = configObj.fullPath + path
     fullPath = fullPath.replaceAll('//', '/')
      // 通知主进程

From 578fc9febaba09b4c56816e7e1579bcf29060c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Sat, 14 Sep 2024 10:23:45 +0800
Subject: [PATCH 06/10] 1

---
 src/renderer/src/views/desktop/index.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index f77fec4..4037329 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -163,13 +163,6 @@ const clickMenu = ({isOuter, path, disabled}) =>{
   // 弹窗
   if(isOuter){
     let configObj = outLink().getBaseData()
-    console.log(configObj,'????????????????????????????')
-    //----- 测试使用 
-    configObj.fullPath = 'https://192.168.2.120:7860/'
-    configObj.data.domain = '192.168.2.120'
-    configObj.data.url = 'http://192.168.2.120:7860/'
-    console.log(configObj,'?????测试地址???????????????????????')
-    //-------
     let fullPath = configObj.fullPath + path
     fullPath = fullPath.replaceAll('//', '/')
      // 通知主进程

From ec9c673b5a64e9820fc3eeda47998080df86665f Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Sat, 14 Sep 2024 13:44:35 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ai-chart/container/text.vue       |  2 +-
 src/renderer/src/components/ai-chart/index.vue       | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/components/ai-chart/container/text.vue b/src/renderer/src/components/ai-chart/container/text.vue
index 68524ae..3372051 100644
--- a/src/renderer/src/components/ai-chart/container/text.vue
+++ b/src/renderer/src/components/ai-chart/container/text.vue
@@ -16,7 +16,7 @@ import { ref, onMounted, nextTick  } from 'vue'
       default: 50, // 默认每字符间隔100毫秒
     },
   })
-  const emit = defineEmits(['loaded'])
+  const emit = defineEmits(['loaded', 'onSuccess'])
 
   const displayedText = ref('')
 
diff --git a/src/renderer/src/components/ai-chart/index.vue b/src/renderer/src/components/ai-chart/index.vue
index 03bb26b..8d95703 100644
--- a/src/renderer/src/components/ai-chart/index.vue
+++ b/src/renderer/src/components/ai-chart/index.vue
@@ -65,7 +65,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, watch } from 'vue'
 import useUserStore from '@/store/modules/user'
 import outLink from '@/utils/linkConfig'
 import Answer from './container/text.vue'
@@ -200,12 +200,16 @@ const closeChart = () =>{
   isOpen.value = false
 }
 
+watch(isOpen, (newVal)=>{
+  if(newVal){
+    if (!conversation_id) {
+      getChartId();
+    }
+  }
+})
 
 onMounted(() => {
   conversation_id = localStorage.getItem("conversation_id");
-  if (!conversation_id) {
-    getChartId();
-  }
 })
 
 </script>

From a5b6cd3516c1aa0feee4fd0159725f5544ab51b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Sat, 14 Sep 2024 14:18:13 +0800
Subject: [PATCH 08/10] 1

---
 src/renderer/src/views/classTask/classTask.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue
index c33fa61..f29b2f3 100644
--- a/src/renderer/src/views/classTask/classTask.vue
+++ b/src/renderer/src/views/classTask/classTask.vue
@@ -214,7 +214,7 @@ const getStudentClassWorkData = () => {
       edusubject: userStore.edusubject,//学科
       deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
       status: '1', // 作业状态：1-已发布
-      orderby: "concat(deaddate,uniquekey) DESC",
+      orderby: "uniquekey DESC",// TODO： 这里是否加 deaddate 的排序，后续看
       pageSize: 1000
     }).then((res) => {
       for (var t = 0; t < classWorkList.value.length; t++) {

From 8013b1c2ccaf4842f49fe69054e39a4003dd33c6 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Sat, 14 Sep 2024 14:59:35 +0800
Subject: [PATCH 09/10] edit

---
 .../src/components/choose-textbook/index.vue  | 29 ++++++++++++-------
 .../views/classTask/container/item-dialog.vue |  2 +-
 .../views/desktop/container/work-trend.vue    | 16 +++++-----
 src/renderer/src/views/profile/userInfo.vue   |  2 ++
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 94b9e2b..7f3c178 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -104,11 +104,16 @@ const getSubjectContent = async () => {
     pageSize: 10000
   }
 
-  let data;
-  const { rows } = await listEvaluation(params)
-  localStorage.setItem('evaluationList', JSON.stringify(rows))
-  evaluationList.value = rows
-  data = rows
+
+  if(localStorage.getItem('evaluationList')){
+    evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
+  }
+  else{
+    const { rows } = await listEvaluation(params)
+    localStorage.setItem('evaluationList', JSON.stringify(rows))
+    evaluationList.value = rows
+  }
+ 
   treeLoading.value = false
 
   //获取教材版本
@@ -263,12 +268,16 @@ const transData = (data) => {
 
 //获取教材
 const getSubject = async () => {
+  if(localStorage.getItem('subjectList')){
+    subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
+  }
+  else{
+    const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage,  pageSize: 10000,orderby: 'orderidx asc', })
 
-  const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage,  pageSize: 10000,orderby: 'orderidx asc', })
-
-  // subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
-  subjectList.value = rows
-  localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
+    // subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
+    subjectList.value = rows
+    localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
+  }
 
   // 默认第一个
   if(!subjectList.value.length) return
diff --git a/src/renderer/src/views/classTask/container/item-dialog.vue b/src/renderer/src/views/classTask/container/item-dialog.vue
index d18c6d3..053a7b5 100644
--- a/src/renderer/src/views/classTask/container/item-dialog.vue
+++ b/src/renderer/src/views/classTask/container/item-dialog.vue
@@ -10,7 +10,7 @@
     destory-on-close
     :before-close="onBeforeClose"
   >
-    <template #title>
+    <template #header>
       <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
         <div style="flex: 1">
           {{ classWorkAnalysis.title }}答题情况
diff --git a/src/renderer/src/views/desktop/container/work-trend.vue b/src/renderer/src/views/desktop/container/work-trend.vue
index 5bc917c..34bd615 100644
--- a/src/renderer/src/views/desktop/container/work-trend.vue
+++ b/src/renderer/src/views/desktop/container/work-trend.vue
@@ -10,7 +10,7 @@
       <el-scrollbar height="500px">
         <ul>
           <!--作业-->
-          <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id"  @click="onClickItem(item)">
+          <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id" @click="onClickItem(item)">
             <div class="class-left flex">
               <div class="class-name flex">
                 <span class="name">{{ item.uniquekey }}</span>
@@ -49,7 +49,7 @@ const itemDialogRef = ref(null)
 const getClass = async () => {
   loading.value = true
   try {
-    const res =  await getSelfReserv()
+    const res = await getSelfReserv()
     let list = res.data || []
     list.sort((a, b) => { if (a.status == '上课中') return -1; else return 0 })
     classList.value = list.filter(item => item.status !== '已结束')
@@ -62,9 +62,9 @@ const getHomework = async () => {
   loading.value = true
   const { edustage, edusubject } = user
   try {
-    const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1' ,orderby: 'uniquekey DESC', pageSize: 500 })
+    const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'uniquekey DESC', pageSize: 500 })
     // 只展示进行中的
-    homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey&& getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate )
+    homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate)
     homeworkList.value.forEach((item) => {
       item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
       // 如果是习题训练任务，则检查一共有多少道
@@ -86,7 +86,7 @@ const onClickItem = (item) => {
   itemDialogRef.value.openDialog(item)
 }
 // 批阅关闭
-const  closeDialog = () => {
+const closeDialog = () => {
   console.log('关闭弹窗,查询一下作业数据，更新界面')
   getHomework()
 }
@@ -114,7 +114,8 @@ onMounted(() => {
     font-weight: bold;
     margin-bottom: 10px;
     align-items: center;
-    .title{
+
+    .title {
       margin-right: 5px;
     }
   }
@@ -185,8 +186,7 @@ onMounted(() => {
     }
 
     .class-grade {
-      padding-top: 3px
-    }
+      padding-top: 3px }
 
   }
 }
diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue
index a56a876..d29380e 100644
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@@ -135,6 +135,8 @@ function submit() {
           userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => {
             userStore.getInfo().then(res => {
               if(res.code === 200){
+                localStorage.removeItem('subjectList')
+                localStorage.removeItem('evaluationList')
                 ElMessage.success('修改成功')
               }else{
                 ElMessage.error(response.msg)

From b279d36c8909b80e41fb0e23cc7df8f28d72e416 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Sat, 14 Sep 2024 15:12:36 +0800
Subject: [PATCH 10/10] edit

---
 src/renderer/src/views/desktop/container/work-trend.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/src/views/desktop/container/work-trend.vue b/src/renderer/src/views/desktop/container/work-trend.vue
index 34bd615..c162f82 100644
--- a/src/renderer/src/views/desktop/container/work-trend.vue
+++ b/src/renderer/src/views/desktop/container/work-trend.vue
@@ -24,6 +24,7 @@
               <div>已交</div>
             </div>
           </li>
+          <el-empty v-if="!homeworkList.length" description="暂无数据" />
         </ul>
       </el-scrollbar>
     </div>