From ea244ad56659840e3f1eaec76cb83b0871855459 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 17:12:13 +0800
Subject: [PATCH 01/19] -- bug

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

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index d48ac5a6..f87b6a1c 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1166,7 +1166,7 @@
                       <span style="color: #999999"
                         ><ProjectLevel
                           v-model:value="level"
-                          :disabled="true"
+                          :tag="true"
                         ></ProjectLevel
                       ></span>
                     </div>
@@ -1177,7 +1177,7 @@
                       <span style="color: #999999"
                         ><TrainClass
                           v-model:value="systemId"
-                          :disabled="true"
+                          :tag="true"
                         ></TrainClass
                       ></span>
                     </div>

From dd11f3577e123b5ef1dd790b76890662d5e2cfa7 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 17:42:12 +0800
Subject: [PATCH 02/19] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                       |   2 +-
 src/api/method.js                       |   6 +-
 src/components/NavTop.vue               |   4 +-
 src/router/index.js                     |   4 +-
 src/views/projectcenter/templateAdd.vue | 187 +++++++++++++-----------
 vue.config.js                           |   6 +-
 6 files changed, 109 insertions(+), 100 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index b726a884..33869ee1 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-14 17:40:35
  * @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..243ae474 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);
@@ -276,7 +276,7 @@ const commonData = {
 const organizationalTree = []
 
 //嵌套页面
-const iframeUrl = "https://u-pre.boe.com/pc/iframe"
+const iframeUrl = "https://u-pre.boe.com/pc-release/iframe"
 //二维码
 const codeUrl = "https://u-pre.boe.com"
 export {
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 306d7b78..31b9dd2c 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -76,12 +76,12 @@ export default {
         {
           id: 1,
           name: "管理员",
-          go: "/manage/learningpath",
+          go: "/manage-release/learningpath",
         },
         {
           id: 2,
           name: "学员",
-          go: "https://u.boe.com/pc/uc/study/courses",
+          go: "https://u.boe.com/manage-release/uc/study/courses",
         },
       ],
 
diff --git a/src/router/index.js b/src/router/index.js
index 75da5b5a..07ef4a8e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-09 09:26:26
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 17:42:59
+ * @LastEditTime: 2022-12-14 17:38:53
  * @FilePath: /fe-manage/src/router/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -17,7 +17,7 @@ const routes = [
 	...routesConfig
 ]
 const router = createRouter({
-	history: createWebHistory("/manage/"),
+	history: createWebHistory("/manage-release/"),
 	routes,
 
 })
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 47bc4d87..adfee657 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="/manage-release/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,18 +43,18 @@
             <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="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 +62,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,53 +82,53 @@
         <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 +138,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 +151,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 +178,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 +190,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 +207,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,23 +229,33 @@ 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();
@@ -285,18 +290,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">
 .active {
diff --git a/vue.config.js b/vue.config.js
index 23d6b8f8..41237ccb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,14 +2,14 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 15:15:30
+ * @LastEditTime: 2022-12-14 17:38:38
  * @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",
+    publicPath: "/manage-release",
     // transpileDependencies: true,
     // devServer: {
     //     port: 8080,

From 4b4c146ca8293f0d6fae38103f8aef5b77eb09f8 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 17:43:38 +0800
Subject: [PATCH 03/19] feat:hebing

---
 src/App.vue               | 2 +-
 src/components/NavTop.vue | 2 +-
 2 files changed, 2 insertions(+), 2 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/NavTop.vue b/src/components/NavTop.vue
index 31b9dd2c..c60640bd 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -81,7 +81,7 @@ export default {
         {
           id: 2,
           name: "学员",
-          go: "https://u.boe.com/manage-release/uc/study/courses",
+          go: "https://u.boe.com/pc-release/uc/study/courses",
         },
       ],
 

From f34add84f032a61c93187748b0d97cb3d42ff2ee Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 19:26:13 +0800
Subject: [PATCH 04/19] -- bug

---
 src/components/project/OrgClass.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 72c82170..29e10290 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -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)

From 86260c8a1961d97b32dcb190d20dd5b536777676 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 23:29:06 +0800
Subject: [PATCH 05/19] =?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.release | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.release b/.env.release
index 4cd4f868..4d5f0120 100644
--- a/.env.release
+++ b/.env.release
@@ -3,5 +3,5 @@ VUE_APP_BASE_API=/manageApi-release
 VUE_APP_LOGIN_URL=https://u.boe.com/web
 
 
-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
+VUE_APP_IFRAME_URL=https://u.boe.com/pc-release/iframe
+VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading
\ No newline at end of file

From 9fe7040b471c5484e9fe140fe27497bac60a1160 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 21 Dec 2022 15:14:02 +0800
Subject: [PATCH 06/19] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E7=BB=8F=E7=90=86?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue    |  9 ++-------
 src/views/projectcenter/ProjectManage.vue | 10 ++--------
 src/views/projectcenter/SonProject.vue    |  6 ++----
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 5066e198..1ea6251c 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -503,13 +503,8 @@ export default {
     };
 
     function managerChange(e, l, d, t) {
-      if (routers.query.parentId) {
-        return;
-      }
-      !state.projectInfo.sourceBelongId &&
-        (state.projectInfo.sourceBelongId = d);
-      !state.projectInfo.sourceBelongName &&
-        (state.projectInfo.sourceBelongName = t);
+      state.projectInfo.sourceBelongId = d
+      state.projectInfo.sourceBelongName = t
     }
 
     return {
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 8f4c0cac..5cec28b5 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1804,14 +1804,8 @@ export default {
     );
 
     function managerChange(e, l, d, t) {
-      if (state.projectInfo.parentId) {
-        return;
-      }
-
-      !state.projectInfo.sourceBelongId &&
-        (state.projectInfo.sourceBelongId = d);
-      !state.projectInfo.sourceBelongName &&
-        (state.projectInfo.sourceBelongName = t);
+      state.projectInfo.sourceBelongId = d
+      state.projectInfo.sourceBelongName = t
     }
 
     return {
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 30aab7eb..3b0264db 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -387,10 +387,8 @@ export default {
     };
 
     function managerChange(e, l, d, t) {
-      !state.projectInfo.sourceBelongId &&
-      (state.projectInfo.sourceBelongId = d);
-      !state.projectInfo.sourceBelongName &&
-      (state.projectInfo.sourceBelongName = t);
+      state.projectInfo.sourceBelongId = d
+      state.projectInfo.sourceBelongName = t
     }
 
     return {

From 03e9e500614f5c39530d25ea9e9d8843076b3f64 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 21 Dec 2022 17:16:13 +0800
Subject: [PATCH 07/19] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectManage.vue | 1224 ++++++++++-----------
 1 file changed, 608 insertions(+), 616 deletions(-)

diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 5cec28b5..80ad33b0 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -6,52 +6,52 @@
       <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.searchStatus"
+              style="width: 270px"
+              placeholder="请选择状态"
+              :options="sProjectStateList"
+              allowClear
           ></a-select>
         </div>
         <div class="select addTimeBox">
           <div class="addTime">创建时间：</div>
           <a-range-picker
-            show-time
-            v-model:value="searchParam.valueDate"
-            format="YYYY-MM-DD"
-            style="border-radius: 8px; height: 40px; margin-left: 5px"
-            :placeholder="['      开始时间', '        结束时间']"
-       
+              show-time
+              v-model:value="searchParam.valueDate"
+              format="YYYY-MM-DD"
+              style="border-radius: 8px; height: 40px; margin-left: 5px"
+              :placeholder="['      开始时间', '        结束时间']"
+
           />
         </div>
         <div style="display: flex; margin-bottom: 20px">
@@ -76,26 +76,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>
@@ -104,18 +104,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)">
           创建项目
@@ -126,18 +126,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;
@@ -147,50 +147,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>
@@ -201,39 +201,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>
@@ -242,18 +242,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;
@@ -263,53 +263,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)">
               多层子项目
@@ -323,18 +323,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;
@@ -344,39 +344,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 ? "子" : "" }}项目
@@ -387,21 +387,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 ? "子" : "" }}项目
@@ -409,8 +409,8 @@
               <div class="centermain1">
                 {{
                   projectInfo.parentId
-                    ? "可创建班级，通过班级填写基础信息并创建任务"
-                    : "包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务"
+                      ? "可创建班级，通过班级填写基础信息并创建任务"
+                      : "包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务"
                 }}
               </div>
             </div>
@@ -422,11 +422,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>
@@ -452,11 +452,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>
@@ -485,11 +485,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>
@@ -515,11 +515,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>
@@ -545,17 +545,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;
@@ -565,21 +565,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>
@@ -620,19 +620,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>
@@ -659,11 +659,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>
@@ -719,11 +719,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>
@@ -750,11 +750,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>
@@ -781,53 +781,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";
 //import { toDate } from "../../api/method";
 
 export default {
@@ -917,15 +917,12 @@ export default {
     // 数据接入 - start -
     const router = useRouter();
     const sProjectStateList = ref([
-      { value: 0, label: "草稿" },
-      { value: 1, label: "审核中" },
-      { value: 2, label: "审核通过" },
-      { value: 3, label: "已发布" },
-      { value: -5, label: "未通过" },
-      { value: -1, label: "已结束" },
+      {value: 0, label: "草稿"},
+      {value: 1, label: "进行中"},
+      {value: 2, label: "已结束"},
     ]);
     const searchReset = () => {
-      state.searchParam = { pageNo: 1, pageSize: 10 };
+      state.searchParam = {pageNo: 1, pageSize: 10};
       getTableDate();
     };
     const searchSubmit = () => {
@@ -968,7 +965,7 @@ export default {
         return;
       }
       /**
-      if (!state.projectInfo.validate) {
+       if (!state.projectInfo.validate) {
         message.destroy();
         message.warning("项目名称重复，请修改名称！");
         return;
@@ -990,9 +987,9 @@ export default {
         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();
       });
     };
@@ -1049,11 +1046,11 @@ export default {
       //获取学员总数
       api.projectStudentCount({
         pid: object.projectId,
-        type:1
+        type: 1
       }).then((res) => {
-            state.projectStudentsNum = res.data.data
-            state.projectPubLoading = false;
-        })
+        state.projectStudentsNum = res.data.data
+        state.projectPubLoading = false;
+      })
       //获取阶段及任务总数
     };
     //确认发布项目
@@ -1097,17 +1094,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 = () => {
@@ -1116,17 +1113,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 = () => {
@@ -1147,17 +1144,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 = () => {
@@ -1175,17 +1172,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 = () => {
@@ -1209,7 +1206,7 @@ export default {
           message.success("模版保存成功");
           return;
         }
-        Modal.error({ title: res.data.msg });
+        Modal.error({title: res.data.msg});
       });
     };
     //关闭存为模版弹窗
@@ -1232,17 +1229,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) => {
@@ -1257,17 +1254,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 = () => {
@@ -1286,17 +1283,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 = () => {
@@ -1339,23 +1336,18 @@ export default {
         align: "center",
         customRender: (value) => {
           return (
-            <div>
-              {value.record.type === 3
-                ? {
-                    0: () => "草稿",
-                    1: () => "草稿",
-                    2: () => "草稿",
-                    3: () =>
-                      dayjs().isBefore(value.record.beginTime)
-                        ? "未开始"
-                        : "进行中",
-                    4: () =>
-                      dayjs().isBefore(value.record.end) ? "进行中" : "已结束",
-                    "-1": () => "已结束",
-                    "-5": () => "草稿",
-                  }[value.record.status + ""]() || ""
-                : "-"}
-            </div>
+              <div>
+                {value.record.type === 3
+                    ? {
+                  0: () => "草稿",
+                  1: () => "草稿",
+                  2: () => "草稿",
+                  3: () => "进行中",
+                  "-1": () => "已结束",
+                  "-5": () => "草稿",
+                }[value.record.status + ""]() || ""
+                    : "-"}
+              </div>
           );
         },
       },
@@ -1376,19 +1368,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>
           );
         },
       },
@@ -1409,93 +1401,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
@@ -1545,165 +1537,165 @@ 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: '',
-                      sourceBelongId: value.record.sourceBelongId,
-                      sourceBelongName: 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: '',
+                            sourceBelongId: value.record.sourceBelongId,
+                            sourceBelongName: 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,
-                        ptojectType: 3,
-                      },
-                    });
-                  }}
-                >
-                  创建班级
-                </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>
-                  ) : (
+                ) : (
                     ""
-                  )}
-                  {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
+                )}
+                {value.record.type === 2 ? (
+                    <span
+                        className="operation3"
+                        style="cursor: pointer"
                         onClick={() => {
                           router.push({
-                            path: "/taskpage",
-                            query: { projectId: value.record.projectId },
+                            path: "/projectadd",
+                            query: {
+                              parentId: value.record.projectId,
+                              parentName:
+                                  value.record.parentName + "——" + value.record.name,
+                              ptojectType: 3,
+                            },
                           });
-                          storage.set("projectId", value.record.projectId);
                         }}
+                    >
+                  创建班级
+                </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>
+                    <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>
               </div>
-            </div>
           );
         },
       },
     ]);
     const getTableDate = () =>
-      api
-        .getProjectList({
-          ...state.searchParam,
-          beginTime:
-            state.searchParam.valueDate &&
-            state.searchParam.valueDate.length === 2
-              ? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
-            
-              : "",
-          endTime:
-            state.searchParam.valueDate &&
-            state.searchParam.valueDate.length === 2
-              ? dayjs(state.searchParam.valueDate[1]).format("YYYY-MM-DD")
-              : "",
-        })
-        .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);
-        });
+        api
+            .getProjectList({
+              ...state.searchParam,
+              beginTime:
+                  state.searchParam.valueDate &&
+                  state.searchParam.valueDate.length === 2
+                      ? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
+
+                      : "",
+              endTime:
+                  state.searchParam.valueDate &&
+                  state.searchParam.valueDate.length === 2
+                      ? dayjs(state.searchParam.valueDate[1]).format("YYYY-MM-DD")
+                      : "",
+            })
+            .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) {
@@ -1711,8 +1703,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);
         });
@@ -1774,33 +1766,33 @@ 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) {
@@ -1869,7 +1861,7 @@ export default {
       okReminderModal,
     };
   },
-};
+  };
 </script>
 <style lang="scss">
 .projectManage {
@@ -2155,9 +2147,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%
         );
       }
 
@@ -2253,9 +2245,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%
         );
       }
 
@@ -2352,9 +2344,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%
         );
       }
 
@@ -2418,9 +2410,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%
         );
       }
 
@@ -2529,8 +2521,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%
             );
           }
 
@@ -2631,8 +2623,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%
         );
       }
 
@@ -2671,9 +2663,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;
@@ -2697,9 +2689,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 05492770a4dd83e67c02ba4153210731c2cdad5f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 21 Dec 2022 17:24:41 +0800
Subject: [PATCH 08/19] =?UTF-8?q?--=20=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=88=B0=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue      | 2 +-
 src/components/drawers/AddEval.vue        | 4 ++--
 src/components/drawers/AddFaceteach.vue   | 2 +-
 src/components/drawers/AddHomework.vue    | 2 +-
 src/components/drawers/AddLive.vue        | 2 +-
 src/components/drawers/AddTest.vue        | 2 +-
 src/components/vote/AddVote.vue           | 2 +-
 src/views/examine/ProjectReviewed.vue     | 2 +-
 src/views/projectcenter/ProjectAdd.vue    | 2 +-
 src/views/projectcenter/ProjectManage.vue | 2 +-
 src/views/projectcenter/SonProject.vue    | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 17cc3de3..6b9fd477 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -51,7 +51,7 @@
             </div>
             <div class="btnbox">
               <a-range-picker
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                 format="YYYY-MM-DD HH:mm"
                 style="width: 400px; height: 40px; border-radius: 8px;"
                 v-model:value="time"
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 0566b5af..4e8da429 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -49,8 +49,8 @@
               <span style="margin-right: 3px">有效期：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker 
-                show-time
+              <a-range-picker
+                :show-time="{ format: 'HH:mm' }"
                 style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="time" format="YYYY-MM-DD HH:mm"
                 :placeholder="['      开始时间', '        结束时间']" />
             </div>
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 6f29ed3b..4b0027c6 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -102,7 +102,7 @@
             </div>
             <div class="select" >
               <a-range-picker style="width: 400px;"
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                 format="YYYY/MM/DD HH:mm"
                 v-model:value="chooseTime"
                 :placeholder="['      开始时间', '        结束时间']"
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 9a5c3ed3..98e0717a 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -46,7 +46,7 @@
               <div class="btnbox">
                 <a-form-item has-feedback label="提交时间" name="choosedTime">
                   <a-range-picker
-                    show-time
+                    :show-time="{ format: 'HH:mm' }"
                     style="width: 400px; height: 40px; border-radius: 8px"
                     v-model:value="formState.choosedTime"
                     format="YYYY/MM/DD HH:mm"
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 1898eac9..ed1ed819 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -70,7 +70,7 @@
             </div>
             <div class="btnbox">
               <a-range-picker
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                 style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="time"
                 format="YYYY/MM/DD HH:mm"
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 3315950c..62af9c4d 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -76,7 +76,7 @@
 							<span style="margin-right: 3px">考试时间：</span>
 						</div>
 						<div class="btnbox">
-							<a-range-picker style="width: 400px; height: 40px; border-radius: 8px" show-time format="YYYY/MM/DD HH:mm"
+							<a-range-picker style="width: 400px; height: 40px; border-radius: 8px" :show-time="{ format: 'HH:mm' }" format="YYYY/MM/DD HH:mm"
 								v-model:value="test.chooseTime" :placeholder="['      开始时间', '        结束时间']" />
 						</div>
 					</div>
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 550ee7db..c9f8b7e4 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -104,7 +104,7 @@
             </div>
             <div class="select" >
               <a-range-picker
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                 format="YYYY-MM-DD HH:mm"
                 style="width: 424px"
                 v-model:value="time"
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index b47e954f..245addaa 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -52,7 +52,7 @@
             <div class="inpbox1">
               <a-range-picker
                 v-model:value="valueDate"
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                 style="border-radius: 8px; height: 40px; margin-left: 5px"
                 :placeholder="['      开始时间', '        结束时间']"
                 format="YYYY/MM/DD HH:mm"
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 1ea6251c..f0e672cc 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -99,8 +99,8 @@
 
           <div class="in">
             <a-range-picker
-              show-time
               separator="至"
+              :show-time="{ format: 'HH:mm' }"
               :placeholder="['      开始时间', '        结束时间']"
               v-model:value="projectInfo.rangeTime"
               style="width: 100%; height: 40px; border-radius: 5px"
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 80ad33b0..a4409f77 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -46,7 +46,7 @@
         <div class="select addTimeBox">
           <div class="addTime">创建时间：</div>
           <a-range-picker
-              show-time
+              :show-time="{ format: 'HH:mm' }"
               v-model:value="searchParam.valueDate"
               format="YYYY-MM-DD"
               style="border-radius: 8px; height: 40px; margin-left: 5px"
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 3b0264db..18f55993 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -89,7 +89,7 @@
 
           <div class="in">
             <a-range-picker
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                 separator="至"
                 :placeholder="['      开始时间', '        结束时间']"
                 v-model:value="projectInfo.rangeTime"

From 80c74969017c587e4936c5e56b84b4065281aef9 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 12:13:09 +0800
Subject: [PATCH 09/19] =?UTF-8?q?--=20=E6=96=87=E4=BB=B6=E4=B8=8A=E5=94=87?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/common/BaseUpload.vue b/src/components/common/BaseUpload.vue
index 3920b81e..3a3406d3 100644
--- a/src/components/common/BaseUpload.vue
+++ b/src/components/common/BaseUpload.vue
@@ -1,7 +1,7 @@
 <template>
   <a-upload
       :file-list="files"
-      action="/manageApi/file/upload"
+      :action="`${process.env.VUE_APP_BASE_API}/file/upload`"
       :show-upload-list="showUploadList"
       :multiple="multiple"
       :before-upload="beforeUpload"

From e1e4a005ce5c1ef8a34f1a00b63b5c610d014b8e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 14:22:33 +0800
Subject: [PATCH 10/19] =?UTF-8?q?--=20=E7=BB=84=E7=BB=87=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue       | 15 +--------------
 src/api/index1.js |  1 +
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5b29d867..f70b4865 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -113,20 +113,7 @@ export default defineComponent({
             .then((res) => res.data.data.rows);
     //获取组织树
     const getOrgTree = () => {
-      const orgtreeList = localStorage.getItem("orgtreeList");
-      if (orgtreeList) {
-        store.commit("getOrgtreeList", JSON.parse(orgtreeList));
-        return;
-      }
-      api
-          .getOrgInfo({
-            keyWord: "",
-            id: -1,
-            pageNo: 1,
-            pageSize: 20,
-          })
-          .then((res) => {
-            localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
+      api.getOrgTreeInfo().then((res) => {
             store.commit("getOrgtreeList", res.data.data);
           });
     };
diff --git a/src/api/index1.js b/src/api/index1.js
index 7bf6ff85..9b9ad512 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -111,6 +111,7 @@ export const searchUsersByOrgId = (obj) => http.post('/admin/router/searchUsersB
 
 //获取组织信息（修改版）
 export const getOrgInfo = (obj) => http.post('/admin/orgStruct/getOrgInfo', obj)
+export const getOrgTreeInfo = (obj) => http.get('/org/initOrg', {params: obj})
 //获取员工（修改版）
 export const getMemberInfo = (obj) => http.post('/admin/orgStruct/getMemberInfo', obj)
 //获取受众（修改版）

From 13e27ae3cac891e2d9fa5ce44d4b0543a8a49593 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 17:31:27 +0800
Subject: [PATCH 11/19] =?UTF-8?q?--=20=E5=AD=A6=E5=91=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 32d56ec0..d52beca2 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -425,19 +425,19 @@
                     </div>
                     <div class="progress">
                       <div class="progresstext">
-                        {{ item.complete ? item.complete : 0 }}/{{
-                          item.total ? item.total : 0
+                        {{ item.finishStuNum }}/{{
+                          item.totalStuNum
                         }}人
                       </div>
                       <div style="display: flex">
                         <a-progress
                           :showInfo="false"
-                          :percent="item.percent"
+                          :percent="parseInt(item.finishStuNum / item.totalStuNum * 100)"
                           strokeColor="#FFC067"
                           trailColor="rgba(253, 209, 98, 0.2)"
                         />
                         <span class="progresstext" style="margin-left: 10px"
-                          >{{ item.percent ? item.percent : 0 }}%</span
+                          >{{ parseInt(item.finishStuNum / item.totalStuNum * 100) }}%</span
                         >
                       </div>
                     </div>

From f33f2cd99aabc3b47c18713b5c8642890f7a2a06 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 18:16:36 +0800
Subject: [PATCH 12/19] =?UTF-8?q?--=20=E6=89=B9=E9=87=8F=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=85=B3=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                           |  1 +
 src/components/student/ChangeLevelModal.vue | 97 ++++++++++++---------
 src/components/student/TableStudent.vue     | 32 ++++++-
 3 files changed, 88 insertions(+), 42 deletions(-)

diff --git a/src/api/index1.js b/src/api/index1.js
index 9b9ad512..c45056c3 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -132,6 +132,7 @@ export const addStudentCourse = (obj) => http.post("/admin/offcourse/addStudent"
 // 获取组织结构树
 export const orgtree = () => http.get("/org/tree");
 export const saveStu = obj => http.post("/admin/student/addStudent", obj);
+export const moveStudent = obj => http.post("/admin/student/moveStudent", obj);
 export const getStuPage = obj => http.get("/admin/student/getStudent", {params: obj});
 export const delStudentList = obj => http.post("/admin/student/delStudent", obj);
 export const validateName = obj => http.post("/admin/validate/validateName", obj);
diff --git a/src/components/student/ChangeLevelModal.vue b/src/components/student/ChangeLevelModal.vue
index 6fa93375..f2b428d6 100644
--- a/src/components/student/ChangeLevelModal.vue
+++ b/src/components/student/ChangeLevelModal.vue
@@ -8,12 +8,12 @@
 -->
 <template>
   <a-modal
-    style="padding: 0"
-    :closable="sh"
-    :visible="visiblene"
-    :footer="null"
-    centered="true"
-    wrapClassName="changeModal"
+      style="padding: 0"
+      :closable="true"
+      :visible="visiblene"
+      :footer="null"
+      centered="true"
+      wrapClassName="changeModal"
   >
     <div class="con">
       <div class="header">
@@ -28,27 +28,25 @@
           <!-- <div class="cur">当前关卡：关卡2</div> -->
           <div class="select">
             <a-select
-              v-model:value="curLevel"
-              style="width: 100%"
-              placeholder="请选择关卡"
-              :options="projectNameList4"
-              @change="selectProjectName4"
-              allowClear
-              showSearch
+                v-model:value="selectStage"
+                style="width: 100%"
+                placeholder="请选择关卡"
+                :options="option"
+                allowClear
             ></a-select>
           </div>
           <div class="btn">
             <button
-              class="sameb btn1"
-              @click="closeChangeModal"
-              style="cursor: pointer"
+                class="sameb btn1"
+                @click="closeChangeModal"
+                style="cursor: pointer"
             >
               取消
             </button>
             <button
-              class="sameb btn2"
-              @click="changelevel"
-              style="cursor: pointer"
+                class="sameb btn2"
+                @click="changelevel"
+                style="cursor: pointer"
             >
               确定
             </button>
@@ -58,28 +56,47 @@
     </div>
   </a-modal>
 </template>
-<script>
-export default {
-  name: "ChangeLevelModal",
-  props: {
-    visiblene: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  setup(props, ctx) {
-    const closeChangeModal = () => {
-      ctx.emit("update:visiblene", false);
-    };
-    const changelevel = () => {
-      console.log("点击调整关卡");
-    };
-    //获取关卡列表
+<script setup>
+import {computed, defineEmits, defineProps, ref} from "vue";
+import {moveStudent} from "@/api/index1";
+import {message} from "ant-design-vue";
 
-    return {
-      closeChangeModal,
-      changelevel,
-    };
+const props = defineProps({
+  visiblene: {
+    type: Boolean,
+    default: false,
   },
+  stage: {
+    type: Array,
+    default: () => [],
+  },
+  ids: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const option = computed(() => {
+  return props.stage.map(e => ({label: e.name, value: e.id}))
+})
+
+const selectStage = ref()
+
+const emit = defineEmits({})
+
+const closeChangeModal = () => {
+  emit("update:visiblene", false);
 };
+const changelevel = () => {
+  if(!selectStage.value){
+    message.error("请选择关卡")
+    return
+  }
+  emit("update:visiblene", false);
+  emit('finash', false)
+  moveStudent({targetId: selectStage.value, ids: props.ids}).then(()=>{
+    emit('finash', true)
+  })
+};
+//获取关卡列表
 </script>
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index d55921c6..aa67d4b5 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -63,7 +63,7 @@
           批量删除
         </a-button>
       </a-col>
-      <a-col :span="1.5" v-if="type == 2">
+      <a-col :span="1.5" v-if="type === 2">
         <a-button class="cus-btn white" @click="showChangeModal">
           <template #icon></template>
           批量调整关卡
@@ -109,7 +109,7 @@
     </div>
   </div>
   <!-- 批量调整关卡弹窗 -->
-  <ChangeLevelModal v-model:visiblene="visiblene" />
+  <ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys"  @finash="submitCall"/>
   <!-- 批量调整关卡弹窗 -->
 </template>
 <script setup>
@@ -117,6 +117,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
 import { delStudentList, getStuPage } from "@/api/index1";
 import CommonStudent from "@/components/student/CommonStudent";
 import ChangeLevelModal from "./ChangeLevelModal.vue";
+import {message} from "ant-design-vue";
 const props = defineProps({
   type: Number,
   id: String,
@@ -261,6 +262,10 @@ function submitCall(flag) {
 //调整关卡
 const visiblene = ref(false);
 const showChangeModal = () => {
+  if(!stuSelectKeys.value.length){
+    message.error("请选择学员")
+    return
+  }
   visiblene.value = true;
 };
 </script>
@@ -274,4 +279,27 @@ const showChangeModal = () => {
   border-right: 1px solid #e9e9e9;
   cursor: pointer;
 }
+.cus-btn {
+  width: 100%;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16px;
+  border: 1px solid #4ea6ff;
+  border-radius: 8px;
+  background: #4ea6ff;
+  cursor: pointer;
+  color: #fff;
+}
+
+.white {
+  background: #fff;
+  color: #4ea6ff;
+}
+
+.cus-input {
+  height: 40px;
+  border-radius: 8px;
+}
 </style>
\ No newline at end of file

From 52bf37a00d2af6cdc34147b3a554f0355463a167 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 18:20:16 +0800
Subject: [PATCH 13/19] =?UTF-8?q?--=20=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue | 2 +-
 src/components/drawers/AddHomework.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 4b0027c6..d7658962 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -354,7 +354,7 @@
             <div class="btnbox">
               <a-upload
                 @change="handleChange"
-                action="/manageApi/file/upload"
+                :action="`${process.env.VUE_APP_BASE_API}/file/upload`"
                 v-model:file-list="fileList"
               >
                 <button class="xkbtn">上传附件</button>
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 98e0717a..ce682451 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -84,7 +84,7 @@
                 <a-upload
                   v-model:file-list="fileList"
                   name="file"
-                  action="/manageApi/file/upload"
+                  :action="`${process.env.VUE_APP_BASE_API}/file/upload`"
                   @change="handleChange"
                 >
                   <button class="xkbtn" type="button">上传附件</button>

From b44e07006915cc990b502f7ffe3015dbefc912be Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 19:18:49 +0800
Subject: [PATCH 14/19] =?UTF-8?q?--=20=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index b65a3f71..fc5abe89 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -82,7 +82,7 @@
         <template #action="{ record }">
           <div
             @click="del(record.id)"
-            style="color: #4ea6ff; font-size: 14px; text-align: center"
+            style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
           >
             删除
           </div>

From 6fa476aa1cd5ae004198699ce77e26cee9c73c65 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 22:30:37 +0800
Subject: [PATCH 15/19] =?UTF-8?q?--=20=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                       | 10 +++++-----
 src/components/common/BaseUpload.vue    |  3 ++-
 src/components/drawers/AddFaceteach.vue |  4 +++-
 src/components/drawers/AddHomework.vue  |  4 +++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index b570c677..8035a778 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -6,7 +6,7 @@
  * @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'
@@ -14,13 +14,13 @@ import router from "@/router";
 
 // axios.defaults.headers.post["Content-Type"] =
 //   "application/x-www-form-urlencoded";
-
+export const FILE_UPLOAD_URL = process.env.VUE_APP_BASE_API + '/file/upload'
 axios.defaults.withCredentials = true;
 const http = axios.create({
     baseURL: process.env.VUE_APP_BASE_API,
     timeout: 1000 * 15,
     // headers: { "Content-Type": "multipart/form-data" },
-    headers: { "Content-Type": "application/json" },
+    headers: {"Content-Type": "application/json"},
 });
 
 http.interceptors.request.use(
@@ -50,14 +50,14 @@ http.interceptors.response.use(
     (response) => {
         // console.log('response', response)
         const {
-            data: { code, msg },
+            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.VUE_APP_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/components/common/BaseUpload.vue b/src/components/common/BaseUpload.vue
index 3a3406d3..b9146eeb 100644
--- a/src/components/common/BaseUpload.vue
+++ b/src/components/common/BaseUpload.vue
@@ -1,7 +1,7 @@
 <template>
   <a-upload
       :file-list="files"
-      :action="`${process.env.VUE_APP_BASE_API}/file/upload`"
+      :action="FILE_UPLOAD_URL"
       :show-upload-list="showUploadList"
       :multiple="multiple"
       :before-upload="beforeUpload"
@@ -16,6 +16,7 @@
 <script setup>
 import {defineProps, defineEmits, defineExpose, ref, watch} from "vue";
 import {message} from "ant-design-vue";
+import {FILE_UPLOAD_URL} from "@/api/config";
 
 const props = defineProps({
   value: {
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index d7658962..6f3518a8 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -354,7 +354,7 @@
             <div class="btnbox">
               <a-upload
                 @change="handleChange"
-                :action="`${process.env.VUE_APP_BASE_API}/file/upload`"
+                :action="FILE_UPLOAD_URL"
                 v-model:file-list="fileList"
               >
                 <button class="xkbtn">上传附件</button>
@@ -392,6 +392,7 @@ import { detail } from "../../api/indexCourse";
 import { queryAppraiseDetailById } from "../../api/indexInvist";
 import { queryWorkDetailById } from "@/api/indexWork";
 import { queryExaminationDetailById } from "@/api/indexExam";
+import {FILE_UPLOAD_URL} from "@/api/config";
 export default {
   name: "AddFaceteach",
   components: {
@@ -841,6 +842,7 @@ export default {
     };
     return {
       ...toRefs(state),
+      FILE_UPLOAD_URL,
       showDrawerSelFacet,
       showDrawerAddHomework,
       showDrawerAddTest,
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 825b96e5..1c6a53e8 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -45,7 +45,7 @@
 								<span style="margin-right: 3px">附件：</span>
 							</div>
 							<div class="btnbox">
-								<a-upload v-model:file-list="fileList" name="file" action="/manageApi/file/upload"
+								<a-upload v-model:file-list="fileList" name="file" :action="FILE_UPLOAD_URL"
 									@change="handleChange">
 									<button class="xkbtn" type="button">上传附件</button>
 								</a-upload>
@@ -82,6 +82,7 @@ import {
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import { addTempTask } from "../../api/indexTaskadd";
+import {FILE_UPLOAD_URL} from "@/api/config";
 
 export default {
 	name: "AddHomework",
@@ -513,6 +514,7 @@ export default {
 			disabledDate,
 			disabledDateTime,
 			afterVisibleChange,
+      FILE_UPLOAD_URL,
 			closeDrawer,
 			closeDrawer2,
 			handleChange,

From 94f83e53608c81741cda819f7630312fd628a441 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 23:20:31 +0800
Subject: [PATCH 16/19] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectManage.vue | 54 ++++++++++++-----------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index a4409f77..e337e5f2 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -78,7 +78,7 @@
       <a-table
           :columns="columns"
           :data-source="tableData"
-          :loading="tableDataTotal === -1 ? true : false"
+          :loading="tableLoading"
           :scroll="{ x: 700 }"
           @expand="expandTable"
           :pagination="false"
@@ -845,6 +845,7 @@ export default {
   },
   setup() {
     const state = reactive({
+      tableLoading:false,
       projectName: null,
       selectTime: null,
       sonproject: false,
@@ -1671,31 +1672,34 @@ export default {
         },
       },
     ]);
-    const getTableDate = () =>
-        api
-            .getProjectList({
-              ...state.searchParam,
-              beginTime:
-                  state.searchParam.valueDate &&
-                  state.searchParam.valueDate.length === 2
-                      ? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
+    const getTableDate = () =>{
+      state.tableLoading = true
+      api.getProjectList({
+        ...state.searchParam,
+        beginTime:
+            state.searchParam.valueDate &&
+            state.searchParam.valueDate.length === 2
+                ? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
+
+                : "",
+        endTime:
+            state.searchParam.valueDate &&
+            state.searchParam.valueDate.length === 2
+                ? dayjs(state.searchParam.valueDate[1]).format("YYYY-MM-DD")
+                : "",
+      })
+          .then((res) => {
+            // console.log("搜索", res, state.searchParam);
+            state.tableDataTotal = Number(res.data.data.total);
+            state.tableLoading = false
+            const data = res.data.data.rows;
+            initDataSublist("", data);
+            console.log(data);
+            tableData.value = data;
+            console.log("tableData", tableData);
+          });
+    }
 
-                      : "",
-              endTime:
-                  state.searchParam.valueDate &&
-                  state.searchParam.valueDate.length === 2
-                      ? dayjs(state.searchParam.valueDate[1]).format("YYYY-MM-DD")
-                      : "",
-            })
-            .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) {

From 3b898181151d7fe1a821a17aab3fbf16766099eb Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Fri, 23 Dec 2022 00:39:44 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=94=B9=E4=B8=BA=E5=88=A0=E9=99=A4=E9=A2=98?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/components/ResearchAddAsk.vue    | 2 +-
 src/views/research/components/ResearchAddItem.vue   | 2 ++
 src/views/research/components/ResearchAddMulti.vue  | 2 +-
 src/views/research/components/ResearchAddPin.vue    | 2 +-
 src/views/research/components/ResearchAddSingle.vue | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/research/components/ResearchAddAsk.vue b/src/views/research/components/ResearchAddAsk.vue
index 0b4836d9..62c40105 100644
--- a/src/views/research/components/ResearchAddAsk.vue
+++ b/src/views/research/components/ResearchAddAsk.vue
@@ -6,7 +6,7 @@
       <div class="tagname">问答题</div>
       <div class="deleteop" @click="handleTypesDel(3)">
         <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
       </div>
     </div>
     <div class="name">
diff --git a/src/views/research/components/ResearchAddItem.vue b/src/views/research/components/ResearchAddItem.vue
index f3b87e8b..bc6318d7 100644
--- a/src/views/research/components/ResearchAddItem.vue
+++ b/src/views/research/components/ResearchAddItem.vue
@@ -17,6 +17,7 @@
       </div>
       <div class="delete" @click="handleDel">删除</div>
     </div>
+    <!--
     <div class="name uploadContent">
       <a-upload
         v-show="!curItem.imgVal"
@@ -43,6 +44,7 @@
         />
       </div>
     </div>
+    -->
   </div>
 </template>
 <script>
diff --git a/src/views/research/components/ResearchAddMulti.vue b/src/views/research/components/ResearchAddMulti.vue
index 7873d68d..c46bb8af 100644
--- a/src/views/research/components/ResearchAddMulti.vue
+++ b/src/views/research/components/ResearchAddMulti.vue
@@ -6,7 +6,7 @@
       <div class="tagname">多选题</div>
       <div class="deleteop" @click="handleTypesDel(2)">
         <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
       </div>
     </div>
     <div class="name">
diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue
index 50f33df7..d59303e5 100644
--- a/src/views/research/components/ResearchAddPin.vue
+++ b/src/views/research/components/ResearchAddPin.vue
@@ -6,7 +6,7 @@
       <div class="tagname">评分题</div>
       <div class="deleteop" @click="handleTypesDel(4)">
         <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
       </div>
     </div>
     <div class="name">
diff --git a/src/views/research/components/ResearchAddSingle.vue b/src/views/research/components/ResearchAddSingle.vue
index 6ee30ae6..0130ab54 100644
--- a/src/views/research/components/ResearchAddSingle.vue
+++ b/src/views/research/components/ResearchAddSingle.vue
@@ -6,7 +6,7 @@
       <div class="tagname">单选题</div>
       <div class="deleteop" @click="handleTypesDel(1)">
         <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
       </div>
     </div>
     <div class="name">

From 2a6678fb23bfc776149b67e9e24051cea5161c89 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Fri, 23 Dec 2022 01:38:22 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue      | 110 ++++++++++++------------
 src/components/project/NameInput.vue    |  36 ++------
 src/components/student/TableStudent.vue |   1 +
 src/views/learningpath/LearningPath.vue |   2 +-
 4 files changed, 64 insertions(+), 85 deletions(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 3bcce3ed..97649ceb 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -130,6 +130,26 @@
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
           </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <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>
           <div class="main_item2">
             <div class="signbox">
               <span style="margin-right: 3px">考试说明：</span>
@@ -147,7 +167,7 @@
           </div>
           <div class="main_item2">
             <div class="signbox">
-              <span style="margin-right: 3px">考试限制：</span>
+              <span style="margin-right: 3px;margin-top: 10px;">考试限制：</span>
             </div>
             <div class="kqszbox">
               <div class="setbox">
@@ -227,64 +247,45 @@
               </a-radio-group>
             </div>
           </div>
+        
+         
           <div class="main_item">
             <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">及格线：</span>
+              <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>
-          <div class="main_item">
-            <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.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>
+              <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 class="main_item" style="height: 20px;"></div>
         </div>
       </div>
       <div class="main_btns">
@@ -811,8 +812,7 @@ export default {
             .setbox {
               display: flex;
               flex-wrap: wrap;
-              margin-top: 10px;
-              margin-bottom: 24px;
+            
 
               .timerbox {
                 margin-top: 6px;
diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue
index 8d2a6eee..a96f1ab7 100644
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -86,45 +86,23 @@ 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 {
+  .road {
   .ant-input-affix-wrapper {
-    position: relative;
-    display: inline-block;
-    width: 99%;
-    min-width: 0;
     padding: 0px 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;
   }
-}
+  }
+
+
+
 
 .b_input,
 .i1_input {
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index fc5abe89..556c407f 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -235,6 +235,7 @@ function getStuList() {
 
 function reset() {
   tableParam.value.studentName="";
+  getStuList();
 }
 
 function bathDel() {
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 7efd5fba..b7af07a2 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -150,7 +150,7 @@
               />
             </div>
             <div class="inname">路径图名称</div>
-            <div class="in">
+            <div class="in road">
               <!--              <a-input-->
               <!--                  v-model:value="pathName"-->
               <!--                  maxlength="20"-->

From 25f8dbd6b45c272118ba54050f23a783472151b5 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 23 Dec 2022 01:39:49 +0800
Subject: [PATCH 19/19] =?UTF-8?q?--=20=E5=BC=80=E8=AF=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index d1e3afb0..837c45dc 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3281,11 +3281,11 @@ const columns7 = [
     key: "5",
     align: "center",
     customRender: ({ record }) => {
-      switch (String(record.source)) {
+      switch (String(record.status)) {
         case "0":
-          return "待审核";
-        case "1":
           return "审核通过";
+        case "1":
+          return "待审核";
         case "2":
           return "审核拒绝";
       }
@@ -3403,11 +3403,11 @@ export default defineComponent({
           key: "5",
           align: "center",
           customRender: ({ record }) => {
-            switch (String(record.source)) {
+            switch (String(record.status)) {
               case "0":
-                return "待审核";
-              case "1":
                 return "审核通过";
+              case "1":
+                return "待审核";
               case "2":
                 return "审核拒绝";
             }