From 171ad0af18b27715f0eff4945e4e35fc7dbbd4b9 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 13 Dec 2022 14:14:19 +0800
Subject: [PATCH 01/35] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=AF=95=E5=8D=B7=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=86=E7=B1=BB=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SelectTest.vue        | 36 +++++++++++---------
 src/components/project/NameInput.vue         |  2 +-
 src/views/courselibrary/CoursewareManage.vue |  6 +++-
 src/views/examine/CourseReviewed.vue         | 25 ++++++++++++--
 src/views/examine/CourseReviewedN.vue        | 15 ++++----
 src/views/learningpath/LearningPath.vue      | 25 +++++++++-----
 src/views/projectcenter/ProjectManage.vue    |  2 +-
 src/views/research/ResearchManage.vue        |  2 ++
 8 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index fcdeffe6..b12a379e 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -162,43 +162,47 @@ export default {
     const tableDataFunc = () => {
       {
         const columns = [
-          {
-            title: "序号",
-            dataIndex: "paperId",
-            key: "paperId",
-            width: 90,
-            align: "center",
-            className: "h head",
-          },
+         // {
+           //  title: "序号",
+            // dataIndex: "paperId",
+            // key: "paperId",
+            // width: 90,
+           //  align: "center",
+            // className: "h head",
+         //  },
           {
             title: "试卷名称",
             dataIndex: "testName",
             key: "testName",
-            width: 110,
+            width: "40%",
             align: "center",
             className: "h head",
+            ellipsis: true,
           },
           {
             title: "随机模式",
             dataIndex: "paperMode",
             key: "paperMode",
-            width: 110,
+            width: "20%",
             align: "center",
             className: "h",
+            ellipsis: true,
           },
           {
             title: "创建人",
             dataIndex: "sysCreateBy",
             key: "sysCreateBy",
-            width: 90,
+            width: "20%",
             align: "center",
             className: "h",
+            ellipsis: true,
           },
           {
             title: "最近更新时间",
             dataIndex: "sysUpdateTime",
             key: "sysUpdateTime",
-            width: 150,
+            ellipsis: true,
+            width: "20%",
             align: "center",
             className: "h",
           },
@@ -248,7 +252,7 @@ export default {
         published: true,
       };
       api
-        .queryExaminationList(obj)
+        .queryExaminationPaperList(obj)
         .then((data) => {
           // getTableDate(res.data.data);
           //**   表格repaint   */
@@ -257,10 +261,10 @@ export default {
           let obj = {
           key: index + 1,
           sysCreateBy: value.sysCreateBy,
-          paperId: index + 1,
+          paperId:value.id,
           testName: value.testName,
-          paperMode: value.randomMode ? "是" : "否",
-          sysUpdateTime: value.sysUpdateTime,
+          paperMode: value.paperMode==1?"固定试卷":"随机",
+          sysUpdateTime:value.sysUpdateTime,
           id:value.id,
         };
         array.push(obj);
diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue
index 6f92741c..d898b85a 100644
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -73,7 +73,7 @@ function validateProName() {
     display: inline-block;
     width: 99%;
     min-width: 0;
-    padding: 0px 17px;
+    padding: 0px 8px;
     color: rgba(0, 0, 0, 0.85);
     font-size: 14px;
     line-height: 1.5715;
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 930dc096..6a1db8f9 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1967,6 +1967,7 @@
               </a-checkbox>
             </div>
           </div>
+          
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">签到设置</span>
@@ -1978,12 +1979,15 @@
                     是否允许未报名的学员签到
                   </span>
                 </a-radio>
+                <!--
                 <a-radio :value="1" @click="clear_xjkkradioV1">
                   <span style="color: #6d7584">签到是否需要口令</span>
-                </a-radio>
+                </a-radio>-->
               </a-radio-group>
             </div>
           </div>
+
+
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">评估设置</span>
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index b5d214fc..9babe163 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -14,6 +14,7 @@
         <div class="tmplh_inp">
           <div class="inpbox">
             <div class="inpbox1">
+            <!--
               <a-select
                 v-model:value="valueproj"
                 value-key="value"
@@ -21,7 +22,27 @@
                   { label: '请选择内容分类', value: '' },
                   ...calssifyList,
                 ]"
-              />
+              />-->
+              <a-tree-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="valueproj"
+              show-search
+       
+              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+              placeholder="请选择内容分类"
+              allow-clear
+              tree-default-expand-all
+              :tree-data="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">
               <a-input
@@ -140,7 +161,7 @@ export default {
   setup() {
     const state = reactive({
       calssifyList: [], //分类字典
-      valueproj: "",
+      valueproj:null,
       valuecreater: "",
       valuename: "",
       currentPage: 1,
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 460796df..635e46a8 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -16,7 +16,7 @@
             <div class="inpbox1">
             <!--
               <a-select
-                v-model:value="categoryId"
+                v-model:value="valueproj"
                 :options="[
                   { label: '请选择内容分类', value: '' },
                   ...calssifyList,
@@ -28,11 +28,12 @@
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="categoryId"
+              v-model:value="valueproj"
               show-search
+        
               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
               placeholder="请选择内容分类"
-              allow-clear
+        
               tree-default-expand-all
               :tree-data="options2222"
             >
@@ -213,7 +214,7 @@ export default {
         },
       ],
       calssifyList: [], //分类字典
-      categoryId: "",
+      valueproj:null,
       valuecreater: "",
       valuename: "",
       // currentFacePage: 1,
@@ -488,7 +489,7 @@ export default {
       state.loading=true
       let objn = {
         auditStatus: 1,
-        categoryId: state.categoryId,
+        categoryId: state.valueproj,
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
@@ -557,7 +558,7 @@ export default {
     const searchList = () => {
       let objn = {
         auditStatus: 1,
-        categoryId: state.categoryId,
+        categoryId: state.valueproj,
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
@@ -622,7 +623,7 @@ export default {
       state.tableData1 = array;
     };
     const reset = () => {
-      state.categoryId = "";
+      state.valueproj = "";
       state.valuecreater = null;
       state.valuename = null;
       getFaceList();
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 4257ad9c..8c76fb9d 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -203,6 +203,7 @@
               <!-- <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" /> -->
+            
               <div
                 @click="chooseImg(item)"
                 v-for="(item, index) in imgData"
@@ -331,6 +332,7 @@
               <!-- <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" /> -->
+       
               <div
                 @click="chooseImg2(item)"
                 v-for="(item, index) in imgData"
@@ -865,7 +867,7 @@ export default {
     const handleOut1 = () => {
       state.pathName = "";
       state.pathBg = "";
-      state.pathBgId = "";
+      state.pathBgId =1;
       state.organizationSelectName = null;
       state.organizationSelectId = null;
       state.pathIntro = "";
@@ -1620,14 +1622,21 @@ export default {
             state.organizationSelectId = detail.organizationId;
             state.pathIntro = detail.remark;
             state.editPathId = id;
-            // console.log("state.imgData", state.imgData);
-            let arr = imgData;
-            for (let i = 0; i < arr.length; i++) {
-              // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
-              if (arr[i].dictValue === state.pathBg) {
-                state.pathBgId = arr[i].dictCode;
+            let arr = imgData.value;
+            arr.forEach((item) => {
+              if (item.dictValue === state.pathBg) {
+                state.pathBgId = item.dictCode;
+
               }
-            }
+            });
+
+            //for (let i = 0; i < arr.length; i++) {
+             //  console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
+            //  if (arr[i].dictValue === state.pathBg) {
+             //   state.pathBgId = arr[i].dictCode;
+
+           //   }
+          //  }
           }
         })
         .catch((err) => {
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index f641a035..aaab9c1e 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -44,7 +44,7 @@
           ></a-select>
         </div>
         <div class="select addTimeBox">
-          <div class="addTime">创建时间：</div>
+          <div class="addTime">项目起止时间：</div>
           <a-range-picker
               v-model:value="searchParam.valueDate"
               :show-time="{
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index c4683b86..032d52ea 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -426,6 +426,7 @@ export default {
             <div class="operation">
               {value.state === "2" ? (
                 <div class="fb">
+                 { /** 
                   <div class="jc"
                     onClick={() => {
                       handleToManagepage(value, "/managepage");
@@ -433,6 +434,7 @@ export default {
                   >
                     管理
                   </div>
+              */  }
                   <div
                     class="jc"
                     onClick={() => {

From d9608d69e37f32bd53d60a8176c88784f6356716 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 13 Dec 2022 17:56:18 +0800
Subject: [PATCH 02/35] =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                              | 1 +
 src/components/BreadCrumb.vue           | 2 +-
 src/views/courselibrary/courseModal.vue | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e297b87..92a8e40b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ package-lock.json
 src/api/config.js
 src/api/config.js
 src/api/config.js
+src/api/config.js
diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue
index 65dbfae8..b5e57c20 100644
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -70,7 +70,7 @@ export default {
               href: "/leveladd",
             },
             {
-              name: "管理",
+              name: "关卡",
             },
           ];
         }
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 104673b8..adf79a38 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -426,7 +426,7 @@ export default defineComponent({
       hideshow: true,
       ft_eidt: false,
       attach: "",
-      validate:false,
+      validate:true,
       ft_hs: false,
       addLoading: false,
       statusJuJue: 0,

From 68f5a4957e353e87cfd733560bd00db0ce40f655 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 13 Dec 2022 21:49:54 +0800
Subject: [PATCH 03/35] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                       |   2 +-
 src/components/NavTop.vue               |   2 +-
 src/views/projectcenter/templateAdd.vue | 220 +++++++++++++-----------
 3 files changed, 119 insertions(+), 105 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index b726a884..8e180c47 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-13 09:24:16
+ * @LastEditTime: 2022-12-13 15:30:27
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 306d7b78..797a6847 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -76,7 +76,7 @@ export default {
         {
           id: 1,
           name: "管理员",
-          go: "/manage/learningpath",
+          go: "/learningpath",
         },
         {
           id: 2,
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 6d7ae89d..839f41b3 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -4,10 +4,10 @@
     <div class="header">
       <span class="title">创建/编辑单层模板</span>
       <div
-          @click="backPage"
-          style="cursor: pointer"
-          to="/manage/libraryAdd"
-          class="goback"
+        @click="backPage"
+        style="cursor: pointer"
+        to="/libraryAdd"
+        class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -17,25 +17,25 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">模板名称</div>
           </div>
           <div class="in">
             <a-input
-                v-model:value="projectInfo.name"
-                placeholder="请输入模板名称"
-                show-count
-                :maxlength="30"
+              v-model:value="projectInfo.name"
+              placeholder="请输入模板名称"
+              show-count
+              :maxlength="30"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">分类</div>
           </div>
@@ -43,92 +43,97 @@
             <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
           </div>
         </div>
-        <div class="name" style="align-items: flex-start;">
+        <div class="name" style="align-items: flex-start">
           <div class="namebox" style="margin-top: 10px">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
-          <div class="in select" style="flex:1">
+          <div class="in select" style="flex: 1">
             <a-select
-                :getPopupContainer="
-                        (triggerNode) => {
-                          return triggerNode.parentNode || document.body;
-                        }
-                      "
-                v-model:value="projectInfo.picUrl"
-                dropdownClassName="dropdown-style"
-                style="width: 440px"
-                placeholder="请选择"
-                :options="projectPic"
-                @change="handleChangeSelect"
-                allowClear
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="projectInfo.picUrl"
+              dropdownClassName="dropdown-style"
+              style="width: 440px"
+              placeholder="请选择"
+              :options="projectPic"
+              @change="handleChangeSelect"
+              allowClear
             ></a-select>
             <img
-                style="width:100px;height:100px;margin-top:20px;border-radius: 8px"
-                v-if="projectInfo.picUrl"
-                :src="projectInfo.picUrl"
-                alt="avatar"
+              style="
+                width: 100px;
+                height: 100px;
+                margin-top: 20px;
+                border-radius: 8px;
+              "
+              v-if="projectInfo.picUrl"
+              :src="projectInfo.picUrl"
+              alt="avatar"
             />
             <div class="i_bottom">
-                      <span style="color: #999ba3">
-                        高宽比为16:9 (如:800*450) png或jpg图片
-                      </span>
+              <span style="color: #999ba3">
+                高宽比为16:9 (如:800*450) png或jpg图片
+              </span>
             </div>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-                separator="至"
-                :placeholder="['      开始时间', '        结束时间']"
-                v-model:value="projectInfo.rangeTime"
-                style="width: 100%; height: 40px; border-radius: 5px"
-                valueFormat="YYYY-MM-DD HH:mm:ss"
-                @change="timeChange"
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="projectInfo.rangeTime"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              valueFormat="YYYY-MM-DD HH:mm:ss"
+              @change="timeChange"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-                v-model:value="projectInfo.managerId"
-                v-model:name="projectInfo.manager"
-                @onChange="managerChange"
-                mode="multiple"
+              v-model:value="projectInfo.managerId"
+              v-model:name="projectInfo.manager"
+              @onChange="managerChange"
+              mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-                v-model:value="projectInfo.sourceBelongId"
-                v-model:name="projectInfo.sourceBelongName"
+              v-model:value="projectInfo.sourceBelongId"
+              v-model:name="projectInfo.sourceBelongName"
             ></OrgClass>
           </div>
         </div>
@@ -138,11 +143,11 @@
           </div>
           <div class="in">
             <a-textarea
-                v-model:value="projectInfo.remark"
-                style="height: 80px"
-                placeholder="请输入说明"
-                show-count
-                :maxlength="200"
+              v-model:value="projectInfo.remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
             />
           </div>
         </div>
@@ -151,24 +156,23 @@
             <div class="inname">同步学习记录</div>
           </div>
           <div class="in">
-            <a-checkbox
-                v-model:checked="projectInfo.courseSyncFlag"
-            ><span
+            <a-checkbox v-model:checked="projectInfo.courseSyncFlag"
+              ><span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
                 "
-            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-            ></a-checkbox
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-checkbox
             >
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -179,8 +183,8 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训体系</div>
           </div>
@@ -191,15 +195,13 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
-            <a-radio-group
-                v-model:value="projectInfo.boeFlag"
-            >
+            <a-radio-group v-model:value="projectInfo.boeFlag">
               <a-radio :value="1">是</a-radio>
               <a-radio :value="0">否</a-radio>
             </a-radio-group>
@@ -210,20 +212,18 @@
     <div class="footer">
       <div class="btn">
         <a-button v-on:click="createProject" type="primary" class="btn1"
-        >确定
-        </a-button
-        >
+          >确定
+        </a-button>
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
     </div>
   </div>
 </template>
 <script setup>
-
-import {useStore} from "vuex";
-import {ref, onMounted, watch} from "vue";
-import {message} from "ant-design-vue";
-import {useRouter, useRoute} from "vue-router";
+import { useStore } from "vuex";
+import { ref, onMounted, watch } from "vue";
+import { message } from "ant-design-vue";
+import { useRouter, useRoute } from "vue-router";
 import * as api from "../../api/indexTemplate";
 import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
@@ -234,31 +234,41 @@ import ProjectLevel from "@/components/project/ProjectLevel";
 const route = useRoute();
 const router = useRouter();
 const store = useStore();
-const projectInfo = ref({})
-const projectPic = ref([])
+const projectInfo = ref({});
+const projectPic = ref([]);
 
 onMounted(() => {
-  getDetail()
-  projectPic.value = store.state.projectPic.map((e) => ({value: e.dictValue, label: e.dictName}));
-})
+  getDetail();
+  projectPic.value = store.state.projectPic.map((e) => ({
+    value: e.dictValue,
+    label: e.dictName,
+  }));
+});
 
-watch(() => route.query.projectTemplateId, () => {
-  getDetail()
-})
+watch(
+  () => route.query.projectTemplateId,
+  () => {
+    getDetail();
+  }
+);
 
-const getDetail = () => route.query.projectTemplateId && api.templateDetail(route.query.projectTemplateId)
-    .then((res) => {
-      projectInfo.value = res.data.data.projectTemplateInfo;
-      projectInfo.value.rangeTime = [projectInfo.value.beginTime, projectInfo.value.endTime]
-    })
+const getDetail = () =>
+  route.query.projectTemplateId &&
+  api.templateDetail(route.query.projectTemplateId).then((res) => {
+    projectInfo.value = res.data.data.projectTemplateInfo;
+    projectInfo.value.rangeTime = [
+      projectInfo.value.beginTime,
+      projectInfo.value.endTime,
+    ];
+  });
 
 const backPage = () => {
   router.back();
 };
 
 const handleChangeSelect = (value) => {
-  projectInfo.value.picUrl = value
-}
+  projectInfo.value.picUrl = value;
+};
 
 function timeChange(e) {
   if (e && e.length === 2) {
@@ -289,18 +299,22 @@ const createProject = () => {
       return;
     }
   }
-  api.templateEdit({...projectInfo.value, courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0}).then(() => {
-    message.destroy();
-    message.success("编辑成功");
-    router.back()
-  })
+  api
+    .templateEdit({
+      ...projectInfo.value,
+      courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
+    })
+    .then(() => {
+      message.destroy();
+      message.success("编辑成功");
+      router.back();
+    });
 };
 
 function managerChange(e, l, d, t) {
-  projectInfo.value.valuesourceBelongId = d
-  projectInfo.value.sourceBelongName = t
+  projectInfo.value.valuesourceBelongId = d;
+  projectInfo.value.sourceBelongName = t;
 }
-
 </script>
 <style lang="scss">
 .projectAdd {

From 7c8ae62f70c7c5349c54c692b10c9dd60645f71e Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 07:27:04 +0800
Subject: [PATCH 04/35] bug

---
 src/components/drawers/AddInvist.vue      |   4 +-
 src/components/drawers/AddOnline.vue      |  38 +++--
 src/components/drawers/SelFacet.vue       | 168 +++++++++++++++++++++-
 src/components/drawers/SelectTest.vue     |  20 +--
 src/components/project/NameInput.vue      |  21 +++
 src/views/courselibrary/courseModal.vue   |   4 +-
 src/views/examine/CourseReviewed.vue      |   2 +-
 src/views/examine/CourseReviewedN.vue     |   2 +-
 src/views/learningpath/LearningPath.vue   |   4 +-
 src/views/projectcenter/ProjectAdd.vue    |  46 +++++-
 src/views/projectcenter/ProjectManage.vue |  21 ++-
 11 files changed, 287 insertions(+), 43 deletions(-)

diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 1ba2c07a..2a3ee083 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -10,7 +10,7 @@
     <div class="drawerMain">
       <div class="header">
         <div v-if="edit" class="headerTitle">编辑评估</div>
-        <div v-else class="headerTitle">添加评估{{assessmentName}}{{assessmentId}}</div>
+        <div v-else class="headerTitle">添加评估</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -192,7 +192,7 @@ export default {
             } else {
               RouterEditTask({
                 chapterId: props.isactive,
-                courseTaskId: state.assessmentId,
+                courseId: state.assessmentId,
                 name: state.assessmentName,
                 routerId: props.routerId,
                 routerTaskId: props.routerTaskId || 0,
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index d4114a0d..ced345f9 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -166,6 +166,9 @@
         <button class="btn2" @click="updateTask">确定</button>
       </div>
     </div>
+    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+      <a-spin :spinning="addLoading" tip="" />
+    </div>
   </a-drawer>
 </template>
 <script>
@@ -256,6 +259,7 @@ export default {
       tableDataTotal: 0,
       pageSize: 10,
       choicecourse: true,
+      ddLoading:false,
     });
     const ChoiceCourse = () => {
       state.choicecourse = false;
@@ -295,7 +299,7 @@ export default {
           title: "名称",
           dataIndex: "name",
           key: "name",
-          width: "40%",
+          width: "30%",
           ellipsis: true,
         },
         {
@@ -304,20 +308,22 @@ export default {
           key: "contenttype",
           width: "15%",
           align: "center",
+          ellipsis: true,
         },
-        {
-          title: "授课教师",
-          dataIndex: "teacher",
-          key: "teacher",
-          width: "15%",
-          align: "center",
-        },
+       //   {
+        //    title: "授课教师",
+        //    dataIndex: "teacher",
+        //    key: "teacher",
+         //   width: "15%",
+         //   align: "center",
+        //  },
         {
           title: "创建人",
           dataIndex: "sysCreateBy",
           key: "sysCreateBy",
           width: "15%x",
           align: "center",
+          ellipsis: true,
         },
      //   {
       //    title: "创建时间",
@@ -330,8 +336,9 @@ export default {
           title: "发布时间",
           dataIndex: "publishTime",
           key: "publishTime",
-          width: "15%",
+          width: "25%",
           align: "center",
+          ellipsis: true,
         },
       ];
       return columns;
@@ -462,9 +469,10 @@ export default {
         });
     };
     const updateTask = () => {
-   
+      state.addLoading =true;
       if (props.isLevel == 1) {
         if(!props.isactive){
+          state.addLoading =false;
           message.destroy();
           return message.warning("请先选中关卡");
         }
@@ -495,6 +503,7 @@ export default {
               }
               message.destroy();
               message.warning("在线课（" + tipStr + "）重复添加");
+              state.addLoading =false;
               return;
             } else {
               state.addOnlineList.map((value) => {
@@ -507,16 +516,19 @@ export default {
                   routerTaskId: props.routerTaskId || 0,
                   type: 1,
                 })
-                  .then(() => {
-                    message.destroy();
-                    message.success(
+                  .then((res) => {
+                    if(res.data.code == 200){
+                      message.destroy();
+                      message.success(
                       `${props.edit ? "编辑" : "新增"}关卡任务成功`
                     );
+                    }
                     ctx.emit("changeData", false);
                     closeDrawer();
                     state.addLoading = false;
                   })
                   .catch(() => {
+                    state.addLoading =false;
                     message.destroy();
                     message.error(
                       `${props.edit ? "编辑" : "新增"}关卡任务失败`
diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index 15dccaec..eeb7414e 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -117,8 +117,8 @@
               :loading="tableDataTotal === -1 ? true : false"
               :pagination="false"
           />
-          <div class="tableBox">
-          <div class="pa" style="display:flex;justify-content:center;padding:20px;">
+          <div class="tableBox" style="margin-top: 85px;">
+          <div class="pa" style="display:flex;justify-content:center;">
             <a-pagination
                 v-if="tableDataTotal > 10"
                 :showSizeChanger="false"
@@ -167,8 +167,8 @@ const columns1 = [
   {
     title: "内容分类",
     width: "15%",
-    dataIndex: "content",
-    key: "content",
+    dataIndex: "category",
+    key: "category",
     align: "center",
   },
   {
@@ -216,6 +216,129 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+      options2222: [
+        {
+          title: "领导力",
+          value: "100",
+          selectable: false,
+          children: [
+            {
+              title: "领导业务",
+              value: "1001",
+            },
+            {
+              title: "领导团队",
+              value: "1002",
+            },
+            {
+              title: "领导自我",
+              value: "1003",
+            },
+          ],
+        },
+        {
+          title: "专业力",
+          value: "200",
+          selectable: false,
+          children: [
+            {
+              title: "研发",
+              value: "2001",
+            },
+            {
+              title: "产品和解决方案",
+              value: "2002",
+            },
+            {
+              title: "生产技术与制造",
+              value: "2003",
+            },
+            {
+              title: "供应链",
+              value: "2004",
+            },
+            {
+              title: "营销",
+              value: "2005",
+            },
+            {
+              title: "品质",
+              value: "2006",
+            },
+            {
+              title: "战略与企划",
+              value: "2007",
+            },
+            {
+              title: "流程管理",
+              value: "2008",
+            },
+            {
+              title: "业绩管理",
+              value: "2009",
+            },
+            {
+              title: "项目管理",
+              value: "20010",
+            },
+            {
+              title: "信息技术",
+              value: "20011",
+            },
+            {
+              title: "环境与安全",
+              value: "20012",
+            },
+            {
+              title: "人力资源",
+              value: "20013",
+            },
+            {
+              title: "企业文化",
+              value: "20014",
+            },
+            {
+              title: "品牌",
+              value: "20015",
+            },
+            {
+              title: "财务",
+              value: "20016",
+            },
+            {
+              title: "法务",
+              value: "20017",
+            },
+            {
+              title: "行政",
+              value: "20018",
+            },
+            {
+              title: "医工",
+              value: "20019",
+            },
+          ],
+        },
+        {
+          title: "通用力",
+          value: "300",
+          selectable: false,
+          children: [
+            {
+              title: "职业操守与道德",
+              value: "3001",
+            },
+            {
+              title: "职业素养与技能",
+              value: "3002",
+            },
+            {
+              title: "规章制度",
+              value: "3003",
+            },
+          ],
+        },
+      ],
       classTableData: [
         // {
         //   key: "1",
@@ -310,6 +433,7 @@ export default {
 
     const getClassData = (tabledata) => {
       let data = tabledata;
+      let tData =[];
       let array = [];
       data.map((value) => {
         let obj = {
@@ -320,11 +444,44 @@ export default {
           creator: value.createName || "-",
           time: value.publishTime,
           categoryId: value.categoryId,
+          category:"",
           //需要判断content
         };
+        let options = state.options2222;      
+        for (let i = 0; i < options.value.length; i++) {
+          for (let j = 0; j < options.value[i].children.length; j++) {
+            if (
+              String(options.value[i].children[j].value) ===
+              String(value.categoryId)
+            ) {
+              console.log();
+              value.category = options.value[i].children[j].title;
+             
+              return false;
+            }
+          }
+        }
         array.push(obj);
+     
       });
-      state.classTableData = array;
+      array.forEach((itm) => {
+        let options = state.options2222;      
+        for (let i = 0; i < options.value.length; i++) {
+          for (let j = 0; j < options.value[i].children.length; j++) {
+            if (
+              String(options.value[i].children[j].value) ===
+              String(itm.categoryId)
+            ) {
+              console.log("找到了",i);
+              itm.category = options.value[i].children[j].title;
+              tData.push(itm);
+              return false;
+            }
+          }
+        }
+        });
+        console.log("结果：",tData);
+      state.classTableData = tData;
     };
     /**
      const options1 = ref([
@@ -369,6 +526,7 @@ export default {
       afterVisibleChange,
       closeDrawer,
 
+
       columns1,
       getClassData,
       handleChange,
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index b12a379e..ca8a5db4 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -88,7 +88,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
+        <button class="btn1"  @click="closeDrawer">取消</button>
         <button class="btn2" @click="CreatSTText()">确定</button>
       </div>
     </div>
@@ -197,15 +197,15 @@ export default {
             className: "h",
             ellipsis: true,
           },
-          {
-            title: "最近更新时间",
-            dataIndex: "sysUpdateTime",
-            key: "sysUpdateTime",
-            ellipsis: true,
-            width: "20%",
-            align: "center",
-            className: "h",
-          },
+         //   {
+         //     title: "最近更新时间",
+         //     dataIndex: "sysUpdateTime",
+         //   //    key: "sysUpdateTime",
+          //    ellipsis: true,
+          //    width: "20%",
+          //    align: "center",
+           //   className: "h",
+         //   },
         ];
         return columns;
       }
diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue
index d898b85a..ed8389e6 100644
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -67,6 +67,27 @@ function validateProName() {
 
 </script>
 <style lang="scss">
+.in{
+  .pro{
+  .ant-input-affix-wrapper {
+    position: relative;
+    display: inline-block;
+    width: 99%;
+    min-width: 0;
+    padding: 4px 8px;
+    color: rgba(0, 0, 0, 0.85);
+    font-size: 14px;
+    line-height: 1.5715;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #d9d9d9;
+    border-radius: 8px;
+    transition: all 0.3s;
+    display: inline-flex;
+  }
+  }
+}
+    
 .in{
   .ant-input-affix-wrapper {
     position: relative;
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index adf79a38..3c19074f 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -50,7 +50,7 @@
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-                    <NameInput placeholder="请输入课程名称" v-model:value="qdms_inputV1" v-model:validate="validate"
+                    <NameInput ref="inputRef"  placeholder="请输入课程名称" v-model:value="qdms_inputV1" v-model:validate="validate"
                                :maxlength="20" show-count :type="2" :id="offcourseId"></NameInput>
 <!--                    <a-input-->
 <!--                        v-model:value="qdms_inputV1"-->
@@ -304,7 +304,7 @@
                   <span style="margin-right: 14px">授课教师</span>
                 </div>
                 <div class="item_inp">
-                  <div class="i1_input">
+                  <div class="select" style="width:88%;">
                     <ProjectManager
                         v-model:value="member.value"
                         v-model:name="member.name"
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 9babe163..05d0864a 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -505,7 +505,7 @@ export default {
       console.log(data);
     };
     const reset = () => {
-      (state.valueproj = ""),
+      (state.valueproj = null),
         (state.valuecreater = null),
         (state.valuename = null),
         getList();
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 635e46a8..65e91f33 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -623,7 +623,7 @@ export default {
       state.tableData1 = array;
     };
     const reset = () => {
-      state.valueproj = "";
+      state.valueproj = null;
       state.valuecreater = null;
       state.valuename = null;
       getFaceList();
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 8c76fb9d..69f732e7 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -809,8 +809,8 @@ export default {
         },
         {
           id: 3,
-          value: "已停用",
-          label: "已停用",
+          value: "已结束",
+          label: "已结束",
           classify: -1,
         },
       ],
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 0bfdb837..f5914863 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -211,6 +211,14 @@
             />
           </div>
         </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">审核意见</div>
+          </div>
+          <div class="description">
+           {{auditDescription}}
+          </div>
+        </div>
       </div>
       <div class="template">
         <div class="name">
@@ -267,6 +275,8 @@ import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import {changeOwnership, scrollLoad} from "@/api/method";
 import {storage} from "../../api/storage";
+import * as api2 from "../../api/indexAudit";
+import {validateName} from "@/api/index1";
 
 export default {
   name: "projectAdd",
@@ -297,6 +307,7 @@ export default {
       },
       classifyList5: [],
       courseSyncFlag: false,
+      auditDescription:"",
     });
 
     // 封面图选择
@@ -340,6 +351,24 @@ export default {
               state.projectInfo.endTime,
             ];
             state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
+            if (Number(state.projectInfo.status) === -5) {
+            let obj = {
+              project_id: state.projectInfo.projectId,
+              type: 1,
+              pageNo: 1,
+              pageSize: 1,
+            };
+            api2.auditList(obj).then((d) => {
+              if (d.data.code === 200) {
+                let res =d.data.data;
+                if (res.rows && res.rows.length > 0) {
+                  let i = res.rows.length;
+                  state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
+                }
+              }
+            });
+        
+             }
           });
     }
 
@@ -416,16 +445,24 @@ export default {
       return true;
     }
 
-    const createProject = () => {
+    const createProject = async() => {
       console.log("保存", state.projectInfo);
       if (!validate(state.projectInfo, errorMsgs)) {
         return;
       }
+      /** 
       if (!state.projectInfo.validate) {
         message.destroy();
         message.warning('项目名称重复，请修改名称！');
         return;
-      }
+      }*/
+        const offName = await validateName({name:state.projectInfo.name, type:1, id:state.projectInfo.projectId}).then(res => {
+          return res.data.data == 1;
+         });
+         if(offName){
+            message.destroy();
+            return message.warning("项目名称重复，请重新填写");
+         }
       state.projectInfo.type = 3;
       state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
       api.createProject(state.projectInfo).then((res) => {
@@ -663,7 +700,10 @@ export default {
       .name2 {
         display: flex;
         align-items: flex-start;
-
+        .description{
+          margin-top: 14px;
+          margin-left: 11px;
+        }
         .ant-input-textarea {
           .ant-input {
             height: 88px;
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index aaab9c1e..67bf4807 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -44,7 +44,7 @@
           ></a-select>
         </div>
         <div class="select addTimeBox">
-          <div class="addTime">项目起止时间：</div>
+          <div class="addTime">创建时间：</div>
           <a-range-picker
               v-model:value="searchParam.valueDate"
               :show-time="{
@@ -179,7 +179,7 @@
               />
             </div>
             <div class="inname">项目名称:</div>
-            <div class="in">
+            <div class="in pro">
               <NameInput
                   placeholder="请输入项目名称"
                   v-model:value="projectInfo.name"
@@ -831,6 +831,7 @@ import dayjs from "dayjs";
 import * as moment from "moment";
 import {changeOwnership} from "@/api/method";
 import NameInput from "@/components/project/NameInput";
+import {validateName} from "@/api/index1";
 
 export default {
   name: "projectManage",
@@ -958,7 +959,7 @@ export default {
     }
 
     // 创建多层项目
-    const createStoreyProject = () => {
+    const createStoreyProject = async() => {
       // 接口需要传递的参数信息
       const errorMsgs = {
         name: "请输入项目名称",
@@ -969,11 +970,19 @@ export default {
       if (!validate(state.projectInfo, errorMsgs)) {
         return;
       }
+      /**
       if (!state.projectInfo.validate) {
         message.destroy();
         message.warning("项目名称重复，请修改名称！");
         return;
-      }
+      } */
+      const offName = await validateName({name: state.qdms_inputV1, type:1, id:state.projectInfo.projectId}).then(res => {
+          return res.data.data == 1;
+         });
+         if(offName){
+            message.destroy();
+            return message.warning("项目名称重复，请重新填写");
+         }
       api.createProject(state.projectInfo).then((res) => {
         state.doublepro = false;
         message.destroy();
@@ -1355,6 +1364,7 @@ export default {
                       dayjs().isBefore(value.record.end) ? "进行中" : "已结束",
                   "-1": () => "已结束",
                   "-5": () => "草稿",
+               
                 }[value.record.status + ""]() || ""
                     : "-"}
               </div>
@@ -2092,6 +2102,9 @@ export default {
     font-weight: 400;
     color: #4ea6ff;
     margin-right: -45px;
+    display: flex;
+    justify-content: right;
+    margin-right: 18px;
 
     // line-height: 36px;
     .operation1 {

From aef73624d61bf4a92b9e459fa985d5c160bbcf2a Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 08:39:46 +0800
Subject: [PATCH 05/35] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SelFacet.vue | 104 +++++++++++++++++-----------
 1 file changed, 63 insertions(+), 41 deletions(-)

diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index eeb7414e..441eb6d2 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -117,7 +117,7 @@
               :loading="tableDataTotal === -1 ? true : false"
               :pagination="false"
           />
-          <div class="tableBox" style="margin-top: 85px;">
+          <div class="tableBox" style="margin-top:85px;">
           <div class="pa" style="display:flex;justify-content:center;">
             <a-pagination
                 v-if="tableDataTotal > 10"
@@ -162,6 +162,7 @@ const columns1 = [
     width: "30%",
     dataIndex: "name",
     key: "name",
+    ellipsis: true,
     
   },
   {
@@ -170,6 +171,7 @@ const columns1 = [
     dataIndex: "category",
     key: "category",
     align: "center",
+    ellipsis: true,
   },
   {
     title: "授课教师",
@@ -177,6 +179,7 @@ const columns1 = [
     dataIndex: "teacher",
     key: "teacher",
     align: "center",
+    ellipsis: true,
   },
   {
     title: "创建人",
@@ -184,6 +187,7 @@ const columns1 = [
     dataIndex: "creator",
     key: "creator",
     align: "center",
+    ellipsis: true,
   },
   {
     title: "发布时间",
@@ -191,6 +195,7 @@ const columns1 = [
     dataIndex: "time",
     key: "time",
     align: "center",
+    ellipsis: true,
   },
 ];
 
@@ -216,6 +221,17 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+      classTableData: [
+        // {
+        //   key: "1",
+        //   num: "JDF2022071100001",
+        //   name: "时间管理课程",
+        //   content: "通用力",
+        //   teacher: "BOE教师",
+        //   creator: "管理员",
+        //   time: "2022-10-31 23:12:00",
+        // }
+      ],
       options2222: [
         {
           title: "领导力",
@@ -339,17 +355,6 @@ export default {
           ],
         },
       ],
-      classTableData: [
-        // {
-        //   key: "1",
-        //   num: "JDF2022071100001",
-        //   name: "时间管理课程",
-        //   content: "通用力",
-        //   teacher: "BOE教师",
-        //   creator: "管理员",
-        //   time: "2022-10-31 23:12:00",
-        // }
-      ],
       currentPage: 1,
       tableDataTotal: null,
       pageSize: 10,
@@ -433,8 +438,8 @@ export default {
 
     const getClassData = (tabledata) => {
       let data = tabledata;
-      let tData =[];
       let array = [];
+      let options = state.options2222;    
       data.map((value) => {
         let obj = {
           key: value.offcourseId,
@@ -447,43 +452,60 @@ export default {
           category:"",
           //需要判断content
         };
-        let options = state.options2222;      
+        console.log("obj",obj);
+        var breaked = false;
+        for (let i = 0; i < options.length; i++) {
+          for (let j = 0; j < options[i].children.length; j++) {
+            if (
+              String(options[i].children[j].value) ===
+              String(obj.categoryId)
+            ) {
+              console.log("obj.categoryId",obj.categoryId);
+              obj.category = options[i].children[j].title;
+              console.log("obj. obj.category ", obj.category );
+              breaked = true;
+              break;
+            }
+          }
+          if(breaked){
+            break;
+          }
+        }
+        if(!obj.category ){
+          obj.category ="-";
+        }
+        console.log("obj. obj.category22 ", obj.category );
+        array.push(obj);
+      });
+      state.classTableData = array;
+    };
+
+
+
+
+   /**
+
+    const getCategory=(id)=>{
+      console.log("进来了");
+      let category="";
+      let options = state.options2222;      
         for (let i = 0; i < options.value.length; i++) {
           for (let j = 0; j < options.value[i].children.length; j++) {
             if (
               String(options.value[i].children[j].value) ===
-              String(value.categoryId)
+              String(id)
             ) {
               console.log();
-              value.category = options.value[i].children[j].title;
+              category = options.value[i].children[j].title;
              
-              return false;
+              return category;
             }
           }
         }
-        array.push(obj);
-     
-      });
-      array.forEach((itm) => {
-        let options = state.options2222;      
-        for (let i = 0; i < options.value.length; i++) {
-          for (let j = 0; j < options.value[i].children.length; j++) {
-            if (
-              String(options.value[i].children[j].value) ===
-              String(itm.categoryId)
-            ) {
-              console.log("找到了",i);
-              itm.category = options.value[i].children[j].title;
-              tData.push(itm);
-              return false;
-            }
-          }
-        }
-        });
-        console.log("结果：",tData);
-      state.classTableData = tData;
-    };
-    /**
+      return category;
+    }
+
+ 
      const options1 = ref([
      {
         value: 0,
@@ -526,7 +548,6 @@ export default {
       afterVisibleChange,
       closeDrawer,
 
-
       columns1,
       getClassData,
       handleChange,
@@ -536,6 +557,7 @@ export default {
       rowSelection,
       search,
       submitCourse,
+     
       // change,
     };
   },

From 428a968f12a8cf7be864782dd022bb72007c727d Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 08:47:37 +0800
Subject: [PATCH 06/35] 404

---
 vue.config.js | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 23d6b8f8..341e4b39 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,27 +6,22 @@
  * @FilePath: /fe-manage/vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-const {defineConfig} = require("@vue/cli-service");
-
+const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
-    publicPath: "/manage",
-    // transpileDependencies: true,
-    // devServer: {
-    //     port: 8080,
-    //     proxy: {
-    //         "/manageApi": {
-    //             target: "http://localhost:30001/",
-    //             changeOrigin: true, //表示是否改变原域名
-    //             // secure: false,
-    //             // ws: false, //表示WebSocket协议
-    //             pathRewrite: {
-    //                 "^/manageApi": "",
-    //             },
-    //         },
-    //         "/userbasic": {
-    //             target: "https://u-pre.boe.com",
-    //             changeOrigin: true,
-    //         },
-    //     },
-    // },
+  publicPath: "/manage",
+  // transpileDependencies: true,
+  devServer: {
+    port: 8080,
+    proxy: {
+      "/manageApi": {
+         target:"http://111.231.196.214:30001/",
+          changeOrigin: true, //表示是否改变原域名
+        // secure: false,
+        // ws: false, //表示WebSocket协议
+        pathRewrite: {
+          "^/manageApi": "",
+        },
+      },
+    },
+  },
 });

From 0382f7ae1231deb36d6740ab953b6ed2a025ad03 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 09:03:23 +0800
Subject: [PATCH 07/35] =?UTF-8?q?feat:=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 +-
 src/components/drawers/AddTest.vue | 400 +++++++++++++----------------
 2 files changed, 181 insertions(+), 221 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 01c9c500..2354d8c4 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("版本0.9.12------------");
+    console.log("版本0.9.13------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index b02f68ea..ca1a2075 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -33,10 +33,10 @@
           外部考试
         </button> -->
       </div>
-  
-        <div class="contentMain">
-          <div class="main_left">
-            <div class="main_item">
+
+      <div class="contentMain">
+        <div class="main_left">
+          <div class="main_item">
             <div class="signbox">
               <div class="sign">
                 <img
@@ -49,13 +49,13 @@
             <div class="btnbox">
               <a-input
                 v-model:value="test.examinationName"
-                style="width: 400px; height: 40px; border-radius: 8px;"
+                style="width: 400px; height: 40px; border-radius: 8px"
                 placeholder="请输入考试名称"
                 :maxlength="20"
               />
             </div>
           </div>
-     
+
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
@@ -70,18 +70,12 @@
               <button class="xkbtn" @click="selectTest">
                 {{ chooseCourse ? "重选" : "选择" }}试卷
               </button>
-              <div   v-if="paperName != ''">
-                <a-tag
-                 
-                    closable
-                    color="processing"
-                    @close="delTag"
-                  >
-                    <span style="font-size: 14px; line-height: 33px">{{
-                      paperName
-                    }}</span>
-                  </a-tag>
-               
+              <div v-if="paperName != ''">
+                <a-tag closable color="processing" @close="delTag">
+                  <span style="font-size: 14px; line-height: 33px">{{
+                    paperName
+                  }}</span>
+                </a-tag>
               </div>
             </div>
             <!-- 选择面授侧弹窗 -->
@@ -94,7 +88,7 @@
             </div>
             <!-- 选择面授侧弹窗 -->
           </div>
-     
+
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
@@ -105,8 +99,9 @@
               </div>
               <span style="margin-right: 3px">考试时间：</span>
             </div>
-            <div class="btnbox" >
-              <a-range-picker style="width: 400px; height: 40px; border-radius: 8px;"
+            <div class="btnbox">
+              <a-range-picker
+                style="width: 400px; height: 40px; border-radius: 8px"
                 show-time
                 format="YYYY/MM/DD HH:mm"
                 v-model:value="test.chooseTime"
@@ -129,7 +124,7 @@
                 :min="0"
                 :max="300"
                 :precision="0"
-                style="width: 400px; height: 40px; border-radius: 8px;"
+                style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="test.examinationDuration"
               ></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -154,7 +149,7 @@
             <div class="signbox">
               <span style="margin-right: 3px">考试限制：</span>
             </div>
-            <div class="kqszbox"> 
+            <div class="kqszbox">
               <div class="setbox">
                 <div class="timerbox">
                   <span>允许重复考试：</span>
@@ -170,166 +165,138 @@
                     "
                     v-model:value="test.examinationLimit"
                   ></a-input-number>
-                  <span style="color: #999999; margin-left: 8px">次,-1表示无限制</span>
+                  <span style="color: #999999; margin-left: 8px"
+                    >次,-1表示无限制</span
+                  >
                 </div>
               </div>
             </div>
           </div>
-    
 
-            <div class="main_item">
-              <div class="signbox">
+          <div class="main_item">
+            <div class="signbox">
               <span style="margin-right: 3px">显示答案：</span>
             </div>
-              <div class="btnbox">
-               
-                  <a-radio-group
-                    style="margin-right: 12px"
-                    v-model:value="test.showAnswers"
-                  >
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="1"
-                      @click="cloradio1"
-                      >允许查看
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio1"
-                      >不允许查看
-                    </a-radio>
-                  </a-radio-group>
-               
-              </div>
+            <div class="btnbox">
+              <a-radio-group
+                style="margin-right: 12px"
+                v-model:value="test.showAnswers"
+              >
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
+                  >允许查看
+                </a-radio>
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
+                  >不允许查看
+                </a-radio>
+              </a-radio-group>
             </div>
-            <div class="main_item">
-              <div class="signbox">
+          </div>
+          <div class="main_item">
+            <div class="signbox">
               <span style="margin-right: 3px">显示解析：</span>
             </div>
-              <div class="btnbox">
-               
-                  <a-radio-group
-                    style="margin-right: 12px"
-                    v-model:value="test.showAnalysis"
-                  >
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="1"
-                      @click="cloradio2"
-                      >允许查看
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio2"
-                      >不允许查看
-                    </a-radio>
-                  </a-radio-group>
-             
-              </div>
+            <div class="btnbox">
+              <a-radio-group
+                style="margin-right: 12px"
+                v-model:value="test.showAnalysis"
+              >
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio2"
+                  >允许查看
+                </a-radio>
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
+                  >不允许查看
+                </a-radio>
+              </a-radio-group>
             </div>
-            <div class="main_item">
-              <div class="signbox">
+          </div>
+          <div class="main_item">
+            <div class="signbox">
               <span style="margin-right: 3px">评分模式：</span>
             </div>
-              <div class="btnbox">
-             
-                  <a-radio-group
-                    style="margin-right: 12px"
-                    v-model:value="test.scoringModel"
-                  >
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="1"
-                      @click="cloradio3"
-                      >最高一次
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio3"
-                      >最后一次
-                    </a-radio>
-                  </a-radio-group>
-              
-              </div>
+            <div class="btnbox">
+              <a-radio-group
+                style="margin-right: 12px"
+                v-model:value="test.scoringModel"
+              >
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio3"
+                  >最高一次
+                </a-radio>
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio3"
+                  >最后一次
+                </a-radio>
+              </a-radio-group>
             </div>
-            <div class="main_item">
-              <div class="signbox">
+          </div>
+          <div class="main_item">
+            <div class="signbox">
               <span style="margin-right: 3px">及格线：</span>
             </div>
-              <div class="btnbox">
-              
-                  <a-input
-                    v-model:value="test.passLine"
-                    type="number"
-                    style="width: 400px; height: 40px; border-radius: 8px;"
-                  />
-              
-                  <span style="color: #999999; margin-left: 8px">分</span>
-              </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="test.passLine"
+                type="number"
+                style="width: 400px; height: 40px; border-radius: 8px"
+              />
+
+              <span style="color: #999999; margin-left: 8px">分</span>
             </div>
+          </div>
+          <div class="main_item">
             <div class="main_item">
-              <div class="main_item">
               <div class="signbox">
-              <span style="margin-right: 3px">作业要求：</span>
-            </div>
+                <span style="margin-right: 3px">作业要求：</span>
+              </div>
               <div class="btnbox">
-              
-                  <a-radio-group
-                    style="margin-right: 12px"
-                    v-model:value="test.questionArrangement"
-                  >
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="1"
-                      @click="cloradio4"
-                      >试题乱序
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio4"
-                      >选项乱序
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="3"
-                      @click="cloradio4"
-                      >全部乱序
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="4"
-                      @click="cloradio4"
-                      >不乱序
-                    </a-radio>
-                  </a-radio-group>
-               
+                <a-radio-group
+                  style="margin-right: 12px"
+                  v-model:value="test.questionArrangement"
+                >
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="1"
+                    @click="cloradio4"
+                    >试题乱序
+                  </a-radio>
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="2"
+                    @click="cloradio4"
+                    >选项乱序
+                  </a-radio>
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="3"
+                    @click="cloradio4"
+                    >全部乱序
+                  </a-radio>
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="4"
+                    @click="cloradio4"
+                    >不乱序
+                  </a-radio>
+                </a-radio-group>
               </div>
             </div>
           </div>
         </div>
-    
+      </div>
+      <div class="main_btns">
+        <a-button class="btn1" @click="closeDrawer2">取消</a-button>
+        <a-button class="btn2" @click="updateTest">确定</a-button>
+      </div>
+      <!--  加载动画 -->
+      <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+        <a-spin :spinning="addLoading" tip="" />
+      </div>
 
+      <!-- 选择考试抽屉 -->
+      <s-test v-model:STvisible="STvisible" @getSTData="getData" />
     </div>
-    <div class="main_btns">
-          <a-button class="btn1" @click="closeDrawer2">取消</a-button>
-          <a-button class="btn2" @click="updateTest">确定</a-button>
-        </div>
-    <!--  加载动画 -->
-    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-      <a-spin :spinning="addLoading" tip="" />
-    </div>
-
-    <!-- 选择考试抽屉 -->
-    <s-test v-model:STvisible="STvisible" @getSTData="getData" />
-  </div> 
   </a-drawer>
 </template>
 <script>
-import { reactive,toRefs } from "vue";
+import { reactive, toRefs } from "vue";
 import { message } from "ant-design-vue";
 import {
   createExamination,
@@ -407,10 +374,8 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-      test:{
+      test: {},
 
-      },
-     
       addLoading: false,
       isOuter: 1, // 是否为外部考试
       STvisible: false, //选择试卷抽屉
@@ -433,14 +398,11 @@ export default {
       ],
     });
 
-
     const clearAll = () => {
-      state.test={};
-
+      state.test = {};
     };
-   
+
     const closeDrawer = () => {
-   
       state.statechoosedTime = "";
       ctx.emit("update:addtestVisible", false);
       ctx.emit("update:edit", false);
@@ -474,14 +436,15 @@ export default {
       state.paperName = "";
     };
     const queryTest = () => {
-      
       queryExaminationDetailById({ examinationId: props.EditTestId })
         .then((res) => {
           state.test = res.data.data;
           state.test.showAnswers = Number(state.test.showAnswers);
           state.test.showAnalysis = Number(state.test.showAnalysis);
-          state.test.scoringModel =Number(state.test.scoringModel);
-          state.test.questionArrangement =Number(state.test.questionArrangement);
+          state.test.scoringModel = Number(state.test.scoringModel);
+          state.test.questionArrangement = Number(
+            state.test.questionArrangement
+          );
           state.test.chooseTime = [
             dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm:ss"),
             dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm:ss"),
@@ -489,16 +452,14 @@ export default {
           state.paperName = state.test.examinationTestName;
           // state.paperId=dayjs
           state.paperId = state.test.examinationTestId;
-          
-          console.log("querytest",state.test);
+
+          console.log("querytest", state.test);
         })
         .catch(() => {
           //message.error(`查询失败`);
         });
     };
     const updateTest = () => {
-      
-
       if (!state.test.examinationName) {
         message.destroy();
         return message.warning("请输入考试名称");
@@ -508,29 +469,29 @@ export default {
         return message.warning("请输入选择试卷");
       }
       if (!state.test.chooseTime) {
-       message.destroy();
-       return message.warning("请输入开始结束时间");
+        message.destroy();
+        return message.warning("请输入开始结束时间");
       }
       if (!state.test.examinationDuration) {
         message.destroy();
         return message.warning("请输入考试时长");
       }
-   
+
       state.addLoading = true;
-      console.log("test",state.test);
-     // state.test.examinationStartTime = toDate(
+      console.log("test", state.test);
+      // state.test.examinationStartTime = toDate(
       //  new Date(state.test.chooseTime[0].$d).getTime() / 1000,
-       // "Y-M-D h:m"
-     // );
-     // state.test.examinationEndTime =toDate(
-     //   new Date(state.test.$slotschooseTime[1].$d).getTime() / 1000,
-     //   "Y-M-D h:m"
-     // );
+      // "Y-M-D h:m"
+      // );
+      // state.test.examinationEndTime =toDate(
+      //   new Date(state.test.$slotschooseTime[1].$d).getTime() / 1000,
+      //   "Y-M-D h:m"
+      // );
       state.test.examinationStartTime = toDate(
         new Date(state.test.chooseTime[0].$d).getTime() / 1000,
         "Y-M-D h:m"
       );
-      state.test.examinationEndTime =toDate(
+      state.test.examinationEndTime = toDate(
         new Date(state.test.chooseTime[1].$d).getTime() / 1000,
         "Y-M-D h:m"
       );
@@ -538,7 +499,7 @@ export default {
       //TODO缺少paperName字段
       state.test.examinationTestName = state.paperName;
 
-      if (props.EditTestId>0) {
+      if (props.EditTestId > 0) {
         // 编辑任务
         updateExamination(state.test)
           .then(async (res) => {
@@ -566,14 +527,14 @@ export default {
       state.EditTestId = res.data.data.examinationId;
       if (props.faceLevel) {
         state.EditTestId = res.data.data.examinationId;
-     
+
         closeDrawer();
       } else {
         if (props.isLevel == 1) {
-          if(!props.isactive){
-          message.destroy();
-          return message.warning("请先选中关卡");
-        }
+          if (!props.isactive) {
+            message.destroy();
+            return message.warning("请先选中关卡");
+          }
           let editObj1 = {
             chapterId: props.isactive,
             duration: res.data.data.examinationDuration,
@@ -588,7 +549,7 @@ export default {
               console.log("props.edit", props.edit);
               message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
               ctx.emit("changeData", false);
-             
+
               closeDrawer();
             })
             .catch(() => {
@@ -673,7 +634,6 @@ export default {
     };
 
     return {
-     
       afterVisibleChange,
       closeDrawer,
       closeDrawer2,
@@ -682,9 +642,9 @@ export default {
       cloradio2,
       cloradio3,
       cloradio4,
-    
+
       clearAll,
-   
+
       delTag,
       // layout,
 
@@ -872,36 +832,36 @@ export default {
       }
     }
     .main_table {
-        position: relative;
-        padding-bottom: 80px;
-        .ant-checkbox-wrapper {
-          align-items: center;
-          margin-top: -2px;
-        }
-        .ant-table-selection-column {
-          padding: 0px !important;
-          padding-left: 5px !important;
-        }
-        .ant-table-thead > tr > th {
-          background-color: rgba(239, 244, 252, 1);
-        }
-        th.h {
-          background-color: #eff4fc !important;
-        }
-        .ant-table-tbody
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
-          background: #f6f9fd;
-        }
-        .pa {
-          left: 0;
-          width: 100%;
-          display: flex;
-          justify-content: center;
-          position: absolute;
-          bottom: 20px;
-        }
+      position: relative;
+      padding-bottom: 80px;
+      .ant-checkbox-wrapper {
+        align-items: center;
+        margin-top: -2px;
       }
+      .ant-table-selection-column {
+        padding: 0px !important;
+        padding-left: 5px !important;
+      }
+      .ant-table-thead > tr > th {
+        background-color: rgba(239, 244, 252, 1);
+      }
+      th.h {
+        background-color: #eff4fc !important;
+      }
+      .ant-table-tbody
+        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+        > td {
+        background: #f6f9fd;
+      }
+      .pa {
+        left: 0;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        position: absolute;
+        bottom: 20px;
+      }
+    }
     .main_btns {
       height: 72px;
       width: 100%;

From ea3315ac3297a1f2b2ad80cf0df8238213008390 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 11:55:48 +0800
Subject: [PATCH 08/35] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=8F=8A=E7=BC=96=E8=BE=91=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                        |   4 +-
 src/components/drawers/AddInvist.vue     | 197 +++++++-------
 src/components/drawers/AssessmentAll.vue | 311 +++++++++++++----------
 3 files changed, 272 insertions(+), 240 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index 8e180c47..ec213068 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-13 15:30:27
+ * @LastEditTime: 2022-12-14 09:04:31
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -56,7 +56,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        window.open("https://u-pre.boe.com/web/", '_self');
+        // window.open("https://u-pre.boe.com/web/", '_self');
         // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 2a3ee083..ddb7666f 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -21,21 +21,17 @@
         <div class="main">
           <div class="main_left">
             <AssessmentAll
-                      v-model:assessmentVisible="assessmentVisible"
-                      v-model:assessmentId="assessmentId"
-                      v-model:assessmentName="assessmentName"
-                     
-                    />
-
+              v-model:assessmentVisible="assessmentVisible"
+              v-model:assessmentId="assessmentId"
+              v-model:assessmentName="assessmentName"
+            />
           </div>
-         
         </div>
-    
       </div>
       <div class="main_btns">
-            <button class="btn1" @click="closeDrawer">取消</button>
-            <button class="btn2" @click="updateTask">确定</button>
-          </div>
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="updateTask">确定</button>
+      </div>
     </div>
   </a-drawer>
 </template>
@@ -119,16 +115,16 @@ export default {
       assessmentName: "",
       assessment: null,
       assessment1: null,
-      assessmentVisible:false,
+      assessmentVisible: false,
       titleTag: false,
     });
-   // const getCheckedAss = (ass) => {
-     // state.assessmentId = ass.assessmentId;
-     // state.assessment = ass;
-     // console.log("state.assessment1",state.assessment);
-   //  
-   // };
-  
+    // const getCheckedAss = (ass) => {
+    // state.assessmentId = ass.assessmentId;
+    // state.assessment = ass;
+    // console.log("state.assessment1",state.assessment);
+    //
+    // };
+
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
       ctx.emit("update:edit", false);
@@ -138,43 +134,45 @@ export default {
       // ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
-     
     };
     const checkAssDrawer = () => {
       state.assessmentVisible = true;
     };
     const afterVisibleChange = (bool) => {
-      if(bool && props.EditInvistId >0){
+      if (bool && props.EditInvistId > 0) {
         state.assessmentVisible = true;
         state.assessmentId = props.EditInvistId;
-      }else{
-        state.assessmentId =null;
-        state.assessmentName =null;
+      } else {
+        state.assessmentId = null;
+        state.assessmentName = null;
       }
-   
     };
-   
+
     const updateTask = () => {
-      console.log("state.assessmentId ",state.assessmentId ,state.assessmentName );
+      console.log(
+        "state.assessmentId ",
+        state.assessmentId,
+        state.assessmentName
+      );
       if (!state.assessmentId) {
         return message.warning("请选择评估");
       }
       let l_data_id = [];
-      l_data_id.push(Number(state.assessmentId))
-      console.log("state.assessment",state.assessment,state.assessmentId);
+      l_data_id.push(Number(state.assessmentId));
+      console.log("state.assessment", state.assessment, state.assessmentId);
       if (props.isLevel == 1) {
-        if(!props.isactive){
+        if (!props.isactive) {
           message.destroy();
           return message.warning("请先选中关卡");
         }
         IsExistence({
           chapterId: Number(props.isactive),
-          courseTaskId:l_data_id,
+          courseTaskId: l_data_id,
           routerId: props.routerId,
           type: 11,
         })
           .then((res) => {
-            console.log('shifouchongfu',res)
+            console.log("shifouchongfu", res);
             console.log("路径图中是否包含此评估了", res);
             if (res.data.data.length) {
               let strdata = res.data.data;
@@ -200,7 +198,9 @@ export default {
               })
                 .then(() => {
                   message.destroy();
-                  message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+                  message.success(
+                    `${props.edit ? "编辑" : "新增"}关卡任务成功`
+                  );
                   ctx.emit("changeData", false);
                   closeDrawer();
                   state.addLoading = false;
@@ -210,20 +210,20 @@ export default {
                   message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
                 });
             }
-          }).catch(err=>{
-            console.log(err)
           })
-
-       
+          .catch((err) => {
+            console.log(err);
+          });
       } else if (props.isLevel == 2) {
         IsExistenceProject({
           courseTaskId: l_data_id,
           projectId: props.projectId,
           stageId: props.chooseStageId || 0,
           type: 11,
-        }).then(res=>{
-          console.log(res)
-          console.log("项目中是否包含此评估了", res);
+        })
+          .then((res) => {
+            console.log(res);
+            console.log("项目中是否包含此评估了", res);
             if (res.data.data.length) {
               let strdata = res.data.data;
               let tipStr = "";
@@ -239,71 +239,70 @@ export default {
               return;
             } else {
               apiTask
-              .addTask({
-                courseId: state.assessmentId,
-                name: state.assessmentName,
-                projectId: props.projectId,
-                projectTaskId: props.projectTaskId || 0,
-                stageId: props.chooseStageId || 0,
-                type: 11,
-              })
-              .then(() => {
-                message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
-                ctx.emit("changeData", false);
-                closeDrawer();
-              })
-              .catch(() => {
-                message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
-              });
+                .addTask({
+                  courseId: state.assessmentId,
+                  name: state.assessmentName,
+                  projectId: props.projectId,
+                  projectTaskId: props.projectTaskId || 0,
+                  stageId: props.chooseStageId || 0,
+                  type: 11,
+                })
+                .then(() => {
+                  message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
+                  ctx.emit("changeData", false);
+                  closeDrawer();
+                })
+                .catch(() => {
+                  message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
+                });
             }
-        }).catch(err=>{
-          console.log(err)
-        })
-        
+          })
+          .catch((err) => {
+            console.log(err);
+          });
       } else if (props.isLevel == 3) {
         IsExistenceProjectTemplate({
           courseTaskId: l_data_id,
           projectTemplateId: props.projectTemplateId,
           stageId: props.chooseStageId || 0,
           type: 11,
-        }).then((res)=>{
-          console.log(res)
+        }).then((res) => {
+          console.log(res);
           console.log("项目中是否包含此评估了", res);
-            if (res.data.data.length) {
-              let strdata = res.data.data;
-              let tipStr = "";
-              for (let i = 0; i < strdata.length; i++) {
-                if (i == strdata.length - 1) {
-                  tipStr += strdata[i].courseName;
-                } else {
-                  tipStr += strdata[i].courseName + "/";
-                }
+          if (res.data.data.length) {
+            let strdata = res.data.data;
+            let tipStr = "";
+            for (let i = 0; i < strdata.length; i++) {
+              if (i == strdata.length - 1) {
+                tipStr += strdata[i].courseName;
+              } else {
+                tipStr += strdata[i].courseName + "/";
               }
-              message.destroy();
-              message.warning("评估（" + tipStr + "）重复添加");
-              return;
-            }else{
-          addTempTask({
-          courseId: state.assessmentId,
-          name: state.assessmentName,
-          projectTemplateId: props.projectTemplateId,
-          projectTaskId: props.projectTaskId || 0,
-          stageId: props.chooseStageId || 0,
-          type: 11,
-        })
-          .then(() => {
-            message.destroy();
-            message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
-            ctx.emit("changeData", false);
-            closeDrawer();
-          })
-          .catch(() => {
-            message.destroy();
-            message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
-          });
             }
+            message.destroy();
+            message.warning("评估（" + tipStr + "）重复添加");
+            return;
+          } else {
+            addTempTask({
+              courseId: state.assessmentId,
+              name: state.assessmentName,
+              projectTemplateId: props.projectTemplateId,
+              projectTaskId: props.projectTaskId || 0,
+              stageId: props.chooseStageId || 0,
+              type: 11,
+            })
+              .then(() => {
+                message.destroy();
+                message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
+                ctx.emit("changeData", false);
+                closeDrawer();
+              })
+              .catch(() => {
+                message.destroy();
+                message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
+              });
+          }
         });
-
       }
     };
 
@@ -313,7 +312,6 @@ export default {
       closeDrawer,
       updateTask,
       checkAssDrawer,
-    
     };
   },
 };
@@ -339,7 +337,6 @@ export default {
       }
     }
     .contentMain {
-    
       .main {
         width: 100%;
         .main_left {
@@ -348,7 +345,7 @@ export default {
           .main_item {
             display: flex;
             align-items: center;
-          
+
             .fi_input {
               margin-right: 20px;
             }
@@ -410,7 +407,7 @@ export default {
             display: flex;
             justify-content: space-between;
             align-items: center;
-            margin-bottom:3px;
+            margin-bottom: 3px;
             height: 40px;
             background-color: #e9f6fe;
             .mntc_left {
@@ -439,11 +436,11 @@ export default {
         }
       }
     }
- 
+
     .main_btns {
       height: 72px;
       width: 100%;
-     
+
       bottom: 0;
       left: 0;
       display: flex;
diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue
index 016926f9..ae06897b 100644
--- a/src/components/drawers/AssessmentAll.vue
+++ b/src/components/drawers/AssessmentAll.vue
@@ -1,59 +1,54 @@
 <!-- 评估列表 -->
 <template>
- 
-    <div class="main_item">
-      <div class="fi_input">
-        <a-input
-          v-model:value="inputV1"
-          style="width: 424px; height: 40px; border-radius: 8px;"
-          placeholder="请输入评估名称"
-          maxlength="20"
-        />
-      </div>
-      <div class="btns" @click="getAllInvistText">
-        <div class="search"></div>
-        <div class="btnText">搜索</div>
-      </div>
-      <div class="btnsn" @click="resetInvist">
-        <div class="search"></div>
-        <div class="btnText">重置</div>
-      </div>
+  <div class="main_item">
+    <div class="fi_input">
+      <a-input
+        v-model:value="inputV1"
+        style="width: 424px; height: 40px; border-radius: 8px"
+        placeholder="请输入评估名称"
+        maxlength="20"
+      />
     </div>
-    <div class="main_notice">
-              <div class="mntc_left">
-                <div class="notice_icon"></div>
-                <div v-if="assessment == null">
-                  <span class="title"
-                    >已选择 <span class="data">0</span> 条</span
-                  >
-                </div>
-                <div v-else>
-                  <div >
-                    <span class="title"
-                      >已选择 <span class="data">1</span> 条;</span
-                    >
-                    <span class="title"
-                      >名称： <span class="data">{{ assessment.name }}</span>
-                    </span><!--
+    <div class="btns" @click="getAllInvistText">
+      <div class="search"></div>
+      <div class="btnText">搜索</div>
+    </div>
+    <div class="btnsn" @click="resetInvist">
+      <div class="search"></div>
+      <div class="btnText">重置</div>
+    </div>
+  </div>
+  <div class="main_notice">
+    <div class="mntc_left">
+      <div class="notice_icon"></div>
+      <div v-if="assessment == null">
+        <span class="title">已选择 <span class="data">0</span> 条</span>
+      </div>
+      <div v-else>
+        <div>
+          <span class="title">已选择 <span class="data">1</span> 条;</span>
+          <span class="title"
+            >名称： <span class="data">{{ assessment.name }}</span> </span
+          ><!--
                     <span class="title"
                       >题数： <span class="data">{{ assessment.essayQuestionVoList?Number(assessment.essayQuestionVoList.length):0
                       +Number(assessment.multipleStemVoList?assessment.multipleStemVoList.length:0)
                       +Number(assessment.scoringQuestionVoList?assessment.scoringQuestionVoList.length:0)
                       +Number(assessment.singleStemVoList?assessment.singleStemVoList.length:0) }}</span>
                     </span>-->
-                    <span class="title"
-                      >题数： <span class="data">{{ assessment.num }}</span>
-                    </span>
-                    <span class="title"
-                      >创建人：
-                      <span class="data">{{ assessment.creator }}</span>
-                    </span>
-                    <span class="title"
-                      >创建时间：
-                      <span class="data">{{ assessment.time }}</span>
-                    </span>
-                  </div>
-                  <!--
+          <span class="title"
+            >题数： <span class="data">{{ assessment.num }}</span>
+          </span>
+          <span class="title"
+            >创建人：
+            <span class="data">{{ assessment.creator }}</span>
+          </span>
+          <span class="title"
+            >创建时间：
+            <span class="data">{{ assessment.time }}</span>
+          </span>
+        </div>
+        <!--
                   <div v-else>
                     <span class="title"
                       >已选择 <span class="data">1</span> 条;</span
@@ -78,27 +73,27 @@
                     </span>
                   </div>
                   -->
-                </div>
-              </div>
       </div>
-   
-      <div class="main_table">
-      <a-table
-        style="border: 1px solid #f2f6fe"
-        :columns="tableDataFunc()"
-        :data-source="tableData"
-        :loading="tableDataTotal === -1 ? true : false"
-        expandRowByClick="true"
-        @expand="expandTable"
-        :pagination="false"
-        :row-selection="{
-                  type: 'radio',
-                  selectedRowKeys: selectedRowKeys,
-                  onChange: onSelectChange,
-                }"
-        filterMultiple:false
-      />
-      <div class="tableBox">
+    </div>
+  </div>
+
+  <div class="main_table">
+    <a-table
+      style="border: 1px solid #f2f6fe"
+      :columns="tableDataFunc()"
+      :data-source="tableData"
+      :loading="tableDataTotal === -1 ? true : false"
+      expandRowByClick="true"
+      @expand="expandTable"
+      :pagination="false"
+      :row-selection="{
+        type: 'radio',
+        selectedRowKeys: selectedRowKeys,
+        onChange: onSelectChange,
+      }"
+      filterMultiple:false
+    />
+    <div class="tableBox">
       <div class="pa">
         <a-pagination
           :showSizeChanger="false"
@@ -110,12 +105,12 @@
           class="pagination"
           @change="handelChangePage"
         />
-      </div></div>
+      </div>
     </div>
-
+  </div>
 </template>
 <script>
-import { reactive, toRefs,onMounted } from "vue";
+import { reactive, toRefs, onMounted, watch } from "vue";
 import * as api from "../../api/indexInvist.js";
 import dayjs from "dayjs";
 export default {
@@ -127,11 +122,11 @@ export default {
       type: Boolean,
       default: false,
     },
-    assessmentId:{
+    assessmentId: {
       type: Number,
       default: null,
     },
-    assessmentName:{
+    assessmentName: {
       type: String,
       default: null,
     },
@@ -145,38 +140,55 @@ export default {
       pageSize: 10,
       tableDataTotal: 0,
       tableData: [],
-      selectedRowKeys:[],
-      assessmentId:null,
-      assessmentName:null,
+      selectedRowKeys: [],
+      assessmentId: null,
+      assessmentName: null,
     });
     const closeDrawer = () => {
       ctx.emit("update:assessmentVisible", false);
     };
-     //清空所选
-     const clearLine = () => {
-      console.log("state.selectedRowKeys",state.selectedRowKeys)
+    //清空所选
+    const clearLine = () => {
+      console.log("state.selectedRowKeys", state.selectedRowKeys);
       state.selectedRowKeys = [];
       state.addOnlineList = [];
     };
     const queryInfo = () => {
       //if (props.edit) {
-       // state.titleTg = false;
-        //编辑讨
-       
-        console.log("查询评估",props.assessmentId);
-        if(props.assessmentId){
-          api
+      // state.titleTg = false;
+      //编辑讨
+
+      console.log("查询评估", props.assessmentId);
+      if (props.assessmentId) {
+        api
           .queryAppraiseDetailById({ assessmentId: props.assessmentId })
           .then((res) => {
-            console.log(res);
+            console.log("查询评估xinxi ", res);
+            let info = res.data.data;
+            let obj = {
+              assessmentId: info.assessmentId,
+              name: info.assessmentName,
+              num: info.essayQuestionVoList
+                ? Number(info.essayQuestionVoList.length)
+                : 0 + info.multipleStemVoList
+                ? Number(info.multipleStemVoList.length)
+                : 0 + info.scoringQuestionVoList
+                ? Number(info.scoringQuestionVoList.length)
+                : 0 + info.singleStemVoList
+                ? Number(info.singleStemVoList.length)
+                : 0,
+              creator: info.createUser ? info.createUser : "-",
+              time: dayjs(info.createTime).format("YYYY-MM-DD"),
+            };
             //更新讨论信息
-            state.assessment = res.data.data;
-          //  state.assessmentId = res.data.data.assessmentId;
+            state.assessment = obj;
+            state.selectedRowKeys = [info.assessmentId];
+            //  state.assessmentId = res.data.data.assessmentId;
           })
           .catch(() => {});
-        }
-       
-    //  }
+      }
+
+      //  }
     };
     const tableDataFunc = () => {
       const columns = [
@@ -219,13 +231,12 @@ export default {
       state.addOnlineList = selectedRows;
       console.log(selectedRowKeys, selectedRows);
       state.assessment = selectedRows[0];
-        console.log("selectedRows=======", state.assessment);
-        //  ctx.emit("checkedAss", state.assessment);
-        ctx.emit("update:assessmentId", state.assessment.assessmentId);
-        ctx.emit("update:assessmentName", state.assessment.name);
-    }
- 
- 
+      console.log("selectedRows=======", state.assessment);
+      //  ctx.emit("checkedAss", state.assessment);
+      ctx.emit("update:assessmentId", state.assessment.assessmentId);
+      ctx.emit("update:assessmentName", state.assessment.name);
+    };
+
     const handelChangePage = (page, pageSize) => {
       state.currentPage = page;
       state.pageSize = pageSize;
@@ -234,21 +245,27 @@ export default {
     const getTableDate = (tableData) => {
       let data = tableData;
       let array = [];
-      data.map((value, index) => {
+      data.map((value) => {
         let obj = {
-          key: index,
+          key: value.assessmentId,
           assessmentId: value.assessmentId,
-          num: value.essayQuestionVoList?Number(value.essayQuestionVoList.length):0
-          +value.multipleStemVoList?Number(value.multipleStemVoList.length):0
-          +value.scoringQuestionVoList?Number(value.scoringQuestionVoList.length):0
-          +value.singleStemVoList?Number(value.singleStemVoList.length):0,
+          num: value.essayQuestionVoList
+            ? Number(value.essayQuestionVoList.length)
+            : 0 + value.multipleStemVoList
+            ? Number(value.multipleStemVoList.length)
+            : 0 + value.scoringQuestionVoList
+            ? Number(value.scoringQuestionVoList.length)
+            : 0 + value.singleStemVoList
+            ? Number(value.singleStemVoList.length)
+            : 0,
           name: value.assessmentName ? value.assessmentName : "-",
           creator: value.createUser ? value.createUser : "-",
           time: dayjs(value.createTime).format("YYYY-MM-DD"),
         };
         array.push(obj);
       });
-      (state.selectedRowKeys = []), (state.tableData = array);
+      state.selectedRowKeys = [];
+      state.tableData = array;
     };
     //获取全部评估信息接口
     const getAllInvistText = () => {
@@ -279,15 +296,34 @@ export default {
     };
     onMounted(() => {
       clearLine();
-      console.log("state.selectedRowKeys",state.selectedRowKeys)
-      if(!state.assessmentId){
+      console.log(
+        "state.selectedRowKeys",
+        state.selectedRowKeys,
+        state.assessmentId
+      );
+      if (!state.assessmentId) {
         clearLine();
       }
 
       queryInfo();
       getAllInvistText();
-      
     });
+    watch(
+      () => props.assessmentId,
+      () => {
+        if (!props.assessmentId) {
+          clearLine();
+          state.assessment = null;
+        } else {
+          queryInfo();
+        }
+        console.log("props.assessmentId", props.assessmentId);
+      },
+      {
+        deep: true,
+      }
+    );
+
     return {
       ...toRefs(state),
       onSelectChange,
@@ -322,14 +358,13 @@ export default {
       }
     }
     .contentMain {
-   
       .main_left {
         padding-right: 30px;
         margin-top: 32px;
         .main_item {
           display: flex;
           align-items: center;
-       
+
           .fi_input {
             margin-right: 20px;
           }
@@ -398,36 +433,36 @@ export default {
       }
     }
     .main_table {
-        position: relative;
-        padding-bottom: 80px;
-        .ant-checkbox-wrapper {
-          align-items: center;
-          margin-top: -2px;
-        }
-        .ant-table-selection-column {
-          padding: 0px !important;
-          padding-left: 5px !important;
-        }
-        .ant-table-thead > tr > th {
-          background-color: rgba(239, 244, 252, 1);
-        }
-        th.h {
-          background-color: #eff4fc !important;
-        }
-        .ant-table-tbody
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
-          background: #f6f9fd;
-        }
-        .pa {
-          left: 0;
-          width: 100%;
-          display: flex;
-          justify-content: center;
-          position: absolute;
-          bottom: 20px;
-        }
+      position: relative;
+      padding-bottom: 80px;
+      .ant-checkbox-wrapper {
+        align-items: center;
+        margin-top: -2px;
       }
+      .ant-table-selection-column {
+        padding: 0px !important;
+        padding-left: 5px !important;
+      }
+      .ant-table-thead > tr > th {
+        background-color: rgba(239, 244, 252, 1);
+      }
+      th.h {
+        background-color: #eff4fc !important;
+      }
+      .ant-table-tbody
+        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+        > td {
+        background: #f6f9fd;
+      }
+      .pa {
+        left: 0;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        position: absolute;
+        bottom: 20px;
+      }
+    }
     .main_btns {
       height: 72px;
       width: 100%;

From 5c4a51b0f7103ce4ee721f5ac966a13035880e63 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 11:59:31 +0800
Subject: [PATCH 09/35] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index f5914863..d34bef73 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -211,7 +211,8 @@
             />
           </div>
         </div>
-        <div class="name name2">
+
+        <div v-if="projectInfo.status == -5" class="name name2">
           <div class="namebox">
             <div class="inname" style="margin-top: 13px">审核意见</div>
           </div>

From a665762f0153479cce053a6c7eaca689aecf12f4 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 12:10:27 +0800
Subject: [PATCH 10/35] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=9C=AA=E9=80=9A=E8=BF=87=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectManage.vue | 1264 +++++++++++----------
 1 file changed, 633 insertions(+), 631 deletions(-)

diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 67bf4807..d41f3d04 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -6,56 +6,56 @@
       <div class="filterItems">
         <div class="select">
           <a-input
-              v-model:value="searchParam.name"
-              style="width: 270px; height: 40px; border-radius: 8px"
-              placeholder="请输入项目名称"
-              allowClear
-              showSearch
+            v-model:value="searchParam.name"
+            style="width: 270px; height: 40px; border-radius: 8px"
+            placeholder="请输入项目名称"
+            allowClear
+            showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-input
-              v-model:value="searchParam.manager"
-              style="width: 270px; height: 40px; border-radius: 8px"
-              placeholder="请输入项目经理"
-              allowClear
-              showSearch
+            v-model:value="searchParam.manager"
+            style="width: 270px; height: 40px; border-radius: 8px"
+            placeholder="请输入项目经理"
+            allowClear
+            showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-input
-              v-model:value="searchParam.createName"
-              style="width: 270px; height: 40px; border-radius: 8px"
-              placeholder="请输入项目创建人"
-              allowClear
-              showSearch
+            v-model:value="searchParam.createName"
+            style="width: 270px; height: 40px; border-radius: 8px"
+            placeholder="请输入项目创建人"
+            allowClear
+            showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-select
-              v-model:value="searchParam.status"
-              style="width: 270px"
-              placeholder="请选择状态"
-              :options="sProjectStateList"
-              allowClear
+            v-model:value="searchParam.status"
+            style="width: 270px"
+            placeholder="请选择状态"
+            :options="sProjectStateList"
+            allowClear
           ></a-select>
         </div>
         <div class="select addTimeBox">
           <div class="addTime">创建时间：</div>
           <a-range-picker
-              v-model:value="searchParam.valueDate"
-              :show-time="{
+            v-model:value="searchParam.valueDate"
+            :show-time="{
               defaultValue: [
                 moment('00:00:00', 'HH:mm:ss'),
                 moment('23:59:59', 'HH:mm:ss'),
               ],
             }"
-              style="border-radius: 8px; height: 40px; margin-left: 5px"
-              :placeholder="['      开始时间', '        结束时间']"
-              valueFormat="X"
+            style="border-radius: 8px; height: 40px; margin-left: 5px"
+            :placeholder="['      开始时间', '        结束时间']"
+            valueFormat="X"
           />
         </div>
         <div style="display: flex; margin-bottom: 20px">
@@ -80,26 +80,26 @@
     <!-- 表格 -->
     <div class="tableBox">
       <a-table
-          :columns="columns"
-          :data-source="tableData"
-          :loading="tableDataTotal === -1 ? true : false"
-          :scroll="{ x: 700 }"
-          @expand="expandTable"
-          :pagination="false"
+        :columns="columns"
+        :data-source="tableData"
+        :loading="tableDataTotal === -1 ? true : false"
+        :scroll="{ x: 700 }"
+        @expand="expandTable"
+        :pagination="false"
       >
       </a-table>
       <div class="tableBox">
         <div class="pa">
           <a-pagination
-              v-if="tableDataTotal > 10"
-              :showSizeChanger="false"
-              showQuickJumper="true"
-              hideOnSinglePage="true"
-              :pageSize="pageSize"
-              v-model:current="searchParam.pageNo"
-              :total="tableDataTotal"
-              class="pagination"
-              @change="changePagination"
+            v-if="tableDataTotal > 10"
+            :showSizeChanger="false"
+            showQuickJumper="true"
+            hideOnSinglePage="true"
+            :pageSize="pageSize"
+            v-model:current="searchParam.pageNo"
+            :total="tableDataTotal"
+            class="pagination"
+            @change="changePagination"
           />
         </div>
       </div>
@@ -108,18 +108,18 @@
     <!-- 无项目 -->
     <div class="tableBox" style="display: none">
       <div
-          class="taskbox"
-          @click="showModal1"
-          style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
+        class="taskbox"
+        @click="showModal1"
+        style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
       >
         <div class="leftt">
-          <img src="../../assets/images/taskpage/left2.png"/>
+          <img src="../../assets/images/taskpage/left2.png" />
         </div>
         <div class="photo">
-          <img src="../../assets/images/projectadd/nopro.png"/>
+          <img src="../../assets/images/projectadd/nopro.png" />
         </div>
         <div class="rightt">
-          <img src="../../assets/images/taskpage/right2.png"/>
+          <img src="../../assets/images/taskpage/right2.png" />
         </div>
         <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
           创建项目
@@ -130,18 +130,18 @@
     <!-- 创建多层项目弹窗 -->
     <div>
       <a-modal
-          v-model:visible="doublepro"
-          :title="null"
-          @ok="closeModal2"
-          :footer="null"
-          :closable="false"
-          wrapClassName="doublepro"
-          width="624px"
-          height="476px"
+        v-model:visible="doublepro"
+        :title="null"
+        @ok="closeModal2"
+        :footer="null"
+        :closable="false"
+        wrapClassName="doublepro"
+        width="624px"
+        height="476px"
       >
         <div
-            class="modalHeader"
-            style="
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -151,50 +151,50 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span class="headerLeftText" style="font-size: 16px"
-            >{{ projectInfo.projectId ? "编辑" : "创建" }}多层项目</span
+              >{{ projectInfo.projectId ? "编辑" : "创建" }}多层项目</span
             >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
             <img
-                style="width: 22px; height: 22px"
-                src="../../assets/images/basicinfo/close22.png"
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
         <div class="modalMain">
           <div
-              style="margin-left: 40px; margin-top: 40px; width: 78%"
-              v-if="projectInfo.parentName"
+            style="margin-left: 40px; margin-top: 40px; width: 78%"
+            v-if="projectInfo.parentName"
           >
             <span style="color: #000000; font-size: 14px">项目归属：</span>
             <span style="color: #999999; font-size: 14px; margin-left: 10px">{{
-                projectInfo.parentName
-              }}</span>
+              projectInfo.parentName
+            }}</span>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                  style="width: 10px; height: 10px"
-                  src="../../assets/images/basicinfo/asterisk.png"
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">项目名称:</div>
             <div class="in pro">
               <NameInput
-                  placeholder="请输入项目名称"
-                  v-model:value="projectInfo.name"
-                  v-model:validate="projectInfo.validate"
-                  :maxlength="30"
-                  show-count
-                  :id="projectInfo.projectId"
+                placeholder="请输入项目名称"
+                v-model:value="projectInfo.name"
+                v-model:validate="projectInfo.validate"
+                :maxlength="30"
+                show-count
+                :id="projectInfo.projectId"
               ></NameInput>
             </div>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                  style="width: 10px; height: 10px"
-                  src="../../assets/images/basicinfo/asterisk.png"
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">培训分类:</div>
@@ -205,39 +205,39 @@
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                  style="width: 10px; height: 10px"
-                  src="../../assets/images/basicinfo/asterisk.png"
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">项目经理:</div>
             <div class="in">
               <ProjectManager
-                  v-model:value="projectInfo.managerId"
-                  v-model:name="projectInfo.manager"
-                  @onChange="managerChange"
-                  mode="multiple"
+                v-model:value="projectInfo.managerId"
+                v-model:name="projectInfo.manager"
+                @onChange="managerChange"
+                mode="multiple"
               ></ProjectManager>
             </div>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                  style="width: 10px; height: 10px"
-                  src="../../assets/images/basicinfo/asterisk.png"
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">资源归属:</div>
             <div class="in select">
               <OrgClass
-                  v-model:value="projectInfo.sourceBelongId"
-                  v-model:name="projectInfo.sourceBelongName"
+                v-model:value="projectInfo.sourceBelongId"
+                v-model:name="projectInfo.sourceBelongName"
               ></OrgClass>
             </div>
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal2">取消</a-button>
             <a-button class="pubtn2" @click="createStoreyProject"
-            >确定
+              >确定
             </a-button>
           </div>
         </div>
@@ -246,18 +246,18 @@
     <!-- 创建多层项目弹窗 -->
     <div>
       <a-modal
-          v-model:visible="sonproject"
-          :title="null"
-          @ok="closeModal"
-          :footer="null"
-          :closable="false"
-          wrapClassName="sonproject"
-          width="764px"
-          height="356px"
+        v-model:visible="sonproject"
+        :title="null"
+        @ok="closeModal"
+        :footer="null"
+        :closable="false"
+        wrapClassName="sonproject"
+        width="764px"
+        height="356px"
       >
         <div
-            class="modalHeader"
-            style="
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -267,53 +267,53 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span class="headerLeftText" style="font-size: 16px"
-            >请选择项目类别1</span
+              >请选择项目类别1</span
             >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
             <img
-                style="width: 22px; height: 22px"
-                src="../../assets/images/basicinfo/close22.png"
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
         <div class="modalMain">
           <div
-              @click="createChildProject"
-              class="taskbox"
-              style="
+            @click="createChildProject"
+            class="taskbox"
+            style="
               margin-right: 24px;
               background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
             "
           >
             <div class="leftt">
-              <img src="../../assets/images/taskpage/left2.png"/>
+              <img src="../../assets/images/taskpage/left2.png" />
             </div>
             <div class="photo">
-              <img src="../../assets/images/taskpage/picture4.png"/>
+              <img src="../../assets/images/taskpage/picture4.png" />
             </div>
             <div class="rightt">
-              <img src="../../assets/images/taskpage/right2.png"/>
+              <img src="../../assets/images/taskpage/right2.png" />
             </div>
             <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
               单层子项目
             </div>
           </div>
           <div
-              class="taskbox"
-              @click="showModal3"
-              style="
+            class="taskbox"
+            @click="showModal3"
+            style="
               background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
             "
           >
             <div class="leftt">
-              <img src="../../assets/images/taskpage/left1.png"/>
+              <img src="../../assets/images/taskpage/left1.png" />
             </div>
             <div class="photo">
-              <img src="../../assets/images/taskpage/picture5.png"/>
+              <img src="../../assets/images/taskpage/picture5.png" />
             </div>
             <div class="rightt">
-              <img src="../../assets/images/taskpage/right1.png"/>
+              <img src="../../assets/images/taskpage/right1.png" />
             </div>
             <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
               多层子项目
@@ -327,18 +327,18 @@
     <div>
       <div>
         <a-modal
-            v-model:visible="estabish"
-            :title="null"
-            @ok="closeModal1"
-            :footer="null"
-            :closable="false"
-            wrapClassName="estabish"
-            width="638px"
-            height="468px"
+          v-model:visible="estabish"
+          :title="null"
+          @ok="closeModal1"
+          :footer="null"
+          :closable="false"
+          wrapClassName="estabish"
+          width="638px"
+          height="468px"
         >
           <div
-              class="modalHeader"
-              style="
+            class="modalHeader"
+            style="
               width: 100%;
               height: 68px;
               display: flex;
@@ -348,39 +348,39 @@
           >
             <div class="headerLeft" style="margin-left: 32px">
               <span class="headerLeftText" style="font-size: 16px"
-              >请选择项目类别</span
+                >请选择项目类别</span
               >
             </div>
             <div
-                style="cursor: pointer; margin-right: 32px"
-                @click="closeModal1"
+              style="cursor: pointer; margin-right: 32px"
+              @click="closeModal1"
             >
               <img
-                  style="width: 22px; height: 22px"
-                  src="../../assets/images/basicinfo/close22.png"
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
               />
             </div>
           </div>
           <div class="modalMain">
             <router-link
-                :to="`/projectadd?parentId=${
+              :to="`/projectadd?parentId=${
                 projectInfo.parentId || ''
               }&parentName=${projectInfo.parentName || ''}`"
             >
               <div
-                  class="taskbox"
-                  style="
+                class="taskbox"
+                style="
                   background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
                 "
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png"/>
+                  <img src="../../assets/images/taskpage/left2.png" />
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture6.png"/>
+                  <img src="../../assets/images/taskpage/picture6.png" />
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png"/>
+                  <img src="../../assets/images/taskpage/right2.png" />
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   单层{{ projectInfo.parentId ? "子" : "" }}项目
@@ -391,21 +391,21 @@
               </div>
             </router-link>
             <div
-                class="taskbox"
-                @click="showModal2"
-                style="
+              class="taskbox"
+              @click="showModal2"
+              style="
                 margin-bottom: 40px;
                 background: linear-gradient(180deg, #e5f6ec 0%, #eef9f3 100%);
               "
             >
               <div class="leftt">
-                <img src="../../assets/images/taskpage/left3.png"/>
+                <img src="../../assets/images/taskpage/left3.png" />
               </div>
               <div class="photo">
-                <img src="../../assets/images/taskpage/picture7.png"/>
+                <img src="../../assets/images/taskpage/picture7.png" />
               </div>
               <div class="rightt">
-                <img src="../../assets/images/taskpage/right3.png"/>
+                <img src="../../assets/images/taskpage/right3.png" />
               </div>
               <div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
                 多层{{ projectInfo.parentId ? "子" : "" }}项目
@@ -413,8 +413,8 @@
               <div class="centermain1">
                 {{
                   projectInfo.parentId
-                      ? "可创建班级，通过班级填写基础信息并创建任务"
-                      : "包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务"
+                    ? "可创建班级，通过班级填写基础信息并创建任务"
+                    : "包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务"
                 }}
               </div>
             </div>
@@ -426,11 +426,11 @@
     <!-- 编辑多层项目弹窗 - end -->
     <!-- 复制路径弹窗 -->
     <a-modal
-        v-model:visible="copyModal"
-        :footer="null"
-        :closable="closeCopy"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="copyModal"
+      :footer="null"
+      :closable="closeCopy"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -456,11 +456,11 @@
     </a-modal>
     <!-- 结束项目弹窗 -->
     <a-modal
-        v-model:visible="stopModal"
-        :footer="null"
-        :closable="closeStop"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="stopModal"
+      :footer="null"
+      :closable="closeStop"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -489,11 +489,11 @@
     </a-modal>
     <!-- 删除项目弹窗 -->
     <a-modal
-        v-model:visible="deleteModal"
-        :footer="null"
-        :closable="closeDelete"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="deleteModal"
+      :footer="null"
+      :closable="closeDelete"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -519,11 +519,11 @@
     </a-modal>
     <!-- 存为模版弹窗 -->
     <a-modal
-        v-model:visible="startModal"
-        :footer="null"
-        :closable="closeStart"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="startModal"
+      :footer="null"
+      :closable="closeStart"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -549,17 +549,17 @@
     </a-modal>
     <!-- 发布弹窗 -->
     <a-modal
-        v-model:visible="projectPub"
-        :title="null"
-        :footer="null"
-        :closable="false"
-        wrapClassName="projectPub"
-        width="679px"
-        height="437px"
+      v-model:visible="projectPub"
+      :title="null"
+      :footer="null"
+      :closable="false"
+      wrapClassName="projectPub"
+      width="679px"
+      height="437px"
     >
       <div
-          class="modalHeader"
-          style="
+        class="modalHeader"
+        style="
           width: 100%;
           height: 68px;
           display: flex;
@@ -569,21 +569,21 @@
       >
         <div class="headerLeft" style="margin-left: 32px">
           <span style="width: 15px; height: 15px"
-          ><img src="../../assets/images/taskpage/pub.png"
+            ><img src="../../assets/images/taskpage/pub.png"
           /></span>
           <span
-              class="headerLeftText"
-              style="font-size: 16px; margin-left: 10px"
-          >项目发布</span
+            class="headerLeftText"
+            style="font-size: 16px; margin-left: 10px"
+            >项目发布</span
           >
         </div>
         <div
-            style="cursor: pointer; margin-right: 32px"
-            @click="closeProjectPub"
+          style="cursor: pointer; margin-right: 32px"
+          @click="closeProjectPub"
         >
           <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
           />
         </div>
       </div>
@@ -624,19 +624,19 @@
       </div>
       <!--  加载动画 -->
       <div
-          class="aeLoading"
-          :style="{ display: projectPubLoading ? 'flex' : 'none' }"
+        class="aeLoading"
+        :style="{ display: projectPubLoading ? 'flex' : 'none' }"
       >
-        <a-spin :spinning="projectPubLoading"/>
+        <a-spin :spinning="projectPubLoading" />
       </div>
     </a-modal>
     <!-- 撤回路径弹窗 -->
     <a-modal
-        v-model:visible="backModal"
-        :footer="null"
-        :closable="closeBack"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="backModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -663,11 +663,11 @@
     </a-modal>
     <!--    撤回结束弹窗-->
     <a-modal
-        v-model:visible="backFinashModal"
-        :footer="null"
-        :closable="closeBack"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="backFinashModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -723,11 +723,11 @@
     <!--    </a-modal>-->
     <!-- 项目提交审核弹窗 -->
     <a-modal
-        v-model:visible="reviewModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="reviewModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -754,11 +754,11 @@
     </a-modal>
     <!-- 项目撤回审核弹窗 -->
     <a-modal
-        v-model:visible="recallReviewModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="recallReviewModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -785,53 +785,53 @@
     </a-modal>
     <!-- 授权名单抽屉 -->
     <proj-power-list
-        v-model:ProjPvisible="ProjPvisible"
-        :selectProjectId="selectProjectId"
-        classify="project"
+      v-model:ProjPvisible="ProjPvisible"
+      :selectProjectId="selectProjectId"
+      classify="project"
     />
     <!-- 归属权抽屉 -->
     <proj-owner-ship
-        v-model:ProjOwnervisible="ProjOwnervisible"
-        :selectProjectId="selectProjectId"
-        classify="project"
+      v-model:ProjOwnervisible="ProjOwnervisible"
+      :selectProjectId="selectProjectId"
+      classify="project"
     />
     <!-- 查看权抽屉 -->
     <proj-check-ship
-        v-model:ProjCheckvisible="ProjCheckvisible"
-        :selectProjectId="selectProjectId"
-        v-model:addAuthList="addAuthList"
-        :authClassify="authClassify"
-        classify="project"
+      v-model:ProjCheckvisible="ProjCheckvisible"
+      :selectProjectId="selectProjectId"
+      v-model:addAuthList="addAuthList"
+      :authClassify="authClassify"
+      classify="project"
     />
     <!-- 管理权抽屉 -->
     <proj-check-ship
-        v-model:ProjCheckvisible="ProjCheckvisible"
-        :selectProjectId="selectProjectId"
-        v-model:addAuthList="addAuthList"
-        :authClassify="authClassify"
-        classify="project"
+      v-model:ProjCheckvisible="ProjCheckvisible"
+      :selectProjectId="selectProjectId"
+      v-model:addAuthList="addAuthList"
+      :authClassify="authClassify"
+      classify="project"
     />
   </div>
 </template>
 <script>
-import {reactive, toRefs, ref, watch} from "vue";
-import {message, Modal} from "ant-design-vue";
-import {useRouter} from "vue-router";
+import { reactive, toRefs, ref, watch } from "vue";
+import { message, Modal } from "ant-design-vue";
+import { useRouter } from "vue-router";
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import * as api from "../../api/index";
 import * as api1 from "../../api/index1";
-import {storage} from "../../api/storage";
+import { storage } from "../../api/storage";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 // import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import dayjs from "dayjs";
 import * as moment from "moment";
-import {changeOwnership} from "@/api/method";
+import { changeOwnership } from "@/api/method";
 import NameInput from "@/components/project/NameInput";
-import {validateName} from "@/api/index1";
+import { validateName } from "@/api/index1";
 
 export default {
   name: "projectManage",
@@ -920,15 +920,15 @@ export default {
     // 数据接入 - start -
     const router = useRouter();
     const sProjectStateList = ref([
-      {value: 0, label: "草稿"},
-      {value: 1, label: "审核中"},
-      {value: 2, label: "审核通过"},
-      {value: 3, label: "已发布"},
-      {value: -2, label: "未通过"},
-      {value: -1, label: "已结束"},
+      { value: 0, label: "草稿" },
+      { value: 1, label: "审核中" },
+      { value: 2, label: "审核通过" },
+      { value: 3, label: "已发布" },
+      { value: -5, label: "未通过" },
+      { value: -1, label: "已结束" },
     ]);
     const searchReset = () => {
-      state.searchParam = {pageNo: 1, pageSize: 10};
+      state.searchParam = { pageNo: 1, pageSize: 10 };
       getTableDate();
     };
     const searchSubmit = () => {
@@ -959,7 +959,7 @@ export default {
     }
 
     // 创建多层项目
-    const createStoreyProject = async() => {
+    const createStoreyProject = async () => {
       // 接口需要传递的参数信息
       const errorMsgs = {
         name: "请输入项目名称",
@@ -976,22 +976,26 @@ export default {
         message.warning("项目名称重复，请修改名称！");
         return;
       } */
-      const offName = await validateName({name: state.qdms_inputV1, type:1, id:state.projectInfo.projectId}).then(res => {
-          return res.data.data == 1;
-         });
-         if(offName){
-            message.destroy();
-            return message.warning("项目名称重复，请重新填写");
-         }
+      const offName = await validateName({
+        name: state.qdms_inputV1,
+        type: 1,
+        id: state.projectInfo.projectId,
+      }).then((res) => {
+        return res.data.data == 1;
+      });
+      if (offName) {
+        message.destroy();
+        return message.warning("项目名称重复，请重新填写");
+      }
       api.createProject(state.projectInfo).then((res) => {
         state.doublepro = false;
         message.destroy();
         message.success("创建成功");
         state.currentPage = 1;
         state.projectInfo.projectId ||
-        changeOwnership("project", res.data.data.projectId, [
-          {id: res.data.data.createId, name: res.data.data.createName},
-        ]);
+          changeOwnership("project", res.data.data.projectId, [
+            { id: res.data.data.createId, name: res.data.data.createName },
+          ]);
         getTableDate();
       });
     };
@@ -1052,19 +1056,19 @@ export default {
         projectId: object.projectId,
       };
       api
-          .projectStudent(obj)
-          .then((res) => {
-            if (res.data.code === 200) {
-              // console.log("res", res.data);
-              state.projectStudentsNum = res.data.data.total
-                  ? res.data.data.total
-                  : 0;
-              state.projectPubLoading = false;
-            }
-          })
-          .catch((err) => {
-            console.log("获取学员人数失败", err);
-          });
+        .projectStudent(obj)
+        .then((res) => {
+          if (res.data.code === 200) {
+            // console.log("res", res.data);
+            state.projectStudentsNum = res.data.data.total
+              ? res.data.data.total
+              : 0;
+            state.projectPubLoading = false;
+          }
+        })
+        .catch((err) => {
+          console.log("获取学员人数失败", err);
+        });
       //获取阶段及任务总数
     };
     //确认发布项目
@@ -1108,17 +1112,17 @@ export default {
         type: -4,
       };
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("撤回成功", res);
-            message.destroy();
-            message.success("撤回成功");
-            state.backModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("撤回失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.backModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("撤回失败", err);
+        });
     };
     //确认撤回结束
     const reFinashedProject = () => {
@@ -1127,17 +1131,17 @@ export default {
         type: -6,
       };
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("撤回成功", res);
-            message.destroy();
-            message.success("撤回成功");
-            state.backFinashModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("撤回失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.backFinashModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("撤回失败", err);
+        });
     };
     //关闭撤回弹窗
     const closeBackModal = () => {
@@ -1158,17 +1162,17 @@ export default {
         type: -1,
       };
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("结束成功", res);
-            message.destroy();
-            message.success("已结束");
-            state.stopModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("结束失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("结束成功", res);
+          message.destroy();
+          message.success("已结束");
+          state.stopModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("结束失败", err);
+        });
     };
     //关闭结束弹窗
     const closeStopModal = () => {
@@ -1186,17 +1190,17 @@ export default {
         type: -2,
       };
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("删除成功", res);
-            message.destroy();
-            message.success("删除成功");
-            state.deleteModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("删除失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.destroy();
+          message.success("删除成功");
+          state.deleteModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
     };
     //关闭删除弹窗
     const closeDeleteModal = () => {
@@ -1220,7 +1224,7 @@ export default {
           message.success("模版保存成功");
           return;
         }
-        Modal.error({title: res.data.msg});
+        Modal.error({ title: res.data.msg });
       });
     };
     //关闭存为模版弹窗
@@ -1243,17 +1247,17 @@ export default {
         type: 2,
       };
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("复制成功", res);
-            message.destroy();
-            message.success("复制成功");
-            state.copyModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("复制失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("复制成功", res);
+          message.destroy();
+          message.success("复制成功");
+          state.copyModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("复制失败", err);
+        });
     };
     //打开提交审核弹窗
     const showReviewModal = (projectId) => {
@@ -1268,17 +1272,17 @@ export default {
       };
       console.log("提交审核obj", obj);
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("提交成功", res);
-            message.destroy();
-            message.success("提交成功");
-            state.reviewModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("提交失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("提交成功", res);
+          message.destroy();
+          message.success("提交成功");
+          state.reviewModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("提交失败", err);
+        });
     };
     //关闭提交审核弹窗
     const closeReviewModal = () => {
@@ -1297,17 +1301,17 @@ export default {
       };
       console.log("撤回成功obj", obj);
       api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("撤回成功", res);
-            message.destroy();
-            message.success("撤回成功");
-            state.recallReviewModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("撤回成功", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.recallReviewModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("撤回成功", err);
+        });
     };
     //关闭提交审核弹窗
     const closeRecallReviewModal = () => {
@@ -1350,24 +1354,23 @@ export default {
         align: "center",
         customRender: (value) => {
           return (
-              <div>
-                {value.record.type === 3
-                    ? {
-                  0: () => "草稿",
-                  1: () => "草稿",
-                  2: () => "草稿",
-                  3: () =>
+            <div>
+              {value.record.type === 3
+                ? {
+                    0: () => "草稿",
+                    1: () => "草稿",
+                    2: () => "草稿",
+                    3: () =>
                       dayjs().isBefore(value.record.beginTime)
-                          ? "未开始"
-                          : "进行中",
-                  4: () =>
+                        ? "未开始"
+                        : "进行中",
+                    4: () =>
                       dayjs().isBefore(value.record.end) ? "进行中" : "已结束",
-                  "-1": () => "已结束",
-                  "-5": () => "草稿",
-               
-                }[value.record.status + ""]() || ""
-                    : "-"}
-              </div>
+                    "-1": () => "已结束",
+                    "-5": () => "草稿",
+                  }[value.record.status + ""]() || ""
+                : "-"}
+            </div>
           );
         },
       },
@@ -1388,19 +1391,19 @@ export default {
         align: "center",
         customRender: (value) => {
           return (
-              <div>
-                {value.record.type === 3
-                    ? {
-                  0: "未审核",
-                  1: "审核中",
-                  2: "已审核",
-                  3: "已审核",
-                  4: "已审核",
-                  "-1": "已审核",
-                  "-5": "拒绝",
-                }[value.record.status + ""] || ""
-                    : "-"}
-              </div>
+            <div>
+              {value.record.type === 3
+                ? {
+                    0: "未审核",
+                    1: "审核中",
+                    2: "已审核",
+                    3: "已审核",
+                    4: "已审核",
+                    "-1": "已审核",
+                    "-5": "拒绝",
+                  }[value.record.status + ""] || ""
+                : "-"}
+            </div>
           );
         },
       },
@@ -1421,93 +1424,93 @@ export default {
         customRender: (value) => {
           // console.log("value", value.record.type, value.record.status);
           return (
-              <div className="operation">
-                {value.record.status === 0 || value.record.status === -5 ? (
-                    <span
-                        onClick={() => {
-                          if (value.record.type === 1 || value.record.type === 2) {
-                            state.doublepro = true;
-                            state.projectInfo = value.record;
-                          } else {
-                            console.log(value.record);
-                            router.push({
-                              path: "/projectadd",
-                              query: {
-                                projectId: value.record.projectId,
-                                parentId: value.record.parentId,
-                                parentName: value.record.parentName,
-                              },
-                            });
-                          }
-                        }}
-                        style="cursor:pointer;"
-                        className="operation1"
-                    >
+            <div className="operation">
+              {value.record.status === 0 || value.record.status === -5 ? (
+                <span
+                  onClick={() => {
+                    if (value.record.type === 1 || value.record.type === 2) {
+                      state.doublepro = true;
+                      state.projectInfo = value.record;
+                    } else {
+                      console.log(value.record);
+                      router.push({
+                        path: "/projectadd",
+                        query: {
+                          projectId: value.record.projectId,
+                          parentId: value.record.parentId,
+                          parentName: value.record.parentName,
+                        },
+                      });
+                    }
+                  }}
+                  style="cursor:pointer;"
+                  className="operation1"
+                >
                   编辑
                 </span>
-                ) : (
-                    ""
-                )}
-                {value.record.status === 0 && value.record.type === 3 ? (
-                    <span
-                        onClick={() => {
-                          showReviewModal(value.record.projectId);
-                        }}
-                        style="cursor:pointer"
-                        class="operation3"
-                    >
+              ) : (
+                ""
+              )}
+              {value.record.status === 0 && value.record.type === 3 ? (
+                <span
+                  onClick={() => {
+                    showReviewModal(value.record.projectId);
+                  }}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
                   提交审核
                 </span>
-                ) : (
-                    ""
-                )}
-                {value.record.status === 1 && value.record.type === 3 ? (
-                    <span
-                        onClick={() => {
-                          showRecallReviewModal(value.record.projectId);
-                        }}
-                        style="cursor:pointer"
-                        class="operation3"
-                    >
+              ) : (
+                ""
+              )}
+              {value.record.status === 1 && value.record.type === 3 ? (
+                <span
+                  onClick={() => {
+                    showRecallReviewModal(value.record.projectId);
+                  }}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
                   撤回审核
                 </span>
-                ) : (
-                    ""
-                )}
-                {value.record.status === 2 && value.record.type === 3 ? (
-                    <span
-                        onClick={() => {
-                          let time =
-                              value.record.beginTime + "-" + value.record.endTime;
-                          let obj = {
-                            projectId: value.record.projectId,
-                            name: value.record.name,
-                            time: time,
-                          };
-                          showProjectPub(obj);
-                        }}
-                        style="cursor:pointer"
-                        class="operation3"
-                    >
+              ) : (
+                ""
+              )}
+              {value.record.status === 2 && value.record.type === 3 ? (
+                <span
+                  onClick={() => {
+                    let time =
+                      value.record.beginTime + "-" + value.record.endTime;
+                    let obj = {
+                      projectId: value.record.projectId,
+                      name: value.record.name,
+                      time: time,
+                    };
+                    showProjectPub(obj);
+                  }}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
                   发布
                 </span>
-                ) : (
-                    ""
-                )}
-                {value.record.status === 3 && value.record.type === 3 ? (
-                    <span
-                        onClick={() => {
-                          showBackModal(value.record.projectId);
-                        }}
-                        style="cursor:pointer"
-                        class="operation3"
-                    >
+              ) : (
+                ""
+              )}
+              {value.record.status === 3 && value.record.type === 3 ? (
+                <span
+                  onClick={() => {
+                    showBackModal(value.record.projectId);
+                  }}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
                   撤回发布
                 </span>
-                ) : (
-                    ""
-                )}
-                {/**
+              ) : (
+                ""
+              )}
+              {/**
                  //<!-- 2022-12-10注释 后面放开 -->
                  <div className="tableSelect">
                  <a-select
@@ -1557,163 +1560,163 @@ export default {
                  </a-select>
                  </div>
                  */}
-                {value.record.type === 1 ? (
-                    <span
-                        className="operation3"
-                        style="cursor: pointer"
-                        onClick={() => {
-                          state.projectInfo = {
-                            parentName: value.record.name,
-                            parentId: value.record.projectId,
-                            name: value.record.name,
-                            sourceBelongId: value.record.sourceBelongId,
-                            sourceBelongame: value.record.sourceBelongName,
-                            manager: value.record.manager,
-                            managerId: value.record.managerId,
-                            systemId: value.record.systemId,
-                            type: 2,
-                          };
-                          state.estabish = true;
-                        }}
-                    >
+              {value.record.type === 1 ? (
+                <span
+                  className="operation3"
+                  style="cursor: pointer"
+                  onClick={() => {
+                    state.projectInfo = {
+                      parentName: value.record.name,
+                      parentId: value.record.projectId,
+                      name: value.record.name,
+                      sourceBelongId: value.record.sourceBelongId,
+                      sourceBelongame: value.record.sourceBelongName,
+                      manager: value.record.manager,
+                      managerId: value.record.managerId,
+                      systemId: value.record.systemId,
+                      type: 2,
+                    };
+                    state.estabish = true;
+                  }}
+                >
                   创建子项目
                 </span>
-                ) : (
-                    ""
-                )}
-                {value.record.type === 2 ? (
-                    <span
-                        className="operation3"
-                        style="cursor: pointer"
-                        onClick={() => {
-                          router.push({
-                            path: "/projectadd",
-                            query: {
-                              parentId: value.record.projectId,
-                              parentName:
-                                  value.record.parentName + "——" + value.record.name,
-                            },
-                          });
-                        }}
-                    >
+              ) : (
+                ""
+              )}
+              {value.record.type === 2 ? (
+                <span
+                  className="operation3"
+                  style="cursor: pointer"
+                  onClick={() => {
+                    router.push({
+                      path: "/projectadd",
+                      query: {
+                        parentId: value.record.projectId,
+                        parentName:
+                          value.record.parentName + "——" + value.record.name,
+                      },
+                    });
+                  }}
+                >
                   创建班级
                 </span>
-                ) : (
+              ) : (
+                ""
+              )}
+              <div className="tableSelect">
+                <a-select
+                  style="width: 50px"
+                  value="更多"
+                  // options={state.projectNameList}
+                  dropdownClassName="tabledropdown"
+                >
+                  <a-select-option value="复制" label="复制">
+                    <div
+                      onClick={() => {
+                        showCopyModal(value.record.projectId);
+                      }}
+                    >
+                      复制
+                    </div>
+                  </a-select-option>
+                  <a-select-option value="删除" label="删除">
+                    <div
+                      onClick={() => {
+                        showDeleteModal(value.record.projectId);
+                      }}
+                    >
+                      删除
+                    </div>
+                  </a-select-option>
+                  {value.record.type === 3 ? (
+                    <a-select-option value="存为模版" label="存为模版">
+                      <div
+                        onClick={() => {
+                          showStartModal(value.record.projectId);
+                        }}
+                      >
+                        存为模版
+                      </div>
+                    </a-select-option>
+                  ) : (
                     ""
-                )}
-                <div className="tableSelect">
-                  <a-select
-                      style="width: 50px"
-                      value="更多"
-                      // options={state.projectNameList}
-                      dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="复制" label="复制">
+                  )}
+                  {value.record.status === 3 && value.record.type === 3 ? (
+                    <a-select-option value="结束" label="结束">
                       <div
-                          onClick={() => {
-                            showCopyModal(value.record.projectId);
-                          }}
+                        onClick={() => {
+                          showStopModal(value.record.projectId);
+                        }}
                       >
-                        复制
+                        结束
                       </div>
                     </a-select-option>
-                    <a-select-option value="删除" label="删除">
-                      <div
-                          onClick={() => {
-                            showDeleteModal(value.record.projectId);
-                          }}
-                      >
-                        删除
-                      </div>
-                    </a-select-option>
-                    {value.record.type === 3 ? (
-                        <a-select-option value="存为模版" label="存为模版">
-                          <div
-                              onClick={() => {
-                                showStartModal(value.record.projectId);
-                              }}
-                          >
-                            存为模版
-                          </div>
-                        </a-select-option>
-                    ) : (
-                        ""
-                    )}
-                    {value.record.status === 3 && value.record.type === 3 ? (
-                        <a-select-option value="结束" label="结束">
-                          <div
-                              onClick={() => {
-                                showStopModal(value.record.projectId);
-                              }}
-                          >
-                            结束
-                          </div>
-                        </a-select-option>
-                    ) : (
-                        ""
-                    )}
+                  ) : (
+                    ""
+                  )}
 
-                    {value.record.status === -1 && value.record.type === 3 ? (
-                        <a-select-option value="撤回" label="撤回">
-                          <div
-                              onClick={() => {
-                                showBackFinashModal(value.record.projectId);
-                              }}
-                          >
-                            撤回
-                          </div>
-                        </a-select-option>
-                    ) : (
-                        ""
-                    )}
-                    {value.record.type === 3 ? (
-                        <a-select-option value="基础信息" label="基础信息">
-                          <div
-                              onClick={() => {
-                                router.push({
-                                  path: "/taskpage",
-                                  query: {projectId: value.record.projectId},
-                                });
-                                storage.set("projectId", value.record.projectId);
-                              }}
-                          >
-                            基础信息
-                          </div>
-                        </a-select-option>
-                    ) : (
-                        ""
-                    )}
-                  </a-select>
-                </div>
+                  {value.record.status === -1 && value.record.type === 3 ? (
+                    <a-select-option value="撤回" label="撤回">
+                      <div
+                        onClick={() => {
+                          showBackFinashModal(value.record.projectId);
+                        }}
+                      >
+                        撤回
+                      </div>
+                    </a-select-option>
+                  ) : (
+                    ""
+                  )}
+                  {value.record.type === 3 ? (
+                    <a-select-option value="基础信息" label="基础信息">
+                      <div
+                        onClick={() => {
+                          router.push({
+                            path: "/taskpage",
+                            query: { projectId: value.record.projectId },
+                          });
+                          storage.set("projectId", value.record.projectId);
+                        }}
+                      >
+                        基础信息
+                      </div>
+                    </a-select-option>
+                  ) : (
+                    ""
+                  )}
+                </a-select>
               </div>
+            </div>
           );
         },
       },
     ]);
     const getTableDate = () =>
-        api
-            .getProjectList({
-              ...state.searchParam,
-              beginTime:
-                  state.searchParam.valueDate &&
-                  state.searchParam.valueDate.length === 2
-                      ? state.searchParam.valueDate[0]
-                      : "",
-              endTime:
-                  state.searchParam.valueDate &&
-                  state.searchParam.valueDate.length === 2
-                      ? state.searchParam.valueDate[1]
-                      : "",
-            })
-            .then((res) => {
-              console.log(res);
-              state.tableDataTotal = Number(res.data.data.total);
-              const data = res.data.data.rows;
-              initDataSublist("", data);
-              console.log(data);
-              tableData.value = data;
-              console.log("tableData", tableData);
-            });
+      api
+        .getProjectList({
+          ...state.searchParam,
+          beginTime:
+            state.searchParam.valueDate &&
+            state.searchParam.valueDate.length === 2
+              ? state.searchParam.valueDate[0]
+              : "",
+          endTime:
+            state.searchParam.valueDate &&
+            state.searchParam.valueDate.length === 2
+              ? state.searchParam.valueDate[1]
+              : "",
+        })
+        .then((res) => {
+          // console.log("搜索", res, state.searchParam);
+          state.tableDataTotal = Number(res.data.data.total);
+          const data = res.data.data.rows;
+          initDataSublist("", data);
+          console.log(data);
+          tableData.value = data;
+          console.log("tableData", tableData);
+        });
 
     function initDataSublist(parentName, data) {
       if (data && data.length) {
@@ -1721,8 +1724,8 @@ export default {
           e.parentName = parentName;
           e.key = e.projectId;
           initDataSublist(
-              (parentName ? parentName + "——" : "") + e.name,
-              e.subList
+            (parentName ? parentName + "——" : "") + e.name,
+            e.subList
           );
           e.subList && e.subList.length && (e.children = e.subList);
         });
@@ -1784,40 +1787,40 @@ export default {
     };
     //添加权限
     watch(
-        () => state.addAuthList,
-        (res) => {
-          console.log("res", res, state.addAuthList);
-          let obj = {
-            type: 2,
-            tag:
-                state.authClassify === 1 ? 3 : state.authClassify === 2 ? 4 : null,
-            opt: 3,
-            deptList: res[1],
-            groupList: res[2],
-            refId: state.selectProjectId,
-            pageNo: 20,
-            pageSize: 1,
-            studentList: res[0],
-            keyWord: "",
-          };
-          console.log("obj", obj);
-          api1
-              .optionAuthPerm(obj)
-              .then((res) => {
-                console.log("添加授权成功", res);
-                message.success("添加授权成功");
-              })
-              .catch((err) => {
-                console.log("添加授权失败", err);
-              });
-        }
+      () => state.addAuthList,
+      (res) => {
+        console.log("res", res, state.addAuthList);
+        let obj = {
+          type: 2,
+          tag:
+            state.authClassify === 1 ? 3 : state.authClassify === 2 ? 4 : null,
+          opt: 3,
+          deptList: res[1],
+          groupList: res[2],
+          refId: state.selectProjectId,
+          pageNo: 20,
+          pageSize: 1,
+          studentList: res[0],
+          keyWord: "",
+        };
+        console.log("obj", obj);
+        api1
+          .optionAuthPerm(obj)
+          .then((res) => {
+            console.log("添加授权成功", res);
+            message.success("添加授权成功");
+          })
+          .catch((err) => {
+            console.log("添加授权失败", err);
+          });
+      }
     );
 
     function managerChange(e, l, d, t) {
       !state.projectInfo.sourceBelongId &&
-      (state.projectInfo.sourceBelongId = d);
+        (state.projectInfo.sourceBelongId = d);
       !state.projectInfo.sourceBelongName &&
-      (state.projectInfo.sourceBelongName = t);
+        (state.projectInfo.sourceBelongName = t);
     }
 
     return {
@@ -1881,7 +1884,7 @@ export default {
       okReminderModal,
     };
   },
-  };
+};
 </script>
 <style lang="scss">
 .projectManage {
@@ -2074,7 +2077,6 @@ export default {
     margin: 20px 38px 30px;
 
     .ant-table-thead > tr > th {
-
       background-color: #eff4fc;
     }
   }
@@ -2168,9 +2170,9 @@ export default {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -2266,9 +2268,9 @@ export default {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -2365,9 +2367,9 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -2431,9 +2433,9 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -2542,8 +2544,8 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-                    rgba(78, 166, 255, 0.2) 0%,
-                    rgba(78, 166, 255, 0) 100%
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -2644,8 +2646,8 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-                rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
         );
       }
 
@@ -2684,9 +2686,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-                    180deg,
-                    rgba(254, 243, 221, 1),
-                    rgba(255, 250, 240, 1)
+              180deg,
+              rgba(254, 243, 221, 1),
+              rgba(255, 250, 240, 1)
             );
             border-radius: 10px;
             margin-right: 7px;
@@ -2710,9 +2712,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-                    180deg,
-                    rgba(221, 234, 255, 1),
-                    rgba(240, 248, 254, 1)
+              180deg,
+              rgba(221, 234, 255, 1),
+              rgba(240, 248, 254, 1)
             );
             border-radius: 10px;
 

From 233d334840487ee003f6e0f6ce1cdabe0ce7cf7f Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 14:09:01 +0800
Subject: [PATCH 11/35] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=B7=E9=80=89=E4=B8=AD=E5=85=B3=E5=8D=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue   | 16 +++----
 src/components/drawers/AddDiscuss.vue         |  5 +-
 src/components/drawers/AddEval.vue            |  5 +-
 src/components/drawers/AddFaceteach.vue       |  5 +-
 src/components/drawers/AddGroupMembers.vue    | 16 +++----
 src/components/drawers/MemberList.vue         | 16 +++----
 src/views/courselibrary/CoursewareManage.vue  | 20 ++++----
 .../courselibrary/CoursewareManage_Old.vue    | 20 ++++----
 src/views/learningpath/LevelAdd.vue           | 16 +++----
 src/views/learningpath/LevelAddDetail.vue     | 16 +++----
 src/views/projectcenter/TaskPage.vue          | 48 ++++++++++---------
 src/views/projectcenter/TemplateLibrary.vue   |  5 +-
 src/views/research/ManagePage.vue             | 12 ++---
 13 files changed, 104 insertions(+), 96 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index e41f7511..0c7a9b5f 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -513,14 +513,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "所在岗位",
-          dataIndex: "gang",
-          key: "gang",
-          width: 50,
-          align: "center",
-          className: "h",
-        },
+       //   {
+         //   title: "所在岗位",
+         //   dataIndex: "gang",
+         //   key: "gang",
+          //  width: 50,
+          //  align: "center",
+          //  className: "h",
+        //  },
         {
           title: "签到时间",
           dataIndex: "cur",
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 5b39e01a..cb1616d1 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -191,11 +191,12 @@ export default {
       }
     };
     const updateTask = async (res) => {
-      if(!props.isactive){
+   
+      if (props.isLevel == 1) {
+        if(!props.isactive){
           message.destroy();
           return message.warning("请先选中关卡");
         }
-      if (props.isLevel == 1) {
         await RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.discussId,
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 28c69f5a..b68eba22 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -177,11 +177,12 @@ export default {
     };
     //向关卡或阶段渲染
     const updateTask = async (value) => {
-      if(!props.isactive){
+    
+      if (props.isLevel == 1) {
+        if(!props.isactive){
           message.destroy();
           return message.warning("请先选中关卡");
         }
-      if (props.isLevel == 1) {
         await RouterEditTask({
           chapterId: props.isactive,
           courseId: Number(value.evaluationId),
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 5b642080..79f0c08c 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -702,11 +702,12 @@ export default {
     // 新增编辑或新增项目任务
     const updateTask = async (res) => {
       console.log("props.isLevel=====", props.isLevel);
-      if(!props.isactive){
+    
+      if (props.isLevel == 1) {
+        if(!props.isactive){
           message.destroy();
           return message.warning("请先选中关卡");
         }
-      if (props.isLevel == 1) {
         let editObj1 = {
           chapterId: props.isactive,
           courseId: res.data.data.offcoursePlanId,
diff --git a/src/components/drawers/AddGroupMembers.vue b/src/components/drawers/AddGroupMembers.vue
index f953497b..7f71100d 100644
--- a/src/components/drawers/AddGroupMembers.vue
+++ b/src/components/drawers/AddGroupMembers.vue
@@ -155,14 +155,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "岗位",
-          dataIndex: "gangw",
-          key: "gangw",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
+         // {
+          //  title: "岗位",
+          //  dataIndex: "gangw",
+          //  key: "gangw",
+          //  width: 60,
+          //  align: "center",
+          //  className: "h",
+         // },
         // {
         //   title: "进度",
         //   dataIndex: "progress",
diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index bad5c2e1..6fe9f77c 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -231,14 +231,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "岗位",
-          dataIndex: "gangw",
-          key: "gangw",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
+        //  {
+         //   title: "岗位",
+         //   dataIndex: "gangw",
+         //   key: "gangw",
+         //   width: 60,
+         //  align: "center",
+         //   className: "h",
+        //  },
         {
           title: "进度",
           dataIndex: "progress",
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 6a1db8f9..5a1d7369 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3246,16 +3246,16 @@ const columns7 = [
       return text ? text : "-";
     },
   },
-  {
-    title: "岗位",
-    width: 300,
-    dataIndex: "postion",
-    key: "3",
-    align: "center",
-    customRender: ({ text }) => {
-      return text ? text : "-";
-    },
-  },
+   // {
+   //   title: "岗位",
+   //   width: 300,
+   //   dataIndex: "postion",
+   //   key: "3",
+    //  align: "center",
+    //  customRender: ({ text }) => {
+    //    return text ? text : "-";
+    //  },
+   // },
   {
     title: "Band",
     width: 200,
diff --git a/src/views/courselibrary/CoursewareManage_Old.vue b/src/views/courselibrary/CoursewareManage_Old.vue
index adda96ba..2cf74957 100644
--- a/src/views/courselibrary/CoursewareManage_Old.vue
+++ b/src/views/courselibrary/CoursewareManage_Old.vue
@@ -3529,16 +3529,16 @@ const columns7 = [
       return text ? text : "-";
     },
   },
-  {
-    title: "岗位",
-    width: 300,
-    dataIndex: "postion",
-    key: "3",
-    align: "center",
-    customRender: ({ text }) => {
-      return text ? text : "-";
-    },
-  },
+  //  //  {
+    //  title: "岗位",
+    //  width: 300,
+    //  dataIndex: "postion",
+    //  key: "3",
+    //  align: "center",
+   //   customRender: ({ text }) => {
+    //    return text ? text : "-";
+    //  },
+  //  },
   {
     title: "Band",
     width: 200,
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 3aa4108c..a7f4668a 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1483,14 +1483,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "岗位",
-          dataIndex: "gang",
-          key: "gang",
-          width: 110,
-          align: "center",
-          className: "h",
-        },
+        //  {
+         //   title: "岗位",
+          //  dataIndex: "gang",
+         //   key: "gang",
+         //   width: 110,
+          //  align: "center",
+         //   className: "h",
+        //  },
         {
           title: "当前关卡",
           dataIndex: "cur",
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index e0f50cc2..15919243 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1531,14 +1531,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "岗位",
-          dataIndex: "gang",
-          key: "gang",
-          width: 110,
-          align: "center",
-          className: "h",
-        },
+       //   {
+         //   title: "岗位",
+         //   dataIndex: "gang",
+         //   key: "gang",
+          //  width: 110,
+          //  align: "center",
+          //  className: "h",
+        //  },
         {
           title: "当前关卡",
           dataIndex: "cur",
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index d48ac5a6..fd59ffda 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -707,6 +707,8 @@
                         placeholder="请输入姓名"
                       />
                     </div>
+                          <!-- 2022-11-30注释 后面放开 -->
+                    <!--
                     <div
                       style="
                         display: flex;
@@ -715,14 +717,14 @@
                         margin-bottom: 10px;
                       "
                     >
+               
                       <div class="groupname">小组名称：</div>
                       <a-input
                         v-model:value="valuestugroup"
                         placeholder="请输入小组名称"
                       />
                     </div>
-                    <!-- 2022-11-30注释 后面放开 -->
-                    <!-- <div
+                    <div
                       style="
                         display: flex;
                         align-items: center;
@@ -3147,22 +3149,22 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "岗位",
-          dataIndex: "gangw",
-          key: "gangw",
+        //  {
+         //   title: "岗位",
+         //   dataIndex: "gangw",
+         //   key: "gangw",
           // width: 50,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "所属小组",
-          dataIndex: "group",
-          key: "group",
+          //  align: "center",
+           // className: "h",
+        //  },
+        //  {
+          //  title: "所属小组",
+          //  dataIndex: "group",
+         //   key: "group",
           // width: 50,
-          align: "center",
-          className: "h",
-        },
+          //  align: "center",
+          //  className: "h",
+         // },
         {
           title: "进度",
           dataIndex: "progress",
@@ -3171,14 +3173,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "证书",
-          dataIndex: "diploma",
-          key: "diploma",
+        //  {
+         //   title: "证书",
+          //  dataIndex: "diploma",
+          //  key: "diploma",
           // width: 30,
-          align: "center",
-          className: "h",
-        },
+          //  align: "center",
+           // className: "h",
+        //  },
         {
           title: "最近学习时间",
           dataIndex: "stutime",
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index 68e30874..f0963337 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -11,8 +11,9 @@
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
-                " placeholder="请输入项目名称" />
+                " placeholder="请输入模板名称" />
             </div>
+            <!--
             <div class="inpbox1">
               <span>创建时间：</span>
               <a-date-picker v-model:value="time" type="date" placeholder="创建时间" style="
@@ -22,6 +23,8 @@
                 margin-right: 14px;
                 " />
             </div>
+-->
+
           </div>
         </div>
         <div class="tmplh_btn">
diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue
index 2ef869f3..28b197a0 100644
--- a/src/views/research/ManagePage.vue
+++ b/src/views/research/ManagePage.vue
@@ -150,12 +150,12 @@ export default {
           dataIndex: "department",
           key: "department",
         },
-        {
-          width: 50,
-          title: "岗位",
-          dataIndex: "post",
-          key: "post",
-        },
+        //  {
+         //   width: 50,
+         //   title: "岗位",
+         //   dataIndex: "post",
+          //  key: "post",
+        //  },
         {
           title: "项目",
           width: 50,

From 57d83419dca712e8e2bae47e3e913d6c6b68296f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 14:27:05 +0800
Subject: [PATCH 12/35] -- bug

---
 src/components/project/NameInput.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue
index ed8389e6..753a9f78 100644
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -12,7 +12,7 @@
   <div style="color:red;font-size: 10px" v-if="value && !validate">名称重复，请重新输入</div>
 </template>
 <script setup>
-import {defineProps, defineEmits, watch, ref} from "vue";
+import {defineProps, defineEmits, watch, ref, onMounted} from "vue";
 import {validateName} from "@/api/index1";
 
 const props = defineProps({
@@ -47,6 +47,10 @@ const emit = defineEmits({})
 
 const modelV = ref()
 
+onMounted(()=>{
+  modelV.value = props.value
+})
+
 watch(() => props.value, () => {
   if (props.value !== modelV.value) {
     modelV.value = props.value

From a57349851231e6e4702a8ffebebda9b27f90581e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 14:28:58 +0800
Subject: [PATCH 13/35] -- bug

---
 src/views/examine/ProjectReviewedN.vue | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index f0741880..88be9fe4 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -151,14 +151,23 @@ export default {
           ellipsis: true,
           width:"20%",
         },
-        // todo 根项目保存
-        // {
-        //   title: "所属项目",
-        //   dataIndex: "sourceBelongName",
-        //   key: "sourceBelongName",
-        //   align: "center",
-        //   width: "11%",
-        // },
+        {
+          title: "所属项目",
+          dataIndex: "topName",
+          key: "topName",
+          align: "center",
+          ellipsis: true,
+          width:"20%",
+          customRender: ({ record: { gaName, faName, name } }) => (
+              <div>
+                {faName
+                    ? gaName !== null
+                        ? gaName + "/" + faName
+                        : faName
+                    : name}
+              </div>
+          ),
+        },
         {
           title: "项目经理",
           dataIndex: "manager",

From 5bbe79f32514aa3286b0820dafaa4f780551bb1e Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 15:09:36 +0800
Subject: [PATCH 14/35] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E5=BC=80=E8=AF=BE=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=BE=85=E5=AE=A1=E6=A0=B8=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue  | 1134 +++++++++--------
 .../courselibrary/components/seeModal.vue     |  164 +--
 2 files changed, 672 insertions(+), 626 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 6a1db8f9..600b62e9 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -82,18 +82,16 @@
             </div>
           </div>
           <div style="display: flex; margin-bottom: 20px">
-        <div class="btn btn1" @click="handleSearch1">
-          <div class="search"></div>
-          <div class="btnText">搜索</div>
-        </div>
-        <div class="btnn btn2" @click="handleRest1">
-          <div class="search"></div>
-          <div class="btnText">重置</div>
-        </div>
-      
-           </div>
-           <div class="btns">
-     
+            <div class="btn btn1" @click="handleSearch1">
+              <div class="search"></div>
+              <div class="btnText">搜索</div>
+            </div>
+            <div class="btnn btn2" @click="handleRest1">
+              <div class="search"></div>
+              <div class="btnText">重置</div>
+            </div>
+          </div>
+          <div class="btns">
             <!-- 2022-11-30注释 后面放开 -->
             <!-- <div class="btn btn3" @click="openMessage">
               <div class="search"></div>
@@ -106,7 +104,7 @@
           </div>
         </div>
       </div>
-      
+
       <!-- 搜索框及按钮 -->
     </div>
     <!-- 选择线上还是面授课弹窗 -->
@@ -631,8 +629,8 @@
                     <span style="margin-right: 14px">授课教师</span>
                   </div>
                   <div class="item_inp">
-                    <div class="select" style="width:436px; " >
-                      <ProjectManager 
+                    <div class="select" style="width: 436px">
+                      <ProjectManager
                         v-model:value="member.value"
                         v-model:name="member.name"
                       ></ProjectManager>
@@ -813,31 +811,33 @@
                   ? 'disabled operation'
                   : 'operation',
               ]"
-            > 
-            <div class="fb">
-              <div class="jc"
-                @click="
-                  () => {
-                    handleEdit(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                编辑
-              </div>
+            >
+              <div class="fb">
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleEdit(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  编辑
+                </div>
 
-              <div class="jc"
-                @click="
-                  () => {
-                    handleCopy(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                复制
-              </div>
-              <!-- 2022-12-10注释 后面放开 -->
-              <!-- <a-dropdown>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleCopy(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  复制
+                </div>
+                <!-- 2022-12-10注释 后面放开 -->
+                <!-- <a-dropdown>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item
@@ -893,18 +893,19 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
-                @click="
-                  () => {
-                    handleDelete(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                删除
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleDelete(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  删除
+                </div>
               </div>
             </div>
-            </div>
           </template>
           <template
             v-if="
@@ -920,29 +921,31 @@
                   : 'operation',
               ]"
             >
-            <div class="fb">
-              <div class="jc"
-                @click="
-                  () => {
-                    handleRejectExit(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                撤回
-              </div>
-              <div class="jc"
-                @click="
-                  () => {
-                    handleCopy(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                复制
-              </div>
-              <!-- 2022-12-10注释 后面放开 -->
-              <!-- <a-dropdown>
+              <div class="fb">
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleRejectExit(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  撤回
+                </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleCopy(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  复制
+                </div>
+                <!-- 2022-12-10注释 后面放开 -->
+                <!-- <a-dropdown>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item
@@ -998,7 +1001,7 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-            </div> 
+              </div>
             </div>
           </template>
           <template
@@ -1008,7 +1011,7 @@
               column.key === 'operation'
             "
           >
-          <div
+            <div
               style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
@@ -1016,29 +1019,31 @@
                   : 'operation',
               ]"
             >
-            <div class="fb">
-            <div class="jc"
-                @click="
-                  () => {
-                    handleStart(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                开课
-              </div>
-              <div class="jc"
-                @click="
-                  () => {
-                    handleLook(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                查看
-              </div>
-               <!-- 2022-12-11注释 后面放开 -->
-             <!--
+              <div class="fb">
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleStart(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  开课
+                </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleLook(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  查看
+                </div>
+                <!-- 2022-12-11注释 后面放开 -->
+                <!--
               <div class="jc"
                 @click="
                   () => {
@@ -1059,18 +1064,19 @@
               >
                 管理
               </div>-->
-              <div class="jc"
-                @click="
-                  () => {
-                    handleCopy(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                复制
-              </div>
-              <!-- 2022-12-10注释 后面放开 -->
-              <!-- <a-dropdown>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleCopy(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  复制
+                </div>
+                <!-- 2022-12-10注释 后面放开 -->
+                <!-- <a-dropdown>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item
@@ -1126,7 +1132,8 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleStop(record, String(record.courseform));
@@ -1136,9 +1143,8 @@
                 >
                   停用
                 </div>
-             </div>
-            </div> 
-            
+              </div>
+            </div>
           </template>
           <template
             v-if="
@@ -1147,7 +1153,7 @@
               column.key === 'operation'
             "
           >
-          <div 
+            <div
               style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
@@ -1155,28 +1161,30 @@
                   : 'operation',
               ]"
             >
-            <div class="fb">
-            <div class="jc"
-                @click="
-                  () => {
-                    handleStart(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                开课
-              </div>
-              <div class="jc"
-                @click="
-                  () => {
-                    handleEdit(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                编辑
-              </div>
-               <!-- 2022-12-10注释 后面放开
+              <div class="fb">
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleStart(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  开课
+                </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleEdit(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  编辑
+                </div>
+                <!-- 2022-12-10注释 后面放开
 
               <div class="jc"
                 @click="
@@ -1198,18 +1206,19 @@
               >
                 管理
               </div> -->
-              <div class="jc"
-                @click="
-                  () => {
-                    handleCopy(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                复制
-              </div>
-              <!-- 2022-12-10注释 后面放开 -->
-              <!-- <a-dropdown>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleCopy(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  复制
+                </div>
+                <!-- 2022-12-10注释 后面放开 -->
+                <!-- <a-dropdown>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item
@@ -1265,26 +1274,28 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
-                @click="
-                  () => {
-                    handleOpen(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                启用
-              </div>
-              <div class="jc"
-                @click="
-                  () => {
-                    handleDelete(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                删除
-              </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleOpen(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  启用
+                </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleDelete(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  删除
+                </div>
               </div>
             </div>
           </template>
@@ -1295,7 +1306,7 @@
               column.key === 'operation'
             "
           >
-          <div 
+            <div
               style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
@@ -1303,29 +1314,31 @@
                   : 'operation',
               ]"
             >
-            <div class="fb">
-            <div class="jc"
-                @click="
-                  () => {
-                    handleEdit(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                编辑
-              </div>
-              <div class="jc"
-                @click="
-                  () => {
-                    handleCopy(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                复制
-              </div>
-              <!-- 2022-12-10注释 后面放开 -->
-              <!-- <a-dropdown>
+              <div class="fb">
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleEdit(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  编辑
+                </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleCopy(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  复制
+                </div>
+                <!-- 2022-12-10注释 后面放开 -->
+                <!-- <a-dropdown>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item
@@ -1381,16 +1394,17 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
-                @click="
-                  () => {
-                    handleDelete(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                删除
-              </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleDelete(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  删除
+                </div>
               </div>
             </div>
           </template>
@@ -1720,12 +1734,13 @@
                 <div class="btnText">重置</div>
               </div>
               <div class="btns">
-              <div class="btn btn3" @click="createkk">
-                <div class="search"></div>
-                <div class="btnText">
-                  <span style="color: #ffffff">新建开课</span>
+                <div class="btn btn3" @click="createkk">
+                  <div class="search"></div>
+                  <div class="btnText">
+                    <span style="color: #ffffff">新建开课</span>
+                  </div>
                 </div>
-              </div></div>
+              </div>
             </div>
             <!-- 无数据样式 -->
             <div class="notable" v-if="tableData6.length === 0">
@@ -1758,8 +1773,8 @@
                 <template #bodyCell="{ record, column }">
                   <template v-if="column.key === 'operation'">
                     <div class="operation">
-                   <div class="fb">
-                 <!--
+                      <div class="fb">
+                        <!--
                      <div class="jc"
                         @click="
                           () => {
@@ -1771,28 +1786,30 @@
                         签到
                       </div>
                       -->
-                      <div class="jc"
-                        @click="
-                          () => {
-                            handelEditStu(record);
-                          }
-                        "
-                      >
-                        编辑
+                        <div
+                          class="jc"
+                          @click="
+                            () => {
+                              handelEditStu(record);
+                            }
+                          "
+                        >
+                          编辑
+                        </div>
+                        <div
+                          class="jc"
+                          @click="
+                            () => {
+                              handelGuan(record);
+                            }
+                          "
+                        >
+                          管理
+                        </div>
                       </div>
-                      <div class="jc"
-                        @click="
-                          () => {
-                            handelGuan(record);
-                          }
-                        "
-                      >
-                        管理
-                      </div>
-                    </div>
-                      <a-dropdown >
+                      <a-dropdown>
                         <template #overlay>
-                          <a-menu style="margin-left: 20px;">
+                          <a-menu style="margin-left: 20px">
                             <a-menu-item
                               @click="
                                 () => {
@@ -1802,7 +1819,7 @@
                             >
                               复制
                             </a-menu-item>
-                            <a-menu-item 
+                            <a-menu-item
                               @click="
                                 () => {
                                   handleDeleteKaike(record);
@@ -1824,11 +1841,12 @@
                             </a-menu-item> -->
                           </a-menu>
                         </template>
-                        <div class="fb" style="margin-left: -20px;">
-                        <div class="jc" >
-                          更多
-                          <down-outlined />
-                        </div></div>
+                        <div class="fb" style="margin-left: -20px">
+                          <div class="jc">
+                            更多
+                            <down-outlined />
+                          </div>
+                        </div>
                       </a-dropdown>
                     </div>
                   </template>
@@ -1853,8 +1871,6 @@
           </div>
         </div>
       </div>
-
-
     </a-modal>
     <!--开课页面 -->
     <!--新建开课页面 -->
@@ -1950,7 +1966,7 @@
               </div>
               <span style="margin-right: 3px">授课教师</span>
             </div>
-            <div class="select" style="width: 440px;">
+            <div class="select" style="width: 440px">
               <ProjectManager
                 v-model:value="member.value"
                 v-model:name="member.name"
@@ -1967,7 +1983,7 @@
               </a-checkbox>
             </div>
           </div>
-          
+
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">签到设置</span>
@@ -1987,7 +2003,6 @@
             </div>
           </div>
 
-
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">评估设置</span>
@@ -2017,7 +2032,7 @@
               />
             </div>
           </div>
-           <!--
+          <!--
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">完成规则</span>
@@ -2030,7 +2045,7 @@
               >
                 <span style="color: #6d7584">报名即完成</span>
               </a-checkbox> -->
-               <!--
+          <!--
               <a-checkbox v-model:checked="signCom" @click="signCom = !signCom">
                 <span style="color: #6d7584">签到即完成</span>
               </a-checkbox>
@@ -2099,8 +2114,16 @@
                       white-space: nowrap;
                       text-overflow: ellipsis;
                     "
-                    >{{ item.slice(item.lastIndexOf("/") + 1) }}</span
                   >
+                    {{
+                      item.indexOf("-") !== -1
+                        ? item.slice(
+                            item.lastIndexOf("/") + 1,
+                            item.indexOf("-")
+                          ) + item.slice(item.lastIndexOf("."))
+                        : item
+                    }}
+                  </span>
                 </div>
                 <!-- 条件渲染 s -->
                 <!-- <div class="file_size">
@@ -2155,8 +2178,8 @@
         </div>
       </div>
       <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-    <a-spin :spinning="addLoading" tip="" />
-  </div>
+        <a-spin :spinning="addLoading" tip="" />
+      </div>
     </a-modal>
     <!--新建开课页面 -->
     <!--开课学员管理页面 -->
@@ -2227,7 +2250,12 @@
                   <a-input
                     v-model:value="xygl_inputV1"
                     placeholder="请输入姓名"
-                    style="width: 400px; height: 40px; border-radius: 8px;margin-right:14px;"
+                    style="
+                      width: 400px;
+                      height: 40px;
+                      border-radius: 8px;
+                      margin-right: 14px;
+                    "
                   />
                   <div class="btn btn1" @click="handleSearchStu">
                     <div class="search"></div>
@@ -2239,9 +2267,9 @@
                   </div>
                 </div>
                 <div class="btns">
-                  <div class="btn btn3"  @click="showStuAdd(currentPlanItem)">
+                  <div class="btn btn3" @click="showStuAdd(currentPlanItem)">
                     <div class="search"></div>
-                     <div class="btnText"> 添加学员</div>
+                    <div class="btnText">添加学员</div>
                   </div>
                   <!-- 2022-11-30注释 后面放开 -->
                   <!-- <div class="stmm_btn btn4" @click="hideShow">
@@ -2284,7 +2312,7 @@
                   </div> -->
                 </div>
               </div>
-              <div class="tableBox" style="margin-top:20px;">
+              <div class="tableBox" style="margin-top: 20px">
                 <a-table
                   :columns="columns7"
                   :data-source="tableData7"
@@ -3113,19 +3141,19 @@ const columns4 = [
 ];
 //开课表格
 const columns6 = [
- // {
+  // {
   //  title: "序号",
   //  dataIndex: "num",
   //  key: "num",
-   // width: "6%",
-   // align: "center",
+  // width: "6%",
+  // align: "center",
   //  ellipsis: true,
-   // customRender: ({ index, record }) => {
-   //   const pageNum =
-    //    Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
-    //  return index + 1 + pageNum;
-   // },
- // },
+  // customRender: ({ index, record }) => {
+  //   const pageNum =
+  //    Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+  //  return index + 1 + pageNum;
+  // },
+  // },
   {
     title: "课程名称",
     dataIndex: "organization",
@@ -3205,18 +3233,18 @@ const columns6 = [
 ];
 //开课学员管理
 const columns7 = [
-////  {
- //   title: "序号",
-//    width: 200,
- //   dataIndex: "num",
+  ////  {
+  //   title: "序号",
+  //    width: 200,
+  //   dataIndex: "num",
   //  key: "num",
   //  align: "center",
- //   customRender: ({ index, record }) => {
-   //   const pageNum =
-   //     Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
-    //  return index + 1 + pageNum;
-   // },
- // },
+  //   customRender: ({ index, record }) => {
+  //   const pageNum =
+  //     Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+  //  return index + 1 + pageNum;
+  // },
+  // },
   {
     title: "姓名",
     width: 200,
@@ -3604,7 +3632,7 @@ export default defineComponent({
 
       imageUrl: "",
       imgList: [],
-      validate:false,
+      validate: false,
 
       pageSize2: 10,
       currentPage2: 0,
@@ -3651,7 +3679,7 @@ export default defineComponent({
       codevisible: false, //二维码弹窗
       codeInfo: null, //二维码内容
       codeUrl: codeUrl,
-      finished:false,
+      finished: false,
       // 课程三级分类
       options2222: [
         {
@@ -4554,12 +4582,12 @@ export default defineComponent({
         message.destroy();
         return message.warning("请输入必填项");
       }
-      
-      console.log("state.validate",state.validate);
-      if(!state.finished){
+
+      console.log("state.validate", state.validate);
+      if (!state.finished) {
         return;
       }
-   
+
       if (!state.validate && state.finished) {
         message.destroy();
         return message.warning("该课程名称已存在");
@@ -4569,11 +4597,10 @@ export default defineComponent({
         state.bs_hs,
         state.valueE1 == 2
       );
-      if( !state.valueE1 && !state.valueE2){
+      if (!state.valueE1 && !state.valueE2) {
         message.destroy();
         return message.warning("请选择课程形式");
       }
-      
 
       if (state.valueE1 === 2) {
         state.of_hs = false;
@@ -4814,7 +4841,7 @@ export default defineComponent({
         .catch();
 
       console.log("res");
-      console.log(item);
+      console.log("获取面授课详情", item);
 
       state.xjkkinputV2 = item.address;
       state.checked1 = item.applyFlag === 1 ? true : false;
@@ -5050,7 +5077,7 @@ export default defineComponent({
             type: -1,
           }).then((res) => {
             if (res.data.code === 200) {
-               message.destroy();
+              message.destroy();
               message.success("删除成功");
               getTableDate();
               delete_exit1();
@@ -5087,7 +5114,7 @@ export default defineComponent({
           console.log(obj);
           editPlan(obj).then((res) => {
             if (res.data.code === 200) {
-               message.destroy();
+              message.destroy();
               message.success("复制成功");
               getTableDate3();
               delete_exit1();
@@ -5119,7 +5146,7 @@ export default defineComponent({
           };
           edit(postData).then((res) => {
             if (res.data.code === 200) {
-               message.destroy();
+              message.destroy();
               message.success("复制成功");
               getTableDate();
               delete_exit1();
@@ -5137,7 +5164,7 @@ export default defineComponent({
             type: -2,
           }).then((res) => {
             if (res.data.code === 200) {
-               message.destroy();
+              message.destroy();
               message.success("操作成功");
               getTableDate();
               delete_exit1();
@@ -5377,7 +5404,7 @@ export default defineComponent({
       }).then((res) => {
         if (res.data.code === 200) {
           getTableDate();
-           message.destroy();
+          message.destroy();
           message.success("启用成功");
         }
       });
@@ -6001,7 +6028,6 @@ export default defineComponent({
     }
   }
 
-
   .tableBox {
     margin: 20px 38px 30px;
 
@@ -6017,20 +6043,20 @@ export default defineComponent({
     }
 
     .operation {
-    display: flex;
-    justify-content: right;
-    .fb {
       display: flex;
-      margin-right: 20px;
-      .jc {
-        color: #4ea6ff;
-        font-size: 14px;
-        margin-left: 20px;
-        white-space: nowrap;
-        cursor: pointer;
+      justify-content: right;
+      .fb {
+        display: flex;
+        margin-right: 20px;
+        .jc {
+          color: #4ea6ff;
+          font-size: 14px;
+          margin-left: 20px;
+          white-space: nowrap;
+          cursor: pointer;
+        }
       }
     }
-  }
     .ynuse {
       display: flex;
       justify-content: center;
@@ -7612,31 +7638,31 @@ export default defineComponent({
               }
 
               .operation {
-              display: flex;
-              justify-content: right;
-              margin-right:20px;
-              .fb {
                 display: flex;
+                justify-content: right;
                 margin-right: 20px;
-                .jc {
-                  color: #4ea6ff;
-                  font-size: 14px;
-                  margin-left: 20px;
-                  white-space: nowrap;
+                .fb {
+                  display: flex;
+                  margin-right: 20px;
+                  .jc {
+                    color: #4ea6ff;
+                    font-size: 14px;
+                    margin-left: 20px;
+                    white-space: nowrap;
+                    cursor: pointer;
+                  }
+                }
+              }
+              .ynuse {
+                display: flex;
+                justify-content: center;
+                align-items: center;
+
+                .use {
                   cursor: pointer;
                 }
               }
             }
-    .ynuse {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      .use {
-        cursor: pointer;
-      }
-    }
-  }
             .stm_inputbtn {
               display: flex;
               width: 90%;
@@ -7663,29 +7689,29 @@ export default defineComponent({
                 }
               }
               .btn {
-              padding: 0px 26px 0px 26px;
-              height: 38px;
-              background: #4ea6ff;
-              border-radius: 8px;
-              //border: 1px solid rgba(64, 158, 255, 1);
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              margin-right: 14px;
-              flex-shrink: 0;
-              cursor: pointer;
+                padding: 0px 26px 0px 26px;
+                height: 38px;
+                background: #4ea6ff;
+                border-radius: 8px;
+                //border: 1px solid rgba(64, 158, 255, 1);
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                margin-right: 14px;
+                flex-shrink: 0;
+                cursor: pointer;
 
-              .search {
-                background-size: 100%;
-              }
+                .search {
+                  background-size: 100%;
+                }
 
-              .btnText {
-                font-size: 14px;
-                font-weight: 400;
-                color: #ffffff;
-                line-height: 36px;
-                margin-left: 5px;
-              }
+                .btnText {
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #ffffff;
+                  line-height: 36px;
+                  margin-left: 5px;
+                }
               }
 
               .btnn {
@@ -7754,60 +7780,60 @@ export default defineComponent({
                 background: rgba(64, 158, 255, 0.2);
               }
               .btns {
+                display: flex;
+                // flex-wrap: wrap;
+                .btn {
+                  padding: 0px 21px 0px 21px;
+                  height: 38px;
+                  background: #4ea6ff;
+                  border-radius: 8px;
+                  //border: 1px solid rgba(64, 158, 255, 1);
                   display: flex;
-                  // flex-wrap: wrap;
-                  .btn {
-                    padding: 0px 21px 0px 21px;
-                    height: 38px;
-                    background: #4ea6ff;
-                    border-radius: 8px;
-                    //border: 1px solid rgba(64, 158, 255, 1);
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                    margin-right: 14px;
-                    flex-shrink: 0;
-                    cursor: pointer;
+                  align-items: center;
+                  justify-content: center;
+                  margin-right: 14px;
+                  flex-shrink: 0;
+                  cursor: pointer;
 
-                    .search {
-                      background-size: 100%;
-                    }
-
-                    .btnText {
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #ffffff;
-                      line-height: 36px;
-                      margin-left: 5px;
-                    }
+                  .search {
+                    background-size: 100%;
                   }
 
-                  .btn3 {
-                    margin-right: 0px;
-
-                    .search {
-                      width: 17px;
-                      height: 18px;
-                      background-image: url("../../assets/images/courseManage/add0.png");
-                    }
-                  }
-
-                  .btn3:hover {
-                    background: rgba(64, 158, 255, 0.76);
-
-                    .search {
-                      background-image: url("../../assets/images/courseManage/add0.png");
-                    }
-
-                    .btnText {
-                      color: #ffffff;
-                    }
-                  }
-
-                  .btn3:active {
-                    background: #0982ff;
+                  .btnText {
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #ffffff;
+                    line-height: 36px;
+                    margin-left: 5px;
                   }
                 }
+
+                .btn3 {
+                  margin-right: 0px;
+
+                  .search {
+                    width: 17px;
+                    height: 18px;
+                    background-image: url("../../assets/images/courseManage/add0.png");
+                  }
+                }
+
+                .btn3:hover {
+                  background: rgba(64, 158, 255, 0.76);
+
+                  .search {
+                    background-image: url("../../assets/images/courseManage/add0.png");
+                  }
+
+                  .btnText {
+                    color: #ffffff;
+                  }
+                }
+
+                .btn3:active {
+                  background: #0982ff;
+                }
+              }
             }
 
             .btn3 {
@@ -7910,7 +7936,6 @@ export default defineComponent({
               }
 
               .ant-table-thead > tr > th {
-         
                 background-color: #eff4fc !important;
               }
 
@@ -7925,20 +7950,20 @@ export default defineComponent({
               }
 
               .operation {
+                display: flex;
+                justify-content: right;
+                .fb {
                   display: flex;
-                  justify-content: right;
-                  .fb {
-                    display: flex;
-                    margin-right: 20px;
-                    .jc {
-                      color: #4ea6ff;
-                      font-size: 14px;
-                      margin-left: 20px;
-                      white-space: nowrap;
-                      cursor: pointer;
-                    }
+                  margin-right: 20px;
+                  .jc {
+                    color: #4ea6ff;
+                    font-size: 14px;
+                    margin-left: 20px;
+                    white-space: nowrap;
+                    cursor: pointer;
                   }
                 }
+              }
 
               .tableBox {
                 .pa {
@@ -7954,7 +7979,6 @@ export default defineComponent({
               }
             }
           }
-
         }
       }
     }
@@ -8009,180 +8033,180 @@ export default defineComponent({
                 .i5_left {
                   display: flex;
 
-              .select {
-                margin-right: 20px;
-                margin-bottom: 20px;
-              }
+                  .select {
+                    margin-right: 20px;
+                    margin-bottom: 20px;
+                  }
 
-              .addTimeBox {
-                position: relative;
-                display: flex;
-                align-items: center;
-
-                .addTime {
-                  position: absolute;
-                  z-index: 10;
-                  margin-left: 10px;
-                  color: rgba(0, 0, 0, 0.4);
-                }
-
-                .ant-picker {
-                  padding-left: 85px;
-                }
-
-                .ant-picker-range .ant-picker-active-bar {
-                  margin-left: 85px;
-                }
-              }
-
-              .btn {
-                padding: 0px 26px 0px 26px;
-                height: 38px;
-                background: #4ea6ff;
-                border-radius: 8px;
-                //border: 1px solid rgba(64, 158, 255, 1);
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                margin-right: 14px;
-                flex-shrink: 0;
-                cursor: pointer;
-
-                .search {
-                  background-size: 100%;
-                }
-
-                .btnText {
-                  font-size: 14px;
-                  font-weight: 400;
-                  color: #ffffff;
-                  line-height: 36px;
-                  margin-left: 5px;
-                }
-              }
-
-              .btnn {
-                padding: 0px 26px 0px 26px;
-                height: 38px;
-                background: #ffffff;
-                border-radius: 8px;
-                border: 1px solid rgba(64, 158, 255, 1);
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                margin-right: 14px;
-                flex-shrink: 0;
-                cursor: pointer;
-
-                .search {
-                  background-size: 100%;
-                }
-
-                .btnText {
-                  font-size: 14px;
-                  font-weight: 400;
-                  color: #4ea6ff;
-                  line-height: 36px;
-                  margin-left: 5px;
-                }
-              }
-
-              .btn1 {
-                .search {
-                  width: 15px;
-                  height: 17px;
-                  background-image: url("../../assets/images/courseManage/search0.png");
-                }
-              }
-
-              .btn2 {
-                .search {
-                  width: 16px;
-                  height: 18px;
-                  background-image: url("../../assets/images/courseManage/reset1.png");
-                }
-              }
-
-              .btn1:hover {
-                background: rgba(64, 158, 255, 0.76);
-
-                .search {
-                  background-image: url("../../assets/images/courseManage/search0.png");
-                }
-
-                .btnText {
-                  color: #ffffff;
-                }
-              }
-
-              .btn1:active {
-                background: #0982ff;
-              }
-
-              .btn2:hover {
-                background: rgba(64, 158, 255, 0.1);
-              }
-
-              .btn2:active {
-                background: rgba(64, 158, 255, 0.2);
-              }
-                        }
-
-                .btns {
+                  .addTimeBox {
+                    position: relative;
                     display: flex;
-                    // flex-wrap: wrap;
-                    .btn {
-                      padding: 0px 26px 0px 26px;
-                      height: 38px;
-                      background: #4ea6ff;
-                      border-radius: 8px;
-                      //border: 1px solid rgba(64, 158, 255, 1);
-                      display: flex;
-                      align-items: center;
-                      justify-content: center;
-                      margin-right: 14px;
-                      flex-shrink: 0;
-                      cursor: pointer;
+                    align-items: center;
 
-                      .search {
-                        background-size: 100%;
-                      }
-
-                      .btnText {
-                        font-size: 14px;
-                        font-weight: 400;
-                        color: #ffffff;
-                        line-height: 36px;
-                        margin-left: 5px;
-                      }
+                    .addTime {
+                      position: absolute;
+                      z-index: 10;
+                      margin-left: 10px;
+                      color: rgba(0, 0, 0, 0.4);
                     }
 
-                .btn3 {
-                  margin-right: 0px;
+                    .ant-picker {
+                      padding-left: 85px;
+                    }
 
-                  .search {
-                    width: 17px;
-                    height: 18px;
-                    background-image: url("../../assets/images/courseManage/add0.png");
+                    .ant-picker-range .ant-picker-active-bar {
+                      margin-left: 85px;
+                    }
+                  }
+
+                  .btn {
+                    padding: 0px 26px 0px 26px;
+                    height: 38px;
+                    background: #4ea6ff;
+                    border-radius: 8px;
+                    //border: 1px solid rgba(64, 158, 255, 1);
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    margin-right: 14px;
+                    flex-shrink: 0;
+                    cursor: pointer;
+
+                    .search {
+                      background-size: 100%;
+                    }
+
+                    .btnText {
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #ffffff;
+                      line-height: 36px;
+                      margin-left: 5px;
+                    }
+                  }
+
+                  .btnn {
+                    padding: 0px 26px 0px 26px;
+                    height: 38px;
+                    background: #ffffff;
+                    border-radius: 8px;
+                    border: 1px solid rgba(64, 158, 255, 1);
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    margin-right: 14px;
+                    flex-shrink: 0;
+                    cursor: pointer;
+
+                    .search {
+                      background-size: 100%;
+                    }
+
+                    .btnText {
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #4ea6ff;
+                      line-height: 36px;
+                      margin-left: 5px;
+                    }
+                  }
+
+                  .btn1 {
+                    .search {
+                      width: 15px;
+                      height: 17px;
+                      background-image: url("../../assets/images/courseManage/search0.png");
+                    }
+                  }
+
+                  .btn2 {
+                    .search {
+                      width: 16px;
+                      height: 18px;
+                      background-image: url("../../assets/images/courseManage/reset1.png");
+                    }
+                  }
+
+                  .btn1:hover {
+                    background: rgba(64, 158, 255, 0.76);
+
+                    .search {
+                      background-image: url("../../assets/images/courseManage/search0.png");
+                    }
+
+                    .btnText {
+                      color: #ffffff;
+                    }
+                  }
+
+                  .btn1:active {
+                    background: #0982ff;
+                  }
+
+                  .btn2:hover {
+                    background: rgba(64, 158, 255, 0.1);
+                  }
+
+                  .btn2:active {
+                    background: rgba(64, 158, 255, 0.2);
                   }
                 }
 
-                .btn3:hover {
-                  background: rgba(64, 158, 255, 0.76);
+                .btns {
+                  display: flex;
+                  // flex-wrap: wrap;
+                  .btn {
+                    padding: 0px 26px 0px 26px;
+                    height: 38px;
+                    background: #4ea6ff;
+                    border-radius: 8px;
+                    //border: 1px solid rgba(64, 158, 255, 1);
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    margin-right: 14px;
+                    flex-shrink: 0;
+                    cursor: pointer;
 
-                  .search {
-                    background-image: url("../../assets/images/courseManage/add0.png");
+                    .search {
+                      background-size: 100%;
+                    }
+
+                    .btnText {
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #ffffff;
+                      line-height: 36px;
+                      margin-left: 5px;
+                    }
                   }
 
-                  .btnText {
-                    color: #ffffff;
+                  .btn3 {
+                    margin-right: 0px;
+
+                    .search {
+                      width: 17px;
+                      height: 18px;
+                      background-image: url("../../assets/images/courseManage/add0.png");
+                    }
+                  }
+
+                  .btn3:hover {
+                    background: rgba(64, 158, 255, 0.76);
+
+                    .search {
+                      background-image: url("../../assets/images/courseManage/add0.png");
+                    }
+
+                    .btnText {
+                      color: #ffffff;
+                    }
+                  }
+
+                  .btn3:active {
+                    background: #0982ff;
                   }
                 }
-
-                .btn3:active {
-                  background: #0982ff;
-                }
-              }
               }
 
               .stmm_i6 {
diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 3fd5d40c..76ee9e31 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -156,7 +156,7 @@
               <div class="mbl_items12">
                 <div
                   class="i12_box1"
-                  style="position:relative;"
+                  style="position: relative"
                   v-for="(item, index) in detail.attach"
                   :key="index"
                 >
@@ -207,21 +207,43 @@
                   <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;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:absolute;top:4px;left:72px;">
-                        {{ item.indexOf('-')!==-1?item.slice(item.lastIndexOf('/')+1,item.indexOf('-')) + item.slice(item.lastIndexOf('.')) :item }}  
+                      <span
+                        style="
+                          color: #6f6f6f;
+                          width: 200px;
+                          display: block;
+                          overflow: hidden;
+                          white-space: nowrap;
+                          text-overflow: ellipsis;
+                          position: absolute;
+                          top: 4px;
+                          left: 72px;
+                        "
+                      >
+                        {{
+                          item.indexOf("-") !== -1
+                            ? item.slice(
+                                item.lastIndexOf("/") + 1,
+                                item.indexOf("-")
+                              ) + item.slice(item.lastIndexOf("."))
+                            : item
+                        }}
                       </span>
                     </div>
 
                     <div class="file_updata">
                       <div class="updatabox">
                         <div class="updatacolor"></div>
-                        <div class="updataxq" style="right:-62px;">上传完成</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" style="margin-left: 5px">下载</a>
                 </div>
               </div>
             </div>
@@ -262,134 +284,134 @@ export default defineComponent({
     },
   },
   setup(props, { emit }) {
-    console.log(props);
+    console.log("props", props);
     const state = reactive({
       imgList: [],
       options2222: [
         {
-          title: '领导力',
-          value: '100',
-          selectable:false,
+          title: "领导力",
+          value: "100",
+          selectable: false,
           children: [
             {
-              title: '领导业务',
-              value: '1001',
+              title: "领导业务",
+              value: "1001",
             },
             {
-              title: '领导团队',
-              value: '1002',
+              title: "领导团队",
+              value: "1002",
             },
             {
-              title: '领导自我',
-              value: '1003',
+              title: "领导自我",
+              value: "1003",
             },
           ],
         },
         {
-          title: '专业力',
-          value: '200',
-          selectable:false,
+          title: "专业力",
+          value: "200",
+          selectable: false,
           children: [
             {
-              title: '研发',
-              value: '2001',
+              title: "研发",
+              value: "2001",
             },
             {
-              title: '产品和解决方案',
-              value: '2002',
+              title: "产品和解决方案",
+              value: "2002",
             },
             {
-              title: '生产技术与制造',
-              value: '2003',
+              title: "生产技术与制造",
+              value: "2003",
             },
             {
-              title: '供应链',
-              value: '2004',
+              title: "供应链",
+              value: "2004",
             },
             {
-              title: '营销',
-              value: '2005',
+              title: "营销",
+              value: "2005",
             },
             {
-              title: '品质',
-              value: '2006',
+              title: "品质",
+              value: "2006",
             },
             {
-              title: '战略与企划',
-              value: '2007',
+              title: "战略与企划",
+              value: "2007",
             },
             {
-              title: '流程管理',
-              value: '2008',
+              title: "流程管理",
+              value: "2008",
             },
             {
-              title: '业绩管理',
-              value: '2009',
+              title: "业绩管理",
+              value: "2009",
             },
             {
-              title: '项目管理',
-              value: '20010',
+              title: "项目管理",
+              value: "20010",
             },
             {
-              title: '信息技术',
-              value: '20011',
+              title: "信息技术",
+              value: "20011",
             },
             {
-              title: '环境与安全',
-              value: '20012',
+              title: "环境与安全",
+              value: "20012",
             },
             {
-              title: '人力资源',
-              value: '20013',
+              title: "人力资源",
+              value: "20013",
             },
             {
-              title: '企业文化',
-              value: '20014',
+              title: "企业文化",
+              value: "20014",
             },
             {
-              title: '品牌',
-              value: '20015',
+              title: "品牌",
+              value: "20015",
             },
             {
-              title: '财务',
-              value: '20016',
+              title: "财务",
+              value: "20016",
             },
             {
-              title: '法务',
-              value: '20017',
+              title: "法务",
+              value: "20017",
             },
             {
-              title: '行政',
-              value: '20018',
+              title: "行政",
+              value: "20018",
             },
             {
-              title: '医工',
-              value: '20019',
-            }
+              title: "医工",
+              value: "20019",
+            },
           ],
         },
         {
-          title: '通用力',
-          value: '300',
-          selectable:false,
+          title: "通用力",
+          value: "300",
+          selectable: false,
           children: [
             {
-              title: '职业操守与道德',
-              value: '3001',
+              title: "职业操守与道德",
+              value: "3001",
             },
             {
-              title: '职业素养与技能',
-              value: '3002',
+              title: "职业素养与技能",
+              value: "3002",
             },
             {
-              title: '规章制度',
-              value: '3003',
+              title: "规章制度",
+              value: "3003",
             },
-          ], 
-        }
-      ]
+          ],
+        },
+      ],
     });
-
+    console.log("detail", props.detail);
     const filterTxt = (txt) => {
       if (txt) {
         return txt;
@@ -400,8 +422,8 @@ export default defineComponent({
     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++){
+        for (let i = 0; i < options2.value.length; i++) {
+          for (let j = 0; j < options2.value[i].children.length; j++) {
             if (String(options2.value[i].children[j].value) === String(txt)) {
               str = options2.value[i].children[j].title;
             }

From 474a360dc6955d171e6a8432c1763c3a1b310f50 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 15:17:03 +0800
Subject: [PATCH 15/35] -- bug

---
 src/components/project/ProjectClass.vue |   6 +-
 src/components/project/ProjectLevel.vue |   5 +-
 src/components/project/TrainClass.vue   |   6 +-
 src/views/projectcenter/LibraryAdd.vue  |  38 ++--
 src/views/projectcenter/TaskPage.vue    |  36 ++--
 src/views/projectcenter/templateAdd.vue | 221 ++++++++++++------------
 6 files changed, 147 insertions(+), 165 deletions(-)

diff --git a/src/components/project/ProjectClass.vue b/src/components/project/ProjectClass.vue
index 854235d3..0a6c96b4 100644
--- a/src/components/project/ProjectClass.vue
+++ b/src/components/project/ProjectClass.vue
@@ -28,16 +28,12 @@ const props = defineProps({
 })
 const emit = defineEmits({})
 
-const options = ref([])
+const options = computed(() => store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName})))
 
 const id = computed(() => {
   return props.value
 })
 
-onMounted(() => {
-  options.value = store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
-
 function change(key, obj) {
   emit('update:name', obj[0])
   emit('update:value', key)
diff --git a/src/components/project/ProjectLevel.vue b/src/components/project/ProjectLevel.vue
index 10b9c9b6..ad6d4b9c 100644
--- a/src/components/project/ProjectLevel.vue
+++ b/src/components/project/ProjectLevel.vue
@@ -39,11 +39,8 @@ const id = computed(() => {
 
 const emit = defineEmits({})
 
-const options = ref([])
+const options = computed(()=>store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName})))
 
-onMounted(() => {
-  options.value = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
 
 function change(key) {
   emit('update:value', key)
diff --git a/src/components/project/TrainClass.vue b/src/components/project/TrainClass.vue
index 9ddbebd5..2cce211d 100644
--- a/src/components/project/TrainClass.vue
+++ b/src/components/project/TrainClass.vue
@@ -40,11 +40,7 @@ const id = computed(() => {
 
 const emit = defineEmits({})
 
-const options = ref([])
-
-onMounted(() => {
-  options.value = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
+const options = computed(() => store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName})))
 
 function change(key) {
   emit('update:value', key)
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 2a89a9f7..6db2fa8c 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -538,24 +538,6 @@
                       }}</span>
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目说明：</span></div>
-                    <div class="setc_main">
-                      <span style="color: #999999">{{
-                        projectInfo.remark
-                      }}</span>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.courseSyncFlag"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
@@ -568,14 +550,32 @@
                       <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="projectInfo.courseSyncFlag" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                      >
+                    </div>
+                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.boeFlag"
+                      <a-radio v-model:checked="projectInfo.boeFlag"  :disabled="true"
                         ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{
+                          projectInfo.remark
+                        }}</span>
+                    </div>
+                  </div>
                 </div>
               </div>
             </a-tab-pane>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index fd59ffda..48ce526b 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1146,29 +1146,13 @@
                       <span style="color: #999999">{{ sourceBelong }}</span>
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目说明：</span></div>
-                    <div class="setc_main">
-                      <span style="color: #999999">{{ remark }}</span>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="checkedSty" :disabled="true"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
                         ><ProjectLevel
                           v-model:value="level"
-                          :disabled="true"
+                          :tag="true"
                         ></ProjectLevel
                       ></span>
                     </div>
@@ -1179,11 +1163,21 @@
                       <span style="color: #999999"
                         ><TrainClass
                           v-model:value="systemId"
-                          :disabled="true"
+                          :tag="true"
                         ></TrainClass
                       ></span>
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="checkedSty" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                      >
+                    </div>
+                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
@@ -1192,6 +1186,12 @@
                       >
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ remark }}</span>
+                    </div>
+                  </div>
                   <div class="set_content" v-if="isPass">
                     <div class="setc_name"><span>审核意见：</span></div>
                     <div class="setc_main">
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 6551c1f2..7cd08f12 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -4,10 +4,10 @@
     <div class="header">
       <span class="title">创建/编辑单层模板</span>
       <div
-        @click="backPage"
-        style="cursor: pointer"
-        to="/libraryAdd"
-        class="goback"
+          @click="backPage"
+          style="cursor: pointer"
+          to="/libraryAdd"
+          class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -17,44 +17,32 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">模板名称</div>
           </div>
           <div class="in">
             <a-input
-              v-model:value="projectInfo.name"
-              placeholder="请输入模板名称"
-              show-count
-              :maxlength="30"
+                v-model:value="projectInfo.name"
+                placeholder="请输入模板名称"
+                show-count
+                :maxlength="30"
             />
           </div>
         </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">分类</div>
-          </div>
-          <div class="in select">
-            <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
-          </div>
-        </div>
         <div class="name" style="align-items: flex-start">
           <div class="namebox" style="margin-top: 10px">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
           <div class="in select" style="display: flex">
             <div
-              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-              style="
+                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+                style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -62,19 +50,19 @@
                 position: relative;
                 overflow: hidden;
               "
-              v-for="(src, index) in projectPic"
-              :key="index"
-              @click="() => (projectInfo.picUrl = src.value)"
+                v-for="(src, index) in projectPic"
+                :key="index"
+                @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                style="
+                  style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                :src="src.value"
-                alt="avatar"
+                  :src="src.value"
+                  alt="avatar"
               />
             </div>
           </div>
@@ -82,92 +70,61 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-              separator="至"
-              :placeholder="['      开始时间', '        结束时间']"
-              v-model:value="projectInfo.rangeTime"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              valueFormat="YYYY-MM-DD HH:mm:ss"
-              @change="timeChange"
+                separator="至"
+                :placeholder="['      开始时间', '        结束时间']"
+                v-model:value="projectInfo.rangeTime"
+                style="width: 100%; height: 40px; border-radius: 5px"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
+                @change="timeChange"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-              v-model:value="projectInfo.managerId"
-              v-model:name="projectInfo.manager"
-              @onChange="managerChange"
-              mode="multiple"
+                v-model:value="projectInfo.managerId"
+                v-model:name="projectInfo.manager"
+                @onChange="managerChange"
+                mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-              v-model:value="projectInfo.sourceBelongId"
-              v-model:name="projectInfo.sourceBelongName"
+                v-model:value="projectInfo.sourceBelongId"
+                v-model:name="projectInfo.sourceBelongName"
             ></OrgClass>
           </div>
         </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname" style="margin-top: 13px">模板说明</div>
-          </div>
-          <div class="in">
-            <a-textarea
-              v-model:value="projectInfo.remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-            />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">同步学习记录</div>
-          </div>
-          <div class="in">
-            <a-checkbox v-model:checked="projectInfo.courseSyncFlag"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-checkbox
-            >
-          </div>
-        </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -178,8 +135,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训体系</div>
           </div>
@@ -190,8 +147,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">是否BOEU实施</div>
           </div>
@@ -202,12 +159,45 @@
             </a-radio-group>
           </div>
         </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-checkbox
+                v-model:checked="courseSyncFlag"
+                :disabled="viewDetail ? true : false"
+            ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            ></a-checkbox
+            >
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">模板说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+                v-model:value="projectInfo.remark"
+                style="height: 80px"
+                placeholder="请输入说明"
+                show-count
+                :maxlength="200"
+            />
+          </div>
+        </div>
       </div>
     </div>
     <div class="footer">
       <div class="btn">
         <a-button v-on:click="createProject" type="primary" class="btn1"
-          >确定
+        >确定
         </a-button>
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
@@ -215,10 +205,10 @@
   </div>
 </template>
 <script setup>
-import { useStore } from "vuex";
-import { ref, onMounted, watch } from "vue";
-import { message } from "ant-design-vue";
-import { useRouter, useRoute } from "vue-router";
+import {useStore} from "vuex";
+import {ref, onMounted, watch} from "vue";
+import {message} from "ant-design-vue";
+import {useRouter, useRoute} from "vue-router";
 import * as api from "../../api/indexTemplate";
 import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
@@ -231,7 +221,7 @@ const router = useRouter();
 const store = useStore();
 const projectInfo = ref({});
 const projectPic = ref([]);
-
+const courseSyncFlag = ref(false)
 onMounted(() => {
   getDetail();
   projectPic.value = store.state.projectPic.map((e) => ({
@@ -241,21 +231,22 @@ onMounted(() => {
 });
 
 watch(
-  () => route.query.projectTemplateId,
-  () => {
-    getDetail();
-  }
+    () => route.query.projectTemplateId,
+    () => {
+      getDetail();
+    }
 );
 
 const getDetail = () =>
-  route.query.projectTemplateId &&
-  api.templateDetail(route.query.projectTemplateId).then((res) => {
-    projectInfo.value = res.data.data.projectTemplateInfo;
-    projectInfo.value.rangeTime = [
-      projectInfo.value.beginTime,
-      projectInfo.value.endTime,
-    ];
-  });
+    route.query.projectTemplateId &&
+    api.templateDetail(route.query.projectTemplateId).then((res) => {
+      projectInfo.value = res.data.data.projectTemplateInfo;
+      projectInfo.value.rangeTime = [
+        projectInfo.value.beginTime,
+        projectInfo.value.endTime,
+      ];
+      projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
+    });
 
 const backPage = () => {
   router.back();
@@ -290,16 +281,17 @@ const createProject = () => {
       return;
     }
   }
+  projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
   api
-    .templateEdit({
-      ...projectInfo.value,
-      courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
-    })
-    .then(() => {
-      message.destroy();
-      message.success("编辑成功");
-      router.back();
-    });
+      .templateEdit({
+        ...projectInfo.value,
+        courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
+      })
+      .then(() => {
+        message.destroy();
+        message.success("编辑成功");
+        router.back();
+      });
 };
 
 function managerChange(e, l, d, t) {
@@ -311,6 +303,7 @@ function managerChange(e, l, d, t) {
 .active {
   border: 2px solid rgba(78, 166, 255, 1);
 }
+
 .projectAdd {
   width: 100%;
   // height: inherit;

From 497b7449cbcbb6011009cfb6cbfe29b9c72990da Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 15:46:33 +0800
Subject: [PATCH 16/35] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=AF=BE=E7=A8=8B=E9=A2=84=E8=A7=88=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue  | 22 +++++++++----------
 .../courselibrary/components/seeModal.vue     | 10 +++++++--
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 1c4b42f6..5692e525 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2119,7 +2119,7 @@
                       item.indexOf("-") !== -1
                         ? item.slice(
                             item.lastIndexOf("/") + 1,
-                            item.indexOf("-")
+                            item.lastIndexOf("-")
                           ) + item.slice(item.lastIndexOf("."))
                         : item
                     }}
@@ -3274,16 +3274,16 @@ const columns7 = [
       return text ? text : "-";
     },
   },
-   // {
-   //   title: "岗位",
-   //   width: 300,
-   //   dataIndex: "postion",
-   //   key: "3",
-    //  align: "center",
-    //  customRender: ({ text }) => {
-    //    return text ? text : "-";
-    //  },
-   // },
+  // {
+  //   title: "岗位",
+  //   width: 300,
+  //   dataIndex: "postion",
+  //   key: "3",
+  //  align: "center",
+  //  customRender: ({ text }) => {
+  //    return text ? text : "-";
+  //  },
+  // },
   {
     title: "Band",
     width: 200,
diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 76ee9e31..1d9971d6 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -224,7 +224,7 @@
                           item.indexOf("-") !== -1
                             ? item.slice(
                                 item.lastIndexOf("/") + 1,
-                                item.indexOf("-")
+                                item.lastIndexOf("-")
                               ) + item.slice(item.lastIndexOf("."))
                             : item
                         }}
@@ -410,8 +410,14 @@ export default defineComponent({
           ],
         },
       ],
+      ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx",
+      ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx",
     });
-    console.log("detail", props.detail);
+
+    // item.slice(
+    //                             item.lastIndexOf("/") + 1,
+    //                             item.indexOf("-")
+    //                           ) + item.slice(item.lastIndexOf("."))
     const filterTxt = (txt) => {
       if (txt) {
         return txt;

From 117dd5f1848b0d91d3c1cfc25e0763959104d264 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 16:00:23 +0800
Subject: [PATCH 17/35] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BC=BA=E5=A4=B1?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/MemberList.vue     | 16 ++++++++--------
 src/views/learningpath/LevelAdd.vue       | 16 ++++++++--------
 src/views/learningpath/LevelAddDetail.vue | 16 ++++++++--------
 src/views/projectcenter/ProjectManage.vue |  2 +-
 src/views/projectcenter/TaskPage.vue      | 14 +++++++-------
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 6fe9f77c..cff40cee 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -239,14 +239,14 @@ export default {
          //  align: "center",
          //   className: "h",
         //  },
-        {
-          title: "进度",
-          dataIndex: "progress",
-          key: "progress",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
+        //  {
+         //   title: "进度",
+          //  dataIndex: "progress",
+         //   key: "progress",
+          //  width: 60,
+          //  align: "center",
+          //  className: "h",
+         // },
         {
           title: "操作",
           dataIndex: "operations",
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index a7f4668a..644ef532 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1499,14 +1499,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "进度",
-          dataIndex: "jin",
-          key: "jin",
-          width: 110,
-          align: "center",
-          className: "h",
-        },
+       //   {
+        //    title: "进度",
+        //    dataIndex: "jin",
+         //   key: "jin",
+         //   width: 110,
+         //   align: "center",
+         //   className: "h",
+        //  },
         {
           title: "开始时间",
           dataIndex: "time",
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 15919243..91f232bd 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1547,14 +1547,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "进度",
-          dataIndex: "jin",
-          key: "jin",
-          width: 110,
-          align: "center",
-          className: "h",
-        },
+        //  {
+         //   title: "进度",
+         //   dataIndex: "jin",
+         //   key: "jin",
+          //  width: 110,
+         //   align: "center",
+          //  className: "h",
+       //   },
         {
           title: "开始时间",
           dataIndex: "time",
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index d41f3d04..1a45eade 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1328,7 +1328,7 @@ export default {
         title: "项目名称",
         dataIndex: "name",
         key: "name",
-        width: 480,
+        width: 380,
         // align: "center",
         ellipsis: true,
         // scopedSlots: { customRender: "action" }, //引入的插槽
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index fd59ffda..f2d530e8 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3165,14 +3165,14 @@ export default {
           //  align: "center",
           //  className: "h",
          // },
-        {
-          title: "进度",
-          dataIndex: "progress",
-          key: "progress",
+       //   {
+         //   title: "进度",
+         //   dataIndex: "progress",
+         //   key: "progress",
           // width: 30,
-          align: "center",
-          className: "h",
-        },
+         //   align: "center",
+         //   className: "h",
+        //  },
         //  {
          //   title: "证书",
           //  dataIndex: "diploma",

From 4b12a51f516caed139d2a3b51f098fb3de58b1d0 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 16:04:10 +0800
Subject: [PATCH 18/35] merge

---
 src/components/project/ProjectClass.vue       |   62 +-
 src/components/project/ProjectLevel.vue       |   62 +-
 src/components/project/TrainClass.vue         |   63 +-
 src/views/courselibrary/CoursewareManage.vue  | 1154 +++++++++--------
 .../courselibrary/components/seeModal.vue     |  168 ++-
 src/views/projectcenter/LibraryAdd.vue        |   38 +-
 src/views/projectcenter/TaskPage.vue          |   36 +-
 src/views/projectcenter/templateAdd.vue       |   83 +-
 8 files changed, 867 insertions(+), 799 deletions(-)

diff --git a/src/components/project/ProjectClass.vue b/src/components/project/ProjectClass.vue
index 854235d3..3a4e9190 100644
--- a/src/components/project/ProjectClass.vue
+++ b/src/components/project/ProjectClass.vue
@@ -1,46 +1,54 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:48
+ * @FilePath: /fe-manage/src/components/project/ProjectClass.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <!-- 评估管理-创建评估页面 -->
 <template>
   <a-select
-      :getPopupContainer="
-                          (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
-                          }
-                        "
-      v-model:value="id"
-      placeholder="请选择分类"
-      style="width: 100%"
-      :options="options"
-      allowClear
-      @change="change"
-      :disabled="disabled"
+    :getPopupContainer="
+      (triggerNode) => {
+        return triggerNode.parentNode || document.body;
+      }
+    "
+    v-model:value="id"
+    placeholder="请选择分类"
+    style="width: 100%"
+    :options="options"
+    allowClear
+    @change="change"
+    :disabled="disabled"
   >
   </a-select>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
-import {useStore} from "vuex";
+import { computed, defineEmits, defineProps } from "vue";
+import { useStore } from "vuex";
 
 const store = useStore();
 
 const props = defineProps({
   value: String,
-  disabled: String
-})
-const emit = defineEmits({})
+  disabled: String,
+});
+const emit = defineEmits({});
 
-const options = ref([])
+const options = computed(() =>
+  store.state.projectClass.map((e) => ({
+    value: parseInt(e.dictCode),
+    label: e.dictName,
+  }))
+);
 
 const id = computed(() => {
-  return props.value
-})
-
-onMounted(() => {
-  options.value = store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
+  return props.value;
+});
 
 function change(key, obj) {
-  emit('update:name', obj[0])
-  emit('update:value', key)
+  emit("update:name", obj[0]);
+  emit("update:value", key);
 }
-
 </script>
diff --git a/src/components/project/ProjectLevel.vue b/src/components/project/ProjectLevel.vue
index 10b9c9b6..65611995 100644
--- a/src/components/project/ProjectLevel.vue
+++ b/src/components/project/ProjectLevel.vue
@@ -1,27 +1,34 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:21
+ * @FilePath: /fe-manage/src/components/project/ProjectLevel.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <template v-if="tag">
-    <div>{{ options?.find(e => e.value == id)?.label || '' }}</div>
+    <div>{{ options?.find((e) => e.value == id)?.label || "" }}</div>
   </template>
   <template v-else>
     <a-select
-        :getPopupContainer="
-                          (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
-                          }
-                        "
-        v-model:value="id"
-        :options="options"
-        style="width: 100%"
-        placeholder="请选择项目级别"
-        @change="change"
-        :disabled="disabled"
+      :getPopupContainer="
+        (triggerNode) => {
+          return triggerNode.parentNode || document.body;
+        }
+      "
+      v-model:value="id"
+      :options="options"
+      style="width: 100%"
+      placeholder="请选择项目级别"
+      @change="change"
+      :disabled="disabled"
     />
   </template>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
-import {useStore} from "vuex";
-
+import { computed, defineEmits, defineProps } from "vue";
+import { useStore } from "vuex";
 
 const store = useStore();
 const props = defineProps({
@@ -29,23 +36,24 @@ const props = defineProps({
   disabled: String,
   tag: {
     type: Boolean,
-    default: false
-  }
-})
+    default: false,
+  },
+});
 
 const id = computed(() => {
-  return props.value || null
-})
+  return props.value || null;
+});
 
-const emit = defineEmits({})
+const emit = defineEmits({});
 
-const options = ref([])
-
-onMounted(() => {
-  options.value = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
+const options = computed(() =>
+  store.state.projectLevel.map((e) => ({
+    value: parseInt(e.dictCode),
+    label: e.dictName,
+  }))
+);
 
 function change(key) {
-  emit('update:value', key)
+  emit("update:value", key);
 }
 </script>
diff --git a/src/components/project/TrainClass.vue b/src/components/project/TrainClass.vue
index 9ddbebd5..4f944ccf 100644
--- a/src/components/project/TrainClass.vue
+++ b/src/components/project/TrainClass.vue
@@ -1,27 +1,34 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:46
+ * @FilePath: /fe-manage/src/components/project/TrainClass.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <template v-if="tag">
-    <div>{{ options.find(e => e.value == id)?.label || '' }}</div>
+    <div>{{ options.find((e) => e.value == id)?.label || "" }}</div>
   </template>
   <template v-else>
     <a-select
-        :getPopupContainer="
-                          (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
-                          }
-                        "
-        v-model:value="id"
-        :options="options"
-        style="width: 100%"
-        placeholder="请选择分类"
-        @change="change"
-        :disabled="disabled"
+      :getPopupContainer="
+        (triggerNode) => {
+          return triggerNode.parentNode || document.body;
+        }
+      "
+      v-model:value="id"
+      :options="options"
+      style="width: 100%"
+      placeholder="请选择分类"
+      @change="change"
+      :disabled="disabled"
     />
   </template>
-
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
-import {useStore} from "vuex";
+import { computed, defineEmits, defineProps } from "vue";
+import { useStore } from "vuex";
 
 const store = useStore();
 
@@ -30,24 +37,24 @@ const props = defineProps({
   disabled: String,
   tag: {
     type: Boolean,
-    default: false
-  }
-})
+    default: false,
+  },
+});
 
 const id = computed(() => {
-  return props.value
-})
+  return props.value;
+});
 
-const emit = defineEmits({})
+const emit = defineEmits({});
 
-const options = ref([])
-
-onMounted(() => {
-  options.value = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
+const options = computed(() =>
+  store.state.projectSys.map((e) => ({
+    value: parseInt(e.dictCode),
+    label: e.dictName,
+  }))
+);
 
 function change(key) {
-  emit('update:value', key)
+  emit("update:value", key);
 }
-
 </script>
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 5a1d7369..5692e525 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -82,18 +82,16 @@
             </div>
           </div>
           <div style="display: flex; margin-bottom: 20px">
-        <div class="btn btn1" @click="handleSearch1">
-          <div class="search"></div>
-          <div class="btnText">搜索</div>
-        </div>
-        <div class="btnn btn2" @click="handleRest1">
-          <div class="search"></div>
-          <div class="btnText">重置</div>
-        </div>
-      
-           </div>
-           <div class="btns">
-     
+            <div class="btn btn1" @click="handleSearch1">
+              <div class="search"></div>
+              <div class="btnText">搜索</div>
+            </div>
+            <div class="btnn btn2" @click="handleRest1">
+              <div class="search"></div>
+              <div class="btnText">重置</div>
+            </div>
+          </div>
+          <div class="btns">
             <!-- 2022-11-30注释 后面放开 -->
             <!-- <div class="btn btn3" @click="openMessage">
               <div class="search"></div>
@@ -106,7 +104,7 @@
           </div>
         </div>
       </div>
-      
+
       <!-- 搜索框及按钮 -->
     </div>
     <!-- 选择线上还是面授课弹窗 -->
@@ -631,8 +629,8 @@
                     <span style="margin-right: 14px">授课教师</span>
                   </div>
                   <div class="item_inp">
-                    <div class="select" style="width:436px; " >
-                      <ProjectManager 
+                    <div class="select" style="width: 436px">
+                      <ProjectManager
                         v-model:value="member.value"
                         v-model:name="member.name"
                       ></ProjectManager>
@@ -813,31 +811,33 @@
                   ? 'disabled operation'
                   : 'operation',
               ]"
-            > 
-            <div class="fb">
-              <div class="jc"
-                @click="
-                  () => {
-                    handleEdit(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                编辑
-              </div>
+            >
+              <div class="fb">
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleEdit(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  编辑
+                </div>
 
-              <div class="jc"
-                @click="
-                  () => {
-                    handleCopy(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                复制
-              </div>
-              <!-- 2022-12-10注释 后面放开 -->
-              <!-- <a-dropdown>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleCopy(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  复制
+                </div>
+                <!-- 2022-12-10注释 后面放开 -->
+                <!-- <a-dropdown>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item
@@ -893,18 +893,19 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
-                @click="
-                  () => {
-                    handleDelete(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                删除
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleDelete(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  删除
+                </div>
               </div>
             </div>
-            </div>
           </template>
           <template
             v-if="
@@ -920,29 +921,31 @@
                   : 'operation',
               ]"
             >
-            <div class="fb">
-              <div class="jc"
-                @click="
-                  () => {
-                    handleRejectExit(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                撤回
-              </div>
-              <div class="jc"
-                @click="
-                  () => {
-                    handleCopy(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                复制
-              </div>
-              <!-- 2022-12-10注释 后面放开 -->
-              <!-- <a-dropdown>
+              <div class="fb">
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleRejectExit(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  撤回
+                </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleCopy(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  复制
+                </div>
+                <!-- 2022-12-10注释 后面放开 -->
+                <!-- <a-dropdown>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item
@@ -998,7 +1001,7 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-            </div> 
+              </div>
             </div>
           </template>
           <template
@@ -1008,7 +1011,7 @@
               column.key === 'operation'
             "
           >
-          <div
+            <div
               style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
@@ -1016,29 +1019,31 @@
                   : 'operation',
               ]"
             >
-            <div class="fb">
-            <div class="jc"
-                @click="
-                  () => {
-                    handleStart(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                开课
-              </div>
-              <div class="jc"
-                @click="
-                  () => {
-                    handleLook(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                查看
-              </div>
-               <!-- 2022-12-11注释 后面放开 -->
-             <!--
+              <div class="fb">
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleStart(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  开课
+                </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleLook(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  查看
+                </div>
+                <!-- 2022-12-11注释 后面放开 -->
+                <!--
               <div class="jc"
                 @click="
                   () => {
@@ -1059,18 +1064,19 @@
               >
                 管理
               </div>-->
-              <div class="jc"
-                @click="
-                  () => {
-                    handleCopy(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                复制
-              </div>
-              <!-- 2022-12-10注释 后面放开 -->
-              <!-- <a-dropdown>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleCopy(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  复制
+                </div>
+                <!-- 2022-12-10注释 后面放开 -->
+                <!-- <a-dropdown>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item
@@ -1126,7 +1132,8 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleStop(record, String(record.courseform));
@@ -1136,9 +1143,8 @@
                 >
                   停用
                 </div>
-             </div>
-            </div> 
-            
+              </div>
+            </div>
           </template>
           <template
             v-if="
@@ -1147,7 +1153,7 @@
               column.key === 'operation'
             "
           >
-          <div 
+            <div
               style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
@@ -1155,28 +1161,30 @@
                   : 'operation',
               ]"
             >
-            <div class="fb">
-            <div class="jc"
-                @click="
-                  () => {
-                    handleStart(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                开课
-              </div>
-              <div class="jc"
-                @click="
-                  () => {
-                    handleEdit(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                编辑
-              </div>
-               <!-- 2022-12-10注释 后面放开
+              <div class="fb">
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleStart(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  开课
+                </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleEdit(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  编辑
+                </div>
+                <!-- 2022-12-10注释 后面放开
 
               <div class="jc"
                 @click="
@@ -1198,18 +1206,19 @@
               >
                 管理
               </div> -->
-              <div class="jc"
-                @click="
-                  () => {
-                    handleCopy(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                复制
-              </div>
-              <!-- 2022-12-10注释 后面放开 -->
-              <!-- <a-dropdown>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleCopy(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  复制
+                </div>
+                <!-- 2022-12-10注释 后面放开 -->
+                <!-- <a-dropdown>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item
@@ -1265,26 +1274,28 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
-                @click="
-                  () => {
-                    handleOpen(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                启用
-              </div>
-              <div class="jc"
-                @click="
-                  () => {
-                    handleDelete(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                删除
-              </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleOpen(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  启用
+                </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleDelete(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  删除
+                </div>
               </div>
             </div>
           </template>
@@ -1295,7 +1306,7 @@
               column.key === 'operation'
             "
           >
-          <div 
+            <div
               style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
@@ -1303,29 +1314,31 @@
                   : 'operation',
               ]"
             >
-            <div class="fb">
-            <div class="jc"
-                @click="
-                  () => {
-                    handleEdit(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                编辑
-              </div>
-              <div class="jc"
-                @click="
-                  () => {
-                    handleCopy(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                复制
-              </div>
-              <!-- 2022-12-10注释 后面放开 -->
-              <!-- <a-dropdown>
+              <div class="fb">
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleEdit(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  编辑
+                </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleCopy(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  复制
+                </div>
+                <!-- 2022-12-10注释 后面放开 -->
+                <!-- <a-dropdown>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item
@@ -1381,16 +1394,17 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
-                @click="
-                  () => {
-                    handleDelete(record, String(record.courseform));
-                  }
-                "
-                style="display: inline-block; margin-left: 20px"
-              >
-                删除
-              </div>
+                <div
+                  class="jc"
+                  @click="
+                    () => {
+                      handleDelete(record, String(record.courseform));
+                    }
+                  "
+                  style="display: inline-block; margin-left: 20px"
+                >
+                  删除
+                </div>
               </div>
             </div>
           </template>
@@ -1720,12 +1734,13 @@
                 <div class="btnText">重置</div>
               </div>
               <div class="btns">
-              <div class="btn btn3" @click="createkk">
-                <div class="search"></div>
-                <div class="btnText">
-                  <span style="color: #ffffff">新建开课</span>
+                <div class="btn btn3" @click="createkk">
+                  <div class="search"></div>
+                  <div class="btnText">
+                    <span style="color: #ffffff">新建开课</span>
+                  </div>
                 </div>
-              </div></div>
+              </div>
             </div>
             <!-- 无数据样式 -->
             <div class="notable" v-if="tableData6.length === 0">
@@ -1758,8 +1773,8 @@
                 <template #bodyCell="{ record, column }">
                   <template v-if="column.key === 'operation'">
                     <div class="operation">
-                   <div class="fb">
-                 <!--
+                      <div class="fb">
+                        <!--
                      <div class="jc"
                         @click="
                           () => {
@@ -1771,28 +1786,30 @@
                         签到
                       </div>
                       -->
-                      <div class="jc"
-                        @click="
-                          () => {
-                            handelEditStu(record);
-                          }
-                        "
-                      >
-                        编辑
+                        <div
+                          class="jc"
+                          @click="
+                            () => {
+                              handelEditStu(record);
+                            }
+                          "
+                        >
+                          编辑
+                        </div>
+                        <div
+                          class="jc"
+                          @click="
+                            () => {
+                              handelGuan(record);
+                            }
+                          "
+                        >
+                          管理
+                        </div>
                       </div>
-                      <div class="jc"
-                        @click="
-                          () => {
-                            handelGuan(record);
-                          }
-                        "
-                      >
-                        管理
-                      </div>
-                    </div>
-                      <a-dropdown >
+                      <a-dropdown>
                         <template #overlay>
-                          <a-menu style="margin-left: 20px;">
+                          <a-menu style="margin-left: 20px">
                             <a-menu-item
                               @click="
                                 () => {
@@ -1802,7 +1819,7 @@
                             >
                               复制
                             </a-menu-item>
-                            <a-menu-item 
+                            <a-menu-item
                               @click="
                                 () => {
                                   handleDeleteKaike(record);
@@ -1824,11 +1841,12 @@
                             </a-menu-item> -->
                           </a-menu>
                         </template>
-                        <div class="fb" style="margin-left: -20px;">
-                        <div class="jc" >
-                          更多
-                          <down-outlined />
-                        </div></div>
+                        <div class="fb" style="margin-left: -20px">
+                          <div class="jc">
+                            更多
+                            <down-outlined />
+                          </div>
+                        </div>
                       </a-dropdown>
                     </div>
                   </template>
@@ -1853,8 +1871,6 @@
           </div>
         </div>
       </div>
-
-
     </a-modal>
     <!--开课页面 -->
     <!--新建开课页面 -->
@@ -1950,7 +1966,7 @@
               </div>
               <span style="margin-right: 3px">授课教师</span>
             </div>
-            <div class="select" style="width: 440px;">
+            <div class="select" style="width: 440px">
               <ProjectManager
                 v-model:value="member.value"
                 v-model:name="member.name"
@@ -1967,7 +1983,7 @@
               </a-checkbox>
             </div>
           </div>
-          
+
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">签到设置</span>
@@ -1987,7 +2003,6 @@
             </div>
           </div>
 
-
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">评估设置</span>
@@ -2017,7 +2032,7 @@
               />
             </div>
           </div>
-           <!--
+          <!--
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">完成规则</span>
@@ -2030,7 +2045,7 @@
               >
                 <span style="color: #6d7584">报名即完成</span>
               </a-checkbox> -->
-               <!--
+          <!--
               <a-checkbox v-model:checked="signCom" @click="signCom = !signCom">
                 <span style="color: #6d7584">签到即完成</span>
               </a-checkbox>
@@ -2099,8 +2114,16 @@
                       white-space: nowrap;
                       text-overflow: ellipsis;
                     "
-                    >{{ item.slice(item.lastIndexOf("/") + 1) }}</span
                   >
+                    {{
+                      item.indexOf("-") !== -1
+                        ? item.slice(
+                            item.lastIndexOf("/") + 1,
+                            item.lastIndexOf("-")
+                          ) + item.slice(item.lastIndexOf("."))
+                        : item
+                    }}
+                  </span>
                 </div>
                 <!-- 条件渲染 s -->
                 <!-- <div class="file_size">
@@ -2155,8 +2178,8 @@
         </div>
       </div>
       <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-    <a-spin :spinning="addLoading" tip="" />
-  </div>
+        <a-spin :spinning="addLoading" tip="" />
+      </div>
     </a-modal>
     <!--新建开课页面 -->
     <!--开课学员管理页面 -->
@@ -2227,7 +2250,12 @@
                   <a-input
                     v-model:value="xygl_inputV1"
                     placeholder="请输入姓名"
-                    style="width: 400px; height: 40px; border-radius: 8px;margin-right:14px;"
+                    style="
+                      width: 400px;
+                      height: 40px;
+                      border-radius: 8px;
+                      margin-right: 14px;
+                    "
                   />
                   <div class="btn btn1" @click="handleSearchStu">
                     <div class="search"></div>
@@ -2239,9 +2267,9 @@
                   </div>
                 </div>
                 <div class="btns">
-                  <div class="btn btn3"  @click="showStuAdd(currentPlanItem)">
+                  <div class="btn btn3" @click="showStuAdd(currentPlanItem)">
                     <div class="search"></div>
-                     <div class="btnText"> 添加学员</div>
+                    <div class="btnText">添加学员</div>
                   </div>
                   <!-- 2022-11-30注释 后面放开 -->
                   <!-- <div class="stmm_btn btn4" @click="hideShow">
@@ -2284,7 +2312,7 @@
                   </div> -->
                 </div>
               </div>
-              <div class="tableBox" style="margin-top:20px;">
+              <div class="tableBox" style="margin-top: 20px">
                 <a-table
                   :columns="columns7"
                   :data-source="tableData7"
@@ -3113,19 +3141,19 @@ const columns4 = [
 ];
 //开课表格
 const columns6 = [
- // {
+  // {
   //  title: "序号",
   //  dataIndex: "num",
   //  key: "num",
-   // width: "6%",
-   // align: "center",
+  // width: "6%",
+  // align: "center",
   //  ellipsis: true,
-   // customRender: ({ index, record }) => {
-   //   const pageNum =
-    //    Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
-    //  return index + 1 + pageNum;
-   // },
- // },
+  // customRender: ({ index, record }) => {
+  //   const pageNum =
+  //    Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+  //  return index + 1 + pageNum;
+  // },
+  // },
   {
     title: "课程名称",
     dataIndex: "organization",
@@ -3205,18 +3233,18 @@ const columns6 = [
 ];
 //开课学员管理
 const columns7 = [
-////  {
- //   title: "序号",
-//    width: 200,
- //   dataIndex: "num",
+  ////  {
+  //   title: "序号",
+  //    width: 200,
+  //   dataIndex: "num",
   //  key: "num",
   //  align: "center",
- //   customRender: ({ index, record }) => {
-   //   const pageNum =
-   //     Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
-    //  return index + 1 + pageNum;
-   // },
- // },
+  //   customRender: ({ index, record }) => {
+  //   const pageNum =
+  //     Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+  //  return index + 1 + pageNum;
+  // },
+  // },
   {
     title: "姓名",
     width: 200,
@@ -3246,16 +3274,16 @@ const columns7 = [
       return text ? text : "-";
     },
   },
-   // {
-   //   title: "岗位",
-   //   width: 300,
-   //   dataIndex: "postion",
-   //   key: "3",
-    //  align: "center",
-    //  customRender: ({ text }) => {
-    //    return text ? text : "-";
-    //  },
-   // },
+  // {
+  //   title: "岗位",
+  //   width: 300,
+  //   dataIndex: "postion",
+  //   key: "3",
+  //  align: "center",
+  //  customRender: ({ text }) => {
+  //    return text ? text : "-";
+  //  },
+  // },
   {
     title: "Band",
     width: 200,
@@ -3604,7 +3632,7 @@ export default defineComponent({
 
       imageUrl: "",
       imgList: [],
-      validate:false,
+      validate: false,
 
       pageSize2: 10,
       currentPage2: 0,
@@ -3651,7 +3679,7 @@ export default defineComponent({
       codevisible: false, //二维码弹窗
       codeInfo: null, //二维码内容
       codeUrl: codeUrl,
-      finished:false,
+      finished: false,
       // 课程三级分类
       options2222: [
         {
@@ -4554,12 +4582,12 @@ export default defineComponent({
         message.destroy();
         return message.warning("请输入必填项");
       }
-      
-      console.log("state.validate",state.validate);
-      if(!state.finished){
+
+      console.log("state.validate", state.validate);
+      if (!state.finished) {
         return;
       }
-   
+
       if (!state.validate && state.finished) {
         message.destroy();
         return message.warning("该课程名称已存在");
@@ -4569,11 +4597,10 @@ export default defineComponent({
         state.bs_hs,
         state.valueE1 == 2
       );
-      if( !state.valueE1 && !state.valueE2){
+      if (!state.valueE1 && !state.valueE2) {
         message.destroy();
         return message.warning("请选择课程形式");
       }
-      
 
       if (state.valueE1 === 2) {
         state.of_hs = false;
@@ -4814,7 +4841,7 @@ export default defineComponent({
         .catch();
 
       console.log("res");
-      console.log(item);
+      console.log("获取面授课详情", item);
 
       state.xjkkinputV2 = item.address;
       state.checked1 = item.applyFlag === 1 ? true : false;
@@ -5050,7 +5077,7 @@ export default defineComponent({
             type: -1,
           }).then((res) => {
             if (res.data.code === 200) {
-               message.destroy();
+              message.destroy();
               message.success("删除成功");
               getTableDate();
               delete_exit1();
@@ -5087,7 +5114,7 @@ export default defineComponent({
           console.log(obj);
           editPlan(obj).then((res) => {
             if (res.data.code === 200) {
-               message.destroy();
+              message.destroy();
               message.success("复制成功");
               getTableDate3();
               delete_exit1();
@@ -5119,7 +5146,7 @@ export default defineComponent({
           };
           edit(postData).then((res) => {
             if (res.data.code === 200) {
-               message.destroy();
+              message.destroy();
               message.success("复制成功");
               getTableDate();
               delete_exit1();
@@ -5137,7 +5164,7 @@ export default defineComponent({
             type: -2,
           }).then((res) => {
             if (res.data.code === 200) {
-               message.destroy();
+              message.destroy();
               message.success("操作成功");
               getTableDate();
               delete_exit1();
@@ -5377,7 +5404,7 @@ export default defineComponent({
       }).then((res) => {
         if (res.data.code === 200) {
           getTableDate();
-           message.destroy();
+          message.destroy();
           message.success("启用成功");
         }
       });
@@ -6001,7 +6028,6 @@ export default defineComponent({
     }
   }
 
-
   .tableBox {
     margin: 20px 38px 30px;
 
@@ -6017,20 +6043,20 @@ export default defineComponent({
     }
 
     .operation {
-    display: flex;
-    justify-content: right;
-    .fb {
       display: flex;
-      margin-right: 20px;
-      .jc {
-        color: #4ea6ff;
-        font-size: 14px;
-        margin-left: 20px;
-        white-space: nowrap;
-        cursor: pointer;
+      justify-content: right;
+      .fb {
+        display: flex;
+        margin-right: 20px;
+        .jc {
+          color: #4ea6ff;
+          font-size: 14px;
+          margin-left: 20px;
+          white-space: nowrap;
+          cursor: pointer;
+        }
       }
     }
-  }
     .ynuse {
       display: flex;
       justify-content: center;
@@ -7612,31 +7638,31 @@ export default defineComponent({
               }
 
               .operation {
-              display: flex;
-              justify-content: right;
-              margin-right:20px;
-              .fb {
                 display: flex;
+                justify-content: right;
                 margin-right: 20px;
-                .jc {
-                  color: #4ea6ff;
-                  font-size: 14px;
-                  margin-left: 20px;
-                  white-space: nowrap;
+                .fb {
+                  display: flex;
+                  margin-right: 20px;
+                  .jc {
+                    color: #4ea6ff;
+                    font-size: 14px;
+                    margin-left: 20px;
+                    white-space: nowrap;
+                    cursor: pointer;
+                  }
+                }
+              }
+              .ynuse {
+                display: flex;
+                justify-content: center;
+                align-items: center;
+
+                .use {
                   cursor: pointer;
                 }
               }
             }
-    .ynuse {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      .use {
-        cursor: pointer;
-      }
-    }
-  }
             .stm_inputbtn {
               display: flex;
               width: 90%;
@@ -7663,29 +7689,29 @@ export default defineComponent({
                 }
               }
               .btn {
-              padding: 0px 26px 0px 26px;
-              height: 38px;
-              background: #4ea6ff;
-              border-radius: 8px;
-              //border: 1px solid rgba(64, 158, 255, 1);
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              margin-right: 14px;
-              flex-shrink: 0;
-              cursor: pointer;
+                padding: 0px 26px 0px 26px;
+                height: 38px;
+                background: #4ea6ff;
+                border-radius: 8px;
+                //border: 1px solid rgba(64, 158, 255, 1);
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                margin-right: 14px;
+                flex-shrink: 0;
+                cursor: pointer;
 
-              .search {
-                background-size: 100%;
-              }
+                .search {
+                  background-size: 100%;
+                }
 
-              .btnText {
-                font-size: 14px;
-                font-weight: 400;
-                color: #ffffff;
-                line-height: 36px;
-                margin-left: 5px;
-              }
+                .btnText {
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #ffffff;
+                  line-height: 36px;
+                  margin-left: 5px;
+                }
               }
 
               .btnn {
@@ -7754,60 +7780,60 @@ export default defineComponent({
                 background: rgba(64, 158, 255, 0.2);
               }
               .btns {
+                display: flex;
+                // flex-wrap: wrap;
+                .btn {
+                  padding: 0px 21px 0px 21px;
+                  height: 38px;
+                  background: #4ea6ff;
+                  border-radius: 8px;
+                  //border: 1px solid rgba(64, 158, 255, 1);
                   display: flex;
-                  // flex-wrap: wrap;
-                  .btn {
-                    padding: 0px 21px 0px 21px;
-                    height: 38px;
-                    background: #4ea6ff;
-                    border-radius: 8px;
-                    //border: 1px solid rgba(64, 158, 255, 1);
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                    margin-right: 14px;
-                    flex-shrink: 0;
-                    cursor: pointer;
+                  align-items: center;
+                  justify-content: center;
+                  margin-right: 14px;
+                  flex-shrink: 0;
+                  cursor: pointer;
 
-                    .search {
-                      background-size: 100%;
-                    }
-
-                    .btnText {
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #ffffff;
-                      line-height: 36px;
-                      margin-left: 5px;
-                    }
+                  .search {
+                    background-size: 100%;
                   }
 
-                  .btn3 {
-                    margin-right: 0px;
-
-                    .search {
-                      width: 17px;
-                      height: 18px;
-                      background-image: url("../../assets/images/courseManage/add0.png");
-                    }
-                  }
-
-                  .btn3:hover {
-                    background: rgba(64, 158, 255, 0.76);
-
-                    .search {
-                      background-image: url("../../assets/images/courseManage/add0.png");
-                    }
-
-                    .btnText {
-                      color: #ffffff;
-                    }
-                  }
-
-                  .btn3:active {
-                    background: #0982ff;
+                  .btnText {
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #ffffff;
+                    line-height: 36px;
+                    margin-left: 5px;
                   }
                 }
+
+                .btn3 {
+                  margin-right: 0px;
+
+                  .search {
+                    width: 17px;
+                    height: 18px;
+                    background-image: url("../../assets/images/courseManage/add0.png");
+                  }
+                }
+
+                .btn3:hover {
+                  background: rgba(64, 158, 255, 0.76);
+
+                  .search {
+                    background-image: url("../../assets/images/courseManage/add0.png");
+                  }
+
+                  .btnText {
+                    color: #ffffff;
+                  }
+                }
+
+                .btn3:active {
+                  background: #0982ff;
+                }
+              }
             }
 
             .btn3 {
@@ -7910,7 +7936,6 @@ export default defineComponent({
               }
 
               .ant-table-thead > tr > th {
-         
                 background-color: #eff4fc !important;
               }
 
@@ -7925,20 +7950,20 @@ export default defineComponent({
               }
 
               .operation {
+                display: flex;
+                justify-content: right;
+                .fb {
                   display: flex;
-                  justify-content: right;
-                  .fb {
-                    display: flex;
-                    margin-right: 20px;
-                    .jc {
-                      color: #4ea6ff;
-                      font-size: 14px;
-                      margin-left: 20px;
-                      white-space: nowrap;
-                      cursor: pointer;
-                    }
+                  margin-right: 20px;
+                  .jc {
+                    color: #4ea6ff;
+                    font-size: 14px;
+                    margin-left: 20px;
+                    white-space: nowrap;
+                    cursor: pointer;
                   }
                 }
+              }
 
               .tableBox {
                 .pa {
@@ -7954,7 +7979,6 @@ export default defineComponent({
               }
             }
           }
-
         }
       }
     }
@@ -8009,180 +8033,180 @@ export default defineComponent({
                 .i5_left {
                   display: flex;
 
-              .select {
-                margin-right: 20px;
-                margin-bottom: 20px;
-              }
+                  .select {
+                    margin-right: 20px;
+                    margin-bottom: 20px;
+                  }
 
-              .addTimeBox {
-                position: relative;
-                display: flex;
-                align-items: center;
-
-                .addTime {
-                  position: absolute;
-                  z-index: 10;
-                  margin-left: 10px;
-                  color: rgba(0, 0, 0, 0.4);
-                }
-
-                .ant-picker {
-                  padding-left: 85px;
-                }
-
-                .ant-picker-range .ant-picker-active-bar {
-                  margin-left: 85px;
-                }
-              }
-
-              .btn {
-                padding: 0px 26px 0px 26px;
-                height: 38px;
-                background: #4ea6ff;
-                border-radius: 8px;
-                //border: 1px solid rgba(64, 158, 255, 1);
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                margin-right: 14px;
-                flex-shrink: 0;
-                cursor: pointer;
-
-                .search {
-                  background-size: 100%;
-                }
-
-                .btnText {
-                  font-size: 14px;
-                  font-weight: 400;
-                  color: #ffffff;
-                  line-height: 36px;
-                  margin-left: 5px;
-                }
-              }
-
-              .btnn {
-                padding: 0px 26px 0px 26px;
-                height: 38px;
-                background: #ffffff;
-                border-radius: 8px;
-                border: 1px solid rgba(64, 158, 255, 1);
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                margin-right: 14px;
-                flex-shrink: 0;
-                cursor: pointer;
-
-                .search {
-                  background-size: 100%;
-                }
-
-                .btnText {
-                  font-size: 14px;
-                  font-weight: 400;
-                  color: #4ea6ff;
-                  line-height: 36px;
-                  margin-left: 5px;
-                }
-              }
-
-              .btn1 {
-                .search {
-                  width: 15px;
-                  height: 17px;
-                  background-image: url("../../assets/images/courseManage/search0.png");
-                }
-              }
-
-              .btn2 {
-                .search {
-                  width: 16px;
-                  height: 18px;
-                  background-image: url("../../assets/images/courseManage/reset1.png");
-                }
-              }
-
-              .btn1:hover {
-                background: rgba(64, 158, 255, 0.76);
-
-                .search {
-                  background-image: url("../../assets/images/courseManage/search0.png");
-                }
-
-                .btnText {
-                  color: #ffffff;
-                }
-              }
-
-              .btn1:active {
-                background: #0982ff;
-              }
-
-              .btn2:hover {
-                background: rgba(64, 158, 255, 0.1);
-              }
-
-              .btn2:active {
-                background: rgba(64, 158, 255, 0.2);
-              }
-                        }
-
-                .btns {
+                  .addTimeBox {
+                    position: relative;
                     display: flex;
-                    // flex-wrap: wrap;
-                    .btn {
-                      padding: 0px 26px 0px 26px;
-                      height: 38px;
-                      background: #4ea6ff;
-                      border-radius: 8px;
-                      //border: 1px solid rgba(64, 158, 255, 1);
-                      display: flex;
-                      align-items: center;
-                      justify-content: center;
-                      margin-right: 14px;
-                      flex-shrink: 0;
-                      cursor: pointer;
+                    align-items: center;
 
-                      .search {
-                        background-size: 100%;
-                      }
-
-                      .btnText {
-                        font-size: 14px;
-                        font-weight: 400;
-                        color: #ffffff;
-                        line-height: 36px;
-                        margin-left: 5px;
-                      }
+                    .addTime {
+                      position: absolute;
+                      z-index: 10;
+                      margin-left: 10px;
+                      color: rgba(0, 0, 0, 0.4);
                     }
 
-                .btn3 {
-                  margin-right: 0px;
+                    .ant-picker {
+                      padding-left: 85px;
+                    }
 
-                  .search {
-                    width: 17px;
-                    height: 18px;
-                    background-image: url("../../assets/images/courseManage/add0.png");
+                    .ant-picker-range .ant-picker-active-bar {
+                      margin-left: 85px;
+                    }
+                  }
+
+                  .btn {
+                    padding: 0px 26px 0px 26px;
+                    height: 38px;
+                    background: #4ea6ff;
+                    border-radius: 8px;
+                    //border: 1px solid rgba(64, 158, 255, 1);
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    margin-right: 14px;
+                    flex-shrink: 0;
+                    cursor: pointer;
+
+                    .search {
+                      background-size: 100%;
+                    }
+
+                    .btnText {
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #ffffff;
+                      line-height: 36px;
+                      margin-left: 5px;
+                    }
+                  }
+
+                  .btnn {
+                    padding: 0px 26px 0px 26px;
+                    height: 38px;
+                    background: #ffffff;
+                    border-radius: 8px;
+                    border: 1px solid rgba(64, 158, 255, 1);
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    margin-right: 14px;
+                    flex-shrink: 0;
+                    cursor: pointer;
+
+                    .search {
+                      background-size: 100%;
+                    }
+
+                    .btnText {
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #4ea6ff;
+                      line-height: 36px;
+                      margin-left: 5px;
+                    }
+                  }
+
+                  .btn1 {
+                    .search {
+                      width: 15px;
+                      height: 17px;
+                      background-image: url("../../assets/images/courseManage/search0.png");
+                    }
+                  }
+
+                  .btn2 {
+                    .search {
+                      width: 16px;
+                      height: 18px;
+                      background-image: url("../../assets/images/courseManage/reset1.png");
+                    }
+                  }
+
+                  .btn1:hover {
+                    background: rgba(64, 158, 255, 0.76);
+
+                    .search {
+                      background-image: url("../../assets/images/courseManage/search0.png");
+                    }
+
+                    .btnText {
+                      color: #ffffff;
+                    }
+                  }
+
+                  .btn1:active {
+                    background: #0982ff;
+                  }
+
+                  .btn2:hover {
+                    background: rgba(64, 158, 255, 0.1);
+                  }
+
+                  .btn2:active {
+                    background: rgba(64, 158, 255, 0.2);
                   }
                 }
 
-                .btn3:hover {
-                  background: rgba(64, 158, 255, 0.76);
+                .btns {
+                  display: flex;
+                  // flex-wrap: wrap;
+                  .btn {
+                    padding: 0px 26px 0px 26px;
+                    height: 38px;
+                    background: #4ea6ff;
+                    border-radius: 8px;
+                    //border: 1px solid rgba(64, 158, 255, 1);
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    margin-right: 14px;
+                    flex-shrink: 0;
+                    cursor: pointer;
 
-                  .search {
-                    background-image: url("../../assets/images/courseManage/add0.png");
+                    .search {
+                      background-size: 100%;
+                    }
+
+                    .btnText {
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #ffffff;
+                      line-height: 36px;
+                      margin-left: 5px;
+                    }
                   }
 
-                  .btnText {
-                    color: #ffffff;
+                  .btn3 {
+                    margin-right: 0px;
+
+                    .search {
+                      width: 17px;
+                      height: 18px;
+                      background-image: url("../../assets/images/courseManage/add0.png");
+                    }
+                  }
+
+                  .btn3:hover {
+                    background: rgba(64, 158, 255, 0.76);
+
+                    .search {
+                      background-image: url("../../assets/images/courseManage/add0.png");
+                    }
+
+                    .btnText {
+                      color: #ffffff;
+                    }
+                  }
+
+                  .btn3:active {
+                    background: #0982ff;
                   }
                 }
-
-                .btn3:active {
-                  background: #0982ff;
-                }
-              }
               }
 
               .stmm_i6 {
diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 3fd5d40c..1d9971d6 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -156,7 +156,7 @@
               <div class="mbl_items12">
                 <div
                   class="i12_box1"
-                  style="position:relative;"
+                  style="position: relative"
                   v-for="(item, index) in detail.attach"
                   :key="index"
                 >
@@ -207,21 +207,43 @@
                   <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;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:absolute;top:4px;left:72px;">
-                        {{ item.indexOf('-')!==-1?item.slice(item.lastIndexOf('/')+1,item.indexOf('-')) + item.slice(item.lastIndexOf('.')) :item }}  
+                      <span
+                        style="
+                          color: #6f6f6f;
+                          width: 200px;
+                          display: block;
+                          overflow: hidden;
+                          white-space: nowrap;
+                          text-overflow: ellipsis;
+                          position: absolute;
+                          top: 4px;
+                          left: 72px;
+                        "
+                      >
+                        {{
+                          item.indexOf("-") !== -1
+                            ? item.slice(
+                                item.lastIndexOf("/") + 1,
+                                item.lastIndexOf("-")
+                              ) + item.slice(item.lastIndexOf("."))
+                            : item
+                        }}
                       </span>
                     </div>
 
                     <div class="file_updata">
                       <div class="updatabox">
                         <div class="updatacolor"></div>
-                        <div class="updataxq" style="right:-62px;">上传完成</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" style="margin-left: 5px">下载</a>
                 </div>
               </div>
             </div>
@@ -262,134 +284,140 @@ export default defineComponent({
     },
   },
   setup(props, { emit }) {
-    console.log(props);
+    console.log("props", props);
     const state = reactive({
       imgList: [],
       options2222: [
         {
-          title: '领导力',
-          value: '100',
-          selectable:false,
+          title: "领导力",
+          value: "100",
+          selectable: false,
           children: [
             {
-              title: '领导业务',
-              value: '1001',
+              title: "领导业务",
+              value: "1001",
             },
             {
-              title: '领导团队',
-              value: '1002',
+              title: "领导团队",
+              value: "1002",
             },
             {
-              title: '领导自我',
-              value: '1003',
+              title: "领导自我",
+              value: "1003",
             },
           ],
         },
         {
-          title: '专业力',
-          value: '200',
-          selectable:false,
+          title: "专业力",
+          value: "200",
+          selectable: false,
           children: [
             {
-              title: '研发',
-              value: '2001',
+              title: "研发",
+              value: "2001",
             },
             {
-              title: '产品和解决方案',
-              value: '2002',
+              title: "产品和解决方案",
+              value: "2002",
             },
             {
-              title: '生产技术与制造',
-              value: '2003',
+              title: "生产技术与制造",
+              value: "2003",
             },
             {
-              title: '供应链',
-              value: '2004',
+              title: "供应链",
+              value: "2004",
             },
             {
-              title: '营销',
-              value: '2005',
+              title: "营销",
+              value: "2005",
             },
             {
-              title: '品质',
-              value: '2006',
+              title: "品质",
+              value: "2006",
             },
             {
-              title: '战略与企划',
-              value: '2007',
+              title: "战略与企划",
+              value: "2007",
             },
             {
-              title: '流程管理',
-              value: '2008',
+              title: "流程管理",
+              value: "2008",
             },
             {
-              title: '业绩管理',
-              value: '2009',
+              title: "业绩管理",
+              value: "2009",
             },
             {
-              title: '项目管理',
-              value: '20010',
+              title: "项目管理",
+              value: "20010",
             },
             {
-              title: '信息技术',
-              value: '20011',
+              title: "信息技术",
+              value: "20011",
             },
             {
-              title: '环境与安全',
-              value: '20012',
+              title: "环境与安全",
+              value: "20012",
             },
             {
-              title: '人力资源',
-              value: '20013',
+              title: "人力资源",
+              value: "20013",
             },
             {
-              title: '企业文化',
-              value: '20014',
+              title: "企业文化",
+              value: "20014",
             },
             {
-              title: '品牌',
-              value: '20015',
+              title: "品牌",
+              value: "20015",
             },
             {
-              title: '财务',
-              value: '20016',
+              title: "财务",
+              value: "20016",
             },
             {
-              title: '法务',
-              value: '20017',
+              title: "法务",
+              value: "20017",
             },
             {
-              title: '行政',
-              value: '20018',
+              title: "行政",
+              value: "20018",
             },
             {
-              title: '医工',
-              value: '20019',
-            }
+              title: "医工",
+              value: "20019",
+            },
           ],
         },
         {
-          title: '通用力',
-          value: '300',
-          selectable:false,
+          title: "通用力",
+          value: "300",
+          selectable: false,
           children: [
             {
-              title: '职业操守与道德',
-              value: '3001',
+              title: "职业操守与道德",
+              value: "3001",
             },
             {
-              title: '职业素养与技能',
-              value: '3002',
+              title: "职业素养与技能",
+              value: "3002",
             },
             {
-              title: '规章制度',
-              value: '3003',
+              title: "规章制度",
+              value: "3003",
             },
-          ], 
-        }
-      ]
+          ],
+        },
+      ],
+      ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx",
+      ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx",
     });
 
+    // item.slice(
+    //                             item.lastIndexOf("/") + 1,
+    //                             item.indexOf("-")
+    //                           ) + item.slice(item.lastIndexOf("."))
     const filterTxt = (txt) => {
       if (txt) {
         return txt;
@@ -400,8 +428,8 @@ export default defineComponent({
     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++){
+        for (let i = 0; i < options2.value.length; i++) {
+          for (let j = 0; j < options2.value[i].children.length; j++) {
             if (String(options2.value[i].children[j].value) === String(txt)) {
               str = options2.value[i].children[j].title;
             }
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 2a89a9f7..6db2fa8c 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -538,24 +538,6 @@
                       }}</span>
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目说明：</span></div>
-                    <div class="setc_main">
-                      <span style="color: #999999">{{
-                        projectInfo.remark
-                      }}</span>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.courseSyncFlag"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
@@ -568,14 +550,32 @@
                       <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="projectInfo.courseSyncFlag" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                      >
+                    </div>
+                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.boeFlag"
+                      <a-radio v-model:checked="projectInfo.boeFlag"  :disabled="true"
                         ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{
+                          projectInfo.remark
+                        }}</span>
+                    </div>
+                  </div>
                 </div>
               </div>
             </a-tab-pane>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index f2d530e8..bafc50b7 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1146,29 +1146,13 @@
                       <span style="color: #999999">{{ sourceBelong }}</span>
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目说明：</span></div>
-                    <div class="setc_main">
-                      <span style="color: #999999">{{ remark }}</span>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="checkedSty" :disabled="true"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
                         ><ProjectLevel
                           v-model:value="level"
-                          :disabled="true"
+                          :tag="true"
                         ></ProjectLevel
                       ></span>
                     </div>
@@ -1179,11 +1163,21 @@
                       <span style="color: #999999"
                         ><TrainClass
                           v-model:value="systemId"
-                          :disabled="true"
+                          :tag="true"
                         ></TrainClass
                       ></span>
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="checkedSty" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                      >
+                    </div>
+                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
@@ -1192,6 +1186,12 @@
                       >
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ remark }}</span>
+                    </div>
+                  </div>
                   <div class="set_content" v-if="isPass">
                     <div class="setc_name"><span>审核意见：</span></div>
                     <div class="setc_main">
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 6551c1f2..6b956f3e 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -31,18 +31,6 @@
             />
           </div>
         </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">分类</div>
-          </div>
-          <div class="in select">
-            <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
-          </div>
-        </div>
         <div class="name" style="align-items: flex-start">
           <div class="namebox" style="margin-top: 10px">
             <img
@@ -132,37 +120,6 @@
             ></OrgClass>
           </div>
         </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname" style="margin-top: 13px">模板说明</div>
-          </div>
-          <div class="in">
-            <a-textarea
-              v-model:value="projectInfo.remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-            />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">同步学习记录</div>
-          </div>
-          <div class="in">
-            <a-checkbox v-model:checked="projectInfo.courseSyncFlag"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-checkbox
-            >
-          </div>
-        </div>
         <div class="name">
           <div class="namebox">
             <img
@@ -202,6 +159,39 @@
             </a-radio-group>
           </div>
         </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-checkbox
+              v-model:checked="courseSyncFlag"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-checkbox
+            >
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">模板说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+              v-model:value="projectInfo.remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+            />
+          </div>
+        </div>
       </div>
     </div>
     <div class="footer">
@@ -220,7 +210,7 @@ import { ref, onMounted, watch } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import * as api from "../../api/indexTemplate";
-import ProjectClass from "@/components/project/ProjectClass";
+// import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
@@ -231,7 +221,7 @@ const router = useRouter();
 const store = useStore();
 const projectInfo = ref({});
 const projectPic = ref([]);
-
+const courseSyncFlag = ref(false);
 onMounted(() => {
   getDetail();
   projectPic.value = store.state.projectPic.map((e) => ({
@@ -255,6 +245,7 @@ const getDetail = () =>
       projectInfo.value.beginTime,
       projectInfo.value.endTime,
     ];
+    projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag;
   });
 
 const backPage = () => {
@@ -290,6 +281,7 @@ const createProject = () => {
       return;
     }
   }
+  projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
   api
     .templateEdit({
       ...projectInfo.value,
@@ -311,6 +303,7 @@ function managerChange(e, l, d, t) {
 .active {
   border: 2px solid rgba(78, 166, 255, 1);
 }
+
 .projectAdd {
   width: 100%;
   // height: inherit;

From 6909dedb987f65ebd30084947bd32c5d59da6f0d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 17:03:28 +0800
Subject: [PATCH 19/35] -- bug

---
 src/components/project/ProjectLevel.vue |    2 +-
 src/views/projectcenter/SonProject.vue  | 1119 +++++------------------
 src/views/projectcenter/templateAdd.vue |    1 -
 3 files changed, 234 insertions(+), 888 deletions(-)

diff --git a/src/components/project/ProjectLevel.vue b/src/components/project/ProjectLevel.vue
index ad6d4b9c..975c58f0 100644
--- a/src/components/project/ProjectLevel.vue
+++ b/src/components/project/ProjectLevel.vue
@@ -19,7 +19,7 @@
   </template>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import {computed, defineEmits, defineProps} from "vue";
 import {useStore} from "vuex";
 
 
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 35bf8f3e..80691e3b 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -4,210 +4,194 @@
     <div class="header">
       <span class="title">创建/编辑单层子项目</span>
       <div
-        @click="backPage"
-        style="cursor: pointer"
-        to="/projectmanage"
-        class="goback"
+          @click="backPage"
+          style="cursor: pointer"
+          to="/projectmanage"
+          class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
     </div>
     <div class="content">
       <div class="main">
-        <div class="name">
+        <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目归属</div>
           </div>
           <div class="in">
             <div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
-              {{ projectAscription }}
+              {{ projectInfo.parentName }}
             </div>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">子项目名称</div>
+            <div class="inname">项目名称</div>
           </div>
           <div class="in">
-            <a-input
-              v-model:value="projectName"
-              placeholder="请输入项目名称"
-              show-count
-              :maxlength="30"
-              :disabled="viewDetail ? true : false"
-            />
+            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name"
+                       v-model:validate="projectInfo.validate" :maxlength="30" show-count
+                       :id="projectInfo.projectId"></NameInput>
           </div>
         </div>
-        <div class="name">
-          <div class="namebox">
+        <div class="name flex-top">
+          <div class="namebox" style="margin-top: 10px">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">分类</div>
-          </div>
-          <div class="in select">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect"
-              placeholder="请选择分类"
-              style="width: 100%"
-              :options="classifyList"
-              @change="classificationChange"
-              allowClear
-              showSearch
-              :disabled="viewDetail ? true : false"
-              :fieldNames="{
-                label: 'dictName',
-                value: 'dictCode',
-              }"
-            >
-            </a-select>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
-          <div
-            class="box"
-            style="
-              width: 100px;
-              height: 100px;
-              border: 1px solid rgba(78, 166, 255, 1);
-              border-radius: 5px;
-              cursor: pointer;
-              position: relative;
-              overflow: hidden;
-            "
-          >
-            <a-upload
-              v-model:file-list="fileList"
-              name="file"
-              list-type="picture-card"
-              class="avatar-uploader"
-              :show-upload-list="false"
-              action="/api/file/upload"
-              :before-upload="beforeUpload"
-              @change="handleChange"
-              :disabled="viewDetail ? true : false"
+          <div class="in select" style="flex: 1; display: flex">
+            <div
+                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+                style="
+                width: 100px;
+                height: 100px;
+                border-radius: 5px;
+                cursor: pointer;
+                position: relative;
+                overflow: hidden;
+              "
+                v-for="(src, index) in projectPic"
+                :key="index"
+                @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                style="
+                  style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                v-if="imageUrl"
-                :src="imageUrl"
-                alt="avatar"
+                  :src="src.value"
+                  alt="avatar"
               />
-              <div v-else>
-                <!-- <loading-outlined v-if="loading"></loading-outlined> -->
-                <!-- <plus-outlined v-else></plus-outlined> -->
-                <div class="box1"></div>
-                <div class="box2"></div>
-                <!-- <div class="ant-upload-text"></div> -->
-              </div>
-            </a-upload>
+            </div>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">子项目时间</div>
+            <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-              separator="至"
-              :placeholder="['      开始时间', '        结束时间']"
-              v-model:value="rangevalue"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              @change="onRangeChange"
-              :disabled="viewDetail ? true : false"
+                show-time
+                separator="至"
+                :placeholder="['      开始时间', '        结束时间']"
+                v-model:value="projectInfo.rangeTime"
+                style="width: 100%; height: 40px; border-radius: 5px"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
+                @change="timeChange"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">子项目经理</div>
+            <div class="inname">项目经理</div>
           </div>
           <div class="in">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              :value="classifySelect1"
-              mode="multiple"
-              placeholder="请选择项目经理"
-              style="width: 100%"
-              :options="classifyList1"
-              @change="classificationChange1"
-              allowClear
-              showSearch
-              :disabled="viewDetail ? true : false"
-              @popupScroll="memberScroll"
-            >
-            </a-select>
+            <ProjectManager
+                v-model:value="projectInfo.managerId"
+                v-model:name="projectInfo.manager"
+                @onChange="managerChange"
+                mode="multiple"
+            ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
-            <a-tree-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect2"
-              style="width: 100%"
-              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-              placeholder="自动带出 可修改"
-              :options="classifyList2"
-              @change="classificationChange2"
-              :disabled="viewDetail ? true : false"
-              :tree-data="classifyList2"
-              :fieldNames="{
-                children: 'treeChildList',
-                label: 'name',
-                value: 'id',
-              }"
-            ></a-tree-select>
+            <OrgClass
+                v-model:value="projectInfo.sourceBelongId"
+                v-model:name="projectInfo.sourceBelongName"
+            ></OrgClass>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目级别</div>
+          </div>
+          <div class="in select">
+            <ProjectLevel v-model:value="projectInfo.level"></ProjectLevel>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">培训分类</div>
+          </div>
+          <div class="in select">
+            <TrainClass v-model:value="projectInfo.systemId"></TrainClass>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">是否BOEU实施</div>
+          </div>
+          <div class="in">
+            <a-radio-group
+                v-model:value="projectInfo.boeFlag"
+                :disabled="viewDetail ? true : false"
+            >
+              <a-radio :style="radioStyle" :value="1">是</a-radio>
+              <a-radio :style="radioStyle" :value="0">否</a-radio>
+            </a-radio-group>
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-checkbox
+                v-model:checked="courseSyncFlag"
+                :disabled="viewDetail ? true : false"
+            ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            ></a-checkbox
+            >
           </div>
         </div>
         <div class="name name2">
@@ -216,178 +200,31 @@
           </div>
           <div class="in">
             <a-textarea
-              v-model:value="remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-              :disabled="viewDetail ? true : false"
+                v-model:value="projectInfo.remark"
+                style="height: 80px"
+                placeholder="请输入说明"
+                show-count
+                :maxlength="200"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
-        <div class="name name2">
+
+        <div v-if="projectInfo.status == -5" class="name name2">
           <div class="namebox">
-            <div class="inname">同步学习记录</div>
+            <div class="inname" style="margin-top: 13px">审核意见</div>
           </div>
-          <div class="in">
-            <a-radio
-              @click="changeChecked"
-              v-model:checked="checked"
-              :disabled="viewDetail ? true : false"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-radio
-            >
+          <div class="description">
+            {{ auditDescription }}
           </div>
         </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目级别</div>
-          </div>
-          <div class="in select">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect3"
-              :options="classifyList3"
-              @change="classificationChange3"
-              placeholder="集团级/组织级/现地级/部门级"
-              :disabled="viewDetail ? true : false"
-              :fieldNames="{
-                label: 'dictName',
-                value: 'dictCode',
-              }"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">培训分类</div>
-          </div>
-          <div class="in select">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect4"
-              :options="classifyList4"
-              @change="classificationChange4"
-              placeholder="集团级/组织级/现地级/部门级"
-              :disabled="viewDetail ? true : false"
-              :fieldNames="{
-                label: 'dictName',
-                value: 'dictCode',
-              }"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">是否BOEU实施</div>
-          </div>
-          <div class="in">
-            <a-radio
-              @click="changeChecked1"
-              v-model:checked="checked1"
-              :disabled="viewDetail ? true : false"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >BOEU实施</span
-              ></a-radio
-            >
-          </div>
-        </div>
-        <!-- <div class="name name2">
-					<div class="namebox" style="margin-top: 8px">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">附件</div>
-					</div>
-					<div class="filebox">
-						<div>
-							<img v-if="fileList1.length < 6" class="fileimg" src="../../assets/images/projectadd/enclosure.png" />
-							<a-upload :disabled="fileList1.length > 5" :before-upload="beforeUpload1" v-model:file-list="fileList1"
-								@remove="removeFile" name="file" action="/api/file/upload" :headers="headers" @change="handleChange1">
-								<span v-if="fileList1.length > 5" class="filetext">上传数量已经达到最大值</span>
-								<span v-else class="filetext">上传附件</span>
-							</a-upload>
-						</div>
-						<div class="support">
-							支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
-						</div>
-					</div>
-				</div> -->
       </div>
-      <!-- 2022-11-30注释 后面放开 -->
-      <!-- <div class="template">
-        <div class="name">
-          <div class="inname" style="width: 50px">模版</div>
-          <div class="in select" style="margin-left: 2px">
-            <a-select
-              v-if="isEdit"
-              disabled="true"
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect5"
-              placeholder="请选择模版"
-              :size="size"
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-            >
-            </a-select>
-            <a-select
-              v-else
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect5"
-              placeholder="请选择模版"
-              :size="size"
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-              @popupScroll="templateScroll"
-            >
-            </a-select>
-          </div>
-        </div>
-      </div> -->
     </div>
     <div class="footer">
       <div class="btn">
         <a-button v-on:click="createProject" type="primary" class="btn1"
-          >确定</a-button
+        >确定
+        </a-button
         >
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
@@ -395,24 +232,33 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref, computed } from "vue";
-import { message } from "ant-design-vue";
-import { useRouter, useRoute } from "vue-router";
-import dayjs from "dayjs";
+import {reactive, toRefs, ref, computed, onMounted} from "vue";
+import {message} from "ant-design-vue";
+import {useRouter, useRoute} from "vue-router";
 import * as api from "../../api/index";
-import * as api1 from "../../api/index1";
-import { toDate, scrollLoad } from "../../api/method";
-import { useStore } from "vuex";
+import {useStore} from "vuex";
+import ProjectManager from "@/components/project/ProjectManagerNew";
+import ProjectLevel from "@/components/project/ProjectLevel";
+import TrainClass from "@/components/project/TrainClass";
+import NameInput from "@/components/project/NameInput";
+import OrgClass from "@/components/project/OrgClass";
+import {validateName} from "../../api/index1";
+
 export default {
   name: "projectAdd",
+  components: {
+    ProjectManager,
+    ProjectLevel,
+    TrainClass,
+    NameInput,
+    OrgClass,
+  },
   setup() {
     const store = useStore();
     // 编辑页面跳转过来时候，自动填充表格
     const routers = useRoute();
     const router = useRouter();
     const isEdit = ref(false);
-    let peojectID = "";
-    let paraentID = "";
 
     const state = reactive({
       classifySelect: null,
@@ -437,78 +283,37 @@ export default {
 
       currentPage1: 1, //项目经理
       pageSize1: 10, //项目经理
+      projectInfo: {},
+      courseSyncFlag:false
     });
 
-    if (routers.query.name == undefined) {
-      router.push({
-        path: "/projectmanage",
-      });
-    }
+    const projectPic = computed(() => store.state.projectPic.map((e) => ({
+      value: e.dictValue,
+      label: e.dictName,
+    })));
 
-    peojectID = routers.query.projectId;
-    state.projectAscription = routers.query.name;
 
-    if (routers.query.edit !== undefined) {
-      isEdit.value = true;
-      // 需要编辑
-      api
-        .getProjectDetail({ projectId: routers.query.projectId })
-        .then((res) => {
-          if (res.status == 200 && res.data.code == 200) {
-            let info = res.data.data.projectInfo;
-            console.log(info);
-            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-            projectName.value = info.name;
-            state.classifySelect = classifyList.value[1]; // info.category
-            imageUrl.value = info.picUrl;
+    onMounted(() => {
+      state.viewDetail = routers.query.viewDetail;
+      getProjectInfo();
+    });
 
-            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
-            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
-            state.rangevalue = [
-              dayjs(start, "YYYY/MM/DD"),
-              dayjs(end, "YYYY/MM/DD"),
+    function getProjectInfo() {
+      state.projectInfo.parentName = routers.query.parentName;
+      state.projectInfo.parentId = routers.query.parentId;
+      state.projectInfo.projectId = routers.query.projectId;
+      (state.projectInfo.projectId || state.projectInfo.parentId) &&
+      api.getProjectDetail({
+            projectId: state.projectInfo.projectId,
+          })
+          .then((res) => {
+            state.projectInfo = res.data.data.projectInfo;
+            state.projectInfo.rangeTime = [
+              state.projectInfo.beginTime,
+              state.projectInfo.endTime,
             ];
-
-            let manageName = info.manager.split(",");
-            let manageValue = info.managerId.split(",");
-            let optionsManage = [];
-            for (let i = 0; i < manageName.length; i++) {
-              let obj = {
-                label: manageName[i],
-                value: manageValue[i],
-              };
-              optionsManage.push(obj);
-            }
-            console.log(optionsManage);
-            state.classifySelect1 = optionsManage;
-            state.classifySelect2 =
-              classifyList2.value[info.sourceBelongId - 1];
-            remark.value = info.remark;
-            state.checked = info.boeFlag ? info.boeFlag : false;
-            state.classifySelect3 = classifyList3.value[info.level];
-            state.classifySelect4 = classifyList4.value[info.systemId - 1];
-            state.checked1 = info.boeFlag ? info.boeFlag : false;
-            // fileList1.value = info.attach.split(",");
-
-            projectType = 1;
-            picUrl = info.picUrl;
-            beginTime = Number(info.beginTime / 1000);
-            endTime = Number(info.endTime / 1000);
-            manager = info.manager;
-            managerId = info.managerId;
-            sourceBelongIdC = Number(info.sourceBelongId);
-            courseSyncFlag = info.courseSyncFlag;
-            levels = info.level;
-            systemid = info.systemId;
-            boeFlag = info.boeFlag;
-            paraentID = Number(info.parentId);
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    } else {
-      paraentID = Number(routers.query.projectId);
+            state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
+          });
     }
 
     const backPage = () => {
@@ -519,542 +324,84 @@ export default {
       }, 400);
     };
 
-    const projectName = ref("");
-
-    const classifyList = ref([
-      // { value: 1, label: "管理者" },
-    ]);
-
-    let projectType = "";
-
-    const classificationChange = (value) => {
-      console.log(`selected ${value}`);
-      projectType = value;
-    };
-
-    function getBase64(img, callback) {
-      const reader = new FileReader();
-      reader.addEventListener("load", () => callback(reader.result));
-      reader.readAsDataURL(img);
-    }
-
-    const fileList = ref([]);
-    const fileList1 = ref([]);
-    const loading = ref(false);
-    const imageUrl = ref("");
-    let picUrl = "";
-
-    const handleChange = (info) => {
-      if (info.file.status === "uploading") {
-        loading.value = true;
-        return;
-      }
-      if (info.file.status === "done") {
-        console.log("上传图片返回的信息 %o", info);
-        picUrl = info.file.response.data;
-        // Get this url from response in real world.
-        getBase64(info.file.originFileObj, (base64Url) => {
-          imageUrl.value = base64Url;
-          loading.value = false;
-        });
-      }
-      if (info.file.status === "error") {
-        loading.value = false;
-        message.error("upload error");
-      }
-    };
-
-    let uplodaFileCount = false;
-
-    let attach = "";
-    let attachData = "";
-    const handleChange1 = (info) => {
-      if (info.file.status === "uploading") {
-        loading.value = true;
-        return;
-      }
-      if (info.file.status === "done") {
-        console.log(
-          "上传附件返回的信息 %o",
-          info,
-          info.fileList.length,
-          uplodaFileCount
-        );
-
-        let attachStr = "";
-        attachData = info.fileList;
-        for (let i = 0; i < attachData.length; i++) {
-          if (attachData.length - 1 == i) {
-            attachStr += attachData[i].response.data;
-          } else {
-            attachStr += attachData[i].response.data + ",";
-          }
-        }
-        console.log(attachStr);
-        attach = attachStr;
-
-        if (info.fileList.length > 5) {
-          uplodaFileCount = true;
-        } else {
-          uplodaFileCount = false;
-        }
-      }
-      if (info.file.status === "error") {
-        loading.value = false;
-        message.error("upload error");
-      }
-    };
-
-    const beforeUpload = (file) => {
-      const isJpgOrPng =
-        file.type === "image/jpeg" || file.type === "image/png";
-      if (!isJpgOrPng) {
-        message.error("You can only upload JPG file!");
-      }
-      const isLt2M = file.size / 1024 / 1024 < 1;
-      if (!isLt2M) {
-        message.error("Image must smaller than 1MB!");
-      }
-      return isJpgOrPng && isLt2M;
-    };
-
-    const beforeUpload1 = () => {
-      return new Promise((resovle, reject) => {
-        if (uplodaFileCount) {
-          message.warning("上传文件数量已达最大数量");
-          return reject(false);
-        }
-        return resovle(true);
-      });
-    };
-
-    let beginTime = "";
-    let endTime = "";
-    const dateFormatList = ["YYYY/MM/DD"];
-
-    const onRangeChange = (value, dateString) => {
-      console.log("Selected Time: ", value);
-      // 项目时间选择函数
-      console.log("Formatted Selected Time: ", dateString);
-      console.log(
-        "Formatted Selected TimeStamp",
-        new Date(dateString[0]).getTime()
-      );
-      beginTime = new Date(dateString[0]).getTime() / 1000;
-      endTime = new Date(dateString[1]).getTime() / 1000;
-    };
-
-    // 项目经理 后续接口调用
-    const classifyList1 = ref([
-      // { value: 1, label: "李俊国" },
-    ]);
-    //获取学员
-    const getMember = () => {
-      api1
-        .getMemberInfo({
-          pageNo: state.currentPage1,
-          pageSize: state.pageSize1,
-          keyWord: "",
-        })
-        .then((res) => {
-          if (res.data.code === 200) {
-            let arr = res.data.data.rows;
-            let array = classifyList1.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.realName,
-              };
-              array.push(obj);
-            });
-            classifyList1.value = array;
-            console.log("获取学员", res.data);
-            // classifyList1.value = res.data.data.rows;
-            // state.tableDataTotal = res.data.data.total;
-            // return res.data.data.rows;
-          }
-        })
-        .catch((err) => {
-          console.log("获取学员失败", err);
-        });
-    };
-    getMember();
-    //学员滚动加载信息
-    const memberScroll = (e) => {
-      // console.log("滚动", e, b);
-      let num = scrollLoad(e);
-      if (num === 1) {
-        state.currentPage1 = 1;
-      } else if (num === 2) {
-        // 如果滑到底部，则加载下一页
-        state.currentPage1++;
-        getMember();
-      }
-    };
-    //选择处理项目经理
-    let manager = "";
-    let managerId = "";
-    const classificationChange1 = (key, options) => {
-      console.log(`selected ${key}`, options);
-      let mstr = "";
-      let midstr = "";
-      for (let i = 0; i < key.length; i++) {
-        if (key.length - 1 !== i) {
-          midstr += key[i] + ",";
-          mstr += classifyList1.value[i].label + ",";
-        } else {
-          midstr += key[i];
-          mstr += classifyList1.value[i].label;
-        }
-      }
-      console.log(mstr, midstr);
-      state.classifySelect1 = options;
-      let newoptions = [];
-      for (let i = 0; i < state.classifySelect1.length; i++) {
-        if (state.classifySelect1[i].value) {
-          newoptions.push(state.classifySelect1[i]);
-        }
-      }
-      state.classifySelect1 = newoptions;
-      manager = mstr;
-      managerId = midstr;
-    };
-
-    // 资源归属 sourceBelongId 后续给接口
-    const classifyList2 = computed(() => {
-      return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
-    });
-
-    let sourceBelongIdC = "";
-    const classificationChange2 = (key) => {
-      console.log(`selected ${key}`, classifyList2);
-      sourceBelongIdC = key;
-    };
-
-    // 项目级别
-    const classifyList3 = ref([
-      // { value: 1, label: "集团级" },
-    ]);
-
-    let levels = "";
-    const classificationChange3 = (key) => {
-      console.log(`selected ${key}`, classifyList3);
-      levels = key;
-    };
-
-    // 培训分类
-    const classifyList4 = ref([
-      // { value: 1, label: "集团级" },
-    ]);
-
-    let systemid = "";
-    const classificationChange4 = (key) => {
-      console.log(`selected ${key}`, classifyList4);
-      systemid = key;
-    };
-    //获取分类、封面图、项目级别、培训分类-----------字典配置-------------------------------
-    const getDictList = (param) => {
-      let obj = {
-        pageNo: 1,
-        pageSize: 20,
-        setCode: param,
-      };
-      api1
-        .getDict(obj)
-        .then((res) => {
-          console.log("获取字典成功", res);
-          if (res.status === 200) {
-            if (param === "projectClass") {
-              classifyList.value = res.data.data.rows;
-            }
-            if (param === "projectPic") {
-              if (res.data.data.rows.length > 0) {
-                imageUrl.value = res.data.data.rows[0].dictValue;
-                picUrl = res.data.data.rows[0].dictValue;
-              }
-            }
-            if (param === "projectLevel") {
-              classifyList3.value = res.data.data.rows;
-            }
-            if (param === "projectSys") {
-              classifyList4.value = res.data.data.rows;
-            }
-          }
-        })
-        .catch((err) => {
-          console.log("获取字典失败", err);
-        });
-    };
-    getDictList("projectClass");
-    getDictList("projectPic");
-    getDictList("projectLevel");
-    getDictList("projectSys");
-    //获取分类、封面图、项目级别、培训分类---------------字典配置---------------------------
-
-    // 模版
-    const classifyList5 = ref([
-      // { value: 1, label: "模版一" },
-    ]);
-    const classificationChange5 = (key) => {
-      console.log(`selected ${key}`, classifyList5);
-    };
-    //获取模版列表
-    const getTemplate = () => {
-      let obj = {
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        // projectId:id?id:''
-      };
-      api
-        .getTemplate(obj)
-        .then((res) => {
-          console.log("获取模版列表", res);
-          state.totalPages = Number(res.data.data.pages);
-          if (res.status === 200) {
-            let arr = res.data.data.rows;
-            let array = classifyList5.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.projectTemplateId,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            classifyList5.value = array;
-          }
-        })
-        .catch((err) => {
-          console.log("获取模版列表失败", err);
-        });
-    };
-    getTemplate();
-    //模版滚动加载模板信息
-    const templateScroll = (e) => {
-      // console.log("滚动", e, b);
-      let num = scrollLoad(e);
-      if (num === 1) {
-        state.currentPage = 1;
-      } else if (num === 2) {
-        // 如果滑到底部，则加载下一页
-        state.currentPage++;
-        getTemplate();
-      }
-    };
-
-    // 项目说明
-    const remark = ref("");
-
-    let courseSyncFlag = 0;
-    const changeChecked = () => {
-      console.log(state.checked);
-      state.checked ? (state.checked = false) : (state.checked = true);
-      courseSyncFlag = state.checked ? 1 : 0;
-    };
-
-    let boeFlag = 0;
-    const changeChecked1 = () => {
-      console.log(state.checked1);
-      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
-      boeFlag = state.checked1 ? 1 : 0;
-    };
-
-    const removeFile = (file) => {
-      const index = fileList1.value.indexOf(file);
-      const newFileList = fileList1.value.slice();
-      newFileList.splice(index, 1);
-      fileList1.value = newFileList;
-
-      let attachStr = "";
-      if (newFileList.length == 0) {
-        attachStr = "";
-      }
-      for (let i = 0; i < fileList1["value"].length; i++) {
-        console.log(fileList1["value"][i].response.data);
-        if (fileList1["value"].length - 1 == i) {
-          attachStr += fileList1["value"][i].response.data;
-        } else {
-          attachStr += fileList1["value"][i].response.data + ",";
-        }
-      }
-      attach = attachStr;
-    };
 
     const errorMsgs = {
       name: "请输入项目名称",
-      category: "请选择项目分类",
-      picUrl: "请上传项目封面图",
+      picUrl: "请选择项目封面图",
       beginTime: "请选择项目开始时间",
       endTime: "请选择项目结束时间",
       manager: "请选择项目经理",
       managerId: "请选择项目经理",
       sourceBelongId: "请选择资源归属",
       level: "请填写项目级别",
-      systemId: "请填写项目培训分类",
-      boeFlag: "请选择是否BOE实施",
+      systemId: "请填写项目培训体系",
+      boeFlag: "请选择是否BOEU实施",
     };
 
-    const createProject = () => {
-      console.log("我是否要编辑项目", isEdit.value);
-      if (isEdit.value) {
-        console.log("我要编辑项目", peojectID);
-        let obj = {
-          projectId: Number(peojectID),
-          name: projectName["value"],
-          category: projectType,
-          picUrl: picUrl,
-          beginTime: beginTime,
-          endTime: endTime,
-          manager: manager,
-          managerId: managerId,
-          sourceBelongId: sourceBelongIdC,
-          remark: remark["value"],
-          courseSyncFlag: courseSyncFlag,
-          level: levels,
-          systemId: systemid,
-          boeFlag: boeFlag,
-          attach: attach,
-          type: 3,
-          templateId: 0,
-          parentId: paraentID,
-          notice: "",
-          noticeFlag: 0,
-          status: 0,
-        };
-
-        console.log(obj);
-
-        for (let i in errorMsgs) {
-          console.log(obj[i]);
-          if (obj[i] === "" || obj[i] === undefined) {
-            message.destroy();
-            message.warning(errorMsgs[i]);
-            return;
-          }
-        }
-
-        api
-          .createProject(obj)
-          .then((res) => {
-            console.log(res);
-            if (res.status == 200 && res.data.code == 200) {
-              message.destroy();
-              message.success("编辑成功");
-              setTimeout(() => {
-                router.push({
-                  path: "/projectmanage",
-                });
-              }, 1000);
-            } else {
-              message.destroy();
-              message.error("编辑失败，请检查当前网络状态。");
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-            message.destroy();
-            message.error("编辑失败，请检查当前网络状态。");
-          });
-      } else {
-        let obj = {
-          name: projectName["value"],
-          category: projectType,
-          picUrl: picUrl,
-          beginTime: beginTime,
-          endTime: endTime,
-          manager: manager,
-          managerId: managerId,
-          sourceBelongId: sourceBelongIdC,
-          remark: remark["value"],
-          courseSyncFlag: courseSyncFlag,
-          level: levels,
-          systemId: systemid,
-          boeFlag: boeFlag,
-          attach: attach,
-          type: 3,
-          templateId: 10,
-          parentId: paraentID,
-          notice: "",
-          noticeFlag: 0,
-          status: 0,
-        };
-        console.log("提交的数据格式 %o", obj);
-        for (let i in errorMsgs) {
-          console.log(obj[i]);
-          if (obj[i] === "" || obj[i] === undefined) {
-            message.destroy();
-            message.warning(errorMsgs[i]);
-            return;
-          }
-        }
-
-        api
-          .createProject(obj)
-          .then((res) => {
-            console.log(res);
-            if (res.status == 200 && res.data.code == 200) {
-              message.destroy();
-              message.success("创建成功");
-              setTimeout(() => {
-                router.push({
-                  path: "/taskpage",
-                  query: { id: res.data.data.projectId },
-                });
-              }, 1000);
-            } else {
-              message.destroy();
-              message.error("创建失败，请检查当前网络状态。");
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-            message.destroy();
-            message.error("创建失败，请检查当前网络状态。");
-          });
+    function timeChange(e) {
+      if (e && e.length === 2) {
+        state.projectInfo.beginTime = e[0];
+        state.projectInfo.endTime = e[1];
       }
+    }
+
+    function validate(obj, errorMsgs) {
+      for (let i in errorMsgs) {
+        if (!obj[i] && obj[i] !== 0) {
+          message.destroy();
+          message.warning(errorMsgs[i]);
+          return false;
+        }
+      }
+      return true;
+    }
+
+    const createProject = async () => {
+      console.log("我是否要编辑项目", isEdit.value);
+      if (!validate(state.projectInfo, errorMsgs)) {
+        return;
+      }
+      /**
+       if (!state.projectInfo.validate) {
+        message.destroy();
+        message.warning('项目名称重复，请修改名称！');
+        return;
+      }*/
+      const offName = await validateName({
+        name: state.projectInfo.name,
+        type: 1,
+        id: state.projectInfo.projectId
+      }).then(res => {
+        return res.data.data == 1;
+      });
+      if (offName) {
+        message.destroy();
+        return message.warning("项目名称重复，请重新填写");
+      }
+      state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
+      api.createProject(state.projectInfo).then(() => {
+        message.destroy();
+        message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
+        router.back()
+      });
     };
 
     return {
       ...toRefs(state),
-      projectName,
-      classifyList,
-      classificationChange,
-      classificationChange1,
-      classificationChange2,
-      classificationChange3,
-      classificationChange4,
-      classificationChange5,
-      fileList,
-      fileList1,
-      loading,
-      imageUrl,
-      handleChange,
-      handleChange1,
-      beforeUpload,
-      beforeUpload1,
-      onRangeChange,
-      classifyList1,
-      classifyList2,
-      classifyList3,
-      classifyList4,
-      classifyList5,
-      remark,
-      changeChecked,
-      changeChecked1,
-      uplodaFileCount,
+      timeChange,
+      projectPic,
       createProject,
-      removeFile,
-
       isEdit,
       backPage,
-      dateFormatList,
-
-      templateScroll,
-      memberScroll,
     };
   },
 };
 </script>
 <style lang="scss">
+.active {
+  border: 2px solid rgba(78, 166, 255, 1);
+}
+
 .sonproject {
   width: 100%;
   // height: inherit;
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 7cd08f12..526840ef 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -210,7 +210,6 @@ import {ref, onMounted, watch} from "vue";
 import {message} from "ant-design-vue";
 import {useRouter, useRoute} from "vue-router";
 import * as api from "../../api/indexTemplate";
-import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";

From 37cb81763a3aa1257c8c05881e114021899060f1 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 17:24:00 +0800
Subject: [PATCH 20/35] =?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 +-
 src/api/config.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2354d8c4..b85229f3 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("版本0.9.13------------");
+    console.log("版本0.9.14------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
diff --git a/src/api/config.js b/src/api/config.js
index ec213068..705f7897 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 09:04:31
+ * @LastEditTime: 2022-12-14 17:22:48
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -56,7 +56,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        // window.open("https://u-pre.boe.com/web/", '_self');
+        window.open("https://u-pre.boe.com/web/", '_self');
         // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);

From 6dda7355a6f75c1cb3b8cf63973eb7f412c7c506 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 17:37:25 +0800
Subject: [PATCH 21/35] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js | 2 +-
 src/api/method.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index 705f7897..80cc989e 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 17:22:48
+ * @LastEditTime: 2022-12-14 17:35:43
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
diff --git a/src/api/method.js b/src/api/method.js
index a10dafa0..771df5d4 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -193,7 +193,7 @@ const setCookie = (name, value, perpetual) => {
 
 //先写一个方法
 function getCookie(name) {
-    return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`,'') || ''
+    return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`, '') || ''
     //1.获取cookie字符串
     // const cookies = document.cookie;
     // console.log('cookies',cookies)
@@ -219,7 +219,7 @@ function getCookie(name) {
 //滚动加载信息
 const scrollLoad = (e) => {
     // console.log("滚动", e, b);
-    const {target} = e;
+    const { target } = e;
     const scrllHeight = target.scrollHeight - target.scrollTop;
     const clientHeight = target.clientHeight;
     // console.log("scrllHeight", scrllHeight, clientHeight);

From 652282773f5f73392f7a3dd197e0f9825f92b2da Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 17:52:13 +0800
Subject: [PATCH 22/35] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js         | 2 +-
 src/api/method.js         | 4 ++++
 src/components/NavTop.vue | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index 80cc989e..df04b6ff 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 17:35:43
+ * @LastEditTime: 2022-12-14 17:51:50
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
diff --git a/src/api/method.js b/src/api/method.js
index 771df5d4..c3ed4f2a 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -277,6 +277,9 @@ const organizationalTree = []
 
 //嵌套页面
 const iframeUrl = "https://u-pre.boe.com/pc/iframe"
+//学员端路由
+const studentUrl = 'https://u.boe.com/pc/uc/study/courses'
+
 //二维码
 const codeUrl = "https://u-pre.boe.com"
 export {
@@ -292,5 +295,6 @@ export {
     commonData,
     organizationalTree,
     iframeUrl,
+    studentUrl,
     codeUrl,
 }
\ No newline at end of file
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 797a6847..b69ba583 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -61,7 +61,7 @@
 import { reactive, toRefs } from "vue";
 import DownLoad from "../components/drawers/DownLoad";
 import * as api from "../api/index1";
-
+import { studentUrl } from "../api/method";
 export default {
   name: "NavTop",
   components: {
@@ -81,7 +81,7 @@ export default {
         {
           id: 2,
           name: "学员",
-          go: "https://u.boe.com/pc/uc/study/courses",
+          go: studentUrl,
         },
       ],
 

From 42340e38d0463b376cdf5ad2a5084a5d160577ba Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:36:37 +0800
Subject: [PATCH 23/35] -- bug

---
 .env                                | 10 ++++++++++
 .env.boe                            |  8 ++++++++
 .env.prod                           |  8 ++++++++
 .env.release                        |  8 ++++++++
 .env.test                           |  9 +++++++++
 src/api/config.js                   |  2 +-
 src/components/project/OrgClass.vue |  8 ++------
 src/router/index.js                 |  2 +-
 vue.config.js                       | 31 +++++++++++++++--------------
 9 files changed, 63 insertions(+), 23 deletions(-)
 create mode 100644 .env
 create mode 100644 .env.boe
 create mode 100644 .env.prod
 create mode 100644 .env.release
 create mode 100644 .env.test

diff --git a/.env b/.env
new file mode 100644
index 00000000..78d58245
--- /dev/null
+++ b/.env
@@ -0,0 +1,10 @@
+VITE_BASE=/manage
+VITE_BASE_API=/
+VITE_PROXY_URL=http://111.231.196.214:30001/
+
+
+VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/.env.boe b/.env.boe
new file mode 100644
index 00000000..20656803
--- /dev/null
+++ b/.env.boe
@@ -0,0 +1,8 @@
+VITE_BASE=/fe-student
+VITE_BASE_API=/manageApi
+
+VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
new file mode 100644
index 00000000..6671831e
--- /dev/null
+++ b/.env.prod
@@ -0,0 +1,8 @@
+VITE_BASE=/fe-student-release
+VITE_BASE_API=/manageApi-release
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u.boe.com
\ No newline at end of file
diff --git a/.env.release b/.env.release
new file mode 100644
index 00000000..6671831e
--- /dev/null
+++ b/.env.release
@@ -0,0 +1,8 @@
+VITE_BASE=/fe-student-release
+VITE_BASE_API=/manageApi-release
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u.boe.com
\ No newline at end of file
diff --git a/.env.test b/.env.test
new file mode 100644
index 00000000..6f9f2122
--- /dev/null
+++ b/.env.test
@@ -0,0 +1,9 @@
+VITE_BASE=/fe-student
+VITE_BASE_API=/manageApi
+
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/src/api/config.js b/src/api/config.js
index ec213068..a8df7617 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -16,7 +16,7 @@ import axios from "axios";
 
 axios.defaults.withCredentials = true;
 const http = axios.create({
-  baseURL: "/manageApi",
+  baseURL: process.env.VITE_BASE_API,
   timeout: 1000 * 15,
   // headers: { "Content-Type": "multipart/form-data" },
   headers: { "Content-Type": "application/json" },
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 72c82170..916f7cc2 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -23,7 +23,7 @@
   </a-tree-select>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import {computed, defineEmits, defineProps} from "vue";
 import {useStore} from "vuex";
 
 const store = useStore();
@@ -33,16 +33,12 @@ const props = defineProps({
 })
 const emit = defineEmits({})
 
-const options = ref([])
+const options = computed(() => store.state.orgtreeList)
 
 const id = computed(() => {
   return props.value
 })
 
-onMounted(() => {
-  options.value = [...store.state.orgtreeList]
-})
-
 function change(key, obj) {
   emit('update:name', obj[0])
   emit('update:value', key)
diff --git a/src/router/index.js b/src/router/index.js
index 75da5b5a..18acace6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -17,7 +17,7 @@ const routes = [
 	...routesConfig
 ]
 const router = createRouter({
-	history: createWebHistory("/manage/"),
+	history: createWebHistory(process.env.VITE_BASE),
 	routes,
 
 })
diff --git a/vue.config.js b/vue.config.js
index 341e4b39..f030ea5f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,22 +6,23 @@
  * @FilePath: /fe-manage/vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-const { defineConfig } = require("@vue/cli-service");
+const {defineConfig} = require("@vue/cli-service");
+
 module.exports = defineConfig({
-  publicPath: "/manage",
-  // transpileDependencies: true,
-  devServer: {
-    port: 8080,
-    proxy: {
-      "/manageApi": {
-         target:"http://111.231.196.214:30001/",
-          changeOrigin: true, //表示是否改变原域名
-        // secure: false,
-        // ws: false, //表示WebSocket协议
-        pathRewrite: {
-          "^/manageApi": "",
+    publicPath: process.env.VITE_BASE,
+    // transpileDependencies: true,
+    devServer: {
+        port: 8080,
+        proxy: {
+            "/manageApi": {
+                target: process.env.VITE_PROXY_URL,
+                changeOrigin: true, //表示是否改变原域名
+                // secure: false,
+                // ws: false, //表示WebSocket协议
+                pathRewrite: {
+                    "^/manageApi": "",
+                },
+            },
         },
-      },
     },
-  },
 });

From fffc5c66b29cf4fce18041a26c4c0df03500a90b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:50:46 +0800
Subject: [PATCH 24/35] -- bug

---
 .env              |  1 +
 .env.boe          |  1 +
 .env.release      |  2 +
 src/api/config.js | 96 +++++++++++++++++++++++------------------------
 vue.config.js     |  2 +-
 5 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/.env b/.env
index 78d58245..06a891d8 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,7 @@
 VITE_BASE=/manage
 VITE_BASE_API=/
 VITE_PROXY_URL=http://111.231.196.214:30001/
+VITE_LOGIN_URL=https://u-pre.boe.com/web
 
 
 VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
diff --git a/.env.boe b/.env.boe
index 20656803..407c5463 100644
--- a/.env.boe
+++ b/.env.boe
@@ -1,6 +1,7 @@
 VITE_BASE=/fe-student
 VITE_BASE_API=/manageApi
 
+
 VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
diff --git a/.env.release b/.env.release
index 6671831e..05c6e5c4 100644
--- a/.env.release
+++ b/.env.release
@@ -1,5 +1,7 @@
 VITE_BASE=/fe-student-release
 VITE_BASE_API=/manageApi-release
+VITE_LOGIN_URL=https://u.boe.com/web
+
 
 VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
diff --git a/src/api/config.js b/src/api/config.js
index ec1bb837..e40b19da 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -6,8 +6,9 @@
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
 import axios from "axios";
+import router from "@/router";
 // import { getCookie } from '../api/method'
 // const Qs = require("qs");
 
@@ -16,61 +17,60 @@ import axios from "axios";
 
 axios.defaults.withCredentials = true;
 const http = axios.create({
-  baseURL: process.env.VITE_BASE_API,
-  timeout: 1000 * 15,
-  // headers: { "Content-Type": "multipart/form-data" },
-  headers: { "Content-Type": "application/json" },
+    baseURL: process.env.VITE_BASE_API,
+    timeout: 1000 * 15,
+    // headers: { "Content-Type": "multipart/form-data" },
+    headers: {"Content-Type": "application/json"},
 });
 
 http.interceptors.request.use(
-  (config) => {
-    // console.log("config", config);
-    // const token = localStorage.getItem("token");
-    // // const token = getCookie('token')
-    // // console.log('token', token)
-    // if (token) {
-    //   config.headers.token = token; //测试1111
-    // } else {
-    // console.log("当前请求页面无token,请执行操作！！！");
+    (config) => {
+        // console.log("config", config);
+        // const token = localStorage.getItem("token");
+        // // const token = getCookie('token')
+        // // console.log('token', token)
+        // if (token) {
+        //   config.headers.token = token; //测试1111
+        // } else {
+        // console.log("当前请求页面无token,请执行操作！！！");
 
-    // // 此处测试默认配置token
-    // config.headers.token =
-    //   "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7";
-    // // }
-    return config;
-  },
-  (err) => {
-    console.log("登陆前拦截", err);
-    return Promise.reject(err);
-  }
+        // // 此处测试默认配置token
+        // config.headers.token =
+        //   "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7";
+        // // }
+        return config;
+    },
+    (err) => {
+        console.log("登陆前拦截", err);
+        return Promise.reject(err);
+    }
 );
 
 http.interceptors.response.use(
-  (response) => {
-    // console.log('response', response)
-    const {
-      data: { code, msg },
-    } = response;
-    // console.log('code', code)
-    if (code === 0 || code === 200) {
-      return response;
-    } else {
-      if (code === 1000) {
-        window.open("https://u-pre.boe.com/web/", '_self');
-        // window.open("http://111.231.196.214:12013/manage/login", '_self');
-      }
-      console.log("api %o", msg);
+    (response) => {
+        // console.log('response', response)
+        const {
+            data: {code, msg},
+        } = response;
+        // console.log('code', code)
+        if (code === 0 || code === 200) {
+            return response;
+        } else {
+            if (code === 1000) {
+                process.env.NODE_ENV === 'development' ? router.push({path: 'login'}) : (window.location.href = process.env.VITE_LOGIN_URL)
+            }
+            console.log("api %o", msg);
+        }
+        return response;
+    },
+    function (error) {
+        if (error.message == "timeout of 1ms exceeded") {
+            message.destroy();
+            message.error("请求超时");
+        }
+        console.log("api error %o", error);
+        return Promise.reject(error);
     }
-    return response;
-  },
-  function (error) {
-    if (error.message == "timeout of 1ms exceeded") {
-      message.destroy();
-      message.error("请求超时");
-    }
-    console.log("api error %o", error);
-    return Promise.reject(error);
-  }
 );
 
 export default http;
diff --git a/vue.config.js b/vue.config.js
index f030ea5f..55ec18eb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,7 +9,7 @@
 const {defineConfig} = require("@vue/cli-service");
 
 module.exports = defineConfig({
-    publicPath: process.env.VITE_BASE,
+    publicPath: "/manage",
     // transpileDependencies: true,
     devServer: {
         port: 8080,

From 29461f594eaa6d753b24bc4bf44ed74e11e8f17a Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:53:07 +0800
Subject: [PATCH 25/35] -- bug

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

diff --git a/package.json b/package.json
index 935c5f5b..026679be 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"version": "0.1.0",
 	"private": true,
 	"scripts": {
-		"serve": "vue-cli-service serve",
+		"serve": "vue-cli-service serve --mode boe",
 		"build": "vue-cli-service build",
 		"lint": "vue-cli-service lint"
 	},

From f484534754979d5baf16af820ec5a7b4ba91d6ff Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:54:00 +0800
Subject: [PATCH 26/35] -- bug

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

diff --git a/.env.boe b/.env.boe
index 407c5463..ef2ad7d6 100644
--- a/.env.boe
+++ b/.env.boe
@@ -1,4 +1,4 @@
-VITE_BASE=/fe-student
+VITE_BASE=/manage
 VITE_BASE_API=/manageApi
 
 

From eece67eb229e53b2a57e0e94e27e830a9ceb71b1 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 20:55:34 +0800
Subject: [PATCH 27/35] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                         |   4 +-
 src/api/method.js                         |   2 +-
 src/components/drawers/AddProject.vue     |  90 ++++----
 src/views/projectcenter/ProjectAdd.vue    | 251 ++++++++++++----------
 src/views/projectcenter/ProjectManage.vue |   1 +
 5 files changed, 181 insertions(+), 167 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index df04b6ff..3353037a 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 17:51:50
+ * @LastEditTime: 2022-12-14 18:56:46
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -56,7 +56,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        window.open("https://u-pre.boe.com/web/", '_self');
+        // window.open("https://u-pre.boe.com/web/", '_self');
         // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);
diff --git a/src/api/method.js b/src/api/method.js
index c3ed4f2a..401b7d1d 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -278,7 +278,7 @@ const organizationalTree = []
 //嵌套页面
 const iframeUrl = "https://u-pre.boe.com/pc/iframe"
 //学员端路由
-const studentUrl = 'https://u.boe.com/pc/uc/study/courses'
+const studentUrl = 'https://u-pre.boe.com/pc/loading'
 
 //二维码
 const codeUrl = "https://u-pre.boe.com"
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 04f75503..98d6dbe1 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -54,7 +54,7 @@
               </div>
             </div>
           </div>
-          <div class="mi_btns" style="margin-left:0px;">
+          <div class="mi_btns" style="margin-left: 0px">
             <div class="btn btn1">
               <div class="search"></div>
               <div class="btnText" @click="searchProjectList()">搜索</div>
@@ -141,11 +141,11 @@
             </div>
           </div>
         </div>
-     
+
         <div class="main_table">
           <div class="drawerbox">
             <!-- 添加的时候显示多选的表 -->
-          
+
             <!-- 编辑的时候显示单选的表 -->
             <a-table
               :columns="tableDataFunc()"
@@ -166,7 +166,7 @@
           <div class="pa">
             <a-pagination
               v-if="tableDataTotal > 10"
-             :showSizeChanger="false"
+              :showSizeChanger="false"
               showQuickJumper="true"
               hideOnSinglePage="true"
               :pageSize="pageSize"
@@ -225,8 +225,9 @@
 import { reactive, toRefs } from "vue";
 import { RouterEditTask } from "@/api/indexTask";
 import { message } from "ant-design-vue";
-import * as apiProj from "../../api/index.js";
+// import * as apiProj from "../../api/index.js";
 import dayjs from "dayjs";
+import * as indexAudit from "../../api/indexAudit";
 
 export default {
   name: "AddProject",
@@ -309,28 +310,28 @@ export default {
           title: "项目名称",
           dataIndex: "name",
           key: "projectName",
-          width:"40%",
+          width: "40%",
           ellipsis: true,
         },
         {
           title: "项目经理",
           dataIndex: "manager",
           key: "manager",
-          width:"20%",
+          width: "20%",
           align: "center",
         },
         {
           title: "创建人",
           dataIndex: "creater",
           key: "creater",
-          width:"20%",
+          width: "20%",
           align: "center",
         },
         {
           title: "创建时间",
           dataIndex: "time",
           key: "time",
-          width:"20%",
+          width: "20%",
           align: "center",
         },
       ];
@@ -400,8 +401,8 @@ export default {
     // TODO 这里后续需要给接口或者改动
     // 获取所有，确定分页位置
     const getCurrentPage = () => {
-      apiProj
-        .getProjectList({
+      indexAudit
+        .auditlist({
           createName: state.inputV1,
           manager: state.inputV2,
           name: state.inputV3,
@@ -450,8 +451,8 @@ export default {
         status: 3,
       });
 
-      apiProj
-        .getProjectList({
+      indexAudit
+        .auditlist({
           createName: state.inputV3,
           manager: state.inputV2,
           name: state.inputV1,
@@ -551,7 +552,7 @@ export default {
 
     const updateTask = async (res) => {
       if (props.isLevel == 1) {
-        if(!props.isactive){
+        if (!props.isactive) {
           message.destroy();
           return message.warning("请先选中关卡");
         }
@@ -849,7 +850,7 @@ export default {
             }
           }
         }
-      
+
         .main_item2 {
           display: flex;
           align-items: flex-start;
@@ -930,36 +931,36 @@ export default {
       }
     }
     .main_table {
-        position: relative;
-        padding-bottom: 80px;
-        .ant-checkbox-wrapper {
-          align-items: center;
-          margin-top: -2px;
-        }
-        .ant-table-selection-column {
-          padding: 0px !important;
-          padding-left: 5px !important;
-        }
-        .ant-table-thead > tr > th {
-          background-color: rgba(239, 244, 252, 1);
-        }
-        th.h {
-          background-color: #eff4fc !important;
-        }
-        .ant-table-tbody
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
-          background: #f6f9fd;
-        }
-        .pa {
-          left: 0;
-          width: 100%;
-          display: flex;
-          justify-content: center;
-          position: absolute;
-          bottom: 20px;
-        }
+      position: relative;
+      padding-bottom: 80px;
+      .ant-checkbox-wrapper {
+        align-items: center;
+        margin-top: -2px;
       }
+      .ant-table-selection-column {
+        padding: 0px !important;
+        padding-left: 5px !important;
+      }
+      .ant-table-thead > tr > th {
+        background-color: rgba(239, 244, 252, 1);
+      }
+      th.h {
+        background-color: #eff4fc !important;
+      }
+      .ant-table-tbody
+        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+        > td {
+        background: #f6f9fd;
+      }
+      .pa {
+        left: 0;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        position: absolute;
+        bottom: 20px;
+      }
+    }
     .main_btns {
       height: 72px;
       width: 100%;
@@ -991,7 +992,6 @@ export default {
         color: #fff;
       }
     }
-    
   }
 }
 </style>
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index d34bef73..a27b84b0 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -3,13 +3,13 @@
   <div class="projectAdd">
     <div class="header">
       <span class="title"
-      >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
+        >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
       >
       <div
-          @click="backPage"
-          style="cursor: pointer"
-          to="/projectmanage"
-          class="goback"
+        @click="backPage"
+        style="cursor: pointer"
+        to="/projectmanage"
+        class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -19,8 +19,8 @@
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目归属</div>
           </div>
@@ -33,29 +33,36 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">项目名称</div>
+            <div class="inname">
+              {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
+            </div>
           </div>
           <div class="in">
-            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name"
-                       v-model:validate="projectInfo.validate" :maxlength="30" show-count
-                       :id="projectInfo.projectId"></NameInput>
+            <NameInput
+              placeholder="请输入项目名称"
+              v-model:value="projectInfo.name"
+              v-model:validate="projectInfo.validate"
+              :maxlength="30"
+              show-count
+              :id="projectInfo.projectId"
+            ></NameInput>
           </div>
         </div>
         <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
           <div class="in select" style="flex: 1; display: flex">
             <div
-                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-                style="
+              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+              style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -63,19 +70,19 @@
                 position: relative;
                 overflow: hidden;
               "
-                v-for="(src, index) in projectPic"
-                :key="index"
-                @click="() => (projectInfo.picUrl = src.value)"
+              v-for="(src, index) in projectPic"
+              :key="index"
+              @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                  style="
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                  :src="src.value"
-                  alt="avatar"
+                :src="src.value"
+                alt="avatar"
               />
             </div>
           </div>
@@ -83,63 +90,63 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-                show-time
-                separator="至"
-                :placeholder="['      开始时间', '        结束时间']"
-                v-model:value="projectInfo.rangeTime"
-                style="width: 100%; height: 40px; border-radius: 5px"
-                valueFormat="YYYY-MM-DD HH:mm:ss"
-                @change="timeChange"
-                :disabled="viewDetail ? true : false"
+              show-time
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="projectInfo.rangeTime"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              valueFormat="YYYY-MM-DD HH:mm:ss"
+              @change="timeChange"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-                v-model:value="projectInfo.managerId"
-                v-model:name="projectInfo.manager"
-                @onChange="managerChange"
-                mode="multiple"
+              v-model:value="projectInfo.managerId"
+              v-model:name="projectInfo.manager"
+              @onChange="managerChange"
+              mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-                v-model:value="projectInfo.sourceBelongId"
-                v-model:name="projectInfo.sourceBelongName"
+              v-model:value="projectInfo.sourceBelongId"
+              v-model:name="projectInfo.sourceBelongName"
             ></OrgClass>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -150,8 +157,8 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训分类</div>
           </div>
@@ -162,15 +169,15 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
             <a-radio-group
-                v-model:value="projectInfo.boeFlag"
-                :disabled="viewDetail ? true : false"
+              v-model:value="projectInfo.boeFlag"
+              :disabled="viewDetail ? true : false"
             >
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
@@ -183,16 +190,16 @@
           </div>
           <div class="in">
             <a-checkbox
-                v-model:checked="courseSyncFlag"
-                :disabled="viewDetail ? true : false"
-            ><span
+              v-model:checked="courseSyncFlag"
+              :disabled="viewDetail ? true : false"
+              ><span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
                 "
-            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-            ></a-checkbox
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-checkbox
             >
           </div>
         </div>
@@ -202,12 +209,12 @@
           </div>
           <div class="in">
             <a-textarea
-                v-model:value="projectInfo.remark"
-                style="height: 80px"
-                placeholder="请输入说明"
-                show-count
-                :maxlength="200"
-                :disabled="viewDetail ? true : false"
+              v-model:value="projectInfo.remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -217,7 +224,7 @@
             <div class="inname" style="margin-top: 13px">审核意见</div>
           </div>
           <div class="description">
-           {{auditDescription}}
+            {{ auditDescription }}
           </div>
         </div>
       </div>
@@ -226,18 +233,18 @@
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
             <a-select
-                :getPopupContainer="
+              :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-                placeholder="请选择模版"
-                :size="size"
-                style="width: 100%"
-                :options="classifyList5"
-                @change="classificationChange5"
-                @popupScroll="templateScroll"
-                :fieldNames="{
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+              @popupScroll="templateScroll"
+              :fieldNames="{
                 label: 'name',
                 value: 'projectTemplateId',
               }"
@@ -251,33 +258,32 @@
       <div class="btn">
         <a-button @click="backPage" class="btn2">取消</a-button>
         <a-button
-            v-on:click="createProject"
-            type="primary"
-            class="btn1"
-            style="margin-left: 20px"
-        >确定
-        </a-button
-        >
+          v-on:click="createProject"
+          type="primary"
+          class="btn1"
+          style="margin-left: 20px"
+          >确定
+        </a-button>
       </div>
     </div>
   </div>
 </template>
 <script>
-import {onMounted, reactive, toRefs, watch} from "vue";
-import {message} from "ant-design-vue";
-import {useRoute, useRouter} from "vue-router";
+import { onMounted, reactive, toRefs, watch } from "vue";
+import { message } from "ant-design-vue";
+import { useRoute, useRouter } from "vue-router";
 import * as api from "../../api/index";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 // import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
-import {changeOwnership, scrollLoad} from "@/api/method";
-import {storage} from "../../api/storage";
+import { changeOwnership, scrollLoad } from "@/api/method";
+import { storage } from "../../api/storage";
 import * as api2 from "../../api/indexAudit";
-import {validateName} from "@/api/index1";
+import { validateName } from "@/api/index1";
 
 export default {
   name: "projectAdd",
@@ -308,7 +314,7 @@ export default {
       },
       classifyList5: [],
       courseSyncFlag: false,
-      auditDescription:"",
+      auditDescription: "",
     });
 
     // 封面图选择
@@ -324,6 +330,8 @@ export default {
       state.viewDetail = routers.query.viewDetail;
       getProjectInfo();
       getTemplate();
+      state.ptojectType = routers.query.ptojectType;
+      // console.log("routers.query.ptojectType", routers.query.ptojectType);
     });
 
     watch(routers.query, () => {
@@ -337,10 +345,10 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       state.projectInfo.projectId = routers.query.projectId;
       (state.projectInfo.projectId || state.projectInfo.parentId) &&
-      api
+        api
           .getProjectDetail({
             projectId:
-                state.projectInfo.projectId || state.projectInfo.parentId,
+              state.projectInfo.projectId || state.projectInfo.parentId,
           })
           .then((res) => {
             state.projectInfo = {
@@ -353,23 +361,24 @@ export default {
             ];
             state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
             if (Number(state.projectInfo.status) === -5) {
-            let obj = {
-              project_id: state.projectInfo.projectId,
-              type: 1,
-              pageNo: 1,
-              pageSize: 1,
-            };
-            api2.auditList(obj).then((d) => {
-              if (d.data.code === 200) {
-                let res =d.data.data;
-                if (res.rows && res.rows.length > 0) {
-                  let i = res.rows.length;
-                  state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
+              let obj = {
+                project_id: state.projectInfo.projectId,
+                type: 1,
+                pageNo: 1,
+                pageSize: 1,
+              };
+              api2.auditList(obj).then((d) => {
+                if (d.data.code === 200) {
+                  let res = d.data.data;
+                  if (res.rows && res.rows.length > 0) {
+                    let i = res.rows.length;
+                    state.auditDescription = res.rows[i - 1].description
+                      ? res.rows[i - 1].description
+                      : "-";
+                  }
                 }
-              }
-            });
-        
-             }
+              });
+            }
           });
     }
 
@@ -446,7 +455,7 @@ export default {
       return true;
     }
 
-    const createProject = async() => {
+    const createProject = async () => {
       console.log("保存", state.projectInfo);
       if (!validate(state.projectInfo, errorMsgs)) {
         return;
@@ -457,26 +466,30 @@ export default {
         message.warning('项目名称重复，请修改名称！');
         return;
       }*/
-        const offName = await validateName({name:state.projectInfo.name, type:1, id:state.projectInfo.projectId}).then(res => {
-          return res.data.data == 1;
-         });
-         if(offName){
-            message.destroy();
-            return message.warning("项目名称重复，请重新填写");
-         }
+      const offName = await validateName({
+        name: state.projectInfo.name,
+        type: 1,
+        id: state.projectInfo.projectId,
+      }).then((res) => {
+        return res.data.data == 1;
+      });
+      if (offName) {
+        message.destroy();
+        return message.warning("项目名称重复，请重新填写");
+      }
       state.projectInfo.type = 3;
       state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
       api.createProject(state.projectInfo).then((res) => {
         state.projectInfo.projectId ||
-        changeOwnership("project", res.data.data.projectId, [
-          {id: res.data.data.createId, name: res.data.data.createName},
-        ]);
+          changeOwnership("project", res.data.data.projectId, [
+            { id: res.data.data.createId, name: res.data.data.createName },
+          ]);
         message.destroy();
         message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
         // router.back();
         router.push({
           path: "/taskpage",
-          query: {projectId: res.data.data.projectId},
+          query: { projectId: res.data.data.projectId },
         });
         storage.set("projectId", res.data.data.projectId);
       });
@@ -484,9 +497,9 @@ export default {
 
     function managerChange(e, l, d, t) {
       !state.projectInfo.sourceBelongId &&
-      (state.projectInfo.sourceBelongId = d);
+        (state.projectInfo.sourceBelongId = d);
       !state.projectInfo.sourceBelongName &&
-      (state.projectInfo.sourceBelongName = t);
+        (state.projectInfo.sourceBelongName = t);
     }
 
     return {
@@ -701,7 +714,7 @@ export default {
       .name2 {
         display: flex;
         align-items: flex-start;
-        .description{
+        .description {
           margin-top: 14px;
           margin-left: 11px;
         }
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 1a45eade..0a549a0a 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1595,6 +1595,7 @@ export default {
                         parentId: value.record.projectId,
                         parentName:
                           value.record.parentName + "——" + value.record.name,
+                        ptojectType: 3,
                       },
                     });
                   }}

From 5c6abd7b8b593ffb64cc1446bb62fd39e451468b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:56:48 +0800
Subject: [PATCH 28/35] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 135 ++++++++++++++++++++++++++-------------------------
 1 file changed, 69 insertions(+), 66 deletions(-)

diff --git a/package.json b/package.json
index 026679be..85cb3cf5 100644
--- a/package.json
+++ b/package.json
@@ -1,68 +1,71 @@
 {
-	"name": "fe_manage",
-	"version": "0.1.0",
-	"private": true,
-	"scripts": {
-		"serve": "vue-cli-service serve --mode boe",
-		"build": "vue-cli-service build",
-		"lint": "vue-cli-service lint"
-	},
-	"dependencies": {
-		"@wangeditor/editor": "^5.1.23",
-		"@wangeditor/editor-for-vue": "^5.1.12",
-		"ant-design-vue": "^3.2.12",
-		"axios": "^1.1.3",
-		"core-js": "^3.8.3",
-		"dayjs": "^1.11.6",
-		"element-plus": "^2.2.17",
-		"element-resize-detector": "^1.2.4",
-		"html2canvas": "^1.4.1",
-		"jquery": "^3.6.1",
-		"mitt": "^3.0.0",
-		"moment": "^2.29.4",
-		"qrcode.vue": "^3.3.3",
-		"qs": "^6.11.0",
-		"sortablejs": "^1.15.0",
-		"vue": "^3.2.13",
-		"vue-router": "^4.0.3",
-		"vuedraggable": "^4.1.0",
-		"vuex": "^4.0.0"
-	},
-	"devDependencies": {
-		"@babel/core": "^7.12.16",
-		"@babel/eslint-parser": "^7.12.16",
-		"@vue/cli-plugin-babel": "~5.0.0",
-		"@vue/cli-plugin-eslint": "~5.0.0",
-		"@vue/cli-plugin-router": "~5.0.0",
-		"@vue/cli-plugin-vuex": "~5.0.0",
-		"@vue/cli-service": "~5.0.0",
-		"eslint": "^7.32.0",
-		"eslint-plugin-vue": "^8.0.3",
-		"sass": "^1.32.7",
-		"sass-loader": "^12.0.0"
-	},
-	"eslintConfig": {
-		"root": true,
-		"env": {
-			"node": true
-		},
-		"extends": [
-			"plugin:vue/vue3-essential",
-			"eslint:recommended"
-		],
-		"parserOptions": {
-			"parser": "@babel/eslint-parser"
-		},
-		"rules": {
-			"no-console": "off",
-			"no-debugger": "off",
-			"no-mixed-spaces-and-tabs": "off"
-		}
-	},
-	"browserslist": [
-		"> 1%",
-		"last 2 versions",
-		"not dead",
-		"not ie 11"
-	]
+  "name": "fe_manage",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build --mode boe",
+    "boe": "vue-cli-service build --mode boe",
+    "release": "vue-cli-service build --mode release",
+    "prod": "vue-cli-service build --mode prod",
+    "test": "vue-cli-service build --mode test"
+  },
+  "dependencies": {
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
+    "ant-design-vue": "^3.2.12",
+    "axios": "^1.1.3",
+    "core-js": "^3.8.3",
+    "dayjs": "^1.11.6",
+    "element-plus": "^2.2.17",
+    "element-resize-detector": "^1.2.4",
+    "html2canvas": "^1.4.1",
+    "jquery": "^3.6.1",
+    "mitt": "^3.0.0",
+    "moment": "^2.29.4",
+    "qrcode.vue": "^3.3.3",
+    "qs": "^6.11.0",
+    "sortablejs": "^1.15.0",
+    "vue": "^3.2.13",
+    "vue-router": "^4.0.3",
+    "vuedraggable": "^4.1.0",
+    "vuex": "^4.0.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.16",
+    "@babel/eslint-parser": "^7.12.16",
+    "@vue/cli-plugin-babel": "~5.0.0",
+    "@vue/cli-plugin-eslint": "~5.0.0",
+    "@vue/cli-plugin-router": "~5.0.0",
+    "@vue/cli-plugin-vuex": "~5.0.0",
+    "@vue/cli-service": "~5.0.0",
+    "eslint": "^7.32.0",
+    "eslint-plugin-vue": "^8.0.3",
+    "sass": "^1.32.7",
+    "sass-loader": "^12.0.0"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/vue3-essential",
+      "eslint:recommended"
+    ],
+    "parserOptions": {
+      "parser": "@babel/eslint-parser"
+    },
+    "rules": {
+      "no-console": "off",
+      "no-debugger": "off",
+      "no-mixed-spaces-and-tabs": "off"
+    }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
 }

From d8c63030f8db90bc57e39b6803f5cef734df7433 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:57:25 +0800
Subject: [PATCH 29/35] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 85cb3cf5..be5848db 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,10 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build --mode boe",
-    "boe": "vue-cli-service build --mode boe",
-    "release": "vue-cli-service build --mode release",
-    "prod": "vue-cli-service build --mode prod",
-    "test": "vue-cli-service build --mode test"
+    "build:boe": "vue-cli-service build --mode boe",
+    "build:release": "vue-cli-service build --mode release",
+    "build:prod": "vue-cli-service build --mode prod",
+    "build:test": "vue-cli-service build --mode test"
   },
   "dependencies": {
     "@wangeditor/editor": "^5.1.23",

From 635cf2040ff6f6d7bb157054254d407bc7947a24 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:57:40 +0800
Subject: [PATCH 30/35] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/package.json b/package.json
index be5848db..f694a453 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build --mode boe",
+    "build": "vue-cli-service build",
     "build:boe": "vue-cli-service build --mode boe",
     "build:release": "vue-cli-service build --mode release",
     "build:prod": "vue-cli-service build --mode prod",

From 2264a83499eef6bb9712c7c761606180fddc97ca Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 21:00:49 +0800
Subject: [PATCH 31/35] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 56 +++++++++++---------
 src/views/learningpath/LevelAdd.vue          | 16 +++---
 src/views/learningpath/LevelAddDetail.vue    | 16 +++---
 src/views/projectcenter/ProjectManage.vue    | 16 +++---
 src/views/projectcenter/TaskPage.vue         | 29 +++++-----
 5 files changed, 72 insertions(+), 61 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 5692e525..7fe0a2fb 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -75,7 +75,7 @@
               <a-range-picker
                 v-model:value="projectTime"
                 style="width: 420px"
-                valueFormat="X"
+                format="YYYY-MM-DD"
                 separator="至"
                 :placeholder="['      开始时间', '        结束时间']"
               />
@@ -2958,26 +2958,26 @@ const columns1 = [
       return text ? text : "-";
     },
   },
-  {
-    title: "学习人数",
-    width: 130,
-    dataIndex: "stunum",
-    key: "4",
-    align: "center",
-    customRender: ({ text }) => {
-      return text ? text : "0";
-    },
-  },
-  {
-    title: "评分",
-    width: 130,
-    dataIndex: "grade",
-    key: "5",
-    align: "center",
-    customRender: ({ text }) => {
-      return text ? text : "0";
-    },
-  },
+ // {
+ //   title: "学习人数",
+   // width: 130,
+  //  dataIndex: "stunum",
+  //  key: "4",
+ //   align: "center",
+  //  customRender: ({ text }) => {
+  // //   return text ? text : "0";
+  //  },
+ // },
+ // {
+  //  title: "评分",
+  //  width: 130,
+  //  dataIndex: "grade",
+ //   key: "5",
+  //  align: "center",
+   // customRender: ({ text }) => {
+   //   return text ? text : "0";
+  //  },
+ // },
   {
     title: "状态",
     width: 130,
@@ -3632,7 +3632,7 @@ export default defineComponent({
 
       imageUrl: "",
       imgList: [],
-      validate: false,
+      validate:true,
 
       pageSize2: 10,
       currentPage2: 0,
@@ -3984,8 +3984,16 @@ export default defineComponent({
       let startTime = "";
       let endTime = "";
       if (state.projectTime) {
-        startTime = state.projectTime[0];
-        endTime = state.projectTime[1];
+       
+        startTime = toDate(
+          new Date(state.projectTime[0].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+        endTime = toDate(
+          new Date(state.projectTime[1].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+       
       }
       let res = await list({
         pageNo: state.currentPage1,
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 644ef532..f5ee9805 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1499,14 +1499,14 @@ export default {
           align: "center",
           className: "h",
         },
-       //   {
-        //    title: "进度",
-        //    dataIndex: "jin",
-         //   key: "jin",
-         //   width: 110,
-         //   align: "center",
-         //   className: "h",
-        //  },
+          {
+            title: "进度",
+           dataIndex: "jin",
+           key: "jin",
+            width: 110,
+           align: "center",
+           className: "h",
+          },
         {
           title: "开始时间",
           dataIndex: "time",
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 91f232bd..5092963e 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1547,14 +1547,14 @@ export default {
           align: "center",
           className: "h",
         },
-        //  {
-         //   title: "进度",
-         //   dataIndex: "jin",
-         //   key: "jin",
-          //  width: 110,
-         //   align: "center",
-          //  className: "h",
-       //   },
+          {
+            title: "进度",
+            dataIndex: "jin",
+            key: "jin",
+            width: 110,
+            align: "center",
+            className: "h",
+          },
         {
           title: "开始时间",
           dataIndex: "time",
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 1a45eade..71da6cc4 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -47,12 +47,7 @@
           <div class="addTime">创建时间：</div>
           <a-range-picker
             v-model:value="searchParam.valueDate"
-            :show-time="{
-              defaultValue: [
-                moment('00:00:00', 'HH:mm:ss'),
-                moment('23:59:59', 'HH:mm:ss'),
-              ],
-            }"
+            format="YYYY-MM-DD"
             style="border-radius: 8px; height: 40px; margin-left: 5px"
             :placeholder="['      开始时间', '        结束时间']"
             valueFormat="X"
@@ -832,6 +827,7 @@ import * as moment from "moment";
 import { changeOwnership } from "@/api/method";
 import NameInput from "@/components/project/NameInput";
 import { validateName } from "@/api/index1";
+import { toDate } from "../../api/method";
 
 export default {
   name: "projectManage",
@@ -1700,12 +1696,16 @@ export default {
           beginTime:
             state.searchParam.valueDate &&
             state.searchParam.valueDate.length === 2
-              ? state.searchParam.valueDate[0]
+              ? toDate(
+          new Date(state.searchParam.valueDate[0].$d).getTime() / 1000,
+          "Y-M-D")
               : "",
           endTime:
             state.searchParam.valueDate &&
             state.searchParam.valueDate.length === 2
-              ? state.searchParam.valueDate[1]
+              ? toDate(
+          new Date(state.searchParam.valueDate[1].$d).getTime() / 1000,
+          "Y-M-D")
               : "",
         })
         .then((res) => {
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index bafc50b7..dc01134e 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3108,7 +3108,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          // width: 30,
+           width:"20%",
           align: "left",
           className: "h",
           // scopedSlots: { customRender: "action" }, //引入的插槽
@@ -3145,9 +3145,10 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          // width: 50,
+          width:"10%",
           align: "center",
           className: "h",
+          ellipsis: true,
         },
         //  {
          //   title: "岗位",
@@ -3165,14 +3166,15 @@ export default {
           //  align: "center",
           //  className: "h",
          // },
-       //   {
-         //   title: "进度",
-         //   dataIndex: "progress",
-         //   key: "progress",
-          // width: 30,
-         //   align: "center",
-         //   className: "h",
-        //  },
+         {
+            title: "进度",
+            dataIndex: "progress",
+            key: "progress",
+            width:"10%",
+            align: "center",
+            className: "h",
+            ellipsis: true,
+          },
         //  {
          //   title: "证书",
           //  dataIndex: "diploma",
@@ -3185,7 +3187,7 @@ export default {
           title: "最近学习时间",
           dataIndex: "stutime",
           key: "stutime",
-          // width: 50,
+          width:"20%",
           align: "center",
           className: "h",
           // sorter: {
@@ -3197,15 +3199,16 @@ export default {
           title: "加入方式",
           dataIndex: "putin",
           key: "putin",
-          // width: 40,
+          width:"10%",
           align: "center",
           className: "h",
+          ellipsis: true,
         },
         {
           title: "操作",
           dataIndex: "operation",
           key: "operation",
-          // width: 60,
+          width:"20%",
           align: "center",
           className: "h",
           scopedSlots: { customRender: "action" }, //引入的插槽

From dbe1a9b0cd000b8a25c095342046742ad5bf4546 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 21:08:37 +0800
Subject: [PATCH 32/35] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index 06a891d8..1cc53141 100644
--- a/.env
+++ b/.env
@@ -4,8 +4,5 @@ VITE_PROXY_URL=http://111.231.196.214:30001/
 VITE_LOGIN_URL=https://u-pre.boe.com/web
 
 
-VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
-VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
-VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
-
-VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
+VITE_IFRAME_URL=https://u.boe.com/pc-release/iframe
+VITE_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading

From a542608dfecde337490c765e95b7b45a36a57c4a Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 21:11:15 +0800
Subject: [PATCH 33/35] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env              | 4 ++--
 .env.boe          | 5 -----
 .env.prod         | 5 -----
 .env.release      | 7 ++-----
 .env.test         | 5 -----
 src/api/method.js | 4 ++--
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/.env b/.env
index 1cc53141..36b945cf 100644
--- a/.env
+++ b/.env
@@ -4,5 +4,5 @@ VITE_PROXY_URL=http://111.231.196.214:30001/
 VITE_LOGIN_URL=https://u-pre.boe.com/web
 
 
-VITE_IFRAME_URL=https://u.boe.com/pc-release/iframe
-VITE_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading
+VITE_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
+VITE_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading
diff --git a/.env.boe b/.env.boe
index ef2ad7d6..bb43a342 100644
--- a/.env.boe
+++ b/.env.boe
@@ -2,8 +2,3 @@ VITE_BASE=/manage
 VITE_BASE_API=/manageApi
 
 
-VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
-VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
-VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
-
-VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
index 6671831e..9408d62f 100644
--- a/.env.prod
+++ b/.env.prod
@@ -1,8 +1,3 @@
 VITE_BASE=/fe-student-release
 VITE_BASE_API=/manageApi-release
 
-VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
-VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
-VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
-
-VITE_BOE_API_URL=https://u.boe.com
\ No newline at end of file
diff --git a/.env.release b/.env.release
index 05c6e5c4..232a2d91 100644
--- a/.env.release
+++ b/.env.release
@@ -3,8 +3,5 @@ VITE_BASE_API=/manageApi-release
 VITE_LOGIN_URL=https://u.boe.com/web
 
 
-VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
-VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
-VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
-
-VITE_BOE_API_URL=https://u.boe.com
\ No newline at end of file
+VITE_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
+VITE_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading
\ No newline at end of file
diff --git a/.env.test b/.env.test
index 6f9f2122..f0cece9d 100644
--- a/.env.test
+++ b/.env.test
@@ -2,8 +2,3 @@ VITE_BASE=/fe-student
 VITE_BASE_API=/manageApi
 
 
-VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
-VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
-VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
-
-VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/src/api/method.js b/src/api/method.js
index 401b7d1d..f0731ba7 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -276,9 +276,9 @@ const commonData = {
 const organizationalTree = []
 
 //嵌套页面
-const iframeUrl = "https://u-pre.boe.com/pc/iframe"
+const iframeUrl = process.env.VITE_IFRAME_URL
 //学员端路由
-const studentUrl = 'https://u-pre.boe.com/pc/loading'
+const studentUrl = process.env.VITE_IFRAME_STUDENT_URL
 
 //二维码
 const codeUrl = "https://u-pre.boe.com"

From 62253c8be90391e32620fbb61bb67cfe5f4a0abd Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 21:12:15 +0800
Subject: [PATCH 34/35] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.env.prod b/.env.prod
index 9408d62f..e299d053 100644
--- a/.env.prod
+++ b/.env.prod
@@ -1,3 +1,2 @@
-VITE_BASE=/fe-student-release
-VITE_BASE_API=/manageApi-release
-
+VITE_BASE=/manage
+VITE_BASE_API=/manageApi
\ No newline at end of file
diff --git a/.env.release b/.env.release
index 232a2d91..baa9e606 100644
--- a/.env.release
+++ b/.env.release
@@ -1,4 +1,4 @@
-VITE_BASE=/fe-student-release
+VITE_BASE=/manage-release
 VITE_BASE_API=/manageApi-release
 VITE_LOGIN_URL=https://u.boe.com/web
 
diff --git a/.env.test b/.env.test
index f0cece9d..bb43a342 100644
--- a/.env.test
+++ b/.env.test
@@ -1,4 +1,4 @@
-VITE_BASE=/fe-student
+VITE_BASE=/manage
 VITE_BASE_API=/manageApi
 
 

From 12c3a1ce72b236458afced80ea6f70421bdb70c8 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 21:21:58 +0800
Subject: [PATCH 35/35] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                | 12 ++++++------
 .env.boe            |  4 ++--
 .env.prod           |  4 ++--
 .env.release        | 10 +++++-----
 .env.test           |  4 ++--
 src/api/config.js   |  4 ++--
 src/api/method.js   |  4 ++--
 src/router/index.js |  2 +-
 vue.config.js       |  2 +-
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.env b/.env
index 36b945cf..75716181 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,8 @@
-VITE_BASE=/manage
-VITE_BASE_API=/
-VITE_PROXY_URL=http://111.231.196.214:30001/
-VITE_LOGIN_URL=https://u-pre.boe.com/web
+VUE_APP_BASE=/manage
+VUE_APP_BASE_API=/manageApi
+VUE_APP_PROXY_URL=http://111.231.196.214:30001/
+VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
 
 
-VITE_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
-VITE_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading
+VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
+VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading
diff --git a/.env.boe b/.env.boe
index bb43a342..6991e05f 100644
--- a/.env.boe
+++ b/.env.boe
@@ -1,4 +1,4 @@
-VITE_BASE=/manage
-VITE_BASE_API=/manageApi
+VUE_APP_BASE=/manage
+VUE_APP_BASE_API=/manageApi
 
 
diff --git a/.env.prod b/.env.prod
index e299d053..2e9213ab 100644
--- a/.env.prod
+++ b/.env.prod
@@ -1,2 +1,2 @@
-VITE_BASE=/manage
-VITE_BASE_API=/manageApi
\ No newline at end of file
+VUE_APP_BASE=/manage
+VUE_APP_BASE_API=/manageApi
\ No newline at end of file
diff --git a/.env.release b/.env.release
index baa9e606..4cd4f868 100644
--- a/.env.release
+++ b/.env.release
@@ -1,7 +1,7 @@
-VITE_BASE=/manage-release
-VITE_BASE_API=/manageApi-release
-VITE_LOGIN_URL=https://u.boe.com/web
+VUE_APP_BASE=/manage-release
+VUE_APP_BASE_API=/manageApi-release
+VUE_APP_LOGIN_URL=https://u.boe.com/web
 
 
-VITE_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
-VITE_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading
\ No newline at end of file
+VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
+VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading
\ No newline at end of file
diff --git a/.env.test b/.env.test
index bb43a342..6991e05f 100644
--- a/.env.test
+++ b/.env.test
@@ -1,4 +1,4 @@
-VITE_BASE=/manage
-VITE_BASE_API=/manageApi
+VUE_APP_BASE=/manage
+VUE_APP_BASE_API=/manageApi
 
 
diff --git a/src/api/config.js b/src/api/config.js
index 87b1987b..31bdeadc 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -17,7 +17,7 @@ import router from "@/router";
 
 axios.defaults.withCredentials = true;
 const http = axios.create({
-  baseURL: process.env.VITE_BASE_API,
+  baseURL: process.env.VUE_APP_BASE_API,
   timeout: 1000 * 15,
   // headers: { "Content-Type": "multipart/form-data" },
   headers: { "Content-Type": "application/json" },
@@ -57,7 +57,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VITE_LOGIN_URL)
+        process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
       }
       console.log("api %o", msg);
     }
diff --git a/src/api/method.js b/src/api/method.js
index f0731ba7..98913705 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -276,9 +276,9 @@ const commonData = {
 const organizationalTree = []
 
 //嵌套页面
-const iframeUrl = process.env.VITE_IFRAME_URL
+const iframeUrl = process.env.VUE_APP_IFRAME_URL
 //学员端路由
-const studentUrl = process.env.VITE_IFRAME_STUDENT_URL
+const studentUrl = process.env.VUE_APP_IFRAME_STUDENT_URL
 
 //二维码
 const codeUrl = "https://u-pre.boe.com"
diff --git a/src/router/index.js b/src/router/index.js
index 18acace6..f376229f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -17,7 +17,7 @@ const routes = [
 	...routesConfig
 ]
 const router = createRouter({
-	history: createWebHistory(process.env.VITE_BASE),
+	history: createWebHistory(process.env.VUE_APP_BASE),
 	routes,
 
 })
diff --git a/vue.config.js b/vue.config.js
index 55ec18eb..369c1aa0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,7 +15,7 @@ module.exports = defineConfig({
         port: 8080,
         proxy: {
             "/manageApi": {
-                target: process.env.VITE_PROXY_URL,
+                target: process.env.VUE_APP_PROXY_URL,
                 changeOrigin: true, //表示是否改变原域名
                 // secure: false,
                 // ws: false, //表示WebSocket协议