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: 'concat(deaddate,uniquekey) DESC',
+      orderby: 'uniquekey DESC',
       pageSize: 100
     }).then((response) => {
       for (var i = 0; i < response.rows.length; i++) {
@@ -213,8 +213,7 @@ const getStudentClassWorkData = () => {
       edustage: userStore.edustage,// 学段
       edusubject: userStore.edusubject,//学科
       deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
-      status: '1', // 作业状态：1-已发布
-      orderby: "uniquekey DESC",// TODO： 这里是否加 deaddate 的排序，后续看
+      orderby: "uniquekey DESC",
       pageSize: 1000
     }).then((res) => {
       for (var t = 0; t < classWorkList.value.length; t++) {
@@ -370,8 +369,7 @@ const getStudentVisible = async () => {
     edustage: userStore.edustage,// 学段
     edusubject: userStore.edusubject,//学科
     deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
-    status: '1', // 作业状态：1-已发布
-    orderby: 'concat(deaddate,uniquekey) DESC',
+    orderby: 'uniquekey DESC',
     pageSize: 100
   })
   const curWorkList = response.rows

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

@@ -150,7 +150,6 @@
                             :min-scale="0.2"
                             :preview-src-list="stuItem.imagefile"
                             :initial-index="4"
-                            fit="contain"
                           />
                         </div>
                       </el-col>
@@ -234,7 +233,6 @@
                                     .map((item) => item.url)
                                 "
                                 :initial-index="4"
-                                fit="contain"
                               />
                             </div>
                           </div>
@@ -278,7 +276,6 @@
                               .map((item) => item.url)
                           "
                           :initial-index="4"
-                          fit="contain"
                         />
                       </div>
                     </div>
@@ -317,6 +314,7 @@
             </el-card>
           </div>
         </div>
+      </div>
 
       <!-- 批改评价与评语 -->
       <div class="tacher_conten_foot">
@@ -403,7 +401,7 @@
                 <el-input
                   v-model="classWorkFormScore.teacherremark"
                   type="textarea"
-                    rows="1"
+                  rows="3"
                   placeholder="请输入评语说明"
                 />
               </el-col>
@@ -415,7 +413,6 @@
         </div>
       </div>
     </div>
-    </div>
 
     <!-- :style="{ height: dialogProps.maxheight + 'px' }" -->
     <el-dialog

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">
             <div class="class-left flex">
               <div class="class-name flex">
                 <span class="name">{{ item.uniquekey }}</span>
@@ -27,7 +27,6 @@
         </ul>
       </el-scrollbar>
     </div>
-    <item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog>
   </div>
 </template>
 <script setup>
@@ -35,15 +34,13 @@ import { ref, onMounted } from 'vue'
 import useUserStore from '@/store/modules/user'
 import { getSelfReserv } from '@/api/classManage'
 import { homeworklist } from '@/api/teaching/classwork'
-import { getCurrentTime, getTomorrow } from '@/utils/date'
-import ItemDialog from '@/views/classTask/container/item-dialog.vue'
+import { getCurrentTime } from '@/utils/date'
 
 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 () => {
@@ -62,34 +59,15 @@ 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 })
-    // 只展示进行中的
-    homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey&& getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate )
+    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
-      // 如果是习题训练任务，则检查一共有多少道
-      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'

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

@@ -104,14 +104,12 @@ const menuList = [{
       {
         name: '作业设计',
         icon: 'icon-jiaoxuefansi',
-        isOuter: true,
-        path: '/teaching/classtaskassign?titleName=作业布置&&openDialog=newClassTask'
+        disabled: true
       },
       {
         name: '作业布置',
         icon: 'icon-xiezuo1',
-        isOuter: true,
-        path: '/teaching/classtaskassign?titleName=作业布置'
+        disabled: true
       },
       {
         name: '作业批改',