From ce6e389f0f24955c9ffa2c48db1f1c03f8cc0c2c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 15 Jan 2023 18:12:59 +0800
Subject: [PATCH 01/64] =?UTF-8?q?--fix=20=E9=9D=A2=E6=8E=88=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/router/RouterFaceStu.vue         | 2 +-
 src/components/drawers/router/RouterFaceTeachManage.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 565896ad..54117863 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -822,7 +822,7 @@ export default {
           process.env.VUE_APP_BASE_API
         }/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=2&thirdType=2`
+        }&type=${2}&pid=${props.datasource.routerId}&taskType=2&thirdType=2&taskId=${props.datasource.routerTaskId}`
       );
       // api
       //   .exportTaskStudent({
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 3a2413e7..9213d019 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -622,7 +622,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=${2}`
+        }&type=${2}&pid=${props.datasource.routerId}&taskType=${2}&taskId=${props.datasource.routerTaskId}`
       );
       // api
       //   .exportTaskStudent({

From 033615ea933cdd290852f32c13bbd61e507d22ce Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 15 Jan 2023 18:58:04 +0800
Subject: [PATCH 02/64] =?UTF-8?q?--fix=20=E5=AF=BC=E5=85=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddLevelImportStu.vue | 23 ++++++++++----------
 src/components/drawers/ExportScore.vue       |  6 +----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index 0d6abdca..4e2c0011 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -36,28 +36,28 @@
                     ? {
                         targetId: Number(courseId),
                         type: 3,
-                        userId: userId,
-                        userName: userName,
+                        userId: userInfo.id,
+                        userName: userInfo.realName,
                       }
                     : courseType == 3
                     ? {
                         targetId: Number(courseId),
                         type: 1,
-                        userId: userId,
-                        userName: userName,
+                        userId: userInfo.id,
+                        userName: userInfo.realName,
                       }
                     : courseType == 4
                     ? {
                         targetId: Number(courseId),
                         type: 2,
-                        userId: userId,
-                        userName: userName,
+                        userId: userInfo.id,
+                        userName: userInfo.realName,
                       }
                     : {
                         targetId: Number(courseId),
                         type: 3,
-                        userId: userId,
-                        userName: userName,
+                        userId: userInfo.id,
+                        userName: userInfo.realName,
                       }
                 "
                 :showUploadList="false"
@@ -197,7 +197,7 @@
 </template>
 
 <script>
-import { reactive, toRefs } from "vue";
+import {computed, reactive, toRefs} from "vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/index1";
 import { BATCH_IMPORT_SCORE } from "@/api/config";
@@ -238,11 +238,11 @@ export default {
       errNum: 0, //失败数据数
       downloadErrUrl: "",
       showBottomBar: false, // 显示底部成功条数和失败条数
-      userId: store.state.userInfo.id,
-      userName: store.state.userInfo.realName,
       fileName: "",
     });
 
+    const userInfo = computed(()=>store.state.userInfo)
+
     const closeDrawer = () => {
       clearInterval(state.timers);
       state.fileList = [];
@@ -356,6 +356,7 @@ export default {
     return {
       ...toRefs(state),
       afterVisibleChange,
+      userInfo,
       closeDrawer,
       // change,
       handleChange,
diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index c72a7d99..521b2812 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -188,11 +188,10 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import {reactive, toRefs} from "vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/index1";
 import { BATCH_IMPORT_SCORE } from "@/api/config";
-import { useStore } from "vuex";
 export default {
   name: "EScore",
   props: {
@@ -219,7 +218,6 @@ export default {
     },
   },
   setup(props, ctx) {
-    const store = useStore();
     const state = reactive({
       fileType: ["xls", "xlsx"],
       importHomeWork:
@@ -231,8 +229,6 @@ export default {
       succNum: 0, //成功数据数
       errNum: 0, //失败数据数
       downloadErrUrl: null, //下载失败数据
-      userId: store.state.userInfo.id,
-      userName: store.state.userInfo.realName,
       fileName: "",
     });
     const closeDrawer = () => {

From bd18c589be69673127528abb65d6528d0bc3013f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 15 Jan 2023 19:44:48 +0800
Subject: [PATCH 03/64] --fix bug

---
 src/views/courselibrary/CoursewareManage.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index b2b6ef1b..243d3f3d 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -40,11 +40,7 @@
           </div>
           <div class="select">
             <a-tree-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
+              :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
               v-model:value="categoryId"
               show-search
               style="width: 200px"
@@ -54,7 +50,7 @@
               tree-default-expand-all
               :fieldNames="{
                 children: 'children',
-                title: 'dictName',
+                label: 'dictName',
                 value: 'dictCode',
               }"
               :tree-data="sysTypeOptions"
@@ -5820,7 +5816,7 @@ export default defineComponent({
           color: #ffffff;
         }
       }
-      /** 
+      /**
       .btn1:active {
         background: #0982ff;
       }
@@ -7573,8 +7569,8 @@ export default defineComponent({
                       background-image: url(../../assets/images/coursewareManage/export1.png);
                     }
                   }
-                  
-                  
+
+
                 }
                 .btn3 {
                     .search {

From 27380707f4a83ffc138a9356c27866774c3e46fd Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sun, 15 Jan 2023 20:15:24 +0800
Subject: [PATCH 04/64] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=BE=85=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E3=80=81=E5=B7=B2=E5=AE=A1=E6=A0=B8=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=88=86=E7=B1=BB=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 40 ++++++++--------
 src/views/examine/CourseReviewed.vue         | 48 ++++++++------------
 src/views/examine/CourseReviewedN.vue        | 28 ++----------
 3 files changed, 41 insertions(+), 75 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 243d3f3d..01b33c91 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3539,30 +3539,30 @@ export default defineComponent({
       state.viewpowervisible = true;
     };
 
-    const sysTypeOptions = computed(() => formateDictT(store.state.sysType));
+    const sysTypeOptions = computed(() => store.state.sysType);
 
     // console.log('12344', sysTypeOptions)
 
     // 处理数据字典
-    function formateDictT(data) {
-      for(let i=0;i<data.length;i++){
-        data[i].title = data[i].dictName;
-        data[i].value = data[i].dictCode;
-        if(data[i].children.length!==0){
-          for(let j=0;j<data[i].children.length;j++){
-            data[i].children[j].title = data[i].children[j].dictName;
-            data[i].children[j].value = data[i].children[j].dictCode;
-            if(data[i].children[j].children.length!==0){
-              for(let k=0; k<data[i].children[j].children.length; k++) {
-                data[i].children[j].children[k].title = data[i].children[j].children[k].dictName;
-                data[i].children[j].children[k].value = data[i].children[j].children[k].dictCode;
-              }
-            }
-          }
-        }
-      }
-      return data;
-    }
+    // function formateDictT(data) {
+    //   for(let i=0;i<data.length;i++){
+    //     data[i].title = data[i].dictName;
+    //     data[i].value = data[i].dictCode;
+    //     if(data[i].children.length!==0){
+    //       for(let j=0;j<data[i].children.length;j++){
+    //         data[i].children[j].title = data[i].children[j].dictName;
+    //         data[i].children[j].value = data[i].children[j].dictCode;
+    //         if(data[i].children[j].children.length!==0){
+    //           for(let k=0; k<data[i].children[j].children.length; k++) {
+    //             data[i].children[j].children[k].title = data[i].children[j].children[k].dictName;
+    //             data[i].children[j].children[k].value = data[i].children[j].children[k].dictCode;
+    //           }
+    //         }
+    //       }
+    //     }
+    //   }
+    //   return data;
+    // }
 
     //  富文本 sssssssssssssss
     // 编辑器实例，必须用 shallowRef
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 2104ca4d..98fd95de 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -23,16 +23,25 @@
                   ...calssifyList,
                 ]"
               />-->
-							<a-tree-select :getPopupContainer="
-								(triggerNode) => {
-									return triggerNode.parentNode || document.body;
-								}
-							" v-model:value="valueproj" show-search :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-								placeholder="请选择内容分类" allow-clear tree-default-expand-all :tree-data="sysTypeOptions">
-								<template #title="{ value: val, title }">
+							<a-tree-select 
+								:getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
+								v-model:value="valueproj" 
+								show-search 
+								:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+								:fieldNames="{
+									children: 'children',
+									label: 'dictName',
+									value: 'dictCode',
+								}"
+								placeholder="请选择内容分类" 
+								allow-clear 
+								tree-default-expand-all 
+								:tree-data="sysTypeOptions">
+
+								<!-- <template #title="{ value: val, title }">
 									<b v-if="val === '11111'" style="color: #08c">sss</b>
 									<template v-else>{{ title }}</template>
-								</template>
+								</template> -->
 							</a-tree-select>
 						</div>
 						<div class="inpbox1">
@@ -401,28 +410,7 @@ export default {
 
     const store = useStore();
 
-    const sysTypeOptions = computed(() => formateDictT(store.state.sysType));
-
-	// 处理数据字典
-    function formateDictT(data) {
-      for(let i=0;i<data.length;i++){
-        data[i].title = data[i].dictName;
-        data[i].value = data[i].dictCode;
-        if(data[i].children.length!==0){
-          for(let j=0;j<data[i].children.length;j++){
-            data[i].children[j].title = data[i].children[j].dictName;
-            data[i].children[j].value = data[i].children[j].dictCode;
-            if(data[i].children[j].children.length!==0){
-              for(let k=0; k<data[i].children[j].children.length; k++) {
-                data[i].children[j].children[k].title = data[i].children[j].children[k].dictName;
-                data[i].children[j].children[k].value = data[i].children[j].children[k].dictCode;
-              }
-            }
-          }
-        }
-      }
-      return data;
-    }
+    const sysTypeOptions = computed(() => store.state.sysType);
 
     function findClassFullName(list,classify,name=''){
       return list && list.length && list.map(e=>{
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index c87026a2..882c68d7 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -25,10 +25,10 @@
 							<a-tree-select 
 								:fieldNames="{
 									children: 'children',
-									title: 'dictName',
+									label: 'dictName',
 									value: 'dictCode',
 								}"
-								:getPopupContainer="triggerNode => triggerNode.parentNode || document.body" 
+								:getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
 								v-model:value="valueproj" 
 								show-search 
 								:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -411,29 +411,7 @@ export default {
 		});
     const store = useStore();
 
-    const sysTypeOptions = computed(() => formateDictT(store.state.sysType));
-	// console.log('asdasd--------------------------------------', sysTypeOptions)
-
-	// 处理数据字典
-    function formateDictT(data) {
-      for(let i=0;i<data.length;i++){
-        data[i].title = data[i].dictName;
-        data[i].value = data[i].dictCode;
-        if(data[i].children.length!==0){
-          for(let j=0;j<data[i].children.length;j++){
-            data[i].children[j].title = data[i].children[j].dictName;
-            data[i].children[j].value = data[i].children[j].dictCode;
-            if(data[i].children[j].children.length!==0){
-              for(let k=0; k<data[i].children[j].children.length; k++) {
-                data[i].children[j].children[k].title = data[i].children[j].children[k].dictName;
-                data[i].children[j].children[k].value = data[i].children[j].children[k].dictCode;
-              }
-            }
-          }
-        }
-      }
-      return data;
-    }
+    const sysTypeOptions = computed(() => store.state.sysType);
 
     function findClassFullName(list,classify,name=''){
       return list && list.length && list.map(e=>{

From 7a1f40df5bfd18a3c6063013b64205d2243e2820 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sun, 15 Jan 2023 22:00:49 +0800
Subject: [PATCH 05/64] =?UTF-8?q?style:=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 4 ++--
 src/components/student/TableStudent.vue  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index fede1abb..d9421ee7 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -341,7 +341,7 @@
   </a-modal>
  -->
   <a-modal
-    :style="{padding: 0,position: relative,right: - (screenWidth/2 - 660) + 'px',}"
+    :style="{padding: 0,position: relative,right: '-20%'}"
     :closable="true"
     :visible="stageVisible"
     :footer="null"
@@ -560,7 +560,7 @@ const stuSelectKeys = ref([]);
 const orgSelectKeys = ref([]);
 const auditSelectKeys = ref([]);
 const screenHeight = ref(document.body.clientHeight);
-const screenWidth = ref(document.body.clientWidth);
+//const screenWidth = ref(document.body.clientWidth);
 const stuRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 46b7c532..7378abe7 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -117,7 +117,8 @@
           导出学习信息
         </a-button>
       </a-col>
-      <a-col :span="1.5" v-else>
+      
+      <a-col :span="1.5" v-if="type === 2">
         <a-button class="cus-btn white" @click="exportTaskStuRouter">
           导出学习信息
         </a-button>

From 357739cc6045bc41a5b16c44d8b4e580330dc9da Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 16 Jan 2023 00:49:03 +0800
Subject: [PATCH 06/64] --fix bug

---
 src/views/projectcenter/TaskPage.vue | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 2277a473..e0607b9e 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -540,32 +540,17 @@
                       </div>
                       <div class="progress">
                         <div class="progresstext">
-                          {{
-                            item.finishStuCnt && item.finishStuCnt !== null
-                              ? item.finishStuCnt
-                              : 0
-                          }}/{{
-                            item.totalStuCnt && item.totalStuCnt !== null
-                              ? item.totalStuCnt
-                              : 0
-                          }}人
+                          {{item.finishStuCnt || 0 }}/{{item.totalStuCnt || 0}}人
                         </div>
                         <div style="display: flex">
                           <a-progress
                             :showInfo="false"
-                            :percent="item.percent"
+                            :percent="parseInt((item.finishStuCnt / item.totalStuCnt) * 100)"
                             strokeColor="#FFC067"
                             trailColor="rgba(253, 209, 98, 0.2)"
                           />
                           <span class="progresstext" style="margin-left: 10px"
-                            >{{
-                              (item.finishStuCnt && item.finishStuCnt !== null
-                                ? item.finishStuCnt
-                                : 0 / item.totalStuCnt &&
-                                  item.totalStuCnt !== null
-                                ? item.totalStuCnt
-                                : 0) * 100
-                            }}%</span
+                            >{{parseInt((item.finishStuCnt / item.totalStuCnt) * 100) || 0 }}%</span
                           >
                         </div>
                       </div>

From f3f6fac02621c5876e944a8004213baf54f61ebf Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 16 Jan 2023 00:50:07 +0800
Subject: [PATCH 07/64] --fix bug

---
 src/views/learningpath/LevelAdd.vue | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 88aa66ca..7b73494a 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -431,23 +431,13 @@
                         <a-progress
                           :showInfo="false"
                           :percent="
-                            parseInt(
-                              (item.finishStuNum / item.totalStuNum) * 100
-                            )
+                            parseInt((item.finishStuNum / item.totalStuNum) * 100)
                           "
                           strokeColor="#FFC067"
                           trailColor="rgba(253, 209, 98, 0.2)"
                         />
                         <span class="progresstext" style="margin-left: 10px"
-                          >{{
-                            item.totalStuNum == 0
-                              ? 0
-                              : item.finishStuNum == 0
-                              ? 0
-                              : parseInt(
-                                  (item.finishStuNum / item.totalStuNum) * 100
-                                )
-                          }}%</span
+                          >{{parseInt((item.finishStuNum / item.totalStuNum) * 100) || 0}}%</span
                         >
                       </div>
                     </div>

From 956a4eadcf58b4e7ee22df39ac4c3473398d1fbf Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 09:56:04 +0800
Subject: [PATCH 08/64] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E4=B8=89?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue  | 19 +++---
 .../courselibrary/components/seeModal.vue     |  4 +-
 src/views/courselibrary/courseModal.vue       |  9 ++-
 src/views/examine/CourseReviewed.vue          |  4 +-
 src/views/examine/CourseReviewedN.vue         | 59 +++++++++++++++----
 5 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 01b33c91..1fc7c9b3 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -41,7 +41,7 @@
           <div class="select">
             <a-tree-select
               :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
-              v-model:value="categoryId"
+              v-model:value="sysTypeId"
               show-search
               style="width: 200px"
               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -3281,6 +3281,7 @@ export default defineComponent({
       createName: "",
       auditStatus: null,
       categoryId: undefined,
+      sysTypeId: undefined,
       projectTime: "",
 
       //列表
@@ -3731,7 +3732,7 @@ export default defineComponent({
 
     // 渲染列表1操作
     const getTableDate = async () => {
-      console.log('我是点击搜索的数据',state.categoryId)
+      console.log('我是点击搜索的数据',state.sysTypeId)
       // let datas = state.tableData1;
       let startTime = "";
       let endTime = "";
@@ -3749,7 +3750,8 @@ export default defineComponent({
         pageNo: state.currentPage1,
         pageSize: state.pageSize1,
         auditStatus: state.auditStatus,
-        categoryId: state.categoryId,
+        // categoryId: state.categoryId, 
+        sysTypeId: state.sysTypeId, 
         projectName: state.projectName,
         name: state.name,
         createName: state.createName,
@@ -3768,7 +3770,7 @@ export default defineComponent({
           key: "offcourseId",
           num: "num",
           name: "name",
-          content: "categoryId",
+          content: "sysTypeId",
           courseform: "type",
           project: "projectName",
           stunum: "studentCnt",
@@ -3786,7 +3788,7 @@ export default defineComponent({
 
       datas.forEach((itm) => {
         itm.pageNo = pageNo;
-        itm.contentTxt = findClassFullName(sysTypeOptions.value,itm.categoryId) || '-'
+        itm.contentTxt = findClassFullName(sysTypeOptions.value,itm.sysTypeId) || '-'
       });
       state.tableData1 = datas;
     };
@@ -3812,7 +3814,7 @@ export default defineComponent({
       state.name = "";
       state.createName = "";
       state.auditStatus = null;
-      state.categoryId = null;
+      state.sysTypeId = null;
       state.projectTime = "";
       getTableDate();
     };
@@ -4887,7 +4889,8 @@ export default defineComponent({
             picUrl: item.picUrl,
             targetUser: item.targetUser,
             meaning: item.meaning,
-            categoryId: item.categoryId,
+            // categoryId: item.categoryId,
+            sysTypeId: item.sysTypeId,
             sceneId: item.sceneId,
             tips: item.tips,
             teacherId: item.teacherId, //?
@@ -4955,7 +4958,7 @@ export default defineComponent({
           state.currentPage1
         }&pageSize=${state.pageSize1}&auditStatus=${
           state.auditStatus ? state.auditStatus : ""
-        }&categoryId=${state.categoryId ? state.categoryId : ""}&projectName=${
+        }&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
           state.projectName ? state.projectName : ""
         }&name=${state.name ? state.name : ""}&createName=${
           state.createName ? state.createName : ""
diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 640dc5be..20da3a76 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -370,13 +370,13 @@ export default defineComponent({
 
     const sysTypeOptions = computed(() => store.state.sysType);
 
-    watch(() => props.detail.categoryId, () => {
+    watch(() => props.detail.sysTypeId, () => {
       state.categoryName =  findClassFullName(sysTypeOptions.value)
     })
 
     function findClassFullName(list, name = '') {
       return list && list.length && list
-          .map(e => props.detail.categoryId == e.dictCode ? name ? name + '-' + e.dictName : e.dictName : findClassFullName(e.children, name ? name + '-' + e.dictName : e.dictName))
+          .map(e => props.detail.sysTypeId == e.dictCode ? name ? name + '-' + e.dictName : e.dictName : findClassFullName(e.children, name ? name + '-' + e.dictName : e.dictName))
           .filter(name => name)
           .join('') || ''
     }
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index e2d717f1..e2b7ebf7 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -766,7 +766,8 @@ export default defineComponent({
 				picUrl: state.feng_mian_1,
 				targetUser: state.qdms_inputV2,
 				meaning: state.qdms_inputV3,
-				categoryId: state.fen_lei,
+				// categoryId: state.fen_lei,
+				sysTypeId: state.fen_lei,
 				sceneContent: state.chang_jin,
 				tips: state.tags_val ? state.tags_val.join(",") : null,
 				// teacherId: state.member.value,
@@ -780,7 +781,8 @@ export default defineComponent({
 			const checkList = [
 				postData.name,
 				postData.targetUser,
-				postData.categoryId,
+				// postData.categoryId,
+				postData.sysTypeId,
 				// postData.teacherId,
 				postData.picUrl,
 				postData.intro,
@@ -855,7 +857,8 @@ export default defineComponent({
 			state.feng_mian_1 = item.picUrl;
 			state.qdms_inputV2 = item.targetUser;
 			state.qdms_inputV3 = item.meaning;
-			state.fen_lei = item.categoryId;
+			// state.fen_lei = item.categoryId;
+			state.fen_lei = item.sysTypeId;
 			state.chang_jin = String(item.sceneContent ? item.sceneContent : '');
 			state.tags_val = item.tips ? item.tips.split(",") : [];
 			state.qdms_inputV6 = item.intro;
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 98fd95de..53f61585 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -427,7 +427,7 @@ export default {
 			state.loading = true
 			let objn = {
 				auditStatus: 0,
-				categoryId: Number(state.valueproj),
+				sysTypeId: state.valueproj,
 				createName: state.valuecreater,
 				name: state.valuename,
 				pageNo: state.currentPage,
@@ -457,7 +457,7 @@ export default {
 					number: n + 1 + (state.currentPage - 1) * 10,
 					name: item.name || "- ",
 					type: item.type == 1 ? "线上" : "线下",
-					content: sHX(item.categoryId),
+					content: sHX(item.sysTypeId),
 					status:
 						item.auditStatus == 0
 							? "未提交"
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 882c68d7..94f88b75 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -39,20 +39,30 @@
 						</div>
 						<div class="inpbox1">
 							<a-input v-model:value="valuecreater" style="
-                  width: 270px;
-                  height: 40px;
-                  border-radius: 8px;
-                  margin-right: 14px;
-                " placeholder="请输入创建人" />
+								width: 270px;
+								height: 40px;
+								border-radius: 8px;
+								margin-right: 14px;
+								" placeholder="请输入创建人" />
 						</div>
 						<div class="inpbox1">
 							<a-input v-model:value="valuename" style="
-                  width: 270px;
-                  height: 40px;
-                  border-radius: 8px;
-                  margin-right: 14px;
-                " placeholder="请输入名称" />
+								width: 270px;
+								height: 40px;
+								border-radius: 8px;
+								margin-right: 14px;
+								" placeholder="请输入名称" />
 						</div>
+						<!-- <div class="select addTimeBox">
+							<div class="addTime">创建时间：</div>
+							<a-range-picker
+								v-model:value="searchParam"
+								style="width: 420px"
+								format="YYYY-MM-DD"
+								separator="至"
+								:placeholder="['      开始时间', '        结束时间']"
+							/>
+						</div> -->
 					</div>
 				</div>
 				<div class="tmplh_btn">
@@ -441,7 +451,8 @@ export default {
 			state.loading = true
 			let objn = {
 				auditStatus: 1,
-				categoryId: state.valueproj,
+				// categoryId: state.valueproj,
+				sysTypeId: state.valueproj,
 				createName: state.valuecreater,
 				name: state.valuename,
 				pageNo: state.currentPage,
@@ -510,7 +521,8 @@ export default {
 		const searchList = () => {
 			let objn = {
 				auditStatus: 1,
-				categoryId: state.valueproj,
+				// categoryId: state.valueproj,
+				sysTypeId: state.valueproj,
 				createName: state.valuecreater,
 				name: state.valuename,
 				pageNo: state.currentPage,
@@ -553,7 +565,7 @@ export default {
 					number: i + 1 + (state.currentPage - 1) * 10,
 					name: item.name,
 					type: item.type == 1 ? "线上" : "线下",
-					content: sHX(item.categoryId),
+					content: sHX(item.sysTypeId),
 					status:
 						item.status == 0
 							? "未提交"
@@ -673,6 +685,27 @@ export default {
 };
 </script>
 <style lang="scss">
+.addTimeBox {
+	top: 4px;
+	position: relative;
+	display: flex;
+	align-items: center;
+
+	.addTime {
+		position: absolute;
+		z-index: 10;
+		margin-left: 10px;
+		color: rgba(0, 0, 0, 0.4);
+	}
+
+	.ant-picker {
+		padding-left: 85px;
+	}
+
+	.ant-picker-range .ant-picker-active-bar {
+		margin-left: 85px;
+	}
+}
 .courAuditModal {
 	.ant-modal {
 		width: 640px !important;

From 185efb082cd91af91af87c135d812906ef0eb707 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 10:13:56 +0800
Subject: [PATCH 09/64] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/App.vue b/src/App.vue
index ba791049..3fdca7d2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.0.9------------");
+		console.log("版本2.1.0------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

From 5fff25010078bb536ef5bb4199ed345502b11ed0 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 16:18:51 +0800
Subject: [PATCH 10/64] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=BE=85=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=AF=BE=E7=A8=8B=EF=BC=8C=E5=B7=B2=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=EF=BC=8C=E5=B7=B2=E5=AE=A1=E6=A0=B8=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=AF=B9=E5=BA=94=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examine/CourseReviewed.vue   | 57 +++++++++++++++++++++-----
 src/views/examine/CourseReviewedN.vue  | 13 +++++-
 src/views/examine/ProjectReviewed.vue  |  2 +-
 src/views/examine/ProjectReviewedN.vue | 44 +++++++++++++++++---
 src/views/projectcenter/TaskAdd.vue    |  8 ++--
 5 files changed, 101 insertions(+), 23 deletions(-)

diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 53f61585..e54c911f 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -46,19 +46,29 @@
 						</div>
 						<div class="inpbox1">
 							<a-input v-model:value="valuecreater" style="
-                  width: 270px;
-                  height: 40px;
-                  border-radius: 8px;
-                  margin-right: 14px;
-                " placeholder="请输入创建人" />
+								width: 270px;
+								height: 40px;
+								border-radius: 8px;
+								margin-right: 14px;
+								" placeholder="请输入创建人" />
 						</div>
 						<div class="inpbox1">
 							<a-input v-model:value="valuename" style="
-                  width: 270px;
-                  height: 40px;
-                  border-radius: 8px;
-                  margin-right: 14px;
-                " placeholder="请输入名称" />
+								width: 270px;
+								height: 40px;
+								border-radius: 8px;
+								margin-right: 14px;
+								" placeholder="请输入名称" />
+						</div>
+						<div class="select addTimeBox">
+							<div class="addTime">审核时间：</div>
+							<a-range-picker
+								v-model:value="searchParam"
+								style="width: 420px"
+								format="YYYY-MM-DD"
+								separator="至"
+								:placeholder="['      开始时间', '        结束时间']"
+							/>
 						</div>
 					</div>
 				</div>
@@ -120,6 +130,7 @@ import {reactive, toRefs, onMounted, computed} from "vue";
 import { courseListView } from "../../api/indexAudit";
 import * as api1 from "@/api/index1";
 import {useStore} from "vuex";
+import dayjs from "dayjs";
 
 export default {
 	name: "CoursereViewed",
@@ -406,6 +417,7 @@ export default {
 					],
 				}
 			],
+			searchParam:[], // 时间搜索
 		});
 
     const store = useStore();
@@ -424,9 +436,12 @@ export default {
 		}
 
 		const getList = () => {
+			console.log(state.searchParam[0],state.searchParam[1],new Date(state.searchParam[0]).getTime(),new Date(state.searchParam[0]))
 			state.loading = true
 			let objn = {
 				auditStatus: 0,
+				beginTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[0]).getTime()).format("YYYY-MM-DD"): "",
+				endTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[1]).getTime()).format("YYYY-MM-DD"): "",
 				sysTypeId: state.valueproj,
 				createName: state.valuecreater,
 				name: state.valuename,
@@ -530,6 +545,28 @@ export default {
 };
 </script>
 <style lang="scss">
+.addTimeBox {
+	top: 4px;
+	position: relative;
+	display: flex;
+	align-items: center;
+
+	.addTime {
+		position: absolute;
+		z-index: 10;
+		margin-left: 10px;
+		color: rgba(0, 0, 0, 0.4);
+	}
+
+	.ant-picker {
+		padding-left: 85px;
+	}
+
+	.ant-picker-range .ant-picker-active-bar {
+		margin-left: 85px;
+	}
+}
+
 .coursereviewed {
 	width: 100%;
 
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 94f88b75..22251710 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -53,7 +53,7 @@
 								margin-right: 14px;
 								" placeholder="请输入名称" />
 						</div>
-						<!-- <div class="select addTimeBox">
+						<div class="select addTimeBox">
 							<div class="addTime">创建时间：</div>
 							<a-range-picker
 								v-model:value="searchParam"
@@ -62,7 +62,7 @@
 								separator="至"
 								:placeholder="['      开始时间', '        结束时间']"
 							/>
-						</div> -->
+						</div>
 					</div>
 				</div>
 				<div class="tmplh_btn">
@@ -150,6 +150,7 @@ import SeeModal from "../courselibrary/components/seeModal.vue";
 import { iframeUrl } from "../../api/method";
 import * as api1 from "@/api/index1";
 import {useStore} from "vuex";
+import dayjs from "dayjs";
 
 export default {
 	name: "CoursereViewedN",
@@ -418,6 +419,7 @@ export default {
 					],
 				}
 			],
+			searchParam:[], // 时间搜索
 		});
     const store = useStore();
 
@@ -519,9 +521,15 @@ export default {
 		// contentList11.find(e => e.dictCode == text)?.dictValue
 
 		const searchList = () => {
+			console.log('searchParamsearchParamsearchParam', state.searchParam)
+			console.log('searchParamsearchParamsearchParam', Math.ceil(new Date(state.searchParam[0]).getTime()))
 			let objn = {
 				auditStatus: 1,
 				// categoryId: state.valueproj,
+				// beginTime:state.searchParam.length!==0? Math.ceil(new Date(state.searchParam[0]).getTime()/1000): "",
+				// endTime:state.searchParam.length!==0? Math.ceil(new Date(state.searchParam[1]).getTime()/1000): "",
+				beginTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[0]).getTime()).format("YYYY-MM-DD"): "",
+				endTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[1]).getTime()).format("YYYY-MM-DD"): "",
 				sysTypeId: state.valueproj,
 				createName: state.valuecreater,
 				name: state.valuename,
@@ -587,6 +595,7 @@ export default {
 			state.tableData1 = array;
 		};
 		const reset = () => {
+			state.searchParam = [];
 			state.valueproj = null;
 			state.valuecreater = null;
 			state.valuename = null;
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index 2af90052..6ff491cc 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -65,7 +65,7 @@
           </div>
           </div>
         </div>
-        <div class="tmplh_btn">
+        <div class="tmplh_btn" style="margin-top:50px;">
           <div class="btn btn1" @click="getProjList">
             <div class="search"></div>
             <div class="btnText btnText1">搜索</div>
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index 88be9fe4..d0b1ac0b 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -53,9 +53,19 @@
             <!--              <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"-->
             <!--                :placeholder="['      开始时间', '        结束时间']" @change="rankTimeChange" />-->
             <!--            </div>-->
+            <div class="select addTimeBox">
+							<div class="addTime">提交时间：</div>
+							<a-range-picker
+								v-model:value="searchParam"
+								style="width: 420px"
+								format="YYYY-MM-DD"
+								separator="至"
+								:placeholder="['      开始时间', '        结束时间']"
+							/>
+						</div>
           </div>
         </div>
-        <div class="tmplh_btn">
+        <div class="tmplh_btn" style="margin-top:50px;">
           <div class="btn btn1" @click="getProjList">
             <div class="search"></div>
             <div class="btnText btnText1">搜索</div>
@@ -108,6 +118,7 @@
 import { onMounted, reactive, toRefs } from "vue";
 import ProjectAudit from "../../components/drawers/ProjectAudit";
 import { auditlist } from "../../api/indexAudit";
+import dayjs from "dayjs";
 
 export default {
   name: "ProjectViewedN",
@@ -230,6 +241,7 @@ export default {
         },
       ],
       tableData1: [],
+      searchParam:[]
     });
     const showProjAudit = (id, createId, creater) => {
       state.ProjAuditvisible = true;
@@ -240,17 +252,16 @@ export default {
     const getProjList = () => {
       state.loading=true
       let objn = {
-        beginTime:
-          state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]),
+        beginTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[0]).getTime()).format("YYYY-MM-DD"): "",
+				endTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[1]).getTime()).format("YYYY-MM-DD"): "",
         createName: state.valuecreater,
-        endTime:
-          state.valueDate == undefined ? "" : Date.parse(state.valueDate[1]),
         manager: state.valuename,
         name: state.valueproj,
         pageNo: state.currentPage,
         pageSize: state.pageSize,
         status: 1,
       };
+      console.log(objn)
       auditlist(objn)
         .then((res) => {
           console.log("获取待审核项目成功", res);
@@ -278,6 +289,7 @@ export default {
       getProjList();
     };
     const reset = () => {
+      state.searchParam = [];
       (state.valueproj = ""),
         (state.valuecreater = ""),
         (state.valuename = ""),
@@ -298,6 +310,28 @@ export default {
 };
 </script>
 <style lang="scss">
+.addTimeBox {
+	top: 4px;
+	position: relative;
+	display: flex;
+	align-items: center;
+
+	.addTime {
+		position: absolute;
+		z-index: 10;
+		margin-left: 10px;
+		color: rgba(0, 0, 0, 0.4);
+	}
+
+	.ant-picker {
+		padding-left: 85px;
+	}
+
+	.ant-picker-range .ant-picker-active-bar {
+		margin-left: 85px;
+	}
+}
+
 .projectviewedn {
   width: 100%;
 
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 588c6fa8..95cd6c7c 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1177,7 +1177,7 @@ export default {
 							arraynew.push(data[i])
 						}
 					}
-					console.log(arraynew)
+					// console.log(arraynew)
 					if (arraynew.length !== 0) {
 						state.chooseStageId = Number(arraynew[arraynew.length - 1].stageId);
 					}
@@ -1439,8 +1439,7 @@ export default {
 				});
 		};
 		onMounted(() => {
-			document.getElementsByTagName("main")[0].style.background =
-				"rgb(245, 247, 250,1)";
+			document.getElementsByTagName("main")[0].style.background = "rgb(245, 247, 250,1)";
 			document.getElementsByTagName("main")[0].style.boxShadow = "none";
 			getTask();
 		});
@@ -1452,8 +1451,7 @@ export default {
 		});
 		onUnmounted(() => {
 			document.getElementsByTagName("main")[0].style.background = "#ffffff";
-			document.getElementsByTagName("main")[0].style.boxShadow =
-				"0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
+			document.getElementsByTagName("main")[0].style.boxShadow = "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
 		});
 		const showDrawerOnline = (id, eleId) => {
 			console.log("id, eleId", id, eleId);

From f7f245e1c22a4637063006def5045764861f9907 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 16 Jan 2023 17:18:32 +0800
Subject: [PATCH 11/64] =?UTF-8?q?--fix=20=E9=9D=A2=E6=8E=88=E8=AF=BE=20?=
 =?UTF-8?q?=E4=B8=8E=E4=BB=BB=E5=8A=A1=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddLevelImportStu.vue  | 29 ++-----------------
 .../drawers/project/ProjectFaceStu.vue        | 26 ++++++++---------
 .../drawers/project/ProjectFaceTaskManage.vue | 18 +++++-------
 .../drawers/router/RouterFaceStu.vue          | 14 ++++-----
 .../drawers/router/RouterFaceTeachManage.vue  | 29 ++++++-------------
 src/components/student/TableStudent.vue       |  2 +-
 6 files changed, 41 insertions(+), 77 deletions(-)

diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index 4e2c0011..c501c212 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -31,35 +31,12 @@
                 name="uploadFile"
                 :multiple="false"
                 @change="handleChange"
-                :data="
-                  courseType == 1
-                    ? {
+                :data="{
                         targetId: Number(courseId),
-                        type: 3,
+                        type: courseType,
                         userId: userInfo.id,
                         userName: userInfo.realName,
-                      }
-                    : courseType == 3
-                    ? {
-                        targetId: Number(courseId),
-                        type: 1,
-                        userId: userInfo.id,
-                        userName: userInfo.realName,
-                      }
-                    : courseType == 4
-                    ? {
-                        targetId: Number(courseId),
-                        type: 2,
-                        userId: userInfo.id,
-                        userName: userInfo.realName,
-                      }
-                    : {
-                        targetId: Number(courseId),
-                        type: 3,
-                        userId: userInfo.id,
-                        userName: userInfo.realName,
-                      }
-                "
+                      } "
                 :showUploadList="false"
               >
                 <p class="ant-upload-drag-icon">
diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index c09d3bba..972d57a9 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -186,7 +186,7 @@
     v-model:AddImpStuvisible="AddImpStuvisible"
     @AddImpStuvisibleClose="AddImpStuvisibleClose"
     :courseId="projectTaskInfo.courseId"
-    :courseType="2"
+    :courseType="3"
   />
   <!-- 批量签到弹窗 -->
   <a-modal
@@ -397,7 +397,7 @@ export default {
         ids: state.selectedStudents,
         taskId: Number(props.projectTaskInfo.projectTaskId),
         taskType: Number(props.projectTaskInfo.type),
-        type: 1,
+        type: 3,
         // userName: "",
       };
       api
@@ -663,7 +663,7 @@ export default {
                       studentName: text.record.studentName,
                       taskId: Number(props.projectTaskInfo.projectTaskId),
                       taskType: Number(props.projectTaskInfo.type),
-                      type: 1,
+                      type: 3,
                       // userName: "",
                     };
                     api
@@ -697,7 +697,7 @@ export default {
                       studentName: text.record.studentName,
                       taskId: Number(props.projectTaskInfo.projectTaskId),
                       taskType: Number(props.projectTaskInfo.type),
-                      type: 1,
+                      type: 3,
                     };
                     api
                       .attendanceLeave(obj)
@@ -800,26 +800,26 @@ export default {
       console.log("我是传递的查询参数", props.projectTaskInfo, {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
-        currentStageId: props.projectTaskInfo.stageId,
-        type: 1,
-        pid: props.projectTaskInfo.projectId,
+        // currentStageId: props.projectTaskInfo.stageId,
+        type: 3,
+        pid: props.projectTaskInfo.courseId,
         // status: Number(state.name),
         studentName: state.name,
         signStatus: state.projectName2,
-        taskId: props.projectTaskInfo.projectTaskId,
+        // taskId: props.projectTaskInfo.projectTaskId,
       });
       api
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.projectTaskInfo.stageId,
-          type: 1,
-          pid: props.projectTaskInfo.projectId,
+          type: 3,
+          pid: props.projectTaskInfo.courseId,
           // status: Number(state.name),
           studentName: state.name,
-          taskId: props.projectTaskInfo.projectTaskId,
+          // taskId: props.projectTaskInfo.projectTaskId,
           signStatus: state.projectName2,
-          taskType: props.projectTaskInfo.type,
+          // taskType: props.projectTaskInfo.type,
         })
         .then((res) => {
           console.log("获取面授管理学员", res);
@@ -866,7 +866,7 @@ export default {
     function exportTaskStu() {
       console.log("props.projectTaskInfo", props.projectTaskInfo);
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&taskId=${props.projectTaskInfo.projectTaskId}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2`
+        `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=2`
       );
       // api
       //   .exportTaskStudent({
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 0d26edaf..0a0fbe56 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -613,23 +613,23 @@ export default {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
         currentStageId: props.projectTaskInfo.stageId,
-        type: 1,
-        pid: props.projectTaskInfo.projectId,
+        type: 3,
+        pid: props.projectTaskInfo.courseId,
         status: state.projectName,
         studentName: state.name,
-        taskId: props.projectTaskInfo.projectTaskId,
+        // taskId: props.projectTaskInfo.projectTaskId,
       });
       api
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.projectTaskInfo.stageId,
-          type: 1,
-          pid: props.projectTaskInfo.projectId,
+          type: 3,
+          pid: props.projectTaskInfo.courseId,
           status: state.projectName,
           studentName: state.name,
-          taskId: props.projectTaskInfo.projectTaskId,
-          taskType: props.projectTaskInfo.type,
+          // taskId: props.projectTaskInfo.projectTaskId,
+          // taskType: props.projectTaskInfo.type,
         })
         .then((res) => {
           console.log("获取面授管理学员", res);
@@ -733,9 +733,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
           props.projectTaskInfo.stageId
-        }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${
-          props.projectTaskInfo.projectTaskId
-        }&taskType=${props.projectTaskInfo.type}`
+        }&type=3&pid=${props.projectTaskInfo.courseId}`
       );
     }
 
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 54117863..f25d73e1 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -181,7 +181,7 @@
     v-model:AddImpStuvisible="AddImpStuvisible"
     @AddImpStuvisibleClose="AddImpStuvisibleClose"
     :courseId="datasource.courseId"
-    :courseType="1"
+    :courseType="3"
   />
   <!-- 批量签到弹窗 -->
   <a-modal
@@ -764,14 +764,14 @@ export default {
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
-          currentStageId: props.datasource.chapterId,
-          type: 2,
-          pid: props.datasource.routerId,
+          // currentStageId: props.datasource.chapterId,
+          type: 3,
+          pid: props.datasource.courseId,
           // status: Number(state.name),
           signStatus: state.projectName2,
           studentName: state.name,
-          taskId: props.datasource.routerTaskId,
-          taskType: props.datasource.type,
+          // taskId: props.datasource.routerTaskId,
+          // taskType: props.datasource.type,
         })
         .then((res) => {
           console.log("获取面授管理学员", res);
@@ -822,7 +822,7 @@ export default {
           process.env.VUE_APP_BASE_API
         }/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=2&thirdType=2&taskId=${props.datasource.routerTaskId}`
+        }&type=3&pid=${props.datasource.courseId}&thirdType=2`
       );
       // api
       //   .exportTaskStudent({
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 9213d019..8a3bec80 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -549,26 +549,15 @@ export default {
     // 获取数据
     //获取学员
     const getStudent = () => {
-      console.log("我是传递的查询参数", {
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        currentStageId: props.datasource.chapterId,
-        type: 2,
-        pid: props.datasource.routerId,
-        taskId: props.datasource.routerTaskId,
-        taskType: props.datasource.type,
-        status: state.projectName,
-        studentName: state.name,
-      });
       api
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.datasource.chapterId,
-          type: 2,
-          pid: props.datasource.routerId,
-          taskId: props.datasource.routerTaskId,
-          taskType: props.datasource.type,
+          type: 3,
+          pid: props.datasource.courseId,
+          // taskId: props.datasource.routerTaskId,
+          // taskType: props.datasource.type,
           status: state.projectName,
           studentName: state.name,
         })
@@ -622,7 +611,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=${2}&taskId=${props.datasource.routerTaskId}`
+        }&type=3&pid=${props.datasource.courseId}`
       );
       // api
       //   .exportTaskStudent({
@@ -647,10 +636,10 @@ export default {
       state.downloadUrl = null;
       let obj = {
         currentStageId: props.datasource.chapterId,
-        pid: props.datasource.routerId,
-        taskId: props.datasource.routerTaskId,
-        taskType: props.datasource.type,
-        type: 2,
+        pid: props.datasource.courseId,
+        // taskId: props.datasource.routerTaskId,
+        // taskType: props.datasource.type,
+        type: 3,
       };
       api
         .exportHomeWork(obj)
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 7378abe7..2e234d49 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -362,7 +362,7 @@
     v-model:AddImpStuvisible="AddImpStuvisible"
     @AddImpStuvisibleClose="AddImpStuvisibleClose"
     :courseId="id"
-    :courseType="type === 1 ? 3 : 4"
+    :courseType="type"
   />
 </template>
 <script setup>

From 8b90e9765b51c6465b5f2b7e4c9d042101c1211d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 16 Jan 2023 18:13:29 +0800
Subject: [PATCH 12/64] =?UTF-8?q?--fix=20=E9=9D=A2=E6=8E=88=E8=AF=BE=20?=
 =?UTF-8?q?=E4=B8=8E=E4=BB=BB=E5=8A=A1=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectFaceStu.vue        | 2 +-
 src/components/drawers/project/ProjectFaceTaskManage.vue | 2 +-
 src/components/drawers/router/RouterFaceStu.vue          | 2 +-
 src/components/drawers/router/RouterFaceTeachManage.vue  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index 972d57a9..5ac697ef 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -866,7 +866,7 @@ export default {
     function exportTaskStu() {
       console.log("props.projectTaskInfo", props.projectTaskInfo);
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=2`
+        `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=6`
       );
       // api
       //   .exportTaskStudent({
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 0a0fbe56..50940ad1 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -733,7 +733,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
           props.projectTaskInfo.stageId
-        }&type=3&pid=${props.projectTaskInfo.courseId}`
+        }&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=4`
       );
     }
 
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index f25d73e1..a18e018f 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -822,7 +822,7 @@ export default {
           process.env.VUE_APP_BASE_API
         }/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=3&pid=${props.datasource.courseId}&thirdType=2`
+        }&type=3&pid=${props.datasource.courseId}&thirdType=7&taskId=${props.datasource.routerTaskId}`
       );
       // api
       //   .exportTaskStudent({
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 8a3bec80..0c1f591f 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -668,7 +668,7 @@ export default {
           props.datasource.chapterId
         }&type=${2}&pid=${props.datasource.routerId}&taskId=${
           props.datasource.routerTaskId
-        }&taskType=${props.datasource.type}`
+        }&taskType=${props.datasource.type}&thirdType=5`
       );
     }
     return {

From 7fd4ac8cf936287df72aa3bd5cb2ef9dfe67449b Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 18:25:34 +0800
Subject: [PATCH 13/64] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E8=AF=BE=E4=BC=A0=E9=80=92=E7=9A=84taskID=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectOnlineManage.vue | 2 +-
 src/components/drawers/router/RouterCommonManage.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 416557ff..450fefd5 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -385,7 +385,7 @@ export default {
           "status": state.projectName,
           "studentName": state.name,
           "targetId":props.datasource.projectId,
-          "taskId": props.datasource.projectTaskId,
+          "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
           "type": 1
         });
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index dad2f39a..84f11ede 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -387,7 +387,7 @@ export default {
           "chapterId": props.datasource.chapterId,
           "status": state.projectName,
           "studentName": state.name,
-          "taskId": props.datasource.routerTaskId,
+          "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
           "type": 1
         });

From a50a42e73c79b8ef43c2b024a43dd10edd49c430 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 18:43:34 +0800
Subject: [PATCH 14/64] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/NoticeHis.vue |  7 ++++---
 src/components/drawers/NoticePub.vue | 13 ++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 289f1834..7e02a166 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -9,14 +9,15 @@
   <div class="noticeContent">
     <div v-for="item in notice" :key="item.id" class="item">
       <!-- <div class="itemcontent">{{ item.content }}</div> -->
-      <a-textarea
+      <!-- <a-textarea
           class="itemcontent"
           disabled="true"
           v-model:value="item.content"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
           style="margin-top: -10px; height: 120px;background-color: #fff;"
-        />
+        /> -->
+      <pre style="text-align: left;padding-left: 20px">{{item.content}}</pre>
       <div class="itemtime">{{ item.pubtime }}</div>
     </div>
   </div>
@@ -138,7 +139,7 @@ export default {
   margin-top: 20px;
   margin-left: 32px;
   .item {
-    height: 66px;
+    // height: 66px;
     width: 74%;
     display: flex;
     justify-content: space-between;
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 1f437cf8..6e5298ef 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -17,13 +17,14 @@
         <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div> -->
-        <a-textarea
+        <!-- <a-textarea
           disabled="true"
           v-model:value="noticeContent1"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
           style="margin-top: -10px; height: 160px; resize: none;background-color: #fff;color:#666;"
-        />
+        /> -->
+        <pre>{{noticeContent1}}</pre>
         <div class="btn-content">
           <a-button type="primary" @click="handleEdit">编辑</a-button>
         </div>
@@ -33,13 +34,7 @@
         <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div> -->
-        <a-textarea
-          disabled="true"
-          v-model:value="noticeContent1"
-          :maxlength="150"
-          placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height:160px; resize: none;background-color: #fff;color:#666;"
-        />
+        <pre>{{noticeContent1}}</pre>
         <p>编辑新公告：</p>
         <a-textarea
           v-model:value="noticeContent"

From 32ba887c052eff85982a3e8e7665670c7106d3e6 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 18:56:28 +0800
Subject: [PATCH 15/64] =?UTF-8?q?style:=E5=85=AC=E5=91=8A=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/NoticePub.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 6e5298ef..59d3deef 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -40,7 +40,7 @@
           v-model:value="noticeContent"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 160px"
+          style="margin-top: -10px; height: 160px; width:340px;"
         />
         <div class="btn-content">
           <a-button class="cancel" @click="handleCancel">取消</a-button>

From d3b7efc548ba668e426c76508ac30c63917dad2c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 16 Jan 2023 19:26:54 +0800
Subject: [PATCH 16/64] =?UTF-8?q?--fix=20=E9=9D=A2=E6=8E=88=E8=AF=BE=20?=
 =?UTF-8?q?=E4=B8=8E=E4=BB=BB=E5=8A=A1=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/router/RouterFaceStu.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index a18e018f..bfad31e0 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -63,7 +63,6 @@
                   :options="projectNameList2"
                   @change="selectProjectName2"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>

From e0ac835badcb3b62fe70ce9bd74db2821c9c04f9 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 16 Jan 2023 19:37:49 +0800
Subject: [PATCH 17/64] =?UTF-8?q?--fix=20=E9=9D=A2=E6=8E=88=E8=AF=BE=20?=
 =?UTF-8?q?=E4=B8=8E=E4=BB=BB=E5=8A=A1=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue               | 1 -
 src/components/drawers/ChangeGroup.vue                    | 1 -
 src/components/drawers/FaceManage.vue                     | 1 -
 src/components/drawers/FaceStu.vue                        | 1 -
 src/components/drawers/TestManage.vue                     | 1 -
 src/components/drawers/TimeManage.vue                     | 1 -
 src/components/drawers/WorkManage.vue                     | 1 -
 src/components/drawers/project/ProjectExamManage.vue      | 1 -
 src/components/drawers/project/ProjectFaceTaskManage.vue  | 1 -
 src/components/drawers/project/ProjectHomeWorkManage.vue  | 1 -
 src/components/drawers/project/ProjectOnlineManage.vue    | 1 -
 src/components/drawers/router/RouterEvaluationManage.vue  | 1 -
 src/components/drawers/router/RouterExaminationManage.vue | 1 -
 src/components/drawers/router/RouterFaceTeachManage.vue   | 1 -
 src/components/drawers/router/RouterHomeworkManage.vue    | 1 -
 src/views/courselibrary/CoursewareManage.vue              | 1 -
 src/views/courselibrary/CoursewareManage_Old.vue          | 2 --
 src/views/learningpath/LearningPath.vue                   | 1 -
 src/views/learningpath/LevelAdd.vue                       | 1 -
 src/views/learningpath/LevelAddDetail.vue                 | 1 -
 src/views/projectcenter/LibraryAdd.vue                    | 1 -
 src/views/projectcenter/temTask.vue                       | 1 -
 src/views/research/ResearchManage.vue                     | 1 -
 23 files changed, 24 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index e41f7511..4b51a340 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -59,7 +59,6 @@
                   :options="projectNameList2"
                   @change="selectProjectName2"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>
diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue
index 9c952210..8ebf6a93 100644
--- a/src/components/drawers/ChangeGroup.vue
+++ b/src/components/drawers/ChangeGroup.vue
@@ -23,7 +23,6 @@
             style="width: 264px; border-radius: 8px"
             :options="stugroupList"
             allowClear
-            showSearch
             @change="handleChange"
           />
         </div>
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 3a4f29f9..5cfe8a12 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -36,7 +36,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>
diff --git a/src/components/drawers/FaceStu.vue b/src/components/drawers/FaceStu.vue
index 58a2c390..c9dba9b0 100644
--- a/src/components/drawers/FaceStu.vue
+++ b/src/components/drawers/FaceStu.vue
@@ -61,7 +61,6 @@
                   :options="projectNameList2"
                   @change="selectProjectName2"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 4ba67bdc..4990c0a2 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -37,7 +37,6 @@
                   :options="projectNameList"
                   @change="selectProjectName"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index a1e1cd65..6fab5795 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -37,7 +37,6 @@
                   :options="projectNameList"
                   @change="selectProjectName"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index d84af08e..61f4aa8f 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -37,7 +37,6 @@
                   :options="projectNameList"
                   @change="selectProjectName"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>
diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index 24594d6a..b65fed0c 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -37,7 +37,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 50940ad1..e549f790 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -48,7 +48,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>
diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue
index 0dccaaaa..829ee738 100644
--- a/src/components/drawers/project/ProjectHomeWorkManage.vue
+++ b/src/components/drawers/project/ProjectHomeWorkManage.vue
@@ -49,7 +49,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 450fefd5..63cd9666 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -65,7 +65,6 @@
                   :options="projectNameList"
                   @change="selectProjectName"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>
diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue
index 50f2943f..b52580b4 100644
--- a/src/components/drawers/router/RouterEvaluationManage.vue
+++ b/src/components/drawers/router/RouterEvaluationManage.vue
@@ -48,7 +48,6 @@
                   :options="projectNameList"
                   @change="selectProjectName"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index 3f88909f..cc194838 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -37,7 +37,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 0c1f591f..62af9cae 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -43,7 +43,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>
diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue
index 26150e06..fff442af 100644
--- a/src/components/drawers/router/RouterHomeworkManage.vue
+++ b/src/components/drawers/router/RouterHomeworkManage.vue
@@ -44,7 +44,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 1fc7c9b3..428af0af 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -34,7 +34,6 @@
               placeholder="请选择状态"
               :options="options1"
               allowClear
-              showSearch
             >
             </a-select>
           </div>
diff --git a/src/views/courselibrary/CoursewareManage_Old.vue b/src/views/courselibrary/CoursewareManage_Old.vue
index 706a903c..9ec39903 100644
--- a/src/views/courselibrary/CoursewareManage_Old.vue
+++ b/src/views/courselibrary/CoursewareManage_Old.vue
@@ -34,7 +34,6 @@
               placeholder="请选择状态"
               :options="options1"
               allowClear
-              showSearch
             >
             </a-select>
           </div>
@@ -1862,7 +1861,6 @@
                         style="width: 200px"
                         :options="options1"
                         allowClear
-                        showSearch
                         @focus="focus"
                         @change="handleChange"
                       >
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 2db48e06..aa755f2d 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -26,7 +26,6 @@
             :options="statusList"
             @change="selectStatusClassify"
             allowClear
-            showSearch
           ></a-select>
         </div>
 
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 7b73494a..c51f3d5b 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -897,7 +897,6 @@
                   :options="statess"
                   @change="selectProjectName4"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
               <div class="btn">
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 7e435804..d5f1ee8a 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1005,7 +1005,6 @@
                 :options="level"
                 @change="handleChangeStage"
                 allowClear
-                showSearch
               ></a-select>
             </div>
             <div class="btn">
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index d669c585..6f246640 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -717,7 +717,6 @@
                   :options="projectNameList4"
                   @change="selectProjectName4"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
               <div class="btn">
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index b151bed1..3ba444da 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -1016,7 +1016,6 @@
                 :options="level"
                 @change="handleChangeStage"
                 allowClear
-                showSearch
               ></a-select>
             </div>
             <div class="btn">
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 4ba0c4f6..be5885b1 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -20,7 +20,6 @@
             :options="projectStateList"
             @change="handleProjectState"
             allowClear
-            showSearch
           ></a-select>
         </div>
         <div class="select">

From 36cf046d2f8830c7ac742f6607633e7d5cbaf1d5 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 19:48:20 +0800
Subject: [PATCH 18/64] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/App.vue b/src/App.vue
index 3fdca7d2..d054fbda 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.1.0------------");
+		console.log("版本2.1.1------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

From 82e1115737a1580f6fd210697b84c3caf655e7a9 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 20:33:48 +0800
Subject: [PATCH 19/64] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE/=E6=A8=A1=E6=9D=BF=E5=BA=93=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E5=90=8C=E6=AD=A5=E5=AD=A6=E4=B9=A0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=B8=94=E4=B8=8D=E5=8F=AF=E6=9B=B4=E6=94=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue  | 19 +++++++++++++++----
 src/views/projectcenter/templateAdd.vue | 16 +++++++++++++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 9d5fbd5f..c0848e5b 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -192,10 +192,11 @@
           <div class="namebox">
             <div class="inname">同步学习记录</div>
           </div>
-          <div class="in">
-            <a-checkbox
+          <div class="in ggysxz">
+            <!-- :disabled="viewDetail ? true : false" -->
+            <a-checkbox 
                 v-model:checked="courseSyncFlag"
-                :disabled="viewDetail ? true : false"
+                disabled
             ><span
                 style="
                   width: 100%;
@@ -320,7 +321,7 @@ export default {
         keyWord: "",
       },
       classifyList5: [],
-      courseSyncFlag: false,
+      courseSyncFlag: true,
       auditDescription: "",
       ptojectType: "",
     });
@@ -533,6 +534,16 @@ export default {
 };
 </script>
 <style lang="scss">
+
+.ggysxz {
+  .ant-checkbox-disabled.ant-checkbox-checked .ant-checkbox-inner::after {
+    border-color: #FFF !important;
+  }
+  .ant-checkbox-disabled .ant-checkbox-inner {
+   background-color: #1890ff !important;
+  }
+}
+
 .flex-top {
   align-items: flex-start !important;
 }
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 9d717962..1c698ac7 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -166,10 +166,11 @@
           <div class="namebox">
             <div class="inname">同步学习记录</div>
           </div>
-          <div class="in">
+          <div class="in ggysxz"> 
+            <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox
+                disabled
                 v-model:checked="courseSyncFlag"
-                :disabled="viewDetail ? true : false"
             ><span
                 style="
                   width: 100%;
@@ -223,7 +224,7 @@ const router = useRouter();
 const store = useStore();
 const projectInfo = ref({});
 const projectPic = ref([]);
-const courseSyncFlag = ref(false)
+const courseSyncFlag = ref(true)
 onMounted(() => {
   getDetail();
   projectPic.value = store.state.projectPic.map((e) => ({
@@ -305,6 +306,15 @@ function managerChange(e, l, d, t,orgName) {
 }
 </script>
 <style lang="scss">
+.ggysxz {
+  .ant-checkbox-disabled.ant-checkbox-checked .ant-checkbox-inner::after {
+    border-color: #FFF !important;
+  }
+  .ant-checkbox-disabled .ant-checkbox-inner {
+   background-color: #1890ff !important;
+  }
+}
+
 .active {
   border: 2px solid rgba(78, 166, 255, 1);
 }

From 4ba190f734629c17e15b9235744898eca6f507fd Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 20:56:14 +0800
Subject: [PATCH 20/64] =?UTF-8?q?style:=E5=90=8C=E6=AD=A5=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E8=AE=B0=E5=BD=95=E6=9C=AA=E9=80=89=E6=8B=A9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue  | 31 ++++++++++++++++++-------
 src/views/projectcenter/templateAdd.vue | 17 +++++++++++++-
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index c0848e5b..c7f3d65a 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -192,20 +192,35 @@
           <div class="namebox">
             <div class="inname">同步学习记录</div>
           </div>
-          <div class="in ggysxz">
+          <div class="in ggysxz" v-if="courseSyncFlag">
             <!-- :disabled="viewDetail ? true : false" -->
-            <a-checkbox 
+            <a-checkbox
                 v-model:checked="courseSyncFlag"
-                disabled
-            ><span
+                disabled>
+              <span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
-            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-            ></a-checkbox
-            >
+                ">
+                同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
+              </span>
+            </a-checkbox>
+          </div>
+          <div class="in" v-else>
+            <!-- :disabled="viewDetail ? true : false" -->
+            <a-checkbox
+                v-model:checked="courseSyncFlag"
+                disabled>
+              <span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                ">
+                同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
+              </span>
+            </a-checkbox>
           </div>
         </div>
         <div class="name name2">
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 1c698ac7..67b90b61 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -166,7 +166,22 @@
           <div class="namebox">
             <div class="inname">同步学习记录</div>
           </div>
-          <div class="in ggysxz"> 
+          <div class="in ggysxz" v-if="courseSyncFlag"> 
+            <!-- :disabled="viewDetail ? true : false" -->
+            <a-checkbox
+                disabled
+                v-model:checked="courseSyncFlag"
+            ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            ></a-checkbox
+            >
+          </div>
+          <div class="in" v-else> 
             <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox
                 disabled

From a7aa0e2940f39503b0e76f1189e07520510e9cdc Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 16 Jan 2023 23:45:55 +0800
Subject: [PATCH 21/64] =?UTF-8?q?--fix=20=E9=9D=A2=E6=8E=88=E8=AF=BE=20?=
 =?UTF-8?q?=E4=B8=8E=E4=BB=BB=E5=8A=A1=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/project/ProjectFaceStu.vue        | 11 --------
 .../drawers/project/ProjectFaceTaskManage.vue | 26 +++++--------------
 .../drawers/router/RouterFaceTeachManage.vue  | 13 +++-------
 3 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index 5ac697ef..46067441 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -797,17 +797,6 @@ export default {
 
     //获取学员
     const getStudent = () => {
-      console.log("我是传递的查询参数", props.projectTaskInfo, {
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        // currentStageId: props.projectTaskInfo.stageId,
-        type: 3,
-        pid: props.projectTaskInfo.courseId,
-        // status: Number(state.name),
-        studentName: state.name,
-        signStatus: state.projectName2,
-        // taskId: props.projectTaskInfo.projectTaskId,
-      });
       api
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index e549f790..38feca10 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -147,12 +147,8 @@
         ? projectTaskInfo.projectTaskId
         : null
     "
-    :type="1"
-    :pid="
-      projectTaskInfo && projectTaskInfo.projectId
-        ? projectTaskInfo.projectId
-        : null
-    "
+    :type="3"
+    :pid="projectTaskInfo?.courseId"
     :taskType="
       projectTaskInfo && projectTaskInfo.type ? projectTaskInfo.type : null
     "
@@ -676,10 +672,7 @@ export default {
     // 导出数据
     function exportTaskStu() {
       console.log("props.projectTaskInfo", props.projectTaskInfo);
-      window.open(
-        `${
-          process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${props.projectTaskInfo.projectTaskId}&taskType=2`
-      );
+      window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=4&taskId=${props.projectTaskInfo.projectTaskId}`);
       // api
       //   .exportTaskStudent({
       //     pageNo: state.currentPage,
@@ -703,10 +696,9 @@ export default {
       // exportHomeWork();
       let obj = {
         currentStageId: props.projectTaskInfo.stageId,
-        pid: props.projectTaskInfo.projectId,
+        pid: props.projectTaskInfo.courseId,
         taskId: props.projectTaskInfo.projectTaskId,
-        taskType: props.projectTaskInfo.type,
-        type: 1,
+        type: 3,
       };
       api
         .exportHomeWork(obj)
@@ -727,13 +719,7 @@ export default {
     };
     //导出作业
     function exportHomeWork() {
-      console.log("props.projectTaskInfo", props.projectTaskInfo);
-      window.open(
-        `${
-          process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
-          props.projectTaskInfo.stageId
-        }&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=4`
-      );
+      window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${props.projectTaskInfo.stageId}&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=3`);
     }
 
     return {
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 62af9cae..43d1a8e8 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -132,15 +132,8 @@
   <ASOver
     v-model:ASOvervisible="ASOvervisible"
     v-model:ids="selectedRowKeys"
-    :taskId="
-      datasource && datasource.routerTaskId ? datasource.routerTaskId : null
-    "
-    :type="2"
-    :pid="datasource && datasource.routerId ? datasource.routerId : null"
-    :taskType="datasource && datasource.type ? datasource.type : null"
-    :currentStageId="
-      datasource && datasource.chapterId ? datasource.chapterId : null
-    "
+    :type="3"
+    :pid="datasource?.courseId"
     v-model:getStudent="getStudent"
   />
   <!-- 录入成绩抽屉 -->
@@ -610,7 +603,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=3&pid=${props.datasource.courseId}`
+        }&type=3&pid=${props.datasource.courseId}&thirdType=5&taskId=${props.datasource.routerTaskId}`
       );
       // api
       //   .exportTaskStudent({

From c542beacfd54fcae912a8d4517e0551f8f0dfe5c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 17 Jan 2023 01:04:46 +0800
Subject: [PATCH 22/64] --fix bug

---
 src/components/student/TableStudent.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 2e234d49..3fbeda80 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -507,7 +507,7 @@ function exportTaskStu() {
   window.open(
     `${
       process.env.VUE_APP_BASE_API
-    }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0`
+    }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}`
   );
 }
  
@@ -516,7 +516,7 @@ function exportTaskStuRouter() {
   window.open(
     `${
       process.env.VUE_APP_BASE_API
-    }/admin/student/exportTaskStudent?type=${2}&pid=${props.id}&taskType=0`
+    }/admin/student/exportTaskStudent?type=${2}&pid=${props.id}`
   );
 }
 

From 1dda330c0794e52b9e8502e0c07895f2c05eba03 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 08:58:54 +0800
Subject: [PATCH 23/64] =?UTF-8?q?fix:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=B9=E6=8D=AE=E5=88=9B=E5=BB=BA=E8=80=85=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA=E5=BD=92=E5=B1=9E=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LearningPath.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index aa755f2d..aac43099 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -858,12 +858,14 @@ export default {
       state.pathName = "";
       state.pathBg = "";
       state.pathBgId = "";
-      if(store.state.userInfo.departId && store.state.userInfo.departName){
-        state.organizationSelectName = store.state.userInfo.departName;
-        state.organizationSelectId = store.state.userInfo.departId;
-      }
       state.pathIntro = "";
       state.out = !state.out;
+      setTimeout(() => {
+        if(store.state.userInfo.departId && store.state.userInfo.departName){
+          state.organizationSelectName = store.state.userInfo.departName;
+          state.organizationSelectId = store.state.userInfo.departId;
+        }
+      }, 2000);
     };
     const handleOut1 = () => {
       state.pathName = "";

From 23610a14016643ffedf206602d0f3d3183487e4e Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 09:17:43 +0800
Subject: [PATCH 24/64] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/App.vue b/src/App.vue
index d054fbda..9d385244 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.1.1------------");
+		console.log("版本2.1.2------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

From 1eb8989b8b0be3453671b2dbc695541dec233554 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 10:56:36 +0800
Subject: [PATCH 25/64] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E9=98=B6=E6=AE=B5=E4=BB=BB=E5=8A=A1=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SeeStu.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index 0a546d83..748f4191 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -302,6 +302,7 @@ export default {
               ? "投票"
               : "-",
           name: value.name,
+          projectTaskId: value.projectTaskId,
           complete:
             value.status == -1
               ? "未开始"
@@ -316,6 +317,8 @@ export default {
         };
         array.push(obj);
       });
+      array.sort((a,b)=>{return a.projectTaskId - b.projectTaskId})
+      console.log('我排序了吗--------------------------》', array)
       return array;
     };
     const setStageList = (tableData) => {

From 6e9d5c3e5926aefef4e171db9d506f77fceb860e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 17 Jan 2023 12:58:10 +0800
Subject: [PATCH 26/64] --fix bug

---
 src/components/drawers/project/ProjectFaceTaskManage.vue | 4 ++--
 src/components/drawers/router/RouterFaceTeachManage.vue  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 38feca10..f57a2136 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -162,9 +162,9 @@
   <!-- 录入成绩抽屉 -->
   <EScore
     v-model:eScorevisible="Evisible"
-    :type="1"
+    :type="3"
     :id="projectTaskInfo?.projectTaskId"
-    :pid="projectTaskInfo?.projectId"
+    :pid="projectTaskInfo?.courseId"
     v-model:searchTaskList="searchTaskList"
   />
   <!-- 查看作业抽屉 -->
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 43d1a8e8..7c0ae81a 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -139,9 +139,9 @@
   <!-- 录入成绩抽屉 -->
   <EScore
     v-model:eScorevisible="Evisible"
-    :type="2"
+    :type="3"
     :id="datasource?.routerTaskId"
-    :pid="datasource?.routerId"
+    :pid="datasource?.courseId"
     v-model:searchTaskList="searchTaskList"
   />
   <!-- 查看作业抽屉 -->

From d258104af169d14da48c55117bc2e5fbbed7d2c9 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 17 Jan 2023 13:12:57 +0800
Subject: [PATCH 27/64] --fix bug

---
 src/components/drawers/project/ProjectHomeWorkManage.vue | 2 +-
 src/components/drawers/router/RouterHomeworkManage.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue
index 829ee738..baf63238 100644
--- a/src/components/drawers/project/ProjectHomeWorkManage.vue
+++ b/src/components/drawers/project/ProjectHomeWorkManage.vue
@@ -569,7 +569,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
           props.projectTaskInfo.stageId
-        }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=${4}`
+        }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=${4}&taskId=${props.projectTaskInfo.projectTaskId}`
       );
       // api
       //   .exportTaskStudent({
diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue
index fff442af..97a2b0bf 100644
--- a/src/components/drawers/router/RouterHomeworkManage.vue
+++ b/src/components/drawers/router/RouterHomeworkManage.vue
@@ -560,7 +560,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}`
+        }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}&taskId=${props.datasource.routerTaskId}`
       );
       // api
       //   .exportTaskStudent({

From e877e2e6c413d7e9b7f0aceb80a89724aa8e615a Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 17 Jan 2023 15:13:32 +0800
Subject: [PATCH 28/64] --fix bug

---
 src/views/courselibrary/CoursewareManage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 428af0af..7fa46255 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2780,8 +2780,8 @@ const columns6 = [
   // 新加学员数
   {
     title: "学员数",
-    dataIndex: "createName",
-    key: "createName",
+    dataIndex: "studentCnt",
+    key: "studentCnt",
     width: 100,
     align: "center",
     ellipsis: true,

From d472e37dafffa8aa79f5be64426e704a16d5e3f6 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 17 Jan 2023 15:20:41 +0800
Subject: [PATCH 29/64] --fix bug

---
 src/api/ThirdApi.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js
index 4158b413..e0b7558f 100644
--- a/src/api/ThirdApi.js
+++ b/src/api/ThirdApi.js
@@ -1,4 +1,5 @@
-export const USER_LIST = '/userbasic/user/list post'
+// export const USER_LIST = '/userbasic/user/list post'
+export const USER_LIST = '/userbasic/user/searchList post'
 export const ORG_LIST = '/userbasic/org/list post'
 export const ORG_CHILD_LIST = '/userbasic/org/info post'
 export const AUDIENCE_LIST = '/userbasic/audience/list post'
\ No newline at end of file

From 0d9f91ca79bdc9b5a6207991a1f648263c357a73 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 15:31:14 +0800
Subject: [PATCH 30/64] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E5=AF=B9=E5=AD=A6=E5=91=98=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=BE=97=E6=93=8D=E4=BD=9C-=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E3=80=81=E6=8B=92=E7=BB=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/TableStudent.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 3fbeda80..41510e4e 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -196,7 +196,7 @@
         :scroll="{ x: 1500 }"
         row-key="id"
         :row-selection="stuRowSelection"
-      >
+      > 
         <template #action="{ record }">
           <!--					<div style="display:flex;justify-content: center;align-items: center;">-->
           <!-- <div v-if="props.type == 1" @click="excellentStudent(record)"
@@ -232,8 +232,8 @@
                 换组
               </div>
             </a-col>
--->
-            <a-col v-if="type === 3">
+-->         
+            <a-col v-if="type === 3 && record.status!==0">
               <div
                 style=" color: #4ea6ff; font-size: 14px;text-align: center; margin-left: 10px; cursor: pointer; "
                 @click="updateStatus(0, record.id)"
@@ -241,7 +241,7 @@
                 通过
               </div>
             </a-col>
-            <a-col v-if="type === 3">
+            <a-col v-if="type === 3 && record.status!==0">
               <div
                 style=" color: #4ea6ff;font-size: 14px;text-align: center; margin-left: 10px;cursor: pointer; "
                 @click="updateStatus(2, record.id)"

From 20500ff393676cc917847dee9f6132ac6e45d77d Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 15:40:25 +0800
Subject: [PATCH 31/64] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/components/seeModal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 20da3a76..a1e3e6a8 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -96,7 +96,7 @@
               </div>
             </div>
             <div class="mb_right">
-              <div class="mbl_items">
+              <!-- <div class="mbl_items">
                 <div class="item_nam">
                   <div class="asterisk_icon">
                     <img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk"/>
@@ -108,7 +108,7 @@
                     {{ filterTxt(detail.teacher) }}
                   </div>
                 </div>
-              </div>
+              </div> -->
               <div class="mbl_items2" v-if="detail.intro">
                 <div class="item_nam">
                   <div class="asterisk_icon">

From baba2414761643a68f19518fdcebc1a11e377b68 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 16:55:09 +0800
Subject: [PATCH 32/64] =?UTF-8?q?fix:=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SelFacet.vue           | 85 ++++++++++++-------
 .../drawers/project/ProjectOnlineManage.vue   |  5 +-
 .../drawers/router/RouterCommonManage.vue     |  2 +-
 3 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index 7638f33c..7367a80c 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -120,6 +120,8 @@ import { reactive, toRefs, computed } from "vue";
 // import { planList } from "../../api/indexTaskadd";
 //import {detail} from "../../api/indexCourse";
 import { list } from "../../api/indexTaskadd";
+import {useStore} from "vuex";
+
 
 
 const columns1 = [
@@ -194,6 +196,7 @@ export default {
 		},
 	},
 	setup(props, ctx) {
+		const store = useStore();
 		const state = reactive({
 			classTableData: [
 				// {
@@ -417,6 +420,17 @@ export default {
 				});
 		};
 
+		const sysTypeOptions = computed(() => store.state.sysType);
+
+		function findClassFullName(list,classify, name = '') {
+			console.log(list,classify)
+			return list && list.length && list
+				.map(e => classify == e.dictCode ? name ? name + '-' + e.dictName : e.dictName : findClassFullName(e.children, classify,name ? name + '-' + e.dictName : e.dictName))
+				.filter(name => name)
+				.join('') || ''
+		}
+
+
 		const getClassData = (tabledata) => {
 			let data = tabledata;
 			let array = [];
@@ -429,8 +443,8 @@ export default {
 					teacher: value.teacher || "-",
 					creator: value.createName || "-",
 					time: value.publishTime,
-					categoryId: value.categoryId,
-					category: changeTreeSelectValue(String(value.categoryId)),
+					categoryId: value.sysTypeId,
+					category: value.sysTypeId,
 					//需要判断content
 				};
 				console.log("obj", obj);
@@ -455,43 +469,48 @@ export default {
 				// 		break;
 				// 	}
 				// }
-				if (!obj.category) {
-					obj.category = "-";
-				}
-				console.log("obj. obj.category22 ", obj.category);
+				// if (!obj.category) {
+				// 	obj.category = "-";
+				// }
+				// console.log("obj. obj.category22 ", obj.category);
 				array.push(obj);
 			});
+			
+			array.forEach((itm) => {
+				itm.category = findClassFullName(sysTypeOptions.value,itm.categoryId) || '-'
+			});
+			console.log(array)
 			state.classTableData = array;
 		};
 
 		// 格式化树型结构选择数据
-		const changeTreeSelectValue = (values) => {
-			let data = state.options2222;
-			console.log(values, data)
-			let str = ''
-			for (let i = 0; i < data.length; i++) {
-				if (data[i].value == values) {
-					str = data[i].title
-				} else {
-					for (let j = 0; j < data[i].children.length; j++) {
-						if (data[i].children[j].value == values) {
-							str = data[i].title + '/' + data[i].children[j].title
-						} else {
-							if (data[i].children[j].children) {
-								for (let k = 0; k < data[i].children[j].children.length; k++) {
-									if (data[i].children[j].children[k].value == values) {
-										str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			console.log('str-str-str-str', str)
-			state.fen_lei1 = str;
-			return str;
-		}
+		// const changeTreeSelectValue = (values) => {
+		// 	let data = state.options2222;
+		// 	console.log(values, data)
+		// 	let str = ''
+		// 	for (let i = 0; i < data.length; i++) {
+		// 		if (data[i].value == values) {
+		// 			str = data[i].title
+		// 		} else {
+		// 			for (let j = 0; j < data[i].children.length; j++) {
+		// 				if (data[i].children[j].value == values) {
+		// 					str = data[i].title + '/' + data[i].children[j].title
+		// 				} else {
+		// 					if (data[i].children[j].children) {
+		// 						for (let k = 0; k < data[i].children[j].children.length; k++) {
+		// 							if (data[i].children[j].children[k].value == values) {
+		// 								str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
+		// 							}
+		// 						}
+		// 					}
+		// 				}
+		// 			}
+		// 		}
+		// 	}
+		// 	console.log('str-str-str-str', str)
+		// 	state.fen_lei1 = str;
+		// 	return str;
+		// }
 
 
 
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 63cd9666..59caaee0 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -388,13 +388,12 @@ export default {
           "thirdId": props.datasource.targetId,
           "type": 1
         });
-
+        {/* "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, */}
         api.QueryOnlineManagementDetail({
-          "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId,
           "status": state.projectName,
           "studentName": state.name,
           "targetId":props.datasource.projectId,
-          "taskId": props.datasource.projectTaskId,
+          "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
           "type": 1
         }).then(res=>{
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 84f11ede..40cba7dc 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -397,7 +397,7 @@ export default {
           "status": state.projectName,
           "studentName": state.name,
           "targetId":props.datasource.routerId,
-          "taskId": props.datasource.routerTaskId,
+          "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
           "type": 1
         }).then(res=>{

From 98d4a51e68f743ddf5ef19c273a58d8a31001b2d Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 16:57:08 +0800
Subject: [PATCH 33/64] =?UTF-8?q?style:=E5=8E=BB=E6=8E=89=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=88=E8=AF=BE=E6=8E=88=E8=AF=BE=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SelFacet.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index 7367a80c..cee1d9f1 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -149,14 +149,14 @@ const columns1 = [
 		align: "center",
 		ellipsis: true,
 	},
-	{
-		title: "授课教师",
-		width: "15%",
-		dataIndex: "teacher",
-		key: "teacher",
-		align: "center",
-		ellipsis: true,
-	},
+	// {
+	// 	title: "授课教师",
+	// 	width: "15%",
+	// 	dataIndex: "teacher",
+	// 	key: "teacher",
+	// 	align: "center",
+	// 	ellipsis: true,
+	// },
 	{
 		title: "创建人",
 		width: "15%",

From 4d00610689eaf8f8c454f8ac50acd2804d2c4e93 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 17:23:20 +0800
Subject: [PATCH 34/64] =?UTF-8?q?style:=E5=85=AC=E5=91=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/NoticeHis.vue |  8 ++++----
 src/components/drawers/NoticePub.vue | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 7e02a166..329ff3f9 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -9,15 +9,15 @@
   <div class="noticeContent">
     <div v-for="item in notice" :key="item.id" class="item">
       <!-- <div class="itemcontent">{{ item.content }}</div> -->
-      <!-- <a-textarea
+      <a-textarea
           class="itemcontent"
           disabled="true"
           v-model:value="item.content"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 120px;background-color: #fff;"
-        /> -->
-      <pre style="text-align: left;padding-left: 20px">{{item.content}}</pre>
+          style="margin-top: -10px; height: 220px;background-color: #fff;border:1px solid #fff;"
+        />
+      <!-- <pre style="text-align: left;padding-left: 20px">{{item.content}}</pre> -->
       <div class="itemtime">{{ item.pubtime }}</div>
     </div>
   </div>
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 59d3deef..be42d539 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -17,14 +17,14 @@
         <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div> -->
-        <!-- <a-textarea
+        <a-textarea
           disabled="true"
           v-model:value="noticeContent1"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 160px; resize: none;background-color: #fff;color:#666;"
-        /> -->
-        <pre>{{noticeContent1}}</pre>
+          style="margin-top: -10px; height: 220px;border:1px solid #fff; resize: none;background-color: #fff;color:#666;"
+        />
+        <!-- <pre>{{noticeContent1}}</pre> -->
         <div class="btn-content">
           <a-button type="primary" @click="handleEdit">编辑</a-button>
         </div>
@@ -34,13 +34,20 @@
         <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div> -->
-        <pre>{{noticeContent1}}</pre>
+        <!-- <pre>{{noticeContent1}}</pre> -->
+        <a-textarea
+          disabled="true"
+          v-model:value="noticeContent1"
+          :maxlength="150"
+          placeholder="公告信息最多输入150个字"
+          style="margin-top: -10px; height: 220px;border:1px solid #fff; resize: none;background-color: #fff;color:#666;"
+        />
         <p>编辑新公告：</p>
         <a-textarea
           v-model:value="noticeContent"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 160px; width:340px;"
+          style="margin-top: -10px; height: 160px;"
         />
         <div class="btn-content">
           <a-button class="cancel" @click="handleCancel">取消</a-button>

From e03131a3c050891a2f352ad0c5321235016ebefa Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 17:35:57 +0800
Subject: [PATCH 35/64] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=E5=9C=B0=E7=82=B9=E8=AE=BE=E7=BD=AE=E4=B8=BA=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 7fa46255..4960463a 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1430,10 +1430,10 @@
           <div class="cstm_items">
             <div class="signbox">
               <div class="sign">
-                <img
+                <!-- <img
                   src="@/assets/images/coursewareManage/asterisk.png"
                   alt=""
-                />
+                /> -->
               </div>
               <span style="margin-right: 3px">地点</span>
             </div>
@@ -4521,7 +4521,7 @@ export default defineComponent({
       console.log(postData);
       const checkList = [
         postData.name,
-        postData.address,
+        // postData.address,
         postData.beginTime,
         postData.endTime,
         postData.teacherId,

From 9235e07a5d6e393eb336d22b7f4c9b399dbc7782 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 17:36:36 +0800
Subject: [PATCH 36/64] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/App.vue b/src/App.vue
index 9d385244..b22bbd4d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.1.2------------");
+		console.log("版本2.1.3------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

From 106209e649f726d020b641ee920cc24375b68017 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 17 Jan 2023 18:46:29 +0800
Subject: [PATCH 37/64] --fix bug

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index 4f5c0444..935cc35a 100644
--- a/.env
+++ b/.env
@@ -20,7 +20,7 @@ VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVU
 
 # 课程二维码
 VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id=
-# 导入学员模板
+# 导入学员模板 -发版前记得修改
 VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩模板-1673511599785.xlsx
 # 导入作业成绩学员模板
 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673511636808.xlsx

From 6023858f038eaf9bdfd4d726ceebcfb2df38eb90 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 20:23:33 +0800
Subject: [PATCH 38/64] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=E7=AD=BE=E5=88=B0=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0taskType=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 4960463a..82a01549 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -5515,7 +5515,7 @@ export default defineComponent({
             : process.env.VUE_APP_BASE_API +
               `/admin/student/studentSign?taskId=${
                 record.offcoursePlanId
-              }&type=${3}`,
+              }&taskType=${2}&type=${3}`,
       };
       console.log("codeInfo", state.codeInfo);
       state.codeIndex = 0;

From b4b462208f6e7415ed6709498c24124cd12c7d98 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 17 Jan 2023 22:06:28 +0800
Subject: [PATCH 39/64] =?UTF-8?q?bug=E9=9D=A2=E6=8E=88=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8E=BB=E6=8E=89=E5=85=B3=E5=8D=A1=E4=B8=80?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/router/RouterFaceTeachManage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 7c0ae81a..267bf633 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -317,7 +317,7 @@ export default {
             );
           },
         },
-        {
+       /** {
           title: "学员关卡",
           dataIndex: "chapterName",
           key: "chapterName",
@@ -334,7 +334,7 @@ export default {
               </div>
             );
           },
-        },
+        },*/ 
         {
           title: "作业成绩",
           dataIndex: "workScore",

From a54c6fa421384c29de9664dbb888af5a096f999b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 17 Jan 2023 22:09:53 +0800
Subject: [PATCH 40/64] --fix bug

---
 .env.prod    | 4 +++-
 .env.release | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.env.prod b/.env.prod
index 8291a432..77beb64f 100644
--- a/.env.prod
+++ b/.env.prod
@@ -13,4 +13,6 @@ VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc/loading
 
 VUE_APP_COURSE_STUDY=https://u.boe.com/pc/course/studyindex?id=
 
-VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
\ No newline at end of file
+VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
+
+VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入学员模版-1673963663229.xlsx
diff --git a/.env.release b/.env.release
index 39b98c87..2479cd46 100644
--- a/.env.release
+++ b/.env.release
@@ -13,4 +13,6 @@ VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading
 
 VUE_APP_COURSE_STUDY=https://u.boe.com/pc-release/course/studyindex?id=
 
-VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
\ No newline at end of file
+VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
+
+VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入学员模版-1673963663229.xlsx
\ No newline at end of file

From 2bdee845e07f8ea070b218490634cb3675d880ba Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 22:23:35 +0800
Subject: [PATCH 41/64] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectExamManage.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index b65fed0c..ecdf0412 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -414,7 +414,10 @@ export default {
 
     {/* 导出数据 */}
     function  exportData() {
-      window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
+      console.log(props.datasource)
+      console.log(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
+      window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
+      
       {/* api.ExportExam({
         "chapterId": props.datasource.chapterId,
         "targetId": props.datasource.routerId,

From 90437c8175b59db712dfcfe8825f02c7165a3637 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 18 Jan 2023 01:14:27 +0800
Subject: [PATCH 42/64] --fix bug

---
 src/views/courselibrary/CoursewareManage.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 82a01549..24b7af3d 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2600,12 +2600,11 @@ const columns2 = [
     key: "courseSource",
     width: "12%",
     align: "center",
-    customRender: (text) => {
+    customRender: ({record:{courseName,routerName}}) => {
       return (
         <div class="racona">
           <span>
-            {" "}
-            {text.record.courseSource ? text.record.courseSource : "-"}
+            {courseName || routerName || "开课"}
           </span>
         </div>
       );

From 81fae7234b7b934e8fa93979c94ceb062ffc42f0 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 18 Jan 2023 01:35:09 +0800
Subject: [PATCH 43/64] --fix bug

---
 src/views/courselibrary/CoursewareManage.vue | 83 +++++---------------
 1 file changed, 18 insertions(+), 65 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 24b7af3d..345f035e 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -982,9 +982,9 @@
         <div class="onlinemanage" :style="{ display: om_1 ? 'block' : 'none' }">
           <div class="om_main">
             <div class="om_body">
-              <div class="b_title">课程：{{ newCourseName }}</div>
               <div class="b_sub">
-                <div class="bs_type">类型：</div>
+                <div class="b_title">课程：{{ newCourseName }}</div>
+                <div class="bs_type" style="margin-left: 20px">类型：</div>
                 <div class="bs_right">{{ faceType }}</div>
                 <div class="bs_left">内容分类：</div>
                 <div class="bs_right">{{ faceClassification }}</div>
@@ -2536,110 +2536,63 @@ const columns2 = [
     title: "姓名",
     dataIndex: "studentName",
     key: "studentName",
-    width: "12%",
+    width: "6%",
     align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span>
-            {" "}
-            {text.record.studentName ? text.record.studentName : "-"}
-          </span>
-        </div>
-      );
-    },
+    customRender: ({record: {studentName}}) => (studentName || "-")
   },
   {
     title: "工号",
     dataIndex: "studentUserNo",
     key: "studentUserNo",
     width: "12%",
+    ellipsis: true,
     align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span>
-            {" "}
-            {text.record.studentUserNo ? text.record.studentUserNo : "-"}
-          </span>
-        </div>
-      );
-    },
+    customRender: ({record: {studentUserNo}}) => (studentUserNo || "-")
   },
   {
     title: "开课名称",
     dataIndex: "name",
     key: "name",
     width: "12%",
+    ellipsis: true,
     align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span> {text.record.name ? text.record.name : "-"}</span>
-        </div>
-      );
-    },
+    customRender: ({record: {name}}) => (name || "-")
   },
   {
     title: "地点",
     dataIndex: "address",
     key: "address",
     width: "12%",
+    ellipsis: true,
     align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span> {text.record.address ? text.record.address : "-"}</span>
-        </div>
-      );
-    },
+    customRender: ({record: {address}}) => (address || "-")
   },
   {
     title: "数据来源",
     dataIndex: "courseSource",
     key: "courseSource",
+    ellipsis: true,
     width: "12%",
     align: "center",
-    customRender: ({record:{courseName,routerName}}) => {
-      return (
-        <div class="racona">
-          <span>
-            {courseName || routerName || "开课"}
-          </span>
-        </div>
-      );
-    },
+    customRender: ({record:{courseName,routerName}}) => (courseName || routerName || "开课"),
   },
   {
     title: "学习时间",
     dataIndex: "lastStudyTime",
     key: "lastStudyTime",
-    width: "12%",
+    width: "10%",
     align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span>
-            {" "}
-            {text.record.lastStudyTime ? text.record.lastStudyTime : "-"}
-          </span>
-        </div>
-      );
-    },
+    ellipsis: true,
+    customRender: ({record:{lastStudyTime}}) => (lastStudyTime || "-")
   },
   {
     title: "签到时间",
     dataIndex: "signTime",
     key: "signTime",
-    width: "12%",
+    width: "10%",
     align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span> {text.record.signTime ? text.record.signTime : "-"}</span>
-        </div>
-      );
-    },
+    ellipsis: true,
+    customRender: ({record:{signTime}}) => (signTime || "-")
   },
   {
     title: "状态",

From f18dbcf24e39c0be335164258792989ade719f9f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 18 Jan 2023 04:20:40 +0800
Subject: [PATCH 44/64] --fix bug

---
 src/components/drawers/CheckStu.vue | 25 +++++++++++++++++++++++--
 src/components/drawers/SeeStu.vue   |  9 +++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue
index 72ef168f..56d52bae 100644
--- a/src/components/drawers/CheckStu.vue
+++ b/src/components/drawers/CheckStu.vue
@@ -28,8 +28,8 @@
           <div class="sortbox">
             <div class="sortname">进度排名</div>
             <div class="sortnub">
-              <span class="nub1">{{pro.currentChapterCnt}}</span>
-              <span class="total">/{{pro.totalChapterCnt}}</span>
+              <span class="nub1">{{rank.current}}</span>
+              <span class="total">/{{rank.total}}</span>
             </div>
           </div>
           <a-divider
@@ -209,6 +209,7 @@
 import { reactive, toRefs } from "vue";
 import CheckStuMess from "./CheckStuMess.vue";
 import {stuProgress} from "@/api/index1";
+import {studentRank} from "@/api/indexProjStu";
 // import {message} from "ant-design-vue";
 export default {
   name: "CheckStu",
@@ -234,17 +235,29 @@ export default {
       pro:null,
       loading:true,
       stageListActive: 0,
+      rank:{total:1,current:1},
     });
     const closeDrawer = () => {
       ctx.emit("update:CheckStuvisible", false);
     };
 
+    const getStuRank = () => {
+      studentRank({
+        projectId: props.routerId,
+        studentId: props.studentId,
+        type:2
+      }).then(res=>{
+        state.rank = res.data.data
+      })
+    }
+
     const showProMess = () => {
       state.StuMessvisible = true;
     };
     const afterVisibleChange = (bool) => {
       if(props.CheckStuvisible) {
         getStuProgress()
+        getStuRank()
       }
       console.log("state", bool);
     };
@@ -546,11 +559,17 @@ export default {
               font-size: 14px;
               font-weight: 500;
               margin-left: 25px;
+              word-break:keep-all;
+              white-space:nowrap;
             }
             .text2 {
               color: rgba(51, 51, 51, 0.8);
               font-size: 14px;
               margin-left: 65px;
+              word-break:keep-all;
+              white-space:nowrap;
+              overflow:hidden;
+              text-overflow:ellipsis;
             }
           }
           .alreadyclass {
@@ -564,6 +583,8 @@ export default {
               color: rgba(56, 125, 247, 1);
               font-size: 14px;
               margin-left: 16px;
+              word-break:keep-all;
+              white-space:nowrap;
             }
           }
         }
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index 748f4191..3c073df3 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -249,6 +249,7 @@ export default {
       studentRank({
         projectId: props.projectId,
         studentId: props.checkStuId,
+        type:1
       }).then(res=>{
         state.rank = res.data.data
       })
@@ -549,11 +550,17 @@ export default {
               font-size: 14px;
               font-weight: 500;
               margin-left: 25px;
+              word-break:keep-all;
+              white-space:nowrap;
             }
             .text2 {
               color: rgba(51, 51, 51, 0.8);
               font-size: 14px;
               margin-left: 65px;
+              word-break:keep-all;
+              white-space:nowrap;
+              overflow:hidden;
+              text-overflow:ellipsis;
             }
           }
           .alreadyclass {
@@ -567,6 +574,8 @@ export default {
               color: rgba(56, 125, 247, 1);
               font-size: 14px;
               margin-left: 16px;
+              word-break:keep-all;
+              white-space:nowrap;
             }
           }
         }

From fe47aef1080f6ed842e83d5281fb77c6892168d4 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 18 Jan 2023 04:41:21 +0800
Subject: [PATCH 45/64] --fix bug

---
 src/views/learningpath/LevelAdd.vue  | 2 +-
 src/views/projectcenter/TaskPage.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index c51f3d5b..05decb25 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1643,7 +1643,7 @@ export default {
           className: "h",
           customRender: ({ record }) => (
             <div>
-              {record.finishTaskNum}/{record.totalTaskNum}
+              {record.finishTaskNum || 0}/{record.totalTaskNum || 0}
             </div>
           ),
         },
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index e0607b9e..17628322 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1839,7 +1839,7 @@ export default {
           ellipsis: true,
           customRender: ({ record }) => (
             <div>
-              {record.finishTaskNum}/{record.totalTaskNum}
+              {record.finishTaskNum|| 0}/{record.totalTaskNum || 0}
             </div>
           ),
         },

From e0f4c84ff0b8a2fe902e0ce346c8b560870b18ab Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 18 Jan 2023 08:52:55 +0800
Subject: [PATCH 46/64] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/App.vue b/src/App.vue
index b22bbd4d..06c7c937 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.1.3------------");
+		console.log("版本2.1.4------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

From 4365cdb0ed25018ecb684c0eee38f549f5f0a6dc Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 18 Jan 2023 16:56:35 +0800
Subject: [PATCH 47/64] =?UTF-8?q?fix:=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E3=80=81=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98=E6=A8=A1=E6=9D=BF=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                                   | 7 +++----
 .env.boe                                               | 5 +----
 .env.prod                                              | 4 +---
 .env.release                                           | 4 +---
 src/App.vue                                            | 2 +-
 src/components/drawers/project/ProjectOnlineManage.vue | 4 ++++
 src/components/drawers/router/RouterCommonManage.vue   | 4 ++++
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.env b/.env
index 935cc35a..5e04d19d 100644
--- a/.env
+++ b/.env
@@ -20,7 +20,6 @@ VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVU
 
 # 课程二维码
 VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id=
-# 导入学员模板 -发版前记得修改
-VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩模板-1673511599785.xlsx
-# 导入作业成绩学员模板
-VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673511636808.xlsx
+
+# 导入学员模板
+VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
diff --git a/.env.boe b/.env.boe
index 4b824494..fdaf95b3 100644
--- a/.env.boe
+++ b/.env.boe
@@ -6,8 +6,5 @@ VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
 
 VUE_APP_BOE_API_URL=https://u-pre.boe.com
 
-
 # 导入学员模板
-VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩模板-1673516508029.xlsx
-# 导入作业成绩学员模板
-VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673516483342.xlsx
\ No newline at end of file
+VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
index 77beb64f..3fc171f3 100644
--- a/.env.prod
+++ b/.env.prod
@@ -13,6 +13,4 @@ VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc/loading
 
 VUE_APP_COURSE_STUDY=https://u.boe.com/pc/course/studyindex?id=
 
-VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
-
-VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入学员模版-1673963663229.xlsx
+VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
diff --git a/.env.release b/.env.release
index 2479cd46..4870808f 100644
--- a/.env.release
+++ b/.env.release
@@ -13,6 +13,4 @@ VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading
 
 VUE_APP_COURSE_STUDY=https://u.boe.com/pc-release/course/studyindex?id=
 
-VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
-
-VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入学员模版-1673963663229.xlsx
\ No newline at end of file
+VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 06c7c937..7ca7582f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.1.4------------");
+		console.log("版本2.1.5------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 59caaee0..fda43def 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -380,6 +380,8 @@ export default {
           });
       } else if(props.datasource.type == 1) {
         console.log("我是传递的查询参数", {
+          "pageNo": state.currentPage,
+          "pageSize": state.pageSize,
           "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId,
           "status": state.projectName,
           "studentName": state.name,
@@ -390,6 +392,8 @@ export default {
         });
         {/* "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, */}
         api.QueryOnlineManagementDetail({
+          "pageNo": state.currentPage,
+          "pageSize": state.pageSize,
           "status": state.projectName,
           "studentName": state.name,
           "targetId":props.datasource.projectId,
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 40cba7dc..b9580ff7 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -384,6 +384,8 @@ export default {
           });
       } else if(props.datasource.type == 1) {
         console.log("我是传递的查询参数", {
+          "pageNo": state.currentPage,
+          "pageSize": state.pageSize,
           "chapterId": props.datasource.chapterId,
           "status": state.projectName,
           "studentName": state.name,
@@ -393,6 +395,8 @@ export default {
         });
 
         api.QueryOnlineManagementDetail({
+          "pageNo": state.currentPage,
+          "pageSize": state.pageSize,
           "chapterId": props.datasource.chapterId,
           "status": state.projectName,
           "studentName": state.name,

From 8b259f57a3dc88a1b90d5124ae06615e5feb9e48 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 18 Jan 2023 22:03:13 +0800
Subject: [PATCH 48/64] =?UTF-8?q?fix:=E5=AF=BC=E5=85=A5=E6=88=90=E7=BB=A9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B6=85=E6=97=B6=E6=8F=90=E7=A4=BA=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=EF=BC=8C=E5=85=B3=E9=97=AD=E8=BD=AC=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ExportScore.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index 521b2812..3c3f18c4 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -286,6 +286,10 @@ export default {
                   console.log("props.getStudent", props.getStudent);
                   clearInterval(timer);
                 }
+              }else{
+                state.addLoading = false;
+                message.destroy();
+                message.error(`文件导入超时`);
               }
             })
             .catch((err) => {

From 3b08dfe999d6c93ec54f2e2535beda8047cd2625 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 18 Jan 2023 22:24:13 +0800
Subject: [PATCH 49/64] =?UTF-8?q?fix:=E7=BC=96=E8=BE=91=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E6=97=B6=EF=BC=8C=E9=85=8D=E7=BD=AE=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E9=83=BD=E4=B8=BA=E6=96=B0=E5=BB=BA=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E5=9C=A8=E5=8E=9F=E6=9D=A5=E8=80=83=E8=AF=95=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E4=B8=8A=E8=BF=9B=E8=A1=8C=E7=BC=96=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 93f843de..b1bff03b 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -309,8 +309,8 @@ import {message} from "ant-design-vue";
 import {
   createExamination,
   queryExaminationDetailById,
-  updateExamination,
 } from "@/api/indexExam";
+// updateExamination,
 import STest from "./SelectTest.vue";
 import {ProjectEditTask, RouterEditTask} from "@/api/indexTask";
 import {addTempTask} from "../../api/indexTaskadd";
@@ -456,7 +456,7 @@ export default {
       console.log("props", props);
       if (props.addtestVisible && props.EditTestId && props.EditTestId >0) {
         // 该页面显示同时 edit为true 时，发送查询请求,
-        queryTest();
+        // queryTest();
       }
       if (bool) {
         state.test.showAnswers = 1;
@@ -553,18 +553,18 @@ export default {
       }
 
 
-      if (props.EditTestId > 0) {
-        // 编辑任务
-        updateExamination(state.test)
-            .then(async (res) => {
-              await updateTask(res);
-              // closeDrawer();
-            })
-            .catch(() => {
-              message.destroy();
-              message.error(`编辑失败`);
-            });
-      } else {
+      // if (props.EditTestId > 0) {
+      //   // 编辑任务
+      //   updateExamination(state.test)
+      //       .then(async (res) => {
+      //         await updateTask(res);
+      //         // closeDrawer();
+      //       })
+      //       .catch(() => {
+      //         message.destroy();
+      //         message.error(`编辑失败`);
+      //       });
+      // } else {
         // 创建任务
         createExamination(state.test)
             .then(async (res) => {
@@ -575,7 +575,7 @@ export default {
               message.destroy();
               message.error(`创建失败`);
             });
-      }
+      // }
     };
     const updateTask = (res) => {
       state.EditTestId = res.data.data.examinationId;

From 7f9df00064637efe18f99ed85b37a2067d320961 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 18 Jan 2023 22:44:51 +0800
Subject: [PATCH 50/64] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=AD=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=8F=82=E6=95=B0=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectOnlineManage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index fda43def..a747c609 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -388,7 +388,7 @@ export default {
           "targetId":props.datasource.projectId,
           "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
-          "type": 1
+          "type": 2
         });
         {/* "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, */}
         api.QueryOnlineManagementDetail({
@@ -399,7 +399,7 @@ export default {
           "targetId":props.datasource.projectId,
           "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
-          "type": 1
+          "type": 2
         }).then(res=>{
           console.log('在线课数据获取', res)
           if(res.data.code==200){

From 71fbba2cb204edc07b95eed9d96dd6e10d2fd905 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 18 Jan 2023 22:56:05 +0800
Subject: [PATCH 51/64] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE/=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=9B=BE/=E9=9D=A2=E6=8E=88=E5=AD=A6=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8A=A0=E5=85=A5=E6=96=B9=E5=BC=8F=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/TableStudent.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 41510e4e..2908b9b5 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -465,7 +465,8 @@ const tablecolumns = ref([
     width: "10%",
     align: "center",
     customRender: ({ record: { source } }) =>
-      ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
+      // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
+      ({ 1: "手动加入", 2: "手动加入", 3: "手动加入", 4: "报名" }[source]),
   },
   ...props.columns,
   {

From 98d32fd6eedda234d263b63e2abf1b271eaa95ca Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 19 Jan 2023 01:52:56 +0800
Subject: [PATCH 52/64] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BE=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue |  3 +++
 src/components/drawers/AddTest.vue      | 29 ++++++++++++++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index ce245d56..937893cd 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -335,6 +335,7 @@
                 v-model:addtestVisible="addtestvisible"
                 v-model:EditTestId="EditTestId"
                 v-model:testName="testName"
+                v-model:offCourseId="offCourseId"
                 :faceLevel="true"
               />
             </div>
@@ -498,6 +499,7 @@ export default {
       assessmentName: null,
       isClick: false,
       attach:"",
+      offCourseId:props.EditFaceId,
 
     });
     const clear = () => {
@@ -586,6 +588,7 @@ export default {
     const queryFaceTeach = () => {
       queryFaceDetailById(props.EditFaceId).then((res) => {
         console.log("获取到了面授课开课详情", res.data.data);
+        state.offCourseId = props.EditFaceId;
         let result = res.data.data;
         state.courseName = result.name;
         state.description = result.description;
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index b1bff03b..5d58b557 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -379,6 +379,10 @@ export default {
       type: String,
       default: null,
     },
+    offCourseId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -541,16 +545,25 @@ export default {
         state.test.targetId = 0;
           state.test.type = 0;
           state.test.chapterId=0;
-        if(props.isLevel == 1){
-          state.test.targetId = props.routerId;
-          state.test.chapterId = props.isactive;
-          state.test.type = 2;
+          console.log("props.offCourseId",props.offCourseId);
+          if (props.faceLevel && props.offCourseId > 0) {
+            state.test.targetId = props.offCourseId;
+            state.test.type = 3;
+          }else{
+            if(props.isLevel == 1){
+            state.test.targetId = props.routerId;
+            state.test.chapterId = props.isactive;
+            state.test.type = 2;
+        
 
-      } else if (props.isLevel == 2) {
-        state.test.targetId = props.projectId;
-        state.test.type = 1;
+            } else if (props.isLevel == 2) {
+              state.test.targetId = props.projectId;
+              state.test.type = 1;
 
-      }
+            }
+          }
+
+      
 
 
       // if (props.EditTestId > 0) {

From d17d64c1d4c5379c20be895e4c7deea438a41caf Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 19 Jan 2023 08:47:31 +0800
Subject: [PATCH 53/64] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/App.vue b/src/App.vue
index 7ca7582f..eaa77157 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.1.5------------");
+		console.log("版本2.1.6------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

From 0e29925e2f6472c959ce7c49574170f11b3d72fb Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 19 Jan 2023 09:35:33 +0800
Subject: [PATCH 54/64] =?UTF-8?q?fix:=E4=B8=8B=E8=BD=BD=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=AE=B9=E9=87=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/DownLoad.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue
index 2507bdb2..af7fe54b 100644
--- a/src/views/DownLoad.vue
+++ b/src/views/DownLoad.vue
@@ -59,7 +59,7 @@
         '0%': countCMB>2?'#FF0000 ':'#45B058',
         '100%': countCMB>2?'#FF0000 ':'#45B058',
       }" />
-        <div v-if="countCMB>2" style="color:rgba(255, 116, 116, 1);font-size:12px;">容量已满，请删除文件</div>
+        <div v-if="formatCapacityGB(capacity)>2" style="color:rgba(255, 116, 116, 1);font-size:12px;">容量已满，请删除文件</div>
       </div>
     </div>
     <!-- 文件容器 -->
@@ -176,6 +176,12 @@ export default {
       return CMB
     }
 
+    function formatCapacityGB(data) {
+      let num = Number(data);
+      let CMB = (num / (1048576*1024)).toFixed(2);
+      return CMB
+    }
+
     // 下载文件
     function downLoadFile(data) {
       console.log(data)
@@ -226,7 +232,8 @@ export default {
       changePaginationStu,
       searchDownloadList,
       reseatDownloadList,
-      formatCapacity
+      formatCapacity,
+      formatCapacityGB
     };
   },
 };

From 9c433a4472492a1afa00957a566e27905b1761e7 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 19 Jan 2023 09:43:26 +0800
Subject: [PATCH 55/64] =?UTF-8?q?style:=E4=B8=8A=E4=BC=A0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E8=B6=85=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddHomework.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 1f70b2d9..b1031950 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -72,7 +72,7 @@
 							<FJUpload v-model:value="attach" @changevalue="changevalue"/>
 							</div>
 						</div>
-						
+						<div style="width:100%;height: 80px;"></div>
 					</div>
 				</div>
 				<div class="main_btns">

From b46d4c8c2a1109612ef316872bd84e87e109ca1d Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 19 Jan 2023 09:44:26 +0800
Subject: [PATCH 56/64] =?UTF-8?q?style:=E4=B8=8A=E4=BC=A0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E8=B6=85=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddHomework.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index b1031950..b68e77fd 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -75,7 +75,7 @@
 						<div style="width:100%;height: 80px;"></div>
 					</div>
 				</div>
-				<div class="main_btns">
+				<div class="main_btns" style="background:#fff;">
 					<a-button class="btn1" @click="closeDrawer2">取消</a-button>
 					<a-button class="btn2" html-type="submit" @click="updteHomeWork">确定</a-button>
 				</div>

From 5173e01cf381812677573af7362b60b1a0474f0f Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 19 Jan 2023 10:03:51 +0800
Subject: [PATCH 57/64] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E6=97=B6=E9=97=B4=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/NoticeHis.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 329ff3f9..eb3343a3 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -7,7 +7,7 @@
     <div>发布时间</div>
   </div>
   <div class="noticeContent">
-    <div v-for="item in notice" :key="item.id" class="item">
+    <div v-for="item in notice" :key="item.id" class="item" style="align-items:flex-start;">
       <!-- <div class="itemcontent">{{ item.content }}</div> -->
       <a-textarea
           class="itemcontent"

From 1767faa85ca861136b40c84e1fdcf5a6f9d66994 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 19 Jan 2023 10:19:48 +0800
Subject: [PATCH 58/64] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE/=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=9B=BE/=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=85=A8=E8=B7=AF=E5=BE=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/TableStudent.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 2908b9b5..586d4600 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -457,6 +457,8 @@ const tablecolumns = ref([
     align: "center",
     className: "h",
     ellipsis: true,
+    customRender: ({ record: { studentOrgName, studentDepartName } }) =>
+      (allDepartShow(studentOrgName, studentDepartName)),
   },
   {
     title: "加入方式",
@@ -478,6 +480,14 @@ const tablecolumns = ref([
     slots: { customRender: "action" },
   },
 ]);
+
+function allDepartShow(a,b) {
+  let org = (a=="" || a == null || a == undefined) ? a = "" : a.slice(0,1) =='/' ? a.slice(1,a.length) : a;
+  let depart = (b=="" || b == null || b == undefined) ? b = "" : b;
+  let allname = org == "" && depart == "" ? '-' : org + depart;
+  return allname;
+}
+
 const tableParam = ref({
   studentName: "", //学员名称
   groupName: "", //学员小组

From f78cac0ea2bd5a7ef7b32ab7b66240a0addf5921 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 19 Jan 2023 10:37:37 +0800
Subject: [PATCH 59/64] =?UTF-8?q?fix:=E5=8A=A0=E5=85=A5=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/TableStudent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 586d4600..5d8481fe 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -468,7 +468,7 @@ const tablecolumns = ref([
     align: "center",
     customRender: ({ record: { source } }) =>
       // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
-      ({ 1: "手动加入", 2: "手动加入", 3: "手动加入", 4: "报名" }[source]),
+      ({ 0: "手动加入", 1: "手动加入", 2: "手动加入", 3: "手动加入", 4: "报名", 5: "手动加入", 6: "手动加入"}[source]),
   },
   ...props.columns,
   {

From cad87d36cb1a78710689e70b4b3f731a52cc1f0c Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 19 Jan 2023 17:19:16 +0800
Subject: [PATCH 60/64] =?UTF-8?q?fix:=E5=AF=BC=E5=85=A530s=E6=97=A0?=
 =?UTF-8?q?=E5=8F=8D=E5=BA=94=E7=BB=93=E6=9D=9F=E8=AF=B7=E6=B1=82=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ExportScore.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index 3c3f18c4..c06a1061 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -298,6 +298,12 @@ export default {
               console.log("查询导入状态失败", err);
             });
         }, 500);
+        setTimeout(() => {
+          clearInterval(timer)
+          state.addLoading = false;
+          message.destroy();
+          message.error(`文件导入超时`);
+        }, 30000);
       } else if (status === "error") {
         state.uploadErr = true;
         message.error(`${info.file.name}上传失败`);

From 52bababcbe4148efdacf94e08ae65602d216cea9 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 19 Jan 2023 23:50:57 +0800
Subject: [PATCH 61/64] =?UTF-8?q?--fix=20bug=20=E8=80=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/project/ProjectExamManage.vue     | 89 +++++++------------
 .../router/RouterExaminationManage.vue        | 82 ++++++-----------
 2 files changed, 58 insertions(+), 113 deletions(-)

diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index ecdf0412..4d7ea2ce 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -183,15 +183,15 @@ export default {
       tablecolumns: [
         {
           title: "工号",
-          dataIndex: "studentCode",
-          key: "studentCode",
+          dataIndex: "studentUserNo",
+          key: "studentUserNo",
           width: 60,
           align: "center",
           className: "h head",
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.studentCode?text.record.studentCode:"-"}</span>
+                <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
               </div>
             );
           },
@@ -245,8 +245,8 @@ export default {
         },
         {
           title: "考试次数",
-          dataIndex: "testNumber",
-          key: "testNumber",
+          dataIndex: "num",
+          key: "num",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -254,15 +254,15 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.testNumber?text.record.testNumber:"-"}</span>
+                <span> {text.record.num?text.record.num:"-"}</span>
               </div>
             );
           },
         },
         {
           title: "成绩",
-          dataIndex: "score",
-          key: "score",
+          dataIndex: "examinationScore",
+          key: "examinationScore",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -270,7 +270,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.score?text.record.score:"-"}</span>
+                <span> {text.record.examinationScore?text.record.examinationScore:"-"}</span>
               </div>
             );
           },
@@ -278,8 +278,8 @@ export default {
 
         {
           title: "完成时间",
-          dataIndex: "finishedTime",
-          key: "finishedTime",
+          dataIndex: "examinationSubmitTime",
+          key: "examinationSubmitTime",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -287,27 +287,20 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
+                <span> {text.record.examinationSubmitTime?text.record.examinationSubmitTime:"-"}</span>
               </div>
             );
           },
         },
         {
           title: "任务状态",
-          dataIndex: "status",
-          key: "status",
+          dataIndex: "finishStatus",
+          key: "finishStatus",
           width: 60,
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: (text) => {
-            console.log(text.record.status);
-            return (
-              <div class="racona">
-                <span> {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}</span>
-              </div>
-            );
-          },
+          customRender: ({record:{finishStatus}}) => ({1:'通过',2:'未通过'}[finishStatus] || '未开始'),
         },
       ],
       loadingData: true
@@ -354,40 +347,19 @@ export default {
 
     // 获取数据
     function getData() {
-      console.log('我是传递的参数',{
-        "chapterId": props.datasource.stageId,
-        "pageNo": state.currentPage,
-        "pageSize": state.pageSize,
-        "studentName": state.name,
-        "status": state.projectName,
-        "targetId": props.datasource.projectId,
-        "taskId": props.datasource.courseId,
-        "type": 1
-      })
-      api.ExamManagementMessage({
-        "chapterId": props.datasource.stageId,
-        "pageNo": state.currentPage,
-        "pageSize": state.pageSize,
-        "studentName": state.name,
-        "status": state.projectName,
-        "targetId": props.datasource.projectId,
-        "taskId": props.datasource.courseId,
-        "type": 1
+      api.AssessmentManagementMessage({
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        currentStageId: props.datasource.stageId,
+        type: 1,
+        pid: props.datasource.projectId,
+        taskId: props.datasource.projectTaskId,
+        taskType: props.datasource.type,
+        status: state.projectName,
+        studentName: state.name,
       }).then(res=>{
-        console.log(res)
-        if(res.data.code == 200){
-          let newData = [];
-          for(let i=0;i<res.data.data.managementDtoList.length;i++){
-            res.data.data.managementDtoList[i].key = i + 1;
-            newData.push(res.data.data.managementDtoList[i])
-          }
-          state.tabledata = newData;
-          state.tableDataTotal = res.data.data.total;
-          state.loadingData = false;
-          console.log('我是处理过后的数据', newData)
-        }
-      }).catch(err=>{
-        console.log(err)
+        state.tabledata = res.data.data.records;
+        state.tableDataTotal = res.data.data.total;
         state.loadingData = false;
       })
     }
@@ -414,10 +386,9 @@ export default {
 
     {/* 导出数据 */}
     function  exportData() {
-      console.log(props.datasource)
-      console.log(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
-      window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
-      
+      // window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
+      window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`)
+
       {/* api.ExportExam({
         "chapterId": props.datasource.chapterId,
         "targetId": props.datasource.routerId,
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index cc194838..9261da8d 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -186,15 +186,15 @@ export default {
       tablecolumns: [
         {
           title: "工号",
-          dataIndex: "studentCode",
-          key: "studentCode",
+          dataIndex: "studentUserNo",
+          key: "studentUserNo",
           width: 120,
           align: "center",
           className: "h head",
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.studentCode?text.record.studentCode:"-"}</span>
+                <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
               </div>
             );
           },
@@ -263,8 +263,8 @@ export default {
         },
         {
           title: "考试次数",
-          dataIndex: "testNumber",
-          key: "testNumber",
+          dataIndex: "num",
+          key: "num",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -272,7 +272,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.testNumber?text.record.testNumber:"-"}</span>
+                <span> {text.record.num?text.record.num:"-"}</span>
               </div>
             );
           },
@@ -288,7 +288,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.score?text.record.score:"-"}</span>
+                <span> {text.record.examinationScore?text.record.examinationScore:"-"}</span>
               </div>
             );
           },
@@ -296,8 +296,8 @@ export default {
 
         {
           title: "完成时间",
-          dataIndex: "finishedTime",
-          key: "finishedTime",
+          dataIndex: "examinationSubmitTime",
+          key: "examinationSubmitTime",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -305,27 +305,20 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
+                <span> {text.record.examinationSubmitTime?text.record.examinationSubmitTime:"-"}</span>
               </div>
             );
           },
         },
         {
           title: "任务状态",
-          dataIndex: "status",
-          key: "status",
+          dataIndex: "finishStatus",
+          key: "finishStatus",
           width: 60,
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: (text) => {
-            console.log(text.record.status);
-            return (
-              <div class="racona">
-                <span> {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}</span>
-              </div>
-            );
-          },
+          customRender: ({record:{finishStatus}}) => ({1:'通过',2:'未通过'}[finishStatus] || '未开始'),
         },
       ],
       loadingData: true
@@ -372,40 +365,19 @@ export default {
 
     // 获取数据
     function getData() {
-      console.log('我是传递的参数',{
-        "chapterId": props.datasource.chapterId,
-        "pageNo": state.currentPage,
-        "pageSize": state.pageSize,
-        "studentName": state.name,
-        "status": state.projectName,
-        "targetId": props.datasource.routerId,
-        "taskId": props.datasource.courseId,
-        "type": 1
-      })
-      api.ExamManagementMessage({
-        "chapterId": props.datasource.chapterId,
-        "pageNo": state.currentPage,
-        "pageSize": state.pageSize,
-        "studentName": state.name,
-        "status": state.projectName,
-        "targetId": props.datasource.routerId,
-        "taskId": props.datasource.courseId,
-        "type": 1
+      api.AssessmentManagementMessage({
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        currentStageId: props.datasource.chapterId,
+        type: 2,
+        pid: props.datasource.routerId,
+        taskId: props.datasource.routerTaskId,
+        taskType: props.datasource.type,
+        status: state.projectName,
+        studentName: state.name,
       }).then(res=>{
-        console.log(res)
-        if(res.data.code == 200){
-          let newData = [];
-          for(let i=0;i<res.data.data.managementDtoList.length;i++){
-            res.data.data.managementDtoList[i].key = i + 1;
-            newData.push(res.data.data.managementDtoList[i])
-          }
-          state.tabledata = newData;
-          state.tableDataTotal = res.data.data.total;
-          state.loadingData = false;
-          console.log('我是处理过后的数据', newData)
-        }
-      }).catch(err=>{
-        console.log(err)
+        state.tabledata = res.data.data.records;
+        state.tableDataTotal = res.data.data.total;
         state.loadingData = false;
       })
     }
@@ -433,7 +405,9 @@ export default {
 
     {/* 导出数据 */}
     function  exportData() {
-      window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
+      // window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
+      window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`)
+
       {/* api.ExportExam({
         "chapterId": props.datasource.chapterId,
         "targetId": props.datasource.routerId,

From 59c05b92588d9ce33e69506a11798a3bfc582be0 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 20 Jan 2023 02:39:17 +0800
Subject: [PATCH 62/64] =?UTF-8?q?--fix=20bug=20=E8=80=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/project/ProjectFaceTaskManage.vue          | 10 +---------
 .../drawers/router/RouterFaceTeachManage.vue           | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index f57a2136..da130709 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -389,15 +389,7 @@ export default {
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: (text) => {
-            return (
-              <div class="racona">
-                <span>
-                  {text.record.assessmentScore || "-"}
-                </span>
-              </div>
-            );
-          },
+          customRender: ({record:{assessmentScore}}) => (assessmentScore ? Math.round(assessmentScore * 100) / 100 : "-"),
         },
         {
           title: "任务状态",
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 267bf633..761949d4 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -384,15 +384,7 @@ export default {
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: (text) => {
-            return (
-              <div class="racona">
-                <span>
-                  {text.record.assessmentScore || "-"}
-                </span>
-              </div>
-            );
-          },
+          customRender: ({record:{assessmentScore}}) => (assessmentScore ? Math.round(assessmentScore * 100) / 100 : "-"),
         },
         {
           title: "任务状态",

From 31aea503df11231555093952746cf9046c616ade Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 20 Jan 2023 03:21:58 +0800
Subject: [PATCH 63/64] --fix bug

---
 src/views/research/ResearchAdd.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index e144479d..6f185b3b 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -69,6 +69,7 @@
             border-radius: 8px;
             background-color: #4ea6ff;
           "
+          :loading="loading"
           @click="handleSave"
         >
           保存
@@ -132,6 +133,7 @@ export default {
 
       allFormsData: [],
       valueMore: "",
+      loading:false
     });
 
     // 详情
@@ -483,6 +485,7 @@ export default {
       if (!checkVal(filterData)) {
         return false;
       }
+      state.loading = true
 
       if (state.assessmentId) {
         resultPost = {
@@ -496,6 +499,7 @@ export default {
           "assessmentMinScore",
         ]);
         editResearchMessage(resultPost).then((res) => {
+          state.loading = false
           if (res.data.code === 200) {
             message.success("编辑成功");
             router.push({

From b6856d719504732e61b3ec7757ec67e04fef5a69 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 28 Jan 2023 16:34:11 +0800
Subject: [PATCH 64/64] =?UTF-8?q?--fix=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index 5e04d19d..5afca6ef 100644
--- a/.env
+++ b/.env
@@ -5,7 +5,7 @@ VUE_APP_BASE_API=/manageApi
 #文件路径
 VUE_APP_FILE_PATH=/upload/
 # 代理url 本地调试，不可以用在其他地方
-VUE_APP_PROXY_URL=http://111.231.196.214/manageApi
+VUE_APP_PROXY_URL=http://43.143.139.204/manageApi
 # 登录url
 VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
 # boe域名