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 1/5] =?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 2/5] =?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 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 3/5] =?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 4/5] 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 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 5/5] 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++) {