From 0d20a1f02387c8d8fc90050a25a26bac7663372d Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 10:39:51 +0800
Subject: [PATCH 01/24] =?UTF-8?q?fix:=E6=96=B0=E5=BB=BA=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=A9=BA=E5=80=BC=E6=A3=80=E6=9F=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 008e3a49..0eef62b9 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -769,8 +769,8 @@ export default defineComponent({
 				categoryId: state.fen_lei,
 				sceneContent: state.chang_jin,
 				tips: state.tags_val ? state.tags_val.join(",") : null,
-				teacherId: state.member.value,
-				teacher: state.member.name,
+				// teacherId: state.member.value,
+				// teacher: state.member.name,
 				intro: state.qdms_inputV6,
 				attach: state.attach,
 				outline: valueHtml.value,
@@ -781,7 +781,7 @@ export default defineComponent({
 				postData.name,
 				postData.targetUser,
 				postData.categoryId,
-				postData.teacherId,
+				// postData.teacherId,
 				postData.picUrl,
 				postData.intro,
 			];

From cec444ebbab5ba72ebeac43e5f3d7d1925fc8f8b Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 11:04:54 +0800
Subject: [PATCH 02/24] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=85=B3=E5=8D=A1=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index f6426dd1..7e435804 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -526,7 +526,7 @@
           </div>
           -->
         </div>
-        <div class="boom">
+        <div class="boom" :style="{minHeight:level.length>6? ((level.length - 6)*106+512) + 'px' : 512 + 'px'}">
           <div class="boomcen">
             <div class="title">
               <div class="tit_left">

From b5fdd7338dbef1d49a65d3722ba4210f18fc8aac Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 11:28:38 +0800
Subject: [PATCH 03/24] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=85=AC=E5=91=8A=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 07f391d6..289f1834 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -8,7 +8,15 @@
   </div>
   <div class="noticeContent">
     <div v-for="item in notice" :key="item.id" class="item">
-      <div class="itemcontent">{{ item.content }}</div>
+      <!-- <div class="itemcontent">{{ item.content }}</div> -->
+      <a-textarea
+          class="itemcontent"
+          disabled="true"
+          v-model:value="item.content"
+          :maxlength="150"
+          placeholder="公告信息最多输入150个字"
+          style="margin-top: -10px; height: 120px;background-color: #fff;"
+        />
       <div class="itemtime">{{ item.pubtime }}</div>
     </div>
   </div>
@@ -136,7 +144,7 @@ export default {
     justify-content: space-between;
     margin-bottom: 66px;
     .itemcontent {
-      width: 500px;
+      width: 700px;
       word-break: break-all;
       word-wrap: break-word;
       // overflow: hidden;
@@ -146,6 +154,7 @@ export default {
       font-weight: 400;
       color: #666666;
       line-height: 22px;
+      resize: none;
     }
     .itemtime {
       font-size: 14px;
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index a19a2293..1f437cf8 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -14,24 +14,38 @@
       <p>当前公告内容：</p>
       <!-- 预览 -->
       <template v-if="!editOn">
-        <div class="txt-content">
+        <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
-        </div>
+        </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;"
+        />
         <div class="btn-content">
           <a-button type="primary" @click="handleEdit">编辑</a-button>
         </div>
       </template>
       <!-- 编辑 -->
       <template v-if="editOn">
-        <div class="txt-content">
+        <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
-        </div>
+        </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;"
+        />
         <p>编辑新公告：</p>
         <a-textarea
           v-model:value="noticeContent"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 120px"
+          style="margin-top: -10px; height: 160px"
         />
         <div class="btn-content">
           <a-button class="cancel" @click="handleCancel">取消</a-button>
@@ -62,7 +76,7 @@ export default {
     const state = reactive({
       noticeChecked: false,
       projectInfo: {},
-      noticeContent1: "",
+      noticeContent1: "暂无公告",
       noticeContent: "",
       editOn: false,
     });

From 800d1564456405c05b819a1222135b77d0263f91 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 12:22:53 +0800
Subject: [PATCH 04/24] =?UTF-8?q?fix:=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=B9=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/learningpath/LevelAdd.vue    | 27 +++++++++++++++++++++-
 src/views/projectcenter/LibraryAdd.vue | 32 ++++++++++++++++++++++++--
 src/views/projectcenter/TaskPage.vue   | 30 +++++++++++++++++++++++-
 3 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index b4f1a7b9..e3e9459d 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -794,7 +794,8 @@
                           >{{ item.name }}</span
                         >
                         <a
-                          :href="item.response ? item.response.data : ''"
+                          href="javascript:void(0);"
+                          @click="downloadFile(item.response ? item.response.data : '')"
                           style="margin-left: 5px"
                           >下载</a
                         >
@@ -2427,6 +2428,29 @@ export default {
       });
     };
 
+    // 共享文档文件下载
+    const downloadFile = (url) => {
+      console.log(url)
+      if(url){
+        window.open(url)
+      }
+      // if(url){
+      //   const filename = '操作指南'
+      //   const x = new XMLHttpRequest()
+      //   x.open('GET', url, true)
+      //   x.responseType = 'blob'
+      //   x.onload = () => {
+      //     // 会创建一个 DOMString，其中包含一个表示参数中给出的对象的URL。这个 URL 的生命周期和创建它的窗口中的 document 绑定。这个新的URL 对象表示指定的 File 对象或 Blob 对象。
+      //     const url = window.URL.createObjectURL(x.response)
+      //     const a = document.createElement('a')
+      //     a.href = url
+      //     a.download = filename
+      //     a.click()
+      //   }
+      //   x.send()
+      // }
+    }
+
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -2492,6 +2516,7 @@ export default {
       evaluationModel,
       homeworkModel,
       commonModel,
+      downloadFile,
     };
   },
 };
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 78747701..d669c585 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -671,7 +671,10 @@
                         <span style="font: oblique bold 16px Sans-serif;width:300px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{
                           item.name
                         }}</span>
-                        <a :href="item.response?item.response.data:''" style="margin-left: 5px">下载</a>
+                        <a 
+                          href="javascript:void(0);"
+                          @click="downloadFile(item.response ? item.response.data : '')"  
+                          style="margin-left: 5px">下载</a>
                         <span
                           style="color: #4ea6ff; cursor: pointer"
                           @click="deFile(item.uid)"
@@ -1335,6 +1338,30 @@ export default defineComponent({
 
       state.edit = true;
     };
+
+    // 共享文档文件下载
+    const downloadFile = (url) => {
+      console.log(url)
+      if(url){
+        window.open(url)
+      }
+      // if(url){
+      //   const filename = '操作指南'
+      //   const x = new XMLHttpRequest()
+      //   x.open('GET', url, true)
+      //   x.responseType = 'blob'
+      //   x.onload = () => {
+      //     // 会创建一个 DOMString，其中包含一个表示参数中给出的对象的URL。这个 URL 的生命周期和创建它的窗口中的 document 绑定。这个新的URL 对象表示指定的 File 对象或 Blob 对象。
+      //     const url = window.URL.createObjectURL(x.response)
+      //     const a = document.createElement('a')
+      //     a.href = url
+      //     a.download = filename
+      //     a.click()
+      //   }
+      //   x.send()
+      // }
+    }
+
     return {
       ...toRefs(state),
       value,
@@ -1356,7 +1383,8 @@ export default defineComponent({
       scoresum,
       checkedClose,
       editNotice,
-      deFile
+      deFile,
+      downloadFile
     };
   },
 });
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index f432d019..f8444c11 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1097,7 +1097,10 @@
                           :title="item.name"
                           >{{ item.name }}</span
                         >
-                        <a :href="item.response?item.response.data:''" style="margin-left: 5px">下载</a>
+                        <a 
+                          href="javascript:void(0);"
+                          @click="downloadFile(item.response ? item.response.data : '')"  
+                          style="margin-left: 5px">下载</a>
                         <span
                           style="color: #4ea6ff; float: right; cursor: pointer"
                           @click="deFile(item.uid)"
@@ -4147,6 +4150,30 @@ export default {
       state.Seevisible = true;
       state.checkStuId = record.studentId;
     }
+
+    // 共享文档文件下载
+    const downloadFile = (url) => {
+      console.log(url)
+      if(url){
+        window.open(url)
+      }
+      // if(url){
+      //   const filename = '操作指南'
+      //   const x = new XMLHttpRequest()
+      //   x.open('GET', url, true)
+      //   x.responseType = 'blob'
+      //   x.onload = () => {
+      //     // 会创建一个 DOMString，其中包含一个表示参数中给出的对象的URL。这个 URL 的生命周期和创建它的窗口中的 document 绑定。这个新的URL 对象表示指定的 File 对象或 Blob 对象。
+      //     const url = window.URL.createObjectURL(x.response)
+      //     const a = document.createElement('a')
+      //     a.href = url
+      //     a.download = filename
+      //     a.click()
+      //   }
+      //   x.send()
+      // }
+    }
+
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -4253,6 +4280,7 @@ export default {
       showCodeModel,
       showCodeModel2,
       checkType,
+      downloadFile,
     };
   },
 };

From f8ab82468a74fac87a4482a7f6f3537549473d35 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 13 Jan 2023 12:45:43 +0800
Subject: [PATCH 05/24] =?UTF-8?q?--fix=20=E5=AD=97=E5=85=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                  | 10 ++------
 src/api/index1.js                            |  1 +
 src/views/courselibrary/CoursewareManage.vue | 27 +++++++++-----------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4ba1c1e5..0235ed40 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -67,6 +67,7 @@ export default defineComponent({
 			initDict("pathmapPic");
 			initDict("projectClass");
 			initDict("projectPic");
+			initDict("sysType");
 			getMemberInfo();
 			getOrgTree();
 		}
@@ -128,14 +129,7 @@ export default defineComponent({
 			store.commit("SET_DICT", { key, data: list });
 		}
 
-		const getDictList = (param) =>
-			api1
-				.getDict({
-					pageNo: 1,
-					pageSize: 20,
-					setCode: param,
-				})
-				.then((res) => res.data.data.rows);
+		const getDictList = (param) => api1.getDictTree({setCode: param,}).then((res) => res.data.data);
 		//获取组织树
 		const getOrgTree = () => {
 			api.getOrgTreeInfo().then((res) => {
diff --git a/src/api/index1.js b/src/api/index1.js
index d5b33d83..679d1bfd 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -102,6 +102,7 @@ export const billboard = (obj) => http.post("/admin/project/billboard", obj);
 //公共信息---------------------------------------------------
 // 获取字典信息
 export const getDict = (obj) => http.post('/dict/getList', obj)
+export const getDictTree = (params) => http.get('/dict/getTree', {params})
 //获取组织树一级列表
 export const getOrgTree = (obj) => http.post('/admin/router/orgList', obj)
 //根据id获取组织树一级元素下所有子元素
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 0b46c720..e2b58111 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -39,15 +39,6 @@
             </a-select>
           </div>
           <div class="select">
-            <!-- <a-select
-              v-model:value="categoryId"
-              dropdownClassName="dropdown-style"
-              style="width: 200px"
-              placeholder="请选择内容分类"
-              :options="options2"
-              allowClear
-              showSearch
-            ></a-select> -->
             <a-tree-select
               :getPopupContainer="
                 (triggerNode) => {
@@ -61,12 +52,13 @@
               placeholder="请选择内容分类"
               allow-clear
               tree-default-expand-all
-              :tree-data="options2222"
+              :fieldNames="{
+                children: 'children',
+                label: 'name',
+                value: 'dictName',
+              }"
+              :tree-data="sysTypeOptions"
             >
-              <template #title="{ value: val, title }">
-                <b v-if="val === '11111'" style="color: #08c">sss</b>
-                <template v-else>{{ title }}</template>
-              </template>
             </a-tree-select>
           </div>
           <div class="select">
@@ -2298,7 +2290,7 @@ import {
   shallowRef,
   onMounted,
   onBeforeUnmount,
-  watch,
+  watch, computed,
 } from "vue";
 
 import * as api from "../../api/indexInvist.js";
@@ -2359,6 +2351,7 @@ import AddTest from "../../components/drawers/AddTest.vue";
 import TableStudent from "@/components/student/TableStudent";
 import FJUpload from "@/components/common/FJUpload";
 import { updateStudent } from "@/api/indexProjStu";
+import {useStore} from "vuex";
 //列表表格
 const columns1 = [
   // {
@@ -2992,6 +2985,7 @@ export default defineComponent({
   },
   setup() {
     const CourseModalRef = ref(null);
+    const store = useStore();
 
     const state = reactive({
       //新加
@@ -3550,6 +3544,8 @@ export default defineComponent({
       state.viewpowervisible = true;
     };
 
+    const sysTypeOptions = computed(() => store.state.sysType);
+
     //  富文本 sssssssssssssss
     // 编辑器实例，必须用 shallowRef
     const editorRef = shallowRef();
@@ -5557,6 +5553,7 @@ export default defineComponent({
     };
     return {
       ...toRefs(state),
+      sysTypeOptions,
       CourseModalRef,
       auditStudent,
       getdateToDateFn,

From f58d76056022ca16c70f37074d26276ea2bd1e3c Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 14:11:40 +0800
Subject: [PATCH 06/24] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE/?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=90=8E=E4=BB=A5=E5=89=8D=E6=B7=BB=E5=8A=A0=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98=E6=B8=85=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 894b2f23..fede1abb 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -594,6 +594,7 @@ const auditRowSelection = computed(() => ({
   preserveSelectedRowKeys: true,
 }));
 const closeDrawer = () => {
+  deleteDepSelect();
   visiable.value = false;
   stuData.value = [];
   nameSearch.value.keyword = "";
@@ -687,7 +688,7 @@ function peopleName(name) {
 }
 
 const resetStu = () => {
-  deleteDepSelect();
+  // deleteDepSelect();
   nameSearch.value.keyword = "";
   nameSearch.value.page = 1;
   nameSearch.value.pageSize = 10;
@@ -742,6 +743,7 @@ function handleStageOk() {
     groupIds: selectsData.value.groupList?.map((e) => e.id),
     studentList: selectsData.value.studentList,
   }).then(() => {
+    deleteDepSelect();
     emit("finash", true);
   });
 }

From 96f3be181245b8622e77dad57029fcff1d8b1cc9 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Fri, 13 Jan 2023 14:28:08 +0800
Subject: [PATCH 07/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8B=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=85=B3=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectEvalManage.vue   | 6 +++---
 src/components/drawers/project/ProjectOnlineManage.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue
index 9f40ef10..d625e0c4 100644
--- a/src/components/drawers/project/ProjectEvalManage.vue
+++ b/src/components/drawers/project/ProjectEvalManage.vue
@@ -246,8 +246,8 @@ export default {
               );
             },
           },
-          {
-            title: "学员关卡",
+         /**  {
+            title: "学员阶段",
             dataIndex: "currentStageName",
             key: "currentStageName",
             width: 60,
@@ -261,7 +261,7 @@ export default {
                 </div>
               );
             },
-          },
+          },*/
           {
             title: "提交时间",
             dataIndex: "endStudyTime",
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 77064fb0..416557ff 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -261,7 +261,7 @@ export default {
             );
           },
         },
-        {
+       /** {
           title: "学员关卡",
           dataIndex: "currentStageName",
           key: "currentStageName",
@@ -276,7 +276,7 @@ export default {
               </div>
             );
           },
-        },
+         },*/
         {
           title: "完成时间",
           dataIndex: "lastStudyTime",

From 8ca735a03de7fdf6533e1e389079bc952e25f485 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 14:53:09 +0800
Subject: [PATCH 08/24] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=9B=BE=E5=AD=A6=E5=91=98=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=8A=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
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/router/RouterFaceStu.vue   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index 2390a49b..15e9bc37 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -632,7 +632,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : "异常"}</span>
+                <span>{text.record.signStatus ? "正常" : text.record.signStatus == null ? "-" : "异常"}</span>
               </div>
             );
           },
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 0723232f..6d6e8c8a 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -575,7 +575,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : "异常"}</span>
+                <span>{text.record.signStatus ? "正常" : text.record.signStatus == null ? "-" : "异常"}</span>
               </div>
             );
           },
@@ -756,6 +756,7 @@ export default {
         pid: props.datasource.routerId,
         // status: Number(state.name),
         studentName: state.name,
+        signStatus: state.projectName2,
         taskId: props.datasource.routerTaskId,
         taskType: props.datasource.type,
       });
@@ -767,6 +768,7 @@ export default {
           type: 2,
           pid: props.datasource.routerId,
           // status: Number(state.name),
+          signStatus: state.projectName2,
           studentName: state.name,
           taskId: props.datasource.routerTaskId,
           taskType: props.datasource.type,

From d6bc7af3fcda5621da7578c7cc3ccbc45fd4d137 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 14:53:13 +0800
Subject: [PATCH 09/24] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=9B=BE=E5=AD=A6=E5=91=98=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=8A=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
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/router/RouterFaceStu.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index 15e9bc37..1d0a3405 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -632,7 +632,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : text.record.signStatus == null ? "-" : "异常"}</span>
+                <span>{text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}</span>
               </div>
             );
           },
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 6d6e8c8a..0708be9c 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -575,7 +575,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : text.record.signStatus == null ? "-" : "异常"}</span>
+                <span>{text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}</span>
               </div>
             );
           },

From 06959aa12f5009db13491cba57e5f325e125f182 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 15:13:12 +0800
Subject: [PATCH 10/24] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E5=AD=A6=E5=91=98=E7=AD=BE=E5=88=B0=E6=9C=AA=E5=9C=A8?=
 =?UTF-8?q?=E8=A7=84=E5=AE=9A=E6=97=B6=E9=97=B4=E5=86=85=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
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/router/RouterFaceStu.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index 1d0a3405..c09d3bba 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -632,7 +632,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}</span>
+                <span>{ text.record.signStatus == null && new Date().getTime() > new Date(state.endTime).getTime() ? "异常" : text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常" }</span>
               </div>
             );
           },
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 0708be9c..565896ad 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -575,7 +575,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}</span>
+                <span>{text.record.signStatus == null && new Date().getTime() > new Date(state.endTime).getTime() ? "异常" : text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}</span>
               </div>
             );
           },

From 156e84d273e24dd81b08d4d9f7efdc9c37fe6a7c Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 16:10:48 +0800
Subject: [PATCH 11/24] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE-=E5=AD=A6=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=AF=BC=E5=87=BA=E5=AD=A6=E4=B9=A0=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 03924a16..f08393ae 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -117,6 +117,11 @@
           导出学习信息
         </a-button>
       </a-col>
+      <a-col :span="1.5" v-else>
+        <a-button class="cus-btn white" @click="exportTaskStuRouter">
+          导出学习信息
+        </a-button>
+      </a-col>
       <a-col :span="1.5">
         <a-button class="cus-btn white" @click="bathDel">
           <template #icon
@@ -496,13 +501,22 @@ const stuRowSelection = computed(() => ({
 }));
 // 导出数据
 function exportTaskStu() {
-  console.log("props.datasource", props.datasource);
+  console.log("props.datasource", props);
   window.open(
     `${
       process.env.VUE_APP_BASE_API
     }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0`
   );
 }
+ 
+function exportTaskStuRouter() {
+  console.log("props.datasource", props);
+  window.open(
+    `${
+      process.env.VUE_APP_BASE_API
+    }/admin/student/exportTaskStudent?type=${2}&pid=${props.id}&taskType=0`
+  );
+}
 
 onMounted(() => {
   getStuList();

From 7bc5dd8fac90fde76a592ad42b05115916663333 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 16:46:52 +0800
Subject: [PATCH 12/24] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=AD=A6=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=93=8D=E4=BD=9C-=E6=9F=A5=E7=9C=8B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4-=EF=BC=88=E7=9B=AE=E5=89=8D=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index e3e9459d..f79ce983 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -529,7 +529,36 @@
             :id="routerId"
             :stage="stage"
             :columns="tableDataFunc()"
-          ></TableStudent>
+          >
+          <!-- <template #extension="{ data: { record } }">
+            <div style="display: flex">
+              <div
+                @click="showStudent(record)"
+                style="
+                  color: #4ea6ff;
+                  font-size: 14px;
+                  text-align: center;
+                  margin-left: 20px;
+                  cursor: pointer;
+                "
+              >
+                查看
+              </div>
+              <div 
+                @click="setLevels(record)"
+                style="
+                  color: #4ea6ff;
+                  font-size: 14px;
+                  text-align: center;
+                  margin-left: 20px;
+                  cursor: pointer;
+                "
+              >
+                调整
+              </div>
+            </div>
+          </template> -->
+        </TableStudent>
         </a-tab-pane>
         <!-- 1211注释 待开放 -->
         <a-tab-pane key="4" tab="设置">
@@ -857,7 +886,7 @@
       <see-stu
         v-model:Seevisible="Seevisible"
         v-model:checkStuId="checkStuId"
-        v-model:projectId="projectId"
+        v-model:projectId="routerId"
       />
 
       <!-- 批量删除学员弹窗 -->
@@ -2451,6 +2480,19 @@ export default {
       // }
     }
 
+    // 点击学员管理-查看学员操作
+    function showStudent(record) {
+      console.log(record)
+      state.Seevisible = true;
+      state.checkStuId = record.studentId;
+    }
+
+    // 调整关卡
+    function setLevels(record) {
+      console.log(record)
+      state.visiblene = true;
+    } 
+
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -2517,6 +2559,8 @@ export default {
       homeworkModel,
       commonModel,
       downloadFile,
+      showStudent,
+      setLevels,
     };
   },
 };

From 56f9a60b4d755a48716c7725e56d7d8728c84967 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 17:48:26 +0800
Subject: [PATCH 13/24] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=9C=AA=E4=BD=BF=E7=94=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue  | 1 +
 src/views/projectcenter/templateAdd.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index b4160ad0..9d5fbd5f 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -507,6 +507,7 @@ export default {
     };
 
     function managerChange(e, l, d, t, orgName) {
+      console.log(e, l)
       state.projectInfo.sourceBelongId = d
       state.projectInfo.sourceBelongName = t
       state.projectInfo.sourceBelongFullName = orgName
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 2895c488..2bc98f00 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -298,6 +298,7 @@ const createProject = () => {
 };
 
 function managerChange(e, l, d, t,orgName) {
+  console.log(e, l)
   projectInfo.value.valuesourceBelongId = d;
   projectInfo.value.sourceBelongName = t;
   projectInfo.value.sourceBelongFullName = orgName

From 29582b6beb77725575a328655c1a452f321e99ce Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 13 Jan 2023 18:17:07 +0800
Subject: [PATCH 14/24] =?UTF-8?q?--fix=20=E5=86=85=E5=AE=B9=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=20=E6=94=B9=E6=88=90=E4=BB=8E=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.js                            |    1 +
 src/views/courselibrary/CoursewareManage.vue  |    2 +-
 .../courselibrary/components/seeModal.vue     | 1567 ++++++++---------
 src/views/courselibrary/courseModal.vue       |   90 +-
 src/views/examine/CourseReviewed.vue          |   56 +-
 src/views/examine/CourseReviewedN.vue         |   68 +-
 6 files changed, 829 insertions(+), 955 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index c7979bfa..e606e3f7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -32,6 +32,7 @@ export default createStore({
         projectSys: [],//培训分类
         pathmapPic: [],//学习路径背景图
         memberInitInfo: [],//学员默认
+        sysType: [],//学员默认
     },
     getters: {},
     mutations: {
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index e2b58111..021e6730 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -54,7 +54,7 @@
               tree-default-expand-all
               :fieldNames="{
                 children: 'children',
-                label: 'name',
+                label: 'dictCode',
                 value: 'dictName',
               }"
               :tree-data="sysTypeOptions"
diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 153dfe7c..640dc5be 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -1,157 +1,157 @@
 <!-- 课件管理页面 -->
 <template>
-	<!-- 预览弹窗 -->
-	<a-modal :visible="visible" title="查看" :footer="null" :closable="false" wrapClassName="modalStyle lookCourseModal"
-		width="80%" @cancel="handleCancel" @ok="handleCancel">
-		<div class="modalHeader">
-			<div class="headerLeft">
-				<img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/basicinfo/add.png" />
-				<span class="headerLeftText">预览</span>
-			</div>
-			<div style="margin-right: 57px; cursor: pointer">
-				<img @click="handleCancel" style="width: 22px; height: 22px" src="@/assets/images/basicinfo/close22.png" />
-			</div>
-		</div>
-		<div class="modalMain">
-			<div class="faceteach">
-				<div class="ft_main">
-					<div class="m_body">
-						<div class="mb_left">
-							<div class="mbl_items">
-								<div class="item_nam">
-									<div class="asterisk_icon">
-										<img src="@/assets/images/coursewareManage/asterisk.png" alt="img" />
-									</div>
-									<span style="margin-right: 14px">课程名称：</span>
-								</div>
-								<div class="item_inp">
-									<div class="i1_input">
-										{{ filterTxt(detail.name) }}
-									</div>
-								</div>
-							</div>
-							<div class="mbl_items2">
-								<div class="item_nam">
-									<div class="asterisk_icon">
-										<img src="@/assets/images/coursewareManage/asterisk.png" alt="img" />
-									</div>
-									<span style="margin-right: 14px">封面图：</span>
-								</div>
-								<img :src="detail.picUrl" alt="img" style="width: 100px; height: 100px" />
-							</div>
-							<div class="mbl_items">
-								<div class="item_nam">
-									<div class="asterisk_icon">
-										<img style="width: 10px; height: 10px" src="@/assets/images/coursewareManage/asterisk.png"
-											alt="img" />
-									</div>
-									<span style="margin-right: 14px">目标人群：</span>
-								</div>
-								<div class="item_inp">
-									<div class="i1_input">
-										{{ filterTxt(detail.targetUser) }}
-									</div>
-								</div>
-							</div>
-							<div v-if="detail.meaning" class="mbl_items2">
-								<div class="item_nam">
-									<span style="margin-right: 14px">课程价值：</span>
-								</div>
-								<div class="item_inp">
-									<div class="i1_input">
-										{{ filterTxt(detail.meaning) }}
-									</div>
-								</div>
-							</div>
-							<div class="mbl_items">
-								<div class="item_nam">
-									<div class="asterisk_icon">
-										<img src="@/assets/images/coursewareManage/asterisk.png" alt="img" />
-									</div>
-									<span style="margin-right: 14px">内容分类：</span>
-								</div>
-								<div class="item_inp">
-									<div class="select i6_input">
-										{{ filterClassTxt(detail.categoryId) }}
-									</div>
-								</div>
-							</div>
-							<div class="mbl_items" v-if="detail.sceneContent">
-								<div class="item_nam">
-									<span style="margin-right: 14px">场景：</span>
-								</div>
-								<div class="item_inp">
-									<div class="select i7_input">
-										{{ detail.sceneContent }}
-									</div>
-								</div>
-							</div>
-							<div class="mbl_items" v-if="detail.tips">
-								<div class="item_nam">
-									<span style="margin-right: 14px">内容标签：</span>
-								</div>
-								<div class="item_inp">
-									{{ filterTxt(detail.tips) }}
-								</div>
-							</div>
-						</div>
-						<div class="mb_right">
-							<div class="mbl_items">
-								<div class="item_nam">
-									<div class="asterisk_icon">
-										<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
-									</div>
-									<span style="margin-right: 14px">授课教师：</span>
-								</div>
-								<div class="item_inp">
-									<div class="i1_input">
-										{{ filterTxt(detail.teacher) }}
-									</div>
-								</div>
-							</div>
-							<div class="mbl_items2" v-if="detail.intro">
-								<div class="item_nam">
-									<div class="asterisk_icon">
-										<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
-									</div>
-									<span style="margin-right: 14px">课程简介：</span>
-								</div>
-								<div class="item_inp">
-									<div class="i10_textarea">
-										{{ filterTxt(detail.intro) }}
-									</div>
-								</div>
-							</div>
-							<div class="mbl_items12">
-								<div class="i12_box1" style="position: relative" v-for="(item, index) in detail.attach" :key="index">
-									<div class="file_img">
-										<img v-if="
+  <!-- 预览弹窗 -->
+  <a-modal :visible="visible" title="查看" :footer="null" :closable="false" wrapClassName="modalStyle lookCourseModal"
+           width="80%" @cancel="handleCancel" @ok="handleCancel">
+    <div class="modalHeader">
+      <div class="headerLeft">
+        <img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/basicinfo/add.png"/>
+        <span class="headerLeftText">预览</span>
+      </div>
+      <div style="margin-right: 57px; cursor: pointer">
+        <img @click="handleCancel" style="width: 22px; height: 22px" src="@/assets/images/basicinfo/close22.png"/>
+      </div>
+    </div>
+    <div class="modalMain">
+      <div class="faceteach">
+        <div class="ft_main">
+          <div class="m_body">
+            <div class="mb_left">
+              <div class="mbl_items">
+                <div class="item_nam">
+                  <div class="asterisk_icon">
+                    <img src="@/assets/images/coursewareManage/asterisk.png" alt="img"/>
+                  </div>
+                  <span style="margin-right: 14px">课程名称：</span>
+                </div>
+                <div class="item_inp">
+                  <div class="i1_input">
+                    {{ filterTxt(detail.name) }}
+                  </div>
+                </div>
+              </div>
+              <div class="mbl_items2">
+                <div class="item_nam">
+                  <div class="asterisk_icon">
+                    <img src="@/assets/images/coursewareManage/asterisk.png" alt="img"/>
+                  </div>
+                  <span style="margin-right: 14px">封面图：</span>
+                </div>
+                <img :src="detail.picUrl" alt="img" style="width: 100px; height: 100px"/>
+              </div>
+              <div class="mbl_items">
+                <div class="item_nam">
+                  <div class="asterisk_icon">
+                    <img style="width: 10px; height: 10px" src="@/assets/images/coursewareManage/asterisk.png"
+                         alt="img"/>
+                  </div>
+                  <span style="margin-right: 14px">目标人群：</span>
+                </div>
+                <div class="item_inp">
+                  <div class="i1_input">
+                    {{ filterTxt(detail.targetUser) }}
+                  </div>
+                </div>
+              </div>
+              <div v-if="detail.meaning" class="mbl_items2">
+                <div class="item_nam">
+                  <span style="margin-right: 14px">课程价值：</span>
+                </div>
+                <div class="item_inp">
+                  <div class="i1_input">
+                    {{ filterTxt(detail.meaning) }}
+                  </div>
+                </div>
+              </div>
+              <div class="mbl_items">
+                <div class="item_nam">
+                  <div class="asterisk_icon">
+                    <img src="@/assets/images/coursewareManage/asterisk.png" alt="img"/>
+                  </div>
+                  <span style="margin-right: 14px">内容分类：</span>
+                </div>
+                <div class="item_inp">
+                  <div class="select i6_input">
+                    {{ categoryName }}
+                  </div>
+                </div>
+              </div>
+              <div class="mbl_items" v-if="detail.sceneContent">
+                <div class="item_nam">
+                  <span style="margin-right: 14px">场景：</span>
+                </div>
+                <div class="item_inp">
+                  <div class="select i7_input">
+                    {{ detail.sceneContent }}
+                  </div>
+                </div>
+              </div>
+              <div class="mbl_items" v-if="detail.tips">
+                <div class="item_nam">
+                  <span style="margin-right: 14px">内容标签：</span>
+                </div>
+                <div class="item_inp">
+                  {{ filterTxt(detail.tips) }}
+                </div>
+              </div>
+            </div>
+            <div class="mb_right">
+              <div class="mbl_items">
+                <div class="item_nam">
+                  <div class="asterisk_icon">
+                    <img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk"/>
+                  </div>
+                  <span style="margin-right: 14px">授课教师：</span>
+                </div>
+                <div class="item_inp">
+                  <div class="i1_input">
+                    {{ filterTxt(detail.teacher) }}
+                  </div>
+                </div>
+              </div>
+              <div class="mbl_items2" v-if="detail.intro">
+                <div class="item_nam">
+                  <div class="asterisk_icon">
+                    <img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk"/>
+                  </div>
+                  <span style="margin-right: 14px">课程简介：</span>
+                </div>
+                <div class="item_inp">
+                  <div class="i10_textarea">
+                    {{ filterTxt(detail.intro) }}
+                  </div>
+                </div>
+              </div>
+              <div class="mbl_items12">
+                <div class="i12_box1" style="position: relative" v-for="(item, index) in detail.attach" :key="index">
+                  <div class="file_img">
+                    <img v-if="
 	item.indexOf('jpg') !== -1 ||
 	item.indexOf('jpeg') !== -1 ||
 	item.indexOf('png') !== -1
-" src="@/assets/images/coursewareManage/pngpic.png" />
-										<div v-else>
-											<img v-if="item.indexOf('doc') !== -1" src="@/assets/images/coursewareManage/docpic.png" />
-											<div v-else>
-												<img v-if="item.indexOf('xls') !== -1" src="@/assets/images/coursewareManage/xlspic.png" />
-												<div v-else>
-													<img v-if="item.indexOf('ppt') !== -1" src="@/assets/images/coursewareManage/pptpic.png" />
-													<div v-else>
-														<img v-if="item.indexOf('pdf') !== -1" src="@/assets/images/coursewareManage/pdfpic.png" />
-														<div v-else>
-															<img v-if="item.indexOf('zip') !== -1"
-																src="@/assets/images/coursewareManage/zippic.png" />
-															<img v-else src="@/assets/images/coursewareManage/docpic.png" />
-														</div>
-													</div>
-												</div>
-											</div>
-										</div>
-									</div>
-									<div class="file_detail">
-										<div class="file_name">
-											<!-- http://111.231.196.214:12016/7.231.196.214:12016/7-1670486854017.jpg -->
-											<span style="
+" src="@/assets/images/coursewareManage/pngpic.png"/>
+                    <div v-else>
+                      <img v-if="item.indexOf('doc') !== -1" src="@/assets/images/coursewareManage/docpic.png"/>
+                      <div v-else>
+                        <img v-if="item.indexOf('xls') !== -1" src="@/assets/images/coursewareManage/xlspic.png"/>
+                        <div v-else>
+                          <img v-if="item.indexOf('ppt') !== -1" src="@/assets/images/coursewareManage/pptpic.png"/>
+                          <div v-else>
+                            <img v-if="item.indexOf('pdf') !== -1" src="@/assets/images/coursewareManage/pdfpic.png"/>
+                            <div v-else>
+                              <img v-if="item.indexOf('zip') !== -1"
+                                   src="@/assets/images/coursewareManage/zippic.png"/>
+                              <img v-else src="@/assets/images/coursewareManage/docpic.png"/>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="file_detail">
+                    <div class="file_name">
+                      <!-- http://111.231.196.214:12016/7.231.196.214:12016/7-1670486854017.jpg -->
+                      <span style="
                           color: #6f6f6f;
                           width: 200px;
                           display: block;
@@ -163,731 +163,700 @@
                           left: 72px;
                         ">
 												{{
-		item.indexOf("-") !== -1
-			? item.slice(
-				item.lastIndexOf("/") + 1,
-				item.lastIndexOf("-")
-			) + item.slice(item.lastIndexOf("."))
-			: item
-}}
+                          item.indexOf("-") !== -1
+                              ? item.slice(
+                              item.lastIndexOf("/") + 1,
+                              item.lastIndexOf("-")
+                          ) + item.slice(item.lastIndexOf("."))
+                              : item
+                        }}
 											</span>
-										</div>
+                    </div>
 
-										<div class="file_updata">
-											<div class="updatabox">
-												<div class="updatacolor"></div>
-												<div class="updataxq" style="right: -62px">
-													上传完成
-												</div>
-											</div>
-											<div class="upjd">
-												<span style="margin: auto 5px">100%</span>
-											</div>
-										</div>
-									</div>
-									<a :href="item.indexOf('http') !== -1 ? item : locationHref + item" style="margin-left: 5px">下载</a>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="m_footer" v-if="detail.outline !== '<p><br></p>'">
-						<div class="fotnam">
-							<span>课程大纲</span>
-						</div>
-						<div class="fotarea">
-							<div style="border: 1px solid #ccc">
-								<div v-html="detail.outline" />
-							</div>
-						</div>
-					</div>
-					<div class="m_btn">
-						<div class="btn btn6" @click="handleCancel">
-							<div class="btnText">确定</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</a-modal>
+                    <div class="file_updata">
+                      <div class="updatabox">
+                        <div class="updatacolor"></div>
+                        <div class="updataxq" style="right: -62px">
+                          上传完成
+                        </div>
+                      </div>
+                      <div class="upjd">
+                        <span style="margin: auto 5px">100%</span>
+                      </div>
+                    </div>
+                  </div>
+                  <a :href="item.indexOf('http') !== -1 ? item : locationHref + item" style="margin-left: 5px">下载</a>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="m_footer" v-if="detail.outline !== '<p><br></p>'">
+            <div class="fotnam">
+              <span>课程大纲</span>
+            </div>
+            <div class="fotarea">
+              <div style="border: 1px solid #ccc">
+                <div v-html="detail.outline"/>
+              </div>
+            </div>
+          </div>
+          <div class="m_btn">
+            <div class="btn btn6" @click="handleCancel">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
 </template>
 <script>
-import { reactive, toRefs, defineComponent, ref } from "vue";
+import {reactive, toRefs, defineComponent, ref, watch, computed} from "vue";
 import * as api1 from "../../../api/index1";
+import {useStore} from "vuex";
 
 export default defineComponent({
-	props: {
-		visible: {
-			type: Boolean,
-			default: false,
-		},
-		detail: {
-			type: Object,
-			default: () => { },
-		},
-	},
-	setup(props, { emit }) {
-		console.log("props", props);
-		const state = reactive({
-			imgList: [],
-			options2222: [
-				{
-					title: '领导力',
-					value: '100',
-					children: [
-						{
-							title: '管理业务',
-							value: '1001',
-						},
-						{
-							title: '管理团队',
-							value: '1002',
-						},
-						{
-							title: '管理自我',
-							value: '1003',
-						},
-					],
-				},
-				{
-					title: '专业力',
-					value: '200',
-					children: [
-						{
-							title: '研发',
-							value: '2001',
-						},
-						{
-							title: '系统和解决方案',
-							value: '2002',
-						},
-						{
-							title: '生产技术与制造',
-							value: '2003',
-						},
-						{
-							title: '供应链',
-							value: '2004',
-						},
-						{
-							title: '营销',
-							value: '2005',
-						},
-						{
-							title: '品质',
-							value: '2006',
-						},
-						{
-							title: '专业职能',
-							value: '2007',
-							children: [
-								{
-									title: '战略与企划',
-									value: '200701',
-								},
-								{
-									title: '流程管理',
-									value: '200702',
-								},
-								{
-									title: '业绩管理',
-									value: '200703',
-								},
-								{
-									title: '项目管理',
-									value: '200704',
-								},
-								{
-									title: '信息技术',
-									value: '200705',
-								},
-								{
-									title: '环境与安全',
-									value: '200706',
-								},
-								{
-									title: '人力资源',
-									value: '200707',
-								},
-								{
-									title: '企业文化',
-									value: '200708',
-								},
-								{
-									title: '品牌',
-									value: '200709',
-								},
-								{
-									title: '财务',
-									value: '200710',
-								},
-								{
-									title: '法务',
-									value: '200711',
-								},
-								{
-									title: '风险控制',
-									value: '200712',
-								},
-								{
-									title: '行政',
-									value: '200713'
-								},
-							]
-						},
-						{
-							title: '医工',
-							value: '2008',
-						}
-					],
-				},
-				{
-					title: '通用力',
-					value: '300',
-					children: [
-						{
-							title: '职业操守与道德',
-							value: '3001',
-						},
-						{
-							title: '职业素养与技能',
-							value: '3002',
-						},
-						{
-							title: '规章制度',
-							value: '3003',
-						},
-					],
-				}
-			],
-			ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx",
-			ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx",
-			locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/'
-		});
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    detail: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  setup(props, {emit}) {
+    console.log("props", props);
+    const store = useStore();
 
-		// item.slice(
-		//                             item.lastIndexOf("/") + 1,
-		//                             item.indexOf("-")
-		//                           ) + item.slice(item.lastIndexOf("."))
-		const filterTxt = (txt) => {
-			if (txt) {
-				return txt;
-			} else {
-				return "-";
-			}
-		};
-		const filterClassTxt = (txt) => {
-			let str = "-";
-			if (txt) {
-				for (let i = 0; i < options2.value.length; i++) {
-					for (let j = 0; j < options2.value[i].children.length; j++) {
-						str = changeTreeSelectValue(String(txt))
-						// if (String(options2.value[i].children[j].value) === String(txt)) {
-						// 	str = options2.value[i].children[j].title;
-						// }
-					}
-				}
-			}
-			return str;
-		};
+    const state = reactive({
+      imgList: [],
+      options2222: [
+        {
+          title: '领导力',
+          value: '100',
+          children: [
+            {
+              title: '管理业务',
+              value: '1001',
+            },
+            {
+              title: '管理团队',
+              value: '1002',
+            },
+            {
+              title: '管理自我',
+              value: '1003',
+            },
+          ],
+        },
+        {
+          title: '专业力',
+          value: '200',
+          children: [
+            {
+              title: '研发',
+              value: '2001',
+            },
+            {
+              title: '系统和解决方案',
+              value: '2002',
+            },
+            {
+              title: '生产技术与制造',
+              value: '2003',
+            },
+            {
+              title: '供应链',
+              value: '2004',
+            },
+            {
+              title: '营销',
+              value: '2005',
+            },
+            {
+              title: '品质',
+              value: '2006',
+            },
+            {
+              title: '专业职能',
+              value: '2007',
+              children: [
+                {
+                  title: '战略与企划',
+                  value: '200701',
+                },
+                {
+                  title: '流程管理',
+                  value: '200702',
+                },
+                {
+                  title: '业绩管理',
+                  value: '200703',
+                },
+                {
+                  title: '项目管理',
+                  value: '200704',
+                },
+                {
+                  title: '信息技术',
+                  value: '200705',
+                },
+                {
+                  title: '环境与安全',
+                  value: '200706',
+                },
+                {
+                  title: '人力资源',
+                  value: '200707',
+                },
+                {
+                  title: '企业文化',
+                  value: '200708',
+                },
+                {
+                  title: '品牌',
+                  value: '200709',
+                },
+                {
+                  title: '财务',
+                  value: '200710',
+                },
+                {
+                  title: '法务',
+                  value: '200711',
+                },
+                {
+                  title: '风险控制',
+                  value: '200712',
+                },
+                {
+                  title: '行政',
+                  value: '200713'
+                },
+              ]
+            },
+            {
+              title: '医工',
+              value: '2008',
+            }
+          ],
+        },
+        {
+          title: '通用力',
+          value: '300',
+          children: [
+            {
+              title: '职业操守与道德',
+              value: '3001',
+            },
+            {
+              title: '职业素养与技能',
+              value: '3002',
+            },
+            {
+              title: '规章制度',
+              value: '3003',
+            },
+          ],
+        }
+      ],
+      categoryName: '',
+      ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx",
+      ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx",
+      locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/'
+    });
 
-		// 格式化树型结构选择数据
-		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 sysTypeOptions = computed(() => store.state.sysType);
 
-		const filterSenceTxt = (txt) => {
-			let str = "-";
-			if (txt) {
-				options3.value.forEach((item) => {
-					if (item.value === String(txt)) {
-						str = item.label;
-					}
-				});
-			}
-			return str;
-		};
-		const handleCancel = () => {
-			emit("cancel");
-		};
+    watch(() => props.detail.categoryId, () => {
+      state.categoryName =  findClassFullName(sysTypeOptions.value)
+    })
 
-		//获取分类、场景-----------字典配置-------------------------------
-		const options2 = ref([]);
-		const options3 = ref([]);
-		const getDictList = (param) => {
-			let obj = {
-				pageNo: 1,
-				pageSize: 20,
-				setCode: param,
-			};
-			api1
-				.getDict(obj)
-				.then((res) => {
-					console.log("获取字典成功", res);
-					if (res.data.code === 200) {
-						if (param === "faceclassClass") {
-							let arr = res.data.data.rows;
-							let newArr = [];
-							arr.forEach((item) => {
-								newArr.push({
-									value: item.dictCode,
-									label: item.dictName,
-								});
-							});
-							options2.value = state.options2222;
-						}
-						if (param === "faceclassScene") {
-							let arr = res.data.data.rows;
-							let newArr = [];
-							arr.forEach((item) => {
-								newArr.push({
-									value: item.dictCode,
-									label: item.dictName,
-								});
-							});
-							options3.value = newArr;
-						}
-					}
-				})
-				.catch((err) => {
-					console.log("获取字典失败", err);
-				});
-		};
-		getDictList("faceclassClass");
-		getDictList("faceclassScene");
-		//获取分类、场景----------------字典配置---------------------------
+    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))
+          .filter(name => name)
+          .join('') || ''
+    }
 
-		return {
-			...toRefs(state),
-			filterTxt,
-			filterClassTxt,
-			filterSenceTxt,
-			handleCancel,
-		};
-	},
+    const filterTxt = (txt) => {
+      if (txt) {
+        return txt;
+      } else {
+        return "-";
+      }
+    };
+
+    const filterSenceTxt = (txt) => {
+      let str = "-";
+      if (txt) {
+        options3.value.forEach((item) => {
+          if (item.value === String(txt)) {
+            str = item.label;
+          }
+        });
+      }
+      return str;
+    };
+    const handleCancel = () => {
+      emit("cancel");
+    };
+
+    //获取分类、场景-----------字典配置-------------------------------
+    const options2 = ref([]);
+    const options3 = ref([]);
+    const getDictList = (param) => {
+      let obj = {
+        pageNo: 1,
+        pageSize: 20,
+        setCode: param,
+      };
+      api1
+          .getDict(obj)
+          .then((res) => {
+            console.log("获取字典成功", res);
+            if (res.data.code === 200) {
+              if (param === "faceclassClass") {
+                let arr = res.data.data.rows;
+                let newArr = [];
+                arr.forEach((item) => {
+                  newArr.push({
+                    value: item.dictCode,
+                    label: item.dictName,
+                  });
+                });
+                options2.value = state.options2222;
+              }
+              if (param === "faceclassScene") {
+                let arr = res.data.data.rows;
+                let newArr = [];
+                arr.forEach((item) => {
+                  newArr.push({
+                    value: item.dictCode,
+                    label: item.dictName,
+                  });
+                });
+                options3.value = newArr;
+              }
+            }
+          })
+          .catch((err) => {
+            console.log("获取字典失败", err);
+          });
+    };
+    getDictList("faceclassClass");
+    getDictList("faceclassScene");
+    //获取分类、场景----------------字典配置---------------------------
+
+    return {
+      ...toRefs(state),
+      filterTxt,
+      filterSenceTxt,
+      handleCancel,
+    };
+  },
 });
 </script>
 <style lang="scss">
 .lookCourseModal {
-	.ant-modal {
-		.ant-modal-content {
+  .ant-modal {
+    .ant-modal-content {
 
-			// width:1358px !important;
-			.ant-modal-body {
-				.modalHeader {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
+      // width:1358px !important;
+      .ant-modal-body {
+        .modalHeader {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
 
-					.headerLeft {
-						margin-left: 27px;
-						display: flex;
-						align-items: center;
+          .headerLeft {
+            margin-left: 27px;
+            display: flex;
+            align-items: center;
 
-						.headerLeftText {
-							font-size: 16px;
-							font-weight: 400;
-							color: #000000;
-							line-height: 36px;
-						}
-					}
-				}
+            .headerLeftText {
+              font-size: 16px;
+              font-weight: 400;
+              color: #000000;
+              line-height: 36px;
+            }
+          }
+        }
 
-				.modalMain {
-					.m_title {
-						margin-bottom: 20px;
-					}
+        .modalMain {
+          .m_title {
+            margin-bottom: 20px;
+          }
 
-					.m_body {
-						display: flex;
-						flex-wrap: wrap;
+          .m_body {
+            display: flex;
+            flex-wrap: wrap;
 
-						.mb_left {
-							width: 50%;
+            .mb_left {
+              width: 50%;
 
-							.mbl_items {
-								display: flex;
-								align-items: center;
-								justify-content: flex-end;
-								margin-bottom: 10px;
+              .mbl_items {
+                display: flex;
+                align-items: center;
+                justify-content: flex-end;
+                margin-bottom: 10px;
 
-								.item_nam {
-									width: 100px;
-									display: flex;
-									align-items: center;
-									justify-content: flex-end;
-									white-space: nowrap;
+                .item_nam {
+                  width: 100px;
+                  display: flex;
+                  align-items: center;
+                  justify-content: flex-end;
+                  white-space: nowrap;
 
-									.asterisk_icon {
-										width: 10px;
-										height: 10px;
-										margin-right: 5px;
-										margin-top: -15px;
-									}
-								}
+                  .asterisk_icon {
+                    width: 10px;
+                    height: 10px;
+                    margin-right: 5px;
+                    margin-top: -15px;
+                  }
+                }
 
-								.item_inp {
-									flex: 1;
-									position: relative;
+                .item_inp {
+                  flex: 1;
+                  position: relative;
 
-									.inp_num {
-										position: absolute;
-										left: 398px;
-										top: 10px;
-									}
-								}
-							}
+                  .inp_num {
+                    position: absolute;
+                    left: 398px;
+                    top: 10px;
+                  }
+                }
+              }
 
-							.mbl_items2 {
-								display: flex;
-								align-items: start;
-								margin-top: 10px;
-								margin-bottom: 10px;
+              .mbl_items2 {
+                display: flex;
+                align-items: start;
+                margin-top: 10px;
+                margin-bottom: 10px;
 
-								.item_nam {
-									width: 100px;
-									display: flex;
-									align-items: center;
-									justify-content: flex-end;
-									white-space: nowrap;
+                .item_nam {
+                  width: 100px;
+                  display: flex;
+                  align-items: center;
+                  justify-content: flex-end;
+                  white-space: nowrap;
 
-									.asterisk_icon {
-										width: 10px;
-										height: 10px;
-										margin-right: 5px;
-										margin-top: -15px;
-									}
-								}
+                  .asterisk_icon {
+                    width: 10px;
+                    height: 10px;
+                    margin-right: 5px;
+                    margin-top: -15px;
+                  }
+                }
 
-								.item_inp {
-									flex: 1;
+                .item_inp {
+                  flex: 1;
 
-									.i_upload_img {
-										width: 100px;
-										height: 100px;
-										border-radius: 8px;
-									}
+                  .i_upload_img {
+                    width: 100px;
+                    height: 100px;
+                    border-radius: 8px;
+                  }
 
-									.i_upload {
-										width: 100px;
-										height: 100px;
-										border: 1px solid #4ea6ff;
-										border-radius: 8px;
-										text-align: center;
-										align-items: center;
-										cursor: pointer;
+                  .i_upload {
+                    width: 100px;
+                    height: 100px;
+                    border: 1px solid #4ea6ff;
+                    border-radius: 8px;
+                    text-align: center;
+                    align-items: center;
+                    cursor: pointer;
 
-										.addimg {
-											position: relative;
+                    .addimg {
+                      position: relative;
 
-											.heng {
-												position: absolute;
-												top: 50px;
-												left: 25px;
-												width: 50px;
-												border: 1px solid #4ea6ff;
-											}
+                      .heng {
+                        position: absolute;
+                        top: 50px;
+                        left: 25px;
+                        width: 50px;
+                        border: 1px solid #4ea6ff;
+                      }
 
-											.shu {
-												position: absolute;
-												top: 25px;
-												left: 50px;
-												height: 50px;
-												border: 1px solid #4ea6ff;
-											}
-										}
-									}
-								}
-							}
+                      .shu {
+                        position: absolute;
+                        top: 25px;
+                        left: 50px;
+                        height: 50px;
+                        border: 1px solid #4ea6ff;
+                      }
+                    }
+                  }
+                }
+              }
 
-							.i2_cz {
-								width: 440px;
-								margin-left: 100px;
+              .i2_cz {
+                width: 440px;
+                margin-left: 100px;
 
-								.i2_top {
-									display: flex;
-									justify-content: space-between;
-								}
-							}
+                .i2_top {
+                  display: flex;
+                  justify-content: space-between;
+                }
+              }
 
-							.i8_bottom {
-								display: flex;
-								width: 440px;
-								margin-left: 100px;
-							}
-						}
+              .i8_bottom {
+                display: flex;
+                width: 440px;
+                margin-left: 100px;
+              }
+            }
 
-						.mb_right {
-							width: 50%;
+            .mb_right {
+              width: 50%;
 
-							.mbl_items {
-								display: flex;
-								align-items: flex-start;
-								justify-content: flex-end;
-								margin-bottom: 10px;
+              .mbl_items {
+                display: flex;
+                align-items: flex-start;
+                justify-content: flex-end;
+                margin-bottom: 10px;
 
-								.item_nam {
-									width: 100px;
-									display: flex;
-									align-items: center;
-									justify-content: flex-end;
-									white-space: nowrap;
+                .item_nam {
+                  width: 100px;
+                  display: flex;
+                  align-items: center;
+                  justify-content: flex-end;
+                  white-space: nowrap;
 
-									.asterisk_icon {
-										width: 10px;
-										height: 10px;
-										margin-top: -15px;
-										margin-right: 5px;
-									}
-								}
+                  .asterisk_icon {
+                    width: 10px;
+                    height: 10px;
+                    margin-top: -15px;
+                    margin-right: 5px;
+                  }
+                }
 
-								.item_inp {
-									flex: 1;
-								}
+                .item_inp {
+                  flex: 1;
+                }
 
-								.accessory {
-									display: flex;
-									align-items: center;
+                .accessory {
+                  display: flex;
+                  align-items: center;
 
-									.accessory_icon {
-										width: 16px;
-										height: 16px;
-										margin-top: -8px;
-										margin-right: 5px;
-									}
-								}
-							}
+                  .accessory_icon {
+                    width: 16px;
+                    height: 16px;
+                    margin-top: -8px;
+                    margin-right: 5px;
+                  }
+                }
+              }
 
-							.mbl_items2 {
-								display: flex;
-								align-items: start;
-								margin-bottom: 10px;
+              .mbl_items2 {
+                display: flex;
+                align-items: start;
+                margin-bottom: 10px;
 
-								.item_nam {
-									width: 100px;
-									display: flex;
-									align-items: center;
-									justify-content: flex-end;
-									white-space: nowrap;
+                .item_nam {
+                  width: 100px;
+                  display: flex;
+                  align-items: center;
+                  justify-content: flex-end;
+                  white-space: nowrap;
 
-									.asterisk_icon {
-										width: 10px;
-										height: 10px;
-										margin-right: 5px;
-										margin-top: -15px;
-									}
-								}
+                  .asterisk_icon {
+                    width: 10px;
+                    height: 10px;
+                    margin-right: 5px;
+                    margin-top: -15px;
+                  }
+                }
 
-								.item_inp {
-									flex: 1;
-									position: relative;
+                .item_inp {
+                  flex: 1;
+                  position: relative;
 
-									.inp_num {
-										position: absolute;
-										left: 395px;
-										bottom: 10px;
-									}
-								}
-							}
+                  .inp_num {
+                    position: absolute;
+                    left: 395px;
+                    bottom: 10px;
+                  }
+                }
+              }
 
-							.mbl_items12 {
-								width: 440px;
-								margin-left: 100px;
+              .mbl_items12 {
+                width: 440px;
+                margin-left: 100px;
 
-								.i12_box1 {
-									display: flex;
-									align-items: center;
-									padding: 17px 0px 17px 21px;
-									border: 1px solid #eff4fc;
-									border-radius: 8px;
-									margin-bottom: 10px;
+                .i12_box1 {
+                  display: flex;
+                  align-items: center;
+                  padding: 17px 0px 17px 21px;
+                  border: 1px solid #eff4fc;
+                  border-radius: 8px;
+                  margin-bottom: 10px;
 
-									.file_img {
-										width: 27px;
-										height: 32px;
-										// background-image: url(@/assets/images/coursewareManage/imgs.png);
-										margin-right: 22px;
+                  .file_img {
+                    width: 27px;
+                    height: 32px;
+                    // background-image: url(@/assets/images/coursewareManage/imgs.png);
+                    margin-right: 22px;
 
-										img {
-											width: 100%;
-											height: 100%;
-										}
-									}
+                    img {
+                      width: 100%;
+                      height: 100%;
+                    }
+                  }
 
-									.file_detail {
-										width: 250px;
-										margin-right: 21px;
+                  .file_detail {
+                    width: 250px;
+                    margin-right: 21px;
 
-										.file_updata {
-											display: flex;
-											align-items: center;
+                    .file_updata {
+                      display: flex;
+                      align-items: center;
 
-											.updatabox {
-												position: relative;
-												width: 230px;
-												height: 5px;
-												background-color: rgba(192, 192, 192, 0.25);
-												border-radius: 3px;
+                      .updatabox {
+                        position: relative;
+                        width: 230px;
+                        height: 5px;
+                        background-color: rgba(192, 192, 192, 0.25);
+                        border-radius: 3px;
 
-												.updatacolor {
-													position: absolute;
-													left: 0;
-													width: 100%;
-													height: 5px;
-													background-color: #57c887;
-													border-radius: 3px;
-												}
+                        .updatacolor {
+                          position: absolute;
+                          left: 0;
+                          width: 100%;
+                          height: 5px;
+                          background-color: #57c887;
+                          border-radius: 3px;
+                        }
 
-												.updatacolor2 {
-													position: absolute;
-													left: 0;
-													width: 80%;
-													height: 5px;
-													background-color: #ff7474;
-													border-radius: 3px;
-												}
+                        .updatacolor2 {
+                          position: absolute;
+                          left: 0;
+                          width: 80%;
+                          height: 5px;
+                          background-color: #ff7474;
+                          border-radius: 3px;
+                        }
 
-												.updatacolor3 {
-													position: absolute;
-													left: 0;
-													width: 60%;
-													height: 5px;
-													background-color: #4ea6ff;
-													border-radius: 3px;
-												}
+                        .updatacolor3 {
+                          position: absolute;
+                          left: 0;
+                          width: 60%;
+                          height: 5px;
+                          background-color: #4ea6ff;
+                          border-radius: 3px;
+                        }
 
-												.updataxq {
-													position: absolute;
-													right: -62px;
-													top: -30px;
-													color: #57c887;
-												}
+                        .updataxq {
+                          position: absolute;
+                          right: -62px;
+                          top: -30px;
+                          color: #57c887;
+                        }
 
-												.updataxq2 {
-													position: absolute;
-													right: -62px;
-													top: -30px;
-													color: #ff7474;
-												}
+                        .updataxq2 {
+                          position: absolute;
+                          right: -62px;
+                          top: -30px;
+                          color: #ff7474;
+                        }
 
-												.updataxq3 {
-													position: absolute;
-													right: -62px;
-													top: -30px;
-													color: #4ea6ff;
-												}
-											}
-										}
-									}
+                        .updataxq3 {
+                          position: absolute;
+                          right: -62px;
+                          top: -30px;
+                          color: #4ea6ff;
+                        }
+                      }
+                    }
+                  }
 
-									.file_operation {
-										display: flex;
+                  .file_operation {
+                    display: flex;
 
-										.fobox {
-											margin-right: 5px;
-											cursor: pointer;
-										}
-									}
-								}
-							}
-						}
-					}
+                    .fobox {
+                      margin-right: 5px;
+                      cursor: pointer;
+                    }
+                  }
+                }
+              }
+            }
+          }
 
-					.m_footer {
-						display: flex;
-						margin: 20px 0;
+          .m_footer {
+            display: flex;
+            margin: 20px 0;
 
-						.fotnam {
-							width: 100px;
-							display: flex;
-							justify-content: end;
-							padding-right: 15px;
-						}
+            .fotnam {
+              width: 100px;
+              display: flex;
+              justify-content: end;
+              padding-right: 15px;
+            }
 
-						.fotarea {
-							width: calc(100% - 150px);
-							position: relative;
+            .fotarea {
+              width: calc(100% - 150px);
+              position: relative;
 
-							img {
-								max-width: 100%;
-							}
+              img {
+                max-width: 100%;
+              }
 
-							.fuwenben {
-								width: 90%;
-								height: 20px;
-								background-color: rgb(95, 95, 95);
-								position: absolute;
-								left: 50%;
-								transform: translate(-50%, 0);
-								top: 3px;
-								z-index: 9999;
-							}
-						}
-					}
+              .fuwenben {
+                width: 90%;
+                height: 20px;
+                background-color: rgb(95, 95, 95);
+                position: absolute;
+                left: 50%;
+                transform: translate(-50%, 0);
+                top: 3px;
+                z-index: 9999;
+              }
+            }
+          }
 
-					.m_btn {
-						width: 100%;
-						margin-top: 25px;
-						margin-bottom: 20px;
-						display: flex;
-						justify-content: center;
-						align-content: center;
+          .m_btn {
+            width: 100%;
+            margin-top: 25px;
+            margin-bottom: 20px;
+            display: flex;
+            justify-content: center;
+            align-content: center;
 
-						.btn {
-							width: 100px;
-							height: 40px;
-							background: rgba(64, 158, 255, 0);
-							border-radius: 8px;
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							margin-right: 14px;
-							flex-shrink: 0;
-							cursor: pointer;
+            .btn {
+              width: 100px;
+              height: 40px;
+              background: rgba(64, 158, 255, 0);
+              border-radius: 8px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-right: 14px;
+              flex-shrink: 0;
+              cursor: pointer;
 
-							.btnText {
-								font-size: 14px;
-								font-weight: 400;
-								line-height: 40px;
-							}
-						}
+              .btnText {
+                font-size: 14px;
+                font-weight: 400;
+                line-height: 40px;
+              }
+            }
 
-						.btn5 {
-							border: 1px solid rgba(64, 158, 255, 1);
-							color: #4ea6ff;
-						}
+            .btn5 {
+              border: 1px solid rgba(64, 158, 255, 1);
+              color: #4ea6ff;
+            }
 
-						.btn6 {
-							background-color: #4ea6ff;
-							color: #ffffff;
-						}
-					}
-				}
-			}
-		}
-	}
+            .btn6 {
+              background-color: #4ea6ff;
+              color: #ffffff;
+            }
+          }
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 0eef62b9..e2d717f1 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -138,26 +138,15 @@
 								</div>
 								<div class="item_inp">
 									<div class="select i6_input">
-										<!--                    <a-select-->
-										<!--                        :getPopupContainer="-->
-										<!--                        (triggerNode) => {-->
-										<!--                          return triggerNode.parentNode || document.body;-->
-										<!--                        }-->
-										<!--                      "-->
-										<!--                        v-model:value="fen_lei"-->
-										<!--                        dropdownClassName="dropdown-style"-->
-										<!--                        style="width: 440px"-->
-										<!--                        placeholder="请选择"-->
-										<!--                        :options="options2"-->
-										<!--                        allowClear-->
-										<!--                        showSearch-->
-										<!--                    />-->
 										<a-tree-select style="width: 440px" placeholder="请选择内容分类" :treeDefaultExpandAll="true"
-											:getPopupContainer="
-	(triggerNode) => {
-		return triggerNode.parentNode || document.body;
-	}
-" @change="changeTreeSelectValue" v-model:value="fen_lei" :tree-data="options2222">
+											             :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
+                                   v-model:value="fen_lei"
+                                   :tree-data="sysTypeOptions"
+                                   :fieldNames="{
+                                          children: 'children',
+                                          label: 'dictName',
+                                          value: 'dictCode',
+                                        }">
 										</a-tree-select>
 									</div>
 								</div>
@@ -321,13 +310,12 @@
 </template>
 <script>
 import {
-	reactive,
-	toRefs,
-	defineComponent,
-	ref,
-	shallowRef,
-	// onMounted,
-	onUnmounted,
+  reactive,
+  toRefs,
+  defineComponent,
+  ref,
+  shallowRef,
+  onUnmounted, computed, watch,
 } from "vue";
 import { validateName } from "@/api/index1";
 import { message } from "ant-design-vue";
@@ -336,11 +324,11 @@ import { fileUp } from "../../api/indexEval";
 import * as api1 from "../../api/index1";
 import "@wangeditor/editor/dist/css/style.css";
 import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
-//import ProjectManager from "@/components/project/ProjectManagerNew";
 import NameInput from "@/components/project/NameInput";
 import FJUpload from "@/components/common/FJUpload";
 import * as moment from "moment";
 import * as api2 from "../../api/indexAudit";
+import {useStore} from "vuex";
 
 export default defineComponent({
 	components: {
@@ -348,7 +336,6 @@ export default defineComponent({
 		Toolbar,
 		FJUpload,
 		NameInput,
-		//ProjectManager,
 	},
 	props: {
 		xzinputV1: {
@@ -514,6 +501,19 @@ export default defineComponent({
 				}
 			],
 		});
+    const store = useStore();
+
+    const sysTypeOptions = computed(() => store.state.sysType);
+
+    watch(()=>state.fen_lei,()=>{
+      state.fen_lei1 = findClassFullName(sysTypeOptions.value)
+    })
+
+    function findClassFullName(list,name=''){
+     return list && list.length && list.map(e=>{
+       return  state.fen_lei == e.dictCode ? name?name+'-'+e.dictName:e.dictName : findClassFullName(e.children,name?name+'-'+e.dictName:e.dictName)
+      }).filter(name=>name).join('')
+    }
 
 		// 删除文件返回参数
 		const changevalue = (e) => {
@@ -855,8 +855,7 @@ export default defineComponent({
 			state.feng_mian_1 = item.picUrl;
 			state.qdms_inputV2 = item.targetUser;
 			state.qdms_inputV3 = item.meaning;
-			state.fen_lei = String(item.categoryId);
-			state.fen_lei1 = changeTreeSelectValue(String(item.categoryId));
+			state.fen_lei = item.categoryId;
 			state.chang_jin = String(item.sceneContent ? item.sceneContent : '');
 			state.tags_val = item.tips ? item.tips.split(",") : [];
 			state.qdms_inputV6 = item.intro;
@@ -911,37 +910,9 @@ export default defineComponent({
 			});
 		};
 
-		// 格式化树型结构选择数据
-		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;
-		}
-
 		return {
 			...toRefs(state),
+      sysTypeOptions,
 			moment,
 			options2,
 			options3,
@@ -963,7 +934,6 @@ export default defineComponent({
 			handleCreated,
 			choicePic,
 			changevalue,
-			changeTreeSelectValue
 		};
 	},
 });
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 2e921375..0d4b8277 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -107,9 +107,10 @@
 	</div>
 </template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
+import {reactive, toRefs, onMounted, computed} from "vue";
 import { courseListView } from "../../api/indexAudit";
 import * as api1 from "@/api/index1";
+import {useStore} from "vuex";
 
 export default {
 	name: "CoursereViewed",
@@ -398,48 +399,19 @@ export default {
 			],
 		});
 
-		// 课程三级分类回显
-		const sHX = (data) => {
-			let str = '-'
-			let sdata = state.options2222
-			for (let i = 0; i < sdata.length; i++) {
-				for (let j = 0; j < sdata[i].children.length; j++) {
-					str = changeTreeSelectValue(String(data))
-					{/* if (String(sdata[i].children[j].value) === String(data)) {
-               str = sdata[i].children[j].title;
-            } */}
-				}
-			}
-			return str
-		}
+    const store = useStore();
 
-		// 格式化树型结构选择数据
-		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 sysTypeOptions = computed(() => store.state.sysType);
+
+    function findClassFullName(list,classify,name=''){
+      return list && list.length && list.map(e=>{
+        return  classify == e.dictCode ? name?name+'-'+e.dictName:e.dictName : findClassFullName(e.children,classify,name?name+'-'+e.dictName:e.dictName)
+      }).filter(name=>name).join('')
+    }
+
+		// 课程三级分类回显
+		const sHX = (classify) => {
+      return findClassFullName(sysTypeOptions.value,classify) || '-'
 		}
 
 		const getList = () => {
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 256a6b60..e3c6a167 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -22,16 +22,8 @@
                   ...calssifyList,
                 ]"
               />-->
-							<a-tree-select :getPopupContainer="
-								(triggerNode) => {
-									return triggerNode.parentNode || document.body;
-								}
-							" v-model:value="valueproj" show-search :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+							<a-tree-select :getPopupContainer="triggerNode => triggerNode.parentNode || document.body" v-model:value="valueproj" show-search :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
 								placeholder="请选择内容分类" tree-default-expand-all :tree-data="options2222">
-								<template #title="{ value: val, title }">
-									<b v-if="val === '11111'" style="color: #08c">sss</b>
-									<template v-else>{{ title }}</template>
-								</template>
 							</a-tree-select>
 						</div>
 						<div class="inpbox1">
@@ -130,12 +122,13 @@
 	</div>
 </template>
 <script>
-import { reactive, toRefs, onMounted, ref } from "vue";
+import {reactive, toRefs, onMounted, ref, computed} from "vue";
 import { list, courseAuditView, courseDetail } from "../../api/indexAudit";
 import { message } from "ant-design-vue";
 import SeeModal from "../courselibrary/components/seeModal.vue";
 import { iframeUrl } from "../../api/method";
 import * as api1 from "@/api/index1";
+import {useStore} from "vuex";
 
 export default {
 	name: "CoursereViewedN",
@@ -171,7 +164,7 @@ export default {
 			chooseCreater: null,
 			chooseOffId: null,
 			lookCourseModal: false, //预览
-			faceDetailObj: null,
+			faceDetailObj: {},
 			columns1: [
 				// {
 				//  title: "序号",
@@ -257,7 +250,6 @@ export default {
 								<span
 									onClick={() => {
 										getFaceDetail(value.record.offId);
-										console.log(value.record);
 									}}
 									style="cursor:pointer;color:#387DF7"
 								>
@@ -406,20 +398,19 @@ export default {
 				}
 			],
 		});
+    const store = useStore();
+
+    const sysTypeOptions = computed(() => store.state.sysType);
+
+    function findClassFullName(list,classify,name=''){
+      return list && list.length && list.map(e=>{
+        return  classify == e.dictCode ? name?name+'-'+e.dictName:e.dictName : findClassFullName(e.children,classify,name?name+'-'+e.dictName:e.dictName)
+      }).filter(name=>name).join('')
+    }
 
 		// 课程三级分类回显
-		const sHX = (data) => {
-			let str = '-'
-			let sdata = state.options2222
-			for (let i = 0; i < sdata.length; i++) {
-				for (let j = 0; j < sdata[i].children.length; j++) {
-					str = changeTreeSelectValue(String(data))
-					// if (String(sdata[i].children[j].value) === String(data)) {
-					// 	str = sdata[i].children[j].title;
-					// }
-				}
-			}
-			return str
+		const sHX = (classify) => {
+      return findClassFullName(sysTypeOptions.value,classify) || '-'
 		}
 
 		/*
@@ -642,35 +633,6 @@ export default {
 			}));
 		});
 
-		// 格式化树型结构选择数据
-		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 onEditorFocus = (event) => {
 			event.enable(false);

From 4e4655f378e59b20bf633853d9fc158cbbea913b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 13 Jan 2023 18:37:10 +0800
Subject: [PATCH 15/24] =?UTF-8?q?--fix=20=E5=86=85=E5=AE=B9=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=20=E6=94=B9=E6=88=90=E4=BB=8E=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 75 +++-----------------
 1 file changed, 11 insertions(+), 64 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 021e6730..2fdaa91b 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2381,11 +2381,9 @@ const columns1 = [
     title: "内容分类",
     width: 130,
     dataIndex: "contentTxt",
+    ellipsis: true,
     key: "1",
     align: "center",
-    customRender: ({ text }) => {
-      return text ? text : "-";
-    },
   },
   {
     title: "课程形式",
@@ -3278,14 +3276,14 @@ export default defineComponent({
       corpowerlistvisible: false,
 
       lookCourseModal: false,
-      faceDetailObj: null,
+      faceDetailObj: {},
 
       offcourseId: null,
       projectName: "",
       name: "",
       createName: "",
       auditStatus: null,
-      categoryId: null,
+      categoryId: '',
       projectTime: "",
 
       //列表
@@ -3765,70 +3763,19 @@ export default defineComponent({
         true
       );
 
-      // datas.forEach((itm) => {
-      //   itm.pageNo = pageNo;
-      //   for (let item of options2.value) {
-      //     if (String(item.value) === String(itm.content)) {
-      //       itm.contentTxt = item.label;
-      //       return false;
-      //     }
-      //   }
-      // });
-
       datas.forEach((itm) => {
         itm.pageNo = pageNo;
-        console.log(itm);
-        for (let i = 0; i < options2.value.length; i++) {
-          for (let j = 0; j < options2.value[i].children.length; j++) {
-            itm.contentTxt = changeTreeSelectValue(itm.categoryId);
-            // if (
-            // 	String(options2.value[i].children[j].value) ===
-            // 	String(itm.categoryId)
-            // ) {
-            // 	console.log();
-            // 	itm.contentTxt = options2.value[i].children[j].title;
-            // 	return false;
-            // }
-          }
-        }
+        itm.contentTxt = findClassFullName(sysTypeOptions.value,itm.categoryId) || '-'
       });
-
-      console.log(datas, options2.value);
       state.tableData1 = datas;
     };
-    // 格式化树型结构选择数据
-    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;
-    };
+
+    function findClassFullName(list,classify, name = '') {
+      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('') || ''
+    }
 
     getTableDate();
     const handelChangePage1 = (page, pageSize) => {

From 14cd052ec09ff67d0218474aed70ab06bcabf81e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 14 Jan 2023 01:03:13 +0800
Subject: [PATCH 16/24] =?UTF-8?q?--fix=20=E4=BD=9C=E4=B8=9A=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                                        | 4 +++-
 src/components/drawers/ExportScore.vue                   | 9 +++++----
 src/components/drawers/project/ProjectFaceTaskManage.vue | 1 +
 src/components/drawers/project/ProjectHomeWorkManage.vue | 1 +
 src/components/drawers/router/RouterFaceTeachManage.vue  | 1 +
 src/components/drawers/router/RouterHomeworkManage.vue   | 1 +
 src/components/student/TableStudent.vue                  | 1 +
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/api/index1.js b/src/api/index1.js
index 679d1bfd..a9626a13 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -164,7 +164,9 @@ export const AssessmentManagementMessage = (obj) => http.get(`/admin/student/get
 export const exportTaskStudent = (obj) => http.post('/admin/student/exportTaskStudent', obj)
 //导出任务作业
 export const exportHomeWork = (obj) => http.get('/admin/student/exportHomeWork', { params: obj })
-//签到 
+//导出任务作业模板
+export const exportHomeWorkTemplate = (obj) => http.get('/admin/student/exportHomeWorkTemplate', { params: obj })
+//签到
 export const attendanceSign = (obj) => http.post('/stu/task/attendance/sign', obj)
 //请假 
 export const attendanceLeave = (obj) => http.post('/stu/task/attendance/leave', obj)
diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index 2a367630..c72a7d99 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -209,6 +209,10 @@ export default {
       type: Number,
       default: null,
     },
+    pid: {
+      type: Number,
+      default: null,
+    },
     searchTaskList: {
       type: Function,
       default: null,
@@ -352,10 +356,7 @@ export default {
       }
     };
     function downTemplate() {
-      window.open(
-        process.env.VUE_APP_FILE_PATH +
-          process.env.VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE
-      );
+      window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportHomeWorkTemplate?taskId=${props.id || ''}&type=${props.type || ''}&pid=${props.pid || ''}&thirdType=3`);
     }
 
     return {
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index b9ad2021..0d26edaf 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -169,6 +169,7 @@
     v-model:eScorevisible="Evisible"
     :type="1"
     :id="projectTaskInfo?.projectTaskId"
+    :pid="projectTaskInfo?.projectId"
     v-model:searchTaskList="searchTaskList"
   />
   <!-- 查看作业抽屉 -->
diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue
index 467a9815..0dccaaaa 100644
--- a/src/components/drawers/project/ProjectHomeWorkManage.vue
+++ b/src/components/drawers/project/ProjectHomeWorkManage.vue
@@ -135,6 +135,7 @@
     v-model:eScorevisible="Evisible"
     :type="1"
     :id="projectTaskInfo?.projectTaskId"
+    :pid="projectTaskInfo?.projectId"
     v-model:searchTaskList="searchTaskList"
   />
   <!-- 查看作业抽屉 -->
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 6ca01869..3a2413e7 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -149,6 +149,7 @@
     v-model:eScorevisible="Evisible"
     :type="2"
     :id="datasource?.routerTaskId"
+    :pid="datasource?.routerId"
     v-model:searchTaskList="searchTaskList"
   />
   <!-- 查看作业抽屉 -->
diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue
index 7d940560..26150e06 100644
--- a/src/components/drawers/router/RouterHomeworkManage.vue
+++ b/src/components/drawers/router/RouterHomeworkManage.vue
@@ -130,6 +130,7 @@
     v-model:eScorevisible="Evisible"
     :type="2"
     :id="datasource?.routerTaskId"
+    :pid="datasource?.routerId"
     v-model:searchTaskList="searchTaskList"
   />
   <!-- 查看作业抽屉 -->
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index f08393ae..46b7c532 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -345,6 +345,7 @@
     v-model:eScorevisible="eScorevisible"
     :type="3"
     :id="id"
+    :pid="id"
     v-model:searchTaskList="getStuList"
   />
   <!-- 导出作业提示框 -->

From e31b92188e7105e5d5f97df80ff630153c430061 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sun, 15 Jan 2023 10:04:05 +0800
Subject: [PATCH 17/24] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index 77360b65..0d6abdca 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -115,7 +115,7 @@
                     </div>
                     <div class="cancel" style="margin-left: 15px"></div>
                   </div>
-                  <div v-if="errNum !== 0" class="defeat">
+                  <div v-if="downloadErrUrl !== ''" class="defeat">
                     <div class="detext" @click="downloadEeeorData">
                       下载失败数据
                     </div>
@@ -124,11 +124,11 @@
               </div>
               <div
                 v-if="showBottomBar"
-                :class="errNum == 0 ? 'succebox' : 'defeatbox'"
+                :class="downloadErrUrl == '' ? 'succebox' : 'defeatbox'"
               >
                 <div class="lefimg"></div>
                 <div class="tacl">
-                  {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
+                  {{ succNum }}条数据导入成功，{{ downloadErrUrl == ''? 0 :errNum }}条数据导入失败
                 </div>
               </div>
 

From 042f55c1c1bc86f85c207234af470a8e98785f6f Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sun, 15 Jan 2023 14:53:22 +0800
Subject: [PATCH 18/24] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE-=E5=AD=A6=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C-=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E3=80=81=E8=B0=83=E6=95=B4=E3=80=81=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                   |   5 +-
 src/components/drawers/CheckStu.vue | 255 ++++++++++++++++++++++++----
 src/views/learningpath/LevelAdd.vue | 110 ++++++++++--
 3 files changed, 325 insertions(+), 45 deletions(-)

diff --git a/src/api/index1.js b/src/api/index1.js
index a9626a13..eafae25e 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -78,8 +78,9 @@ export const delStudent = (obj) =>
     http.post("/admin/router/deleteStudent", obj);
 
 // 获取学员路径图进度明细
-export const stuProgress = (obj) =>
-    http.post("/admin/router/studentProcess", obj);
+export const stuProgress = (params) => http.get('/admin/router/studentProcess', {params});
+// export const stuProgress = (obj) =>http.post("/admin/router/studentProcess", obj);
+
 //编辑学习路径基本信息
 export const editLearnInfo = (obj) => http.post('/admin/router/editInfo', obj)
 
diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue
index 25585065..72ef168f 100644
--- a/src/components/drawers/CheckStu.vue
+++ b/src/components/drawers/CheckStu.vue
@@ -15,14 +15,15 @@
           @click="closeDrawer"
         />
       </div>
-      <div class="main">
+      <a-spin v-if="loading" :spinning="loading"/>
+      <div v-if="!loading" class="main">
         <div class="stuinfor">
           <div class="portrait">
             <img src="../../assets/images/studentimg/character.png" />
           </div>
           <div class="stumation">
             <div class="stuname">{{pro.userInfoBo.userName}}</div>
-            <div class="stugangw">{{pro.userInfoBo.deptName+'-'+pro.userInfoBo.jobName}}</div>
+            <div class="stugangw">{{pro.userInfoBo.deptName?pro.userInfoBo.deptName:"" + '-' + pro.userInfoBo.jobName?pro.userInfoBo.jobName:""}}</div>
           </div>
           <div class="sortbox">
             <div class="sortname">进度排名</div>
@@ -46,7 +47,7 @@
               <span class="total">/{{pro.totalReqCnt}}</span>
             </div>
           </div>
-          <a-divider
+          <!-- <a-divider
             type="vertical"
             style="
               height: 49px;
@@ -59,16 +60,16 @@
             <div class="sortnub">
               <span class="nub1">{{pro.certCnt}}</span>
             </div>
-          </div>
+          </div> -->
         </div>
         <div class="secondrow">
-          <div class="rowleft">产品经理管理 - 腾飞班1</div>
-          <div class="rowbox" @click="showProMess">
+          <div class="rowleft">{{ pro.name }}</div>
+          <!-- <div class="rowbox" @click="showProMess">
             <div class="shuom">说明</div>
             <div><img src="../../assets/images/studentimg/chak.png" /></div>
-          </div>
+          </div> -->
         </div>
-        <div v-for="(item,index) in pro.chapterProcessList" class="mainbox"
+        <!-- <div v-for="(item) in pro.chapterProcessList" class="mainbox"
         style="margin-top: 15px; height: 56px"
         :key="item.chapterId">
         <div class="rowtitle" @click="changeDown">
@@ -81,7 +82,7 @@
                 "
               />
             </div>
-            <div class="titletext">关卡{{index}} {{item.chapterName}}</div>
+            <div class="titletext">{{item.chapterName}}</div>
           </div>
 
           <div :style="{ display: showDown ? 'block' : 'none' }">
@@ -99,11 +100,105 @@
               </div>
             </div>
           </div>
+        </div> -->
+
+        <div class="mainbox">
+          <a-collapse v-model:activeKey="stageListActive">
+            <template #expandIcon="{ isActive }">
+              <img
+                style="margin-right: 20px"
+                :src="
+                  isActive
+                    ? require('../../assets/images/studentimg/open.png')
+                    : require('../../assets/images/studentimg/close.png')
+                "
+              />
+              <div></div>
+            </template>
+            <a-collapse-panel
+              v-for="value in pro.chapterProcessList"
+              :key="value.chapterId"
+              :header="value.chapterName"
+             
+            > 
+            <template #extra >
+            <div @click.stop="">
+              <div class="rowbox">
+                <a-popover title="关卡说明">
+                <template #content>
+                  <p>{{value.remark}}</p>
+                </template>
+              <div class="shuom">说明</div>
+              </a-popover>
+              <div><img src="../../assets/images/studentimg/chak.png" /></div>
+            </div>
+           </div> 
+            </template>
+         
+              <div 
+                class="rowclass"
+                v-for="(item, key) in value.taskProcessList"
+                :key="key"
+              >
+            
+                <div class="leftclass">
+                  <div>
+                    <img
+                      :src="
+                        item.type === 1
+                          ? require('../../assets/images/leveladd/zai.png')
+                          : item.type === 2
+                          ? require('../../assets/images/leveladd/mian.png')
+                          : item.type === 3
+                          ? require('../../assets/images/leveladd/an.png')
+                          : item.type === 4
+                          ? require('../../assets/images/leveladd/zuo.png')
+                          : item.type === 5
+                          ? require('../../assets/images/leveladd/kao.png')
+                          : item.type === 6
+                          ? require('../../assets/images/leveladd/zhi.png')
+                          : item.type === 7
+                          ? require('../../assets/images/leveladd/wai.png')
+                          : item.type === 8
+                          ? require('../../assets/images/leveladd/tao.png')
+                          : item.type === 9
+                          ? require('../../assets/images/leveladd/huo.png')
+                          : item.type === 10
+                          ? require('../../assets/images/leveladd/ce.png')
+                          : item.type === 11
+                          ? require('../../assets/images/leveladd/diao.png')
+                          : item.type === 12
+                          ? require('../../assets/images/leveladd/tou.png')
+                          : item.type === 13
+                          ? require('../../assets/images/leveladd/diao.png')
+                          : null
+                      "
+                    />
+                  </div>
+                  <div class="text1">{{ checkType(item.type) }}</div>
+                  <div class="text2">{{ item.name }}</div>
+                </div>
+                <div class="alreadyclass">
+                  <div class="alimg">
+                    <img
+                      :src="
+                        item.status === 1
+                          ? require('../../assets/images/studentimg/complete.png')
+                          : require('../../assets/images/studentimg/notice.png')
+                      "
+                    />
+                  </div>
+                  <div class="altext">{{ item.status ==0?"进行中":item.status ==1?"已完成":"未开始" }}</div>
+                </div>
+               
+              </div>
+            </a-collapse-panel>
+          </a-collapse>
         </div>
 
       </div>
       <div class="btnn">
-        <button class="btn2">关闭</button>
+        <button class="btn2" @click="closeDrawer">关闭</button>
       </div>
     </div>
   </a-drawer>
@@ -114,7 +209,7 @@
 import { reactive, toRefs } from "vue";
 import CheckStuMess from "./CheckStuMess.vue";
 import {stuProgress} from "@/api/index1";
-import {message} from "ant-design-vue";
+// import {message} from "ant-design-vue";
 export default {
   name: "CheckStu",
   components: { CheckStuMess },
@@ -126,13 +221,19 @@ export default {
     studentId: {
       type: Number,
       default: null,
-    }
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
       StuMessvisible: false,
       showDown: false,
       pro:null,
+      loading:true,
+      stageListActive: 0,
     });
     const closeDrawer = () => {
       ctx.emit("update:CheckStuvisible", false);
@@ -151,21 +252,24 @@ export default {
       state.showDown = !state.showDown;
     };
     const getStuProgress = () => {
+      state.loading = true
       let obj = {
-        routerId:100,
+        routerId:props.routerId,
         studentId:props.studentId
       }
       stuProgress(obj).then(res => {
-        message.success("操作成功")
+        console.log("查询当前学员进度信息success",res)
         state.pro = res.data.data
+        state.loading = false
         console.log(res)
       }).catch(err => {
-        message.error("操作失败"+err)
+        console.log("查询当前学员进度信息err",err)
+        state.loading = false
         console.log(err)
       })
     }
 
-    const checkType = (type) => {
+  const checkType = (type) => {
     let typeRules = [
         "",
         "在线",
@@ -317,28 +421,115 @@ export default {
           }
         }
       }
+      // .mainbox {
+      //   // height: 463px;
+      //   margin-right: 37px;
+      //   margin-top: 32px;
+      //   border: 1px solid rgba(221, 238, 255, 1);
+      //   border-radius: 6px;
+      //   .rowtitle {
+      //     height: 56px;
+      //     background: rgba(240, 246, 252, 1);
+      //     display: flex;
+      //     align-items: center;
+      //     .titleimg {
+      //       width: 20px;
+      //       height: 20px;
+      //       margin-left: 23px;
+      //     }
+      //     .titletext {
+      //       color: rgba(51, 51, 51, 1);
+      //       font-size: 16px;
+      //       font-weight: 500;
+      //       margin-left: 16px;
+      //     }
+      //   }
+      //   .rowclass {
+      //     height: 81px;
+      //     border-bottom: 1px solid rgba(221, 238, 255, 1);
+      //     display: flex;
+      //     justify-content: space-between;
+      //     align-items: center;
+      //     .leftclass {
+      //       display: flex;
+      //       margin-left: 25px;
+      //       align-items: center;
+      //       .text1 {
+      //         color: #000000;
+      //         font-size: 14px;
+      //         font-weight: 500;
+      //         margin-left: 25px;
+      //       }
+      //       .text2 {
+      //         color: rgba(51, 51, 51, 0.8);
+      //         font-size: 14px;
+      //         margin-left: 65px;
+      //       }
+      //     }
+      //     .alreadyclass {
+      //       display: flex;
+      //       margin-right: 57px;
+      //       .alimg {
+      //         height: 16px;
+      //         width: 16px;
+      //       }
+      //       .altext {
+      //         color: rgba(56, 125, 247, 1);
+      //         font-size: 14px;
+      //         margin-left: 16px;
+      //       }
+      //     }
+      //   }
+      // }
       .mainbox {
         // height: 463px;
         margin-right: 37px;
         margin-top: 32px;
-        border: 1px solid rgba(221, 238, 255, 1);
-        border-radius: 6px;
-        .rowtitle {
-          height: 56px;
-          background: rgba(240, 246, 252, 1);
+        //border: 1px solid rgba(221, 238, 255, 1);
+        //border-radius: 6px;
+        .rowbox {
+          width: 64px;
+          height: 24px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          margin-left: 24px;
+          border: 1px solid rgba(64, 158, 255, 1);
+          background: rgba(64, 158, 255, 0.1);
+          margin-right: 480px;
+          cursor: pointer;
+          .shuom {
+            color: rgba(64, 158, 255, 1);
+            font-size: 14px;
+            line-height: 20px;
+            margin-right: 5px;
+          }
+        }
+        .ant-collapse {
+          background-color: #ffffff;
+          border: 0;
+        }
+        .ant-collapse-content > .ant-collapse-content-box {
+          padding: 0;
+          border: 0;
+        }
+        .ant-collapse > .ant-collapse-item {
+          border: 1px solid rgba(221, 238, 255, 1);
+          border-radius: 6px;
+          margin-bottom: 15px;
+          border-bottom: 0px;
+        }
+        .ant-collapse-content {
+          border-top: 0;
+        }
+        .ant-collapse-header {
           display: flex;
           align-items: center;
-          .titleimg {
-            width: 20px;
-            height: 20px;
-            margin-left: 23px;
-          }
-          .titletext {
-            color: rgba(51, 51, 51, 1);
-            font-size: 16px;
-            font-weight: 500;
-            margin-left: 16px;
-          }
+          height: 56px;
+          background-color: rgba(240, 246, 252, 1);
+          font-size: 16px;
+          color: rgba(51, 51, 51, 1);
+          font-weight: 500;
         }
         .rowclass {
           height: 81px;
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f79ce983..0cc907d0 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -525,12 +525,13 @@
         </a-tab-pane>
         <a-tab-pane key="3" tab="学员管理" force-render>
           <TableStudent
+            v-if="isreload"
             :type="2"
             :id="routerId"
             :stage="stage"
             :columns="tableDataFunc()"
           >
-          <!-- <template #extension="{ data: { record } }">
+          <template #extension="{ data: { record } }">
             <div style="display: flex">
               <div
                 @click="showStudent(record)"
@@ -557,7 +558,43 @@
                 调整
               </div>
             </div>
-          </template> -->
+          </template>
+        </TableStudent>
+        <TableStudent
+            v-else
+            :type="2"
+            :id="routerId"
+            :stage="stage"
+            :columns="tableDataFunc()"
+          >
+          <template #extension="{ data: { record } }">
+            <div style="display: flex">
+              <div
+                @click="showStudent(record)"
+                style="
+                  color: #4ea6ff;
+                  font-size: 14px;
+                  text-align: center;
+                  margin-left: 20px;
+                  cursor: pointer;
+                "
+              >
+                查看
+              </div>
+              <div 
+                @click="setLevels(record)"
+                style="
+                  color: #4ea6ff;
+                  font-size: 14px;
+                  text-align: center;
+                  margin-left: 20px;
+                  cursor: pointer;
+                "
+              >
+                调整
+              </div>
+            </div>
+          </template>
         </TableStudent>
         </a-tab-pane>
         <!-- 1211注释 待开放 -->
@@ -861,21 +898,21 @@
           </div>
           <div class="mid">
             <div class="inher">
-              <div class="cur">当前关卡：关卡2</div>
+              <div class="cur">当前关卡：{{ curLevelName }}</div>
               <div class="select">
                 <a-select
                   v-model:value="curLevel"
                   style="width: 100%"
                   placeholder="请选择关卡"
-                  :options="projectNameList4"
+                  :options="statess"
                   @change="selectProjectName4"
                   allowClear
                   showSearch
                 ></a-select>
               </div>
               <div class="btn">
-                <button class="sameb btn1">取消</button>
-                <button class="sameb btn2">确定</button>
+                <button class="sameb btn1" style="cursor:pointer;"  @click="closeChangeModal">取消</button>
+                <button class="sameb btn2" style="cursor:pointer;" @click="changeLevel">确定</button>
               </div>
             </div>
           </div>
@@ -1019,6 +1056,7 @@
       <!-- 学员管理查看抽屉 -->
       <check-stu
         v-model:CheckStuvisible="CheckStuvisible"
+        v-model:routerId="routerId"
         v-model:studentId="studentId"
       />
       <!-- 面授学员抽屉 -->
@@ -1269,7 +1307,7 @@
   </div>
 </template>
 <script>
-import { ref, reactive, toRefs, onMounted, createVNode, watch } from "vue";
+import { ref, reactive, toRefs, onMounted, createVNode, watch, defineEmits } from "vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import { message, Modal } from "ant-design-vue";
 // import PathAddStu from "../../components/drawers/pathStuAdd";
@@ -1295,13 +1333,14 @@ import { codeUrl } from "../../api/method";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 import TableStudent from "@/components/student/TableStudent";
 // import * as student from "@/api/student";
-import { getStuPage } from "@/api/index1";
+import { getStuPage, moveStudent } from "@/api/index1";
 
 import RouterFaceTeachManage from "../../components/drawers/router/RouterFaceTeachManage";
 import RouterExaminationManage from "../../components/drawers/router/RouterExaminationManage";
 import RouterEvaluationManage from "../../components/drawers/router/RouterEvaluationManage";
 import RouterHomeworkManage from "../../components/drawers/router/RouterHomeworkManage";
 import RouterCommonManage from "../../components/drawers/router/RouterCommonManage";
+import { func } from "vue-types";
 
 export default {
   name: "LevelAdd",
@@ -1331,6 +1370,7 @@ export default {
     // const store = useStore();
     const state = reactive({
       stage: [],
+      statess: [],
       routerId: storage.get("routerId")
         ? JSON.parse(storage.get("routerId"))
         : null, //学习路径页面传的学习路径id
@@ -1434,7 +1474,9 @@ export default {
       sh: false,
       nodata: true,
       closeDeleteAll: false,
-      curLevel: "",
+      curLevel: undefined,
+      curLevelName: "",
+      curStuID:"",
       taskSyllabusActive: 0,
       //在线管理等页面传递参数
       showTimeText: "",
@@ -1516,6 +1558,7 @@ export default {
         location.href.indexOf("http://") !== -1
           ? "http://111.231.196.214:12016/"
           : location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
+      isreload: true
     });
 
     const levelList = reactive({
@@ -1691,6 +1734,9 @@ export default {
       state.visible = true;
     };
     const closeChangeModal = () => {
+      state.curLevel = undefined;
+      state.curStuID = "";
+      state.curLevelName = "";
       state.visiblene = false;
     };
     const showAddStu = () => {
@@ -2146,6 +2192,10 @@ export default {
             id: e.chapterId,
             name: e.name,
           }));
+          state.statess = res.data.data.chapterList.map((e) => ({
+            value: e.chapterId,
+            label: e.name,
+          }));
           state.taskSyllabus = data;
           // for(let i in data) {
           //   state.taskSyllabus[i].name = data[i].name
@@ -2483,16 +2533,52 @@ export default {
     // 点击学员管理-查看学员操作
     function showStudent(record) {
       console.log(record)
-      state.Seevisible = true;
-      state.checkStuId = record.studentId;
+      state.CheckStuvisible = true;
+      state.studentId = record.studentId;
     }
 
     // 调整关卡
     function setLevels(record) {
       console.log(record)
+      state.curLevelName = record.currentStageName;
+      state.curStuID = record.id;
       state.visiblene = true;
     } 
 
+    // 选择要调整的关卡
+    function selectProjectName4(e){
+      console.log(e)
+      state.curLevel = e;
+    }
+
+    // 点击确定 调整关卡
+    function changeLevel() {
+      state.isreload = false;
+      if(!state.curLevel){
+        message.error("请选择关卡")
+        return
+      }
+      moveStudent({targetId: state.curLevel, ids: [state.curStuID]}).then(res => {
+        console.log(res)
+        state.visiblene = false;
+        message.destroy();
+        state.isreload = true;
+        message.success("调整关卡成功")
+        state.curLevel = undefined;
+        state.curStuID = "";
+        state.curLevelName = "";
+        getStudent();
+      }).catch(err=>{
+        console.log(err)
+        state.visiblene = false;
+        message.error("调整关卡失败");
+        state.isreload = true;
+        state.curLevel = undefined;
+        state.curStuID = "";
+        state.curLevelName = "";
+      })
+    }
+
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -2561,6 +2647,8 @@ export default {
       downloadFile,
       showStudent,
       setLevels,
+      selectProjectName4,
+      changeLevel
     };
   },
 };

From a252610dfe294a8995235001f75ed2a8c5119d6a Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sun, 15 Jan 2023 14:59:41 +0800
Subject: [PATCH 19/24] =?UTF-8?q?fix=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=9C=AA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 0cc907d0..88aa66ca 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1307,7 +1307,7 @@
   </div>
 </template>
 <script>
-import { ref, reactive, toRefs, onMounted, createVNode, watch, defineEmits } from "vue";
+import { ref, reactive, toRefs, onMounted, createVNode, watch } from "vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import { message, Modal } from "ant-design-vue";
 // import PathAddStu from "../../components/drawers/pathStuAdd";
@@ -1340,7 +1340,6 @@ import RouterExaminationManage from "../../components/drawers/router/RouterExami
 import RouterEvaluationManage from "../../components/drawers/router/RouterEvaluationManage";
 import RouterHomeworkManage from "../../components/drawers/router/RouterHomeworkManage";
 import RouterCommonManage from "../../components/drawers/router/RouterCommonManage";
-import { func } from "vue-types";
 
 export default {
   name: "LevelAdd",

From e648f4e4142f8ed044d12d42cd68ef853254d0af Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sun, 15 Jan 2023 15:21:10 +0800
Subject: [PATCH 20/24] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?-=E5=AD=A6=E5=91=98=E7=AE=A1=E7=90=86-=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8-=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index f8444c11..2277a473 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1858,6 +1858,20 @@ export default {
             </div>
           ),
         },
+        {
+          title: "状态",
+          dataIndex: "status",
+          key: "status",
+          width: 80,
+          align: "center",
+          className: "h",
+          ellipsis: true,
+          customRender: ({ record }) => (
+            <div>
+              {record.finishTaskNum ==0?"未开始":record.finishTaskNum == record.totalTaskNum?"已完成":"进行中"}
+            </div>
+          ),
+        },
         {
           title: "最近学习时间",
           dataIndex: "lastStudyTime",

From 639195a3afb28438cfab77a2711e665c9f8a8ff0 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sun, 15 Jan 2023 17:38:12 +0800
Subject: [PATCH 21/24] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E3=80=81?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86=E8=AF=BE=E7=A8=8B=E5=88=86?=
 =?UTF-8?q?=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 | 33 +++++++++++++--
 src/views/examine/CourseReviewed.vue         | 26 +++++++++++-
 src/views/examine/CourseReviewedN.vue        | 42 ++++++++++++++++++--
 3 files changed, 91 insertions(+), 10 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 2fdaa91b..b2b6ef1b 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -54,8 +54,8 @@
               tree-default-expand-all
               :fieldNames="{
                 children: 'children',
-                label: 'dictCode',
-                value: 'dictName',
+                title: 'dictName',
+                value: 'dictCode',
               }"
               :tree-data="sysTypeOptions"
             >
@@ -2352,6 +2352,7 @@ import TableStudent from "@/components/student/TableStudent";
 import FJUpload from "@/components/common/FJUpload";
 import { updateStudent } from "@/api/indexProjStu";
 import {useStore} from "vuex";
+
 //列表表格
 const columns1 = [
   // {
@@ -3283,7 +3284,7 @@ export default defineComponent({
       name: "",
       createName: "",
       auditStatus: null,
-      categoryId: '',
+      categoryId: undefined,
       projectTime: "",
 
       //列表
@@ -3542,7 +3543,30 @@ export default defineComponent({
       state.viewpowervisible = true;
     };
 
-    const sysTypeOptions = computed(() => store.state.sysType);
+    const sysTypeOptions = computed(() => formateDictT(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;
+    }
 
     //  富文本 sssssssssssssss
     // 编辑器实例，必须用 shallowRef
@@ -3711,6 +3735,7 @@ export default defineComponent({
 
     // 渲染列表1操作
     const getTableDate = async () => {
+      console.log('我是点击搜索的数据',state.categoryId)
       // let datas = state.tableData1;
       let startTime = "";
       let endTime = "";
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 0d4b8277..2104ca4d 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -28,7 +28,7 @@
 									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="options2222">
+								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>
@@ -401,7 +401,28 @@ export default {
 
     const store = useStore();
 
-    const sysTypeOptions = computed(() => store.state.sysType);
+    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;
+    }
 
     function findClassFullName(list,classify,name=''){
       return list && list.length && list.map(e=>{
@@ -515,6 +536,7 @@ export default {
 			changePagination,
 			showProjAuditModal,
 			closeProjAuditModal,
+			sysTypeOptions
 		};
 	},
 };
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index e3c6a167..c87026a2 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -22,8 +22,19 @@
                   ...calssifyList,
                 ]"
               />-->
-							<a-tree-select :getPopupContainer="triggerNode => triggerNode.parentNode || document.body" v-model:value="valueproj" show-search :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-								placeholder="请选择内容分类" tree-default-expand-all :tree-data="options2222">
+							<a-tree-select 
+								:fieldNames="{
+									children: 'children',
+									title: 'dictName',
+									value: 'dictCode',
+								}"
+								:getPopupContainer="triggerNode => triggerNode.parentNode || document.body" 
+								v-model:value="valueproj" 
+								show-search 
+								:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+								placeholder="请选择内容分类" 
+								tree-default-expand-all 
+								:tree-data="sysTypeOptions">
 							</a-tree-select>
 						</div>
 						<div class="inpbox1">
@@ -400,7 +411,29 @@ export default {
 		});
     const store = useStore();
 
-    const sysTypeOptions = computed(() => store.state.sysType);
+    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;
+    }
 
     function findClassFullName(list,classify,name=''){
       return list && list.length && list.map(e=>{
@@ -655,7 +688,8 @@ export default {
 			contentList11,
 			sceneist11,
 			onEditorFocus,
-			sHX
+			sHX,
+			sysTypeOptions
 		};
 	},
 };

From 16988dca765384db83710bc591f1397d039e728c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 15 Jan 2023 17:41:51 +0800
Subject: [PATCH 22/24] --fix

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

diff --git a/src/views/login.vue b/src/views/login.vue
index ebae75bf..4433665e 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -50,8 +50,8 @@ export default {
     const router = useRouter();
     const state = reactive({
       form: {
-        account: "00004409",
-        // account: "10181457",
+        // account: "00004409",
+        account: "10181457",
         password: "1234567890Aa",
       },
     });

From 7c5d3a8aae9707511c5149769c5def1c70f27070 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sun, 15 Jan 2023 17:49:25 +0800
Subject: [PATCH 23/24] =?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 6d4e56c2..0ebc1acd 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.7------------");
+		console.log("版本2.0.8------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

From f9a5fc026510280b59d7a0c058f1e9b8fa823420 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sun, 15 Jan 2023 17:57:05 +0800
Subject: [PATCH 24/24] =?UTF-8?q?=E7=89=88=E6=9C=AC=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 0ebc1acd..ba791049 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.8------------");
+		console.log("版本2.0.9------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});