From f84bfdf87b4ae400d484d6805aa2c76f4ebbdb72 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 2 Dec 2022 17:16:25 +0800
Subject: [PATCH 01/13] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectManager.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue
index 52fbc59f..c741101e 100644
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -19,7 +19,7 @@
   </a-select>
 </template>
 <script>
-import {reactive, toRefs, watch} from "vue";
+import {onMounted, reactive, toRefs, watch} from "vue";
 import {scrollLoad} from "@/api/method";
 import * as api1 from "@/api/index1";
 
@@ -48,7 +48,11 @@ export default {
     });
 
     watch(() => state.memberParam, getMember)
-    watch(() => props.value, init)
+    watch(props , init)
+
+    onMounted(() => {
+      console.log('onMounted')
+    })
 
     function getMember() {
       state.loading = true
@@ -83,8 +87,10 @@ export default {
         state.managerArray = arrManagerId
         state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
         state.init = true
-        getMember()
+      } else {
+        state.options = []
       }
+      getMember()
     }
 
     function change(e, l) {

From 5e4c479c8e61e13fb127c60f5d5bd649b41eba23 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 2 Dec 2022 17:18:49 +0800
Subject: [PATCH 02/13] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue
index c741101e..ad40e399 100644
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -48,7 +48,7 @@ export default {
     });
 
     watch(() => state.memberParam, getMember)
-    watch(props , init)
+    watch(props, init)
 
     onMounted(() => {
       console.log('onMounted')
@@ -88,6 +88,7 @@ export default {
         state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
         state.init = true
       } else {
+        state.managerArray = []
         state.options = []
       }
       getMember()

From cb4423575e905db1a232c1cfed58a129a3eb0acc Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Fri, 2 Dec 2022 17:19:06 +0800
Subject: [PATCH 03/13] =?UTF-8?q?fix(BUG:51):=E6=8A=95=E7=A5=A8=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=99=90=E5=88=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/vote/AddVote.vue | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 7e2a3b8a..ef50165a 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -73,8 +73,8 @@
               <span style="margin-right: 3px">基础投票数：</span>
             </div>
             <div class="btnbox">
-              <a-upload @change="handleChange" :multiple="true" :max-count="1" action="/manageApi/vote/baseVoteupload"
-                v-model:file-list="fileList">
+              <a-upload @change="handleChange" :before-upload="beforeUpload" :multiple="true" :max-count="1"
+                action="/manageApi/vote/baseVoteupload" v-model:file-list="fileList">
                 <button class="xkbtn">点击上传</button></a-upload>
               <div v-if="voteCount > 0"><a-tag color="processing"> <span style="font-size:14px;line-height: 33px;">{{
                   voteCount
@@ -218,7 +218,23 @@ export default {
 
     };
 
+    // 限制文件格式上传
+    const beforeUpload = (obj) => {
+      console.log(obj)
+    }
+
     const handleChange = info => {
+      console.log(info.file.type, info.file.type.indexOf('sheet'))
+      if (info.file.type.indexOf('sheet') == -1) {
+        message.destroy()
+        message.error("请上传正确的文件格式")
+
+        console.log(state.fileList)
+
+        state.fileList = []
+        return
+      }
+
       let resFileList = [...info.fileList];
 
 
@@ -353,9 +369,9 @@ export default {
       if (props.edit) {
         api
           .editVote(obj)
-          .then(async(res) => {
+          .then(async (res) => {
             console.log("updte======");
-           await updateToTask(res);
+            await updateToTask(res);
             closeDrawer();
             message.destroy();
             message.success("修改投票信息成功")
@@ -367,7 +383,7 @@ export default {
       } else {
         api
           .createVote(obj)
-          .then(async(res) => {
+          .then(async (res) => {
             await updateToTask(res);
             closeDrawer();
             message.destroy();
@@ -401,6 +417,7 @@ export default {
       queryStem,
       closeStem,
       handleChange,
+      beforeUpload,
       log,
     };
   },

From 7d39bc93fb2f1858bb502df07dd156b0d5a8722e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 2 Dec 2022 17:33:31 +0800
Subject: [PATCH 04/13] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectManager.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue
index ad40e399..766d61d4 100644
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -52,6 +52,7 @@ export default {
 
     onMounted(() => {
       console.log('onMounted')
+      init()
     })
 
     function getMember() {
@@ -81,17 +82,17 @@ export default {
     };
 
     function init() {
-      if (props.value && props.name) {
+      if (!props.value) {
+        state.managerArray = []
+        return;
+      }
+      if (props.value !== state.managerArray.join(',')) {
         const arrManager = props.name.split(',')
         const arrManagerId = props.value.split(',')
         state.managerArray = arrManagerId
         state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
-        state.init = true
-      } else {
-        state.managerArray = []
-        state.options = []
+        getMember()
       }
-      getMember()
     }
 
     function change(e, l) {

From 6b152f68b7ba850b4c93f860b4aaa10f2a1db4ac Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 2 Dec 2022 17:42:33 +0800
Subject: [PATCH 05/13] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/OrgClass.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index d0a197c9..e08c2b9b 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -46,9 +46,15 @@ export default {
     watch(state.id, () => {
       ctx.emit('update:modelValue', state.id)
     })
-    onMounted(() => {
-      state.options = [{id: props.modelValue, name: props.name}, ...store.state.orgtreeList]
+    watch(props, () => {
+      if (props.modelValue !== state.id) {
+        state.id = props.modelValue
+      }
     })
+    onMounted(() => {
+      state.options = [...store.state.orgtreeList]
+    })
+
     function change(key, obj) {
       ctx.emit('update:name', obj[0])
     }

From 1f5d7359e9e928836e842145b5cfd6b3b48c130d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 2 Dec 2022 17:47:25 +0800
Subject: [PATCH 06/13] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectClass.vue | 7 +++++++
 src/components/project/TrainClass.vue   | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/components/project/ProjectClass.vue b/src/components/project/ProjectClass.vue
index e659034f..6364db17 100644
--- a/src/components/project/ProjectClass.vue
+++ b/src/components/project/ProjectClass.vue
@@ -33,6 +33,13 @@ export default {
       options: [],
       id: props.modelValue
     });
+
+    watch(props, () => {
+      if (props.modelValue !== state.id) {
+        state.id = props.modelValue
+      }
+    })
+    
     watch(state.id,()=>{
       ctx.emit('update:modelValue',state.id)
     })
diff --git a/src/components/project/TrainClass.vue b/src/components/project/TrainClass.vue
index af14081c..ccac922a 100644
--- a/src/components/project/TrainClass.vue
+++ b/src/components/project/TrainClass.vue
@@ -33,6 +33,14 @@ export default {
     watch(state.id, () => {
       ctx.emit('update:modelValue', state.id)
     })
+
+    watch(props, () => {
+      if (props.modelValue !== state.id) {
+        state.id = props.modelValue
+      }
+    })
+
+
     onMounted(() => {
       state.options = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
     })

From c74c6481bfd6f661b2a2a6b12ba8d88ef1db9745 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Fri, 2 Dec 2022 18:32:47 +0800
Subject: [PATCH 07/13] =?UTF-8?q?fix(BUG:46):=E4=BF=AE=E6=94=B9=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE-=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=84-=E6=B5=8B=E8=AF=84=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddEval.vue | 230 +++++++++++++----------------
 1 file changed, 99 insertions(+), 131 deletions(-)

diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 5eb59a79..a424b672 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -1,49 +1,30 @@
 <template>
-  <a-drawer
-      :visible="addevalVisible"
-      class="drawerStyle addevalDrawer"
-      width="80%"
-      title="添加测评"
-      placement="right"
-      @after-visible-change="afterVisibleChange"
-  >
+  <a-drawer :visible="addevalVisible" class="drawerStyle addevalDrawer" width="80%" title="添加测评" placement="right"
+    @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">{{ edit ? "编辑" : "添加" }}测评</div>
-        <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">测评名称：</span>
             </div>
             <div class="btnbox">
-              <a-input
-                  v-model:value="inputV1"
-                  style="width: 424px; height: 32px"
-                  placeholder="请输入测评名称"
-                  maxlength="20"
-              />
+              <a-input v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入测评名称"
+                maxlength="20" />
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">选择测评：</span>
             </div>
@@ -52,13 +33,9 @@
                 选择测评
               </button>
               <span style="margin-left: 10px">
-                <a-tag
-                    class="tag-style"
-                    v-if="evaluationTypeName !== ''"
-                    :closable="true"
-                    @close="delTag"
-                >{{ evaluationTypeName }}</a-tag
-                >
+                <a-tag class="tag-style" v-if="evaluationTypeName !== ''" :closable="true" @close="delTag">{{
+                    evaluationTypeName
+                }}</a-tag>
               </span>
             </div>
           </div>
@@ -67,12 +44,8 @@
               <span style="margin-right: 3px">有效期：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker
-                  style="width: 424px"
-                  v-model:value="time"
-                  format="YYYY-MM-DD HH:mm:ss"
-                  :placeholder="['      开始时间', '        结束时间']"
-              />
+              <a-range-picker style="width: 424px" v-model:value="time" format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="['      开始时间', '        结束时间']" />
             </div>
           </div>
           <div class="main_item2">
@@ -80,12 +53,9 @@
               <span style="margin-right: 3px">测评说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea
-                  v-model:value="description"
-                  placeholder="请输入测评说明"
-                  style="width: 424px; height: 120px"
-                  allowClear
-              />
+              <a-textarea maxlength="150" v-model:value="description" placeholder="请输入测评说明"
+                style="width: 424px; height: 120px" allowClear />
+              <span style="position:relative;top:96px;left:-54px;z-index:9999;">{{ description.length }}/150</span>
             </div>
           </div>
         </div>
@@ -95,26 +65,23 @@
         <button class="btn2" @click="creoredit">确定</button>
       </div>
     </div>
-    <EvList
-        v-model:EvalListVisible="EvalListVisible"
-        v-model:evaluationTypeName="evaluationTypeName"
-        @getEvListData="checkFinish"
-    />
+    <EvList v-model:EvalListVisible="EvalListVisible" v-model:evaluationTypeName="evaluationTypeName"
+      @getEvListData="checkFinish" />
     <!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
       <a-spin :spinning="addLoading" tip="添加中..." />
     </div> -->
   </a-drawer>
 </template>
 <script>
-import {reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 // import { useRouter } from "vue-router";
 import EvList from "./EvList.vue";
 import * as api from "../../api/indexEval";
 import * as apitaskadd from "../../api/indexTaskadd";
-import {message} from "ant-design-vue";
-import {RouterEditTask} from "@/api/indexTask";
+import { message } from "ant-design-vue";
+import { RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
-import {addTempTask} from "../../api/indexTaskadd";
+import { addTempTask } from "../../api/indexTaskadd";
 
 export default {
   name: "AddEval",
@@ -170,7 +137,7 @@ export default {
       evaluationTypeId: null,
       evaluationTypeName: '',
       description: "",
-      EvalListVisible: false,
+      EvalListVisible: false
       // addLoading:false,
     });
     const checkFinish = (value) => {
@@ -184,8 +151,8 @@ export default {
       state.time = undefined;
       state.description = "";
       state.evaluationTypeId = 0,
-          state.evaluationTypeName = "",
-          localStorage.setItem("stageId", props.chooseStageId);
+        state.evaluationTypeName = "",
+        localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
@@ -212,32 +179,32 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 10,
         })
-            .then(() => {
-              //message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`);
-            })
-            .catch(() => {
-              //message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`);
-            });
+          .then(() => {
+            //message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`);
+          })
+          .catch(() => {
+            //message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`);
+          });
       } else if (props.isLevel == 2) {
         await apitaskadd
-            .addTask({
-              duration: 0,
-              flag: true,
-              courseId: Number(value.evaluationId),
-              name: value.evaluationName,
-              projectId: props.projectId,
-              projectTaskId: props.projectTaskId || 0,
-              stageId: props.chooseStageId || 0,
-              type: 10,
-            })
-            .then(() => {
-              message.destroy()
-              message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-            })
-            .catch(() => {
-              message.destroy()
-              //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-            });
+          .addTask({
+            duration: 0,
+            flag: true,
+            courseId: Number(value.evaluationId),
+            name: value.evaluationName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId || 0,
+            type: 10,
+          })
+          .then(() => {
+            message.destroy()
+            message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+          })
+          .catch(() => {
+            message.destroy()
+            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+          });
       } else if (props.isLevel == 3) {
         await addTempTask({
           courseId: Number(value.evaluationId),
@@ -247,12 +214,12 @@ export default {
           stageId: props.chooseStageId || 0,
           type: 10,
         })
-            .then(() => {
-              //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-            })
-            .catch(() => {
-              //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-            });
+          .then(() => {
+            //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+          })
+          .catch(() => {
+            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+          });
       }
     };
     //根据id获取测评信息
@@ -261,24 +228,24 @@ export default {
         evaluationId: props.EditEvalId,
       };
       api
-          .queryEvaluationDetailById(objqi)
-          .then((res) => {
-            message.destroy()
-            message.success("获取测评信息成功");
-            state.inputV1 = res.data.data.evaluationName
-            state.evaluationTypeName = res.data.data.evaluationTypeName
-            state.evaluationTypeId = res.data.data.evaluationTypeId;
-            state.time = res.data.data.evaluationStartTime ? [
-              dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"),
-              dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
-            ] : undefined;
-            state.description = res.data.data.evaluationExplain
-          })
-          .catch((err) => {
-            message.destroy()
-            message.error("获取测量平信息失败");
-            console.log(err, "erererrerererererer");
-          });
+        .queryEvaluationDetailById(objqi)
+        .then((res) => {
+          message.destroy()
+          message.success("获取测评信息成功");
+          state.inputV1 = res.data.data.evaluationName
+          state.evaluationTypeName = res.data.data.evaluationTypeName
+          state.evaluationTypeId = res.data.data.evaluationTypeId;
+          state.time = res.data.data.evaluationStartTime ? [
+            dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"),
+            dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
+          ] : undefined;
+          state.description = res.data.data.evaluationExplain
+        })
+        .catch((err) => {
+          message.destroy()
+          message.error("获取测量平信息失败");
+          console.log(err, "erererrerererererer");
+        });
     }
     const creoredit = () => {
       if (props.edit) {
@@ -287,6 +254,7 @@ export default {
         createEvalText()
       }
     }
+
     const editInvistText = () => {
       if (!state.inputV1) {
         message.destroy();
@@ -309,18 +277,18 @@ export default {
         updateTime: "",
       };
       api
-          .updateEvaluation(objei)
-          .then(async (res) => {
-            await updateTask(res.data.data);
-            closeDrawer();
-            ctx.emit("changeData", false);
-            message.destroy();
-            message.success("创建测评成功");
-          })
-          .catch(() => {
-            message.destroy();
-            message.success("创建测评失败");
-          });
+        .updateEvaluation(objei)
+        .then(async (res) => {
+          await updateTask(res.data.data);
+          closeDrawer();
+          ctx.emit("changeData", false);
+          message.destroy();
+          message.success("创建测评成功");
+        })
+        .catch(() => {
+          message.destroy();
+          message.success("创建测评失败");
+        });
     }
     //创建测评信息
     const createEvalText = () => {
@@ -346,18 +314,18 @@ export default {
         updateTime: "",
       };
       api
-          .createEvaluation(obj)
-          .then(async (res) => {
-            await updateTask(res.data.data);
-            closeDrawer();
-            ctx.emit("changeData", false);
-            message.destroy();
-            message.success("创建测评成功");
-          })
-          .catch(() => {
-            message.destroy();
-            message.success("创建测评失败");
-          });
+        .createEvaluation(obj)
+        .then(async (res) => {
+          await updateTask(res.data.data);
+          closeDrawer();
+          ctx.emit("changeData", false);
+          message.destroy();
+          message.success("创建测评成功");
+        })
+        .catch(() => {
+          message.destroy();
+          message.success("创建测评失败");
+        });
     };
 
     return {
@@ -372,7 +340,7 @@ export default {
       queryInvistById,
       editInvistText,
       showEvalDrawer,
-      updateTask,
+      updateTask
     };
   },
 };

From 37bb59475fa46e3b00c2293e42cd963134165ad5 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 2 Dec 2022 23:12:23 +0800
Subject: [PATCH 08/13] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AEshenhe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexAudit.js                  |   3 +
 src/views/examine/ProjectReviewed.vue  | 338 ++++++++++---------------
 src/views/examine/ProjectReviewedN.vue |  67 -----
 3 files changed, 132 insertions(+), 276 deletions(-)

diff --git a/src/api/indexAudit.js b/src/api/indexAudit.js
index 773045e9..4ce63f8a 100644
--- a/src/api/indexAudit.js
+++ b/src/api/indexAudit.js
@@ -9,6 +9,9 @@ export const projlist = (obj) => http.post('/admin/project/list', obj)
 //获取待审核项目列表
 export const auditlist = (obj) => http.post('/admin/project/auditlist', obj)
 
+//获取已审核项目列表
+export const auditedlist = (obj) => http.post('/admin/project/auditedlist', obj)
+
 //获取已审核项目列表
 export const listView = (obj) => http.post('/admin/project/listView', obj)
 
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index 21654395..cecfabf5 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -15,56 +15,48 @@
           <div class="inpbox">
             <div class="inpbox1">
               <a-input
-                v-model:value="valueproj"
-                style="
+                  v-model:value="valueproj"
+                  style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                placeholder="请输入项目名称/所属项目"
+                  placeholder="请输入项目名称/所属项目"
               />
             </div>
             <div class="inpbox1">
               <a-input
-                v-model:value="valuename"
-                style="
+                  v-model:value="valuename"
+                  style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                placeholder="请输入项目经理"
+                  placeholder="请输入项目经理"
               />
             </div>
             <div class="inpbox1">
               <a-input
-                v-model:value="valuecreater"
-                style="
+                  v-model:value="valuecreater"
+                  style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                placeholder="请输入创建人"
+                  placeholder="请输入创建人"
               />
             </div>
             <div class="inpbox1">
               <a-range-picker
-                v-model:value="valueDate"
-                style="border-radius: 8px; height: 40px; margin-left: 5px"
-                :placeholder="['      开始时间', '        结束时间']"
-                @change="rankTimeChange"
+                  v-model:value="valueDate"
+                  style="border-radius: 8px; height: 40px; margin-left: 5px"
+                  :placeholder="['      开始时间', '        结束时间']"
+                  valueFormat="X"
               />
             </div>
-<!--            <div class="inpbox1">-->
-<!--              <a-select-->
-<!--                v-model:value="valuestate"-->
-<!--                placeholder="请选择审核状态"-->
-<!--                @change="handleChangeproj"-->
-<!--                :options="optionsproj"-->
-<!--              />-->
-<!--            </div>-->
           </div>
         </div>
         <div class="tmplh_btn">
@@ -81,26 +73,26 @@
       <div class="tmpl_body">
         <div class="tmpl_tabbox">
           <a-table
-            :columns="columns1"
-            :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
-            @expand="expandTable"
-            :scroll="{ x: 1300 }"
-            :pagination="false"
+              :columns="columns1"
+              :data-source="tableData1"
+              :loading="tableDataTotal === -1 ? true : false"
+              expandRowByClick="true"
+              @expand="expandTable"
+              :scroll="{ x: 1300 }"
+              :pagination="false"
           />
         </div>
         <div class="tableBox">
           <div class="pa">
             <a-pagination
-              v-if="total > 10"
-              showSizeChanger="true"
-              show-quick-jumper
-              :pageSize="pageSize"
-              v-model:current="currentPage"
-              :total="total"
-              class="pagination"
-              @change="changePagination"
+                v-if="total > 10"
+                showSizeChanger="true"
+                show-quick-jumper
+                :pageSize="pageSize"
+                v-model:current="currentPage"
+                :total="total"
+                class="pagination"
+                @change="changePagination"
             />
           </div>
         </div>
@@ -108,11 +100,11 @@
     </div>
     <!-- 审核日志弹窗 -->
     <a-modal
-      v-model:visible="projAuditModal"
-      :footer="null"
-      :closable="closeBack"
-      wrapClassName="projAuditModal"
-      centered="true"
+        v-model:visible="projAuditModal"
+        :footer="null"
+        :closable="closeBack"
+        wrapClassName="projAuditModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -124,14 +116,14 @@
           </div>
           <div class="body">
             <a-table
-              style="width: 90%"
-              :columns="columnsAudit"
-              :data-source="tableDataAudit"
-              :loading="tableDataTotalAudit === -1 ? true : false"
-              expandRowByClick="true"
-              :scroll="{ y: 150 }"
-              @expand="expandTable"
-              :pagination="false"
+                style="width: 90%"
+                :columns="columnsAudit"
+                :data-source="tableDataAudit"
+                :loading="tableDataTotalAudit === -1 ? true : false"
+                expandRowByClick="true"
+                :scroll="{ y: 150 }"
+                @expand="expandTable"
+                :pagination="false"
             />
           </div>
           <div class="del_btnbox">
@@ -148,9 +140,8 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
-import { listView, auditList } from "../../api/indexAudit";
-import { toDate } from "@/api/method";
+import {reactive, toRefs, onMounted} from "vue";
+import {listView, auditList, auditlist, auditedlist} from "../../api/indexAudit";
 
 export default {
   name: "ProjectViewed",
@@ -180,8 +171,8 @@ export default {
       columns1: [
         {
           title: "序号",
-          dataIndex: "number",
-          key: "number",
+          dataIndex: "projectId",
+          key: "projectId",
           align: "center",
         },
         {
@@ -193,8 +184,8 @@ export default {
 
         {
           title: "所属项目",
-          dataIndex: "sourceBelongName",
-          key: "sourceBelongName",
+          dataIndex: "topName",
+          key: "topName",
           align: "center",
           width: "10%",
         },
@@ -209,23 +200,24 @@ export default {
           dataIndex: "status",
           key: "status",
           align: "center",
+          customRender: ({record: {status}}) => <div>{{2: '审核通过', 3: '审核拒绝'}[status]}</div>,
         },
         {
           title: "创建人",
-          dataIndex: "creater",
-          key: "creater",
+          dataIndex: "createName",
+          key: "createName",
           align: "center",
         },
         {
           title: "审核时间",
-          dataIndex: "time",
-          key: "time",
+          dataIndex: "updateTime",
+          key: "updateTime",
           align: "center",
         },
         {
           title: "审核说明",
-          dataIndex: "msg",
-          key: "msg",
+          dataIndex: "description",
+          key: "description",
           align: "center",
         },
 
@@ -236,16 +228,16 @@ export default {
           align: "center",
           customRender: (value) => {
             return (
-              <div>
+                <div>
                 <span
-                  onClick={() => {
-                    showProjAuditModal(value.record.id);
-                  }}
-                  style="cursor:pointer;color:#387DF7"
+                    onClick={() => {
+                      showProjAuditModal(value.record.auditList);
+                    }}
+                    style="cursor:pointer;color:#387DF7"
                 >
                   审核日志
                 </span>
-              </div>
+                </div>
             );
           },
         },
@@ -254,22 +246,23 @@ export default {
       columnsAudit: [
         {
           title: "审核人",
-          dataIndex: "name",
-          key: "name",
+          dataIndex: "createName",
+          key: "createName",
           align: "center",
         },
 
         {
           title: "审核状态",
-          dataIndex: "belong",
-          key: "belong",
+          dataIndex: "status",
+          key: "status",
           align: "center",
+          customRender: ({record: {status}}) => <div>{{'2': '审核通过', '-2': '审核拒绝'}[(status + '')]}</div>,
         },
 
         {
           title: "审核时间",
-          dataIndex: "time",
-          key: "time",
+          dataIndex: "createName",
+          key: "createName",
           align: "center",
         },
 
@@ -286,124 +279,21 @@ export default {
     });
     const getProjList = () => {
       let objn = {
-        beginTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]) ,
-        endTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[1]),
+        beginTime: state.valueDate ? state.valueDate[0] : '',
+        endTime: state.valueDate ? state.valueDate[1] : '',
         createName: state.valuecreater,
         manager: state.valuename,
         name: state.valueproj,
         pageNo: state.currentPage,
         pageSize: state.pageSize,
-        status: 0,
+        status: 1,
       };
-      listView(objn)
-        .then((res) => {
-          console.log("获取已审核项目成功", res.data.data.rows);
-          let result = res.data.data;
-          state.total = res.data.data.total;
-            setTableData(result.rows);
-        })
-        .catch((err) => {
-          console.log("获取已审核项目失败", err);
-        });
+      auditedlist(objn).then((res) => {
+        let result = res.data.data;
+        state.total = res.data.data.total;
+        state.tableData1 = result.rows
+      })
     };
-    const setTableData = (tabledata) => {
-      let data = tabledata;
-      let array = [];
-      data.map((item,index) => {
-        if(item.type == 3){
-        let obj = {
-          key:index+1,
-          number: item.projectId,
-          name: item.name,
-          belong: "",
-          manager: item.manager || "-",
-          sourceBelongName: item.sourceBelongName,
-          status:
-            item.status == 0
-              ? "草稿"
-              : item.status == 1
-              ? "已发布"
-              : item.status == 2
-              ? "已结束"
-              : "-",
-          creater: item.createName,
-          time: toDate(item.beginTime, "Y-M-D h:m"),
-          msg: item.description || "-",
-          id: item.projectId,
-        };
-        array.push(obj);
-      } else {
-        let obj = {
-          key:index+1,
-          number: item.projectId,
-          name: item.name,
-          belong: "",
-          sourceBelongName: item.sourceBelongName,
-          manager: item.manager || "-",
-          status:
-            item.status == 0
-              ? "草稿"
-              : item.status == 1
-              ? "已发布"
-              : item.status == 2
-              ? "已结束"
-              : "-",
-          creater: item.createName,
-          time: toDate(item.beginTime, "Y-M-D h:m"),
-          msg: item.description || "-",
-          id: item.projectId,
-          children: item.subList ? setTableData(item.subList) : [] ,
-        };
-        array.push(obj);
-      }
-      });
-      state.tableData1 = array;
-      return array
-    };
-    // const getName = (item) => {
-    //   if (
-    //     Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
-    //     !Object.prototype.hasOwnProperty.call(
-    //       item.subList[0].subList[0],
-    //       "name"
-    //     )
-    //   ) {
-    //     // 两层
-    //     return item.subList[0].name;
-    //   } else if (
-    //     Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
-    //     Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
-    //   ) {
-    //     //三层
-    //     return item.subList[0].subList[0].name;
-    //     // return item.name
-    //   } else {
-    //     // 单层
-    //     return item.name;
-    //   }
-    // };
-    // const getBelong = (item) => {
-    //   if (
-    //     Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
-    //     !Object.prototype.hasOwnProperty.call(
-    //       item.subList[0].subList[0],
-    //       "name"
-    //     )
-    //   ) {
-    //     // 两层
-    //     return item.name;
-    //   } else if (
-    //     Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
-    //     Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
-    //   ) {
-    //     //三层
-    //     return item.subList[0].name + "/" + item.subList[0].subList[0].name;
-    //     // return item.name
-    //   } else {
-    //     // 单层
-    //     return item.name;
-    //   }
-    // };
     const changePagination = (pagina) => {
       state.currentPage = pagina;
       getProjList();
@@ -419,21 +309,9 @@ export default {
     const closeProjAuditModal = () => {
       state.projAuditModal = false;
     };
-    const showProjAuditModal = (id) => {
+    const showProjAuditModal = (data) => {
+      state.tableDataAudit = data
       state.projAuditModal = true;
-      auditList({
-        pageNo: 1,
-        pageSize: 10,
-        project_id: id,
-      })
-        .then((res) => {
-          console.log("获取到了审核日志列表", res);
-          let result = res.data.data;
-          setAudit(result.rows);
-        })
-        .catch((err) => {
-          console.log("审核日志列表获取失败", err);
-        });
     };
     const setAudit = (table) => {
       let data = table;
@@ -442,13 +320,13 @@ export default {
         let obj = {
           name: item.create_name,
           belong:
-            item.status == 1
-              ? "提交待审核"
-              : item.status == 2
-              ? "通过"
-              : item.status == 3
-              ? "拒绝"
-              : "-",
+              item.status == 1
+                  ? "提交待审核"
+                  : item.status == 2
+                      ? "通过"
+                      : item.status == 3
+                          ? "拒绝"
+                          : "-",
           time: item.createTime,
           description: item.description,
         };
@@ -464,7 +342,6 @@ export default {
     return {
       ...toRefs(state),
       getProjList,
-      setTableData,
       changePagination,
       reset,
       closeProjAuditModal,
@@ -479,13 +356,16 @@ export default {
   .ant-modal {
     width: 816px !important;
     min-height: 420px !important;
+
     .ant-modal-content {
       width: 816px !important;
       min-height: 420px !important;
+
       .ant-modal-body {
         width: 816px !important;
         min-height: 420px !important;
         padding: 0 !important;
+
         .delete {
           z-index: 999;
           width: 816px;
@@ -502,19 +382,22 @@ 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%
             );
           }
+
           .del_main {
             width: 100%;
             position: relative;
+
             .header {
               display: flex;
               align-items: center;
               padding-top: 20px;
               padding-left: 26px;
               font-size: 16px;
+
               .icon {
                 width: 16px;
                 height: 16px;
@@ -522,6 +405,7 @@ export default {
                 background-image: url(@/assets/images/taskpage/gan.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -532,6 +416,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -541,9 +426,11 @@ export default {
               flex-direction: column;
               // background-color: red;
               position: relative;
+
               .ant-table-empty {
                 width: 100% !important;
               }
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -552,10 +439,12 @@ export default {
                 color: #666666;
               }
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -567,17 +456,20 @@ export default {
 
                 flex-shrink: 0;
                 cursor: pointer;
+
                 .btnText {
                   font-size: 14px;
                   font-weight: 400;
                   line-height: 40px;
                 }
               }
+
               .btn1 {
                 border: 1px solid rgba(64, 158, 255, 1);
                 color: #4ea6ff;
                 margin-right: 14px;
               }
+
               .btn2 {
                 background-color: #4ea6ff;
                 color: #ffffff;
@@ -589,10 +481,13 @@ export default {
     }
   }
 }
+
 .projectviewed {
   width: 100%;
+
   .tmpl {
     width: 100%;
+
     .tmpl_header {
       display: flex;
       flex-wrap: wrap;
@@ -601,33 +496,39 @@ export default {
 
       margin-left: 32px;
       margin-right: 32px;
+
       .tmplh_inp {
         .inpbox {
           display: flex;
           flex-wrap: wrap;
           margin-top: 42px;
+
           .inpbox1 {
             display: flex;
             justify-content: center;
             align-items: center;
             margin-right: 24px;
             margin-top: 10px;
+
             .ant-select-selector {
               border-radius: 8px;
               width: 270px;
               height: 40px;
               padding-top: 5px;
             }
+
             span {
               white-space: nowrap;
             }
           }
         }
       }
+
       .tmplh_btn {
         display: flex;
         // margin-left: 38px;
         margin-top: 32px;
+
         .btn {
           padding: 0px 26px 0px 26px;
           height: 38px;
@@ -638,72 +539,90 @@ export default {
           margin-right: 14px;
           cursor: pointer;
           flex-shrink: 0;
+
           .search {
             background-size: 100%;
           }
+
           .btnText {
             font-size: 14px;
             font-weight: 400;
             line-height: 36px;
             margin-left: 5px;
           }
+
           .btnText1 {
             color: rgb(255, 255, 255);
           }
+
           .btnText2 {
             color: rgba(64, 158, 255, 1);
           }
         }
+
         .btn1 {
           background: #409eff;
+
           .search {
             width: 15px;
             height: 17px;
             background-image: url("../../assets/images/courseManage/search0.png");
           }
         }
+
         .btn2 {
           background: #ffffff;
           border: 1px solid #388be1;
+
           .search {
             width: 16px;
             height: 18px;
             background-image: url("../../assets/images/courseManage/reset1.png");
           }
         }
+
         .btn1:hover {
           background: rgb(255, 255, 255);
           border: 1px solid #388be1;
+
           .search {
             background-image: url("../../assets/images/courseManage/search1.png");
           }
+
           .btnText {
             color: rgba(64, 158, 255, 1);
           }
         }
+
         .btn2:hover {
           background: rgba(64, 158, 255, 1);
+
           .search {
             background-image: url("../../assets/images/courseManage/reset0.png");
           }
+
           .btnText {
             color: #ffffff;
           }
         }
       }
     }
+
     .tmpl_body {
       padding: 0px 30px;
+
       .tmpl_tabbox {
         .operation {
           display: flex;
           justify-content: center;
           align-items: center;
           color: #4ea6ff;
+
           .nselect {
             justify-content: center;
             align-items: center;
             display: flex;
+
             .jc {
               margin-left: 20px;
               white-space: nowrap;
@@ -712,6 +631,7 @@ export default {
           }
         }
       }
+
       .pa {
         width: 100%;
         margin-top: 20px;
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index ea7dd151..ec8ec9f8 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -207,72 +207,6 @@ export default {
           console.log("获取待审核项目失败", err);
         });
     };
-    const setProjList = (tableData) => {
-      let data = tableData;
-      let array = [];
-      data.map((item, index) => {
-        if (item.type == 3) {
-          let obj = {
-            key: index + 1,
-            number: item.projectId,
-            name: item.name,
-            belong: item.parentId,
-            sourceBelongName: item.sourceBelongName,
-            manager: item.manager || "-",
-            status:
-              item.status == 0
-                ? "草稿"
-                : item.status == 1
-                  ? "待审核"
-                  : item.status == 2
-                    ? "通过"
-                    : item.status == 3
-                      ? "发布"
-                      : item.status == -1
-                        ? "已结束"
-                        : item.status == -2
-                          ? "拒绝"
-                          : "-",
-            creater: item.createName,
-            time: item.createTime,
-            projectId: item.projectId,
-            createId: item.createId,
-          };
-          array.push(obj);
-        } else {
-          let obj = {
-            key: index + 1,
-            number: item.projectId,
-            name: item.name,
-            belong: item.parentId,
-            sourceBelongName: item.sourceBelongName,
-            manager: item.manager || "-",
-            status:
-              item.status == 0
-                ? "草稿"
-                : item.status == 1
-                  ? "待审核"
-                  : item.status == 2
-                    ? "通过"
-                    : item.status == 3
-                      ? "发布"
-                      : item.status == -1
-                        ? "已结束"
-                        : item.status == -2
-                          ? "拒绝"
-                          : "-",
-            creater: item.createName,
-            time: item.createTime,
-            projectId: item.projectId,
-            createId: item.createId,
-            children: item.subList ? setProjList(item.subList) : [],
-          };
-          array.push(obj);
-        }
-      });
-      state.tableData1 = array
-      return array
-    };
     const changePagination = (pagina) => {
       state.currentPage = pagina;
       getProjList();
@@ -291,7 +225,6 @@ export default {
       ...toRefs(state),
       showProjAudit,
       getProjList,
-      setProjList,
       changePagination,
       reset,
     };

From 2926e182796c6dd5b80beed44af2d6424d4248c4 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 3 Dec 2022 00:22:07 +0800
Subject: [PATCH 09/13] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E7=BB=8F=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/method.js                         | 393 +++++++++++-----------
 src/components/project/ProjectManager.vue |  43 ++-
 src/views/projectcenter/ProjectManage.vue |   2 +-
 3 files changed, 236 insertions(+), 202 deletions(-)

diff --git a/src/api/method.js b/src/api/method.js
index 78a6113b..75c63029 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -1,221 +1,235 @@
-
 function formatNumber(n) {
-  n = n.toString();
-  return n[1] ? n : "0" + n;
+    n = n.toString();
+    return n[1] ? n : "0" + n;
 }
+
 function toDate(number, format) {
-  var formateArr = ["Y", "M", "D", "h", "m", "s"];
-  var returnArr = [];
+    var formateArr = ["Y", "M", "D", "h", "m", "s"];
+    var returnArr = [];
 
-  if (number === 0) {
-    return 0;
-  } else {
-    var date = new Date(number * 1000);
-  }
-  returnArr.push(date.getFullYear());
-  returnArr.push(formatNumber(date.getMonth() + 1));
-  returnArr.push(formatNumber(date.getDate()));
+    if (number === 0) {
+        return 0;
+    } else {
+        var date = new Date(number * 1000);
+    }
+    returnArr.push(date.getFullYear());
+    returnArr.push(formatNumber(date.getMonth() + 1));
+    returnArr.push(formatNumber(date.getDate()));
 
-  returnArr.push(formatNumber(date.getHours()));
-  returnArr.push(formatNumber(date.getMinutes()));
-  returnArr.push(formatNumber(date.getSeconds()));
+    returnArr.push(formatNumber(date.getHours()));
+    returnArr.push(formatNumber(date.getMinutes()));
+    returnArr.push(formatNumber(date.getSeconds()));
 
-  for (var i in returnArr) {
-    format = format.replace(formateArr[i], returnArr[i]);
-  }
-  return format;
+    for (var i in returnArr) {
+        format = format.replace(formateArr[i], returnArr[i]);
+    }
+    return format;
 }
+
 function getWeek(date) {
-  //date:'Y-M-D'
-  let time = new Date(date).getDay()
-  let week;
-  if (time == 0) week = "星期日"
-  if (time == 1) week = "星期一"
-  if (time == 2) week = "星期二"
-  if (time == 3) week = "星期三"
-  if (time == 4) week = "星期四"
-  if (time == 5) week = "星期五"
-  if (time == 6) week = "星期六"
-  return week;
+    //date:'Y-M-D'
+    let time = new Date(date).getDay()
+    let week;
+    if (time == 0) week = "星期日"
+    if (time == 1) week = "星期一"
+    if (time == 2) week = "星期二"
+    if (time == 3) week = "星期三"
+    if (time == 4) week = "星期四"
+    if (time == 5) week = "星期五"
+    if (time == 6) week = "星期六"
+    return week;
 }
 
 /************************************将数字搞成带逗号的那种*********************************************/
 function autoComma(number) {
-  // let number = parseInt(numb)
-  if (number) {
-    let newNum = ""; //中间变量
-    let arr = [];
-    let arr1 = [];
-    let num = ""; //最终结果
-    let isDecimal = false; //是不是小数
-    let decimal = 0; //小数点所在位置
-    let decimalNum = ""; //小数点和以后的数据
-    let negative = false; //是不是负数
-    // 判断百万级别或者上亿级别
-    let thousand = false;
-    let Billion = false;
+    // let number = parseInt(numb)
+    if (number) {
+        let newNum = ""; //中间变量
+        let arr = [];
+        let arr1 = [];
+        let num = ""; //最终结果
+        let isDecimal = false; //是不是小数
+        let decimal = 0; //小数点所在位置
+        let decimalNum = ""; //小数点和以后的数据
+        let negative = false; //是不是负数
+        // 判断百万级别或者上亿级别
+        let thousand = false;
+        let Billion = false;
 
-    if (
-      (number >= 10000 || number <= -10000) &&
-      number < 100000000 &&
-      number > -100000000
-    ) {
-      thousand = true;
-      number = number / 10000;
-    }
-    if (number >= 100000000 || number <= -100000000) {
-      thousand = false;
-      Billion = true;
-      number = number / 100000000;
-    }
+        if (
+            (number >= 10000 || number <= -10000) &&
+            number < 100000000 &&
+            number > -100000000
+        ) {
+            thousand = true;
+            number = number / 10000;
+        }
+        if (number >= 100000000 || number <= -100000000) {
+            thousand = false;
+            Billion = true;
+            number = number / 100000000;
+        }
 
-    if (number < 0) {
-      number = Math.abs(number);
-      negative = true;
-    }
-    let numStr = JSON.stringify(number);
-    // 如果传入的是小数，逗号的添加位置和整数是有区别滴
-    for (let i = 0; i < numStr.length; i++) {
-      if (numStr[i] === ".") {
-        isDecimal = true;
-        decimal = i;
-        decimalNum = numStr.slice(decimal, numStr.length);
-        // 保留两位小数
-        if (decimalNum.length > 2) {
-          decimalNum = decimalNum.slice(0, 3);
+        if (number < 0) {
+            number = Math.abs(number);
+            negative = true;
         }
-        numStr = numStr.slice(0, decimal);
-      }
-    }
-    for (let i = 0; i < numStr.length; i++) {
-      arr.push(numStr[numStr.length - i - 1]);
-    }
-    for (let i = 0; i < arr.length; i++) {
-      if ((i + 1) % 3 === 0 && i + 1 !== 0 && i + 1 < arr.length) {
-        newNum += arr[i];
-        newNum = newNum + ",";
-      } else {
-        newNum += arr[i];
-      }
-    }
-    for (let i = 0; i < newNum.length; i++) {
-      arr1.push(newNum[newNum.length - i - 1]);
-    }
-    for (let i = 0; i < arr1.length; i++) {
-      num += arr1[i];
-    }
-    if (isDecimal) {
-      if (negative) {
-        // num = '-' + num + decimalNum
-        // return num
-        if (thousand) {
-          num = "-" + num + decimalNum + "万";
-          return num;
-        } else if (Billion) {
-          num = "-" + num + decimalNum + "亿";
-          return num;
+        let numStr = JSON.stringify(number);
+        // 如果传入的是小数，逗号的添加位置和整数是有区别滴
+        for (let i = 0; i < numStr.length; i++) {
+            if (numStr[i] === ".") {
+                isDecimal = true;
+                decimal = i;
+                decimalNum = numStr.slice(decimal, numStr.length);
+                // 保留两位小数
+                if (decimalNum.length > 2) {
+                    decimalNum = decimalNum.slice(0, 3);
+                }
+                numStr = numStr.slice(0, decimal);
+            }
+        }
+        for (let i = 0; i < numStr.length; i++) {
+            arr.push(numStr[numStr.length - i - 1]);
+        }
+        for (let i = 0; i < arr.length; i++) {
+            if ((i + 1) % 3 === 0 && i + 1 !== 0 && i + 1 < arr.length) {
+                newNum += arr[i];
+                newNum = newNum + ",";
+            } else {
+                newNum += arr[i];
+            }
+        }
+        for (let i = 0; i < newNum.length; i++) {
+            arr1.push(newNum[newNum.length - i - 1]);
+        }
+        for (let i = 0; i < arr1.length; i++) {
+            num += arr1[i];
+        }
+        if (isDecimal) {
+            if (negative) {
+                // num = '-' + num + decimalNum
+                // return num
+                if (thousand) {
+                    num = "-" + num + decimalNum + "万";
+                    return num;
+                } else if (Billion) {
+                    num = "-" + num + decimalNum + "亿";
+                    return num;
+                } else {
+                    num = "-" + num + decimalNum;
+                    return num;
+                }
+            } else {
+                // num = num + decimalNum
+                // return num
+                if (thousand) {
+                    num = num + decimalNum + "万";
+                    return num;
+                } else if (Billion) {
+                    num = num + decimalNum + "亿";
+                    return num;
+                } else {
+                    num = num + decimalNum;
+                    return num;
+                }
+            }
         } else {
-          num = "-" + num + decimalNum;
-          return num;
+            if (negative) {
+                // num = '-' + num
+                // return num
+                if (thousand) {
+                    num = "-" + num + "万";
+                    return num;
+                } else if (Billion) {
+                    num = "-" + num + "亿";
+                    return num;
+                } else {
+                    num = "-" + num;
+                    return num;
+                }
+            } else {
+                if (thousand) {
+                    num = num + "万";
+                    return num;
+                } else if (Billion) {
+                    num = num + "亿";
+                    return num;
+                } else {
+                    return num;
+                }
+            }
         }
-      } else {
-        // num = num + decimalNum
-        // return num
-        if (thousand) {
-          num = num + decimalNum + "万";
-          return num;
-        } else if (Billion) {
-          num = num + decimalNum + "亿";
-          return num;
-        } else {
-          num = num + decimalNum;
-          return num;
-        }
-      }
     } else {
-      if (negative) {
-        // num = '-' + num
-        // return num
-        if (thousand) {
-          num = "-" + num + "万";
-          return num;
-        } else if (Billion) {
-          num = "-" + num + "亿";
-          return num;
-        } else {
-          num = "-" + num;
-          return num;
-        }
-      } else {
-        if (thousand) {
-          num = num + "万";
-          return num;
-        } else if (Billion) {
-          num = num + "亿";
-          return num;
-        } else {
-          return num;
-        }
-      }
+        return 0;
     }
-  } else {
-    return 0;
-  }
+}
+
+//节流
+function throttle(fn, delay = 200) {
+    var timer = null;
+    return function () {
+        console.log('throttle')
+        var context = this, args = arguments;
+        clearTimeout(timer);
+        timer = setTimeout(function () {
+            fn.apply(context, args);
+        }, delay);
+    };
 }
 
 //把token存到cookie
 //name 字段名   value 字段值   perpetual  有效期
 const setCookie = (name, value, perpetual) => {
-  console.log('存储token到cookie')
-  let exdate = new Date()
-  exdate.setDate(perpetual * 24 * 60 * 60 * 1000)  //exdate.setDate(exdate.getDate() + 365)
-  document.cookie = `${name}=${value};expires=${exdate.toGMTString()};path=/`
-  //永久有效
-  //document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT'    
+    console.log('存储token到cookie')
+    let exdate = new Date()
+    exdate.setDate(perpetual * 24 * 60 * 60 * 1000)  //exdate.setDate(exdate.getDate() + 365)
+    document.cookie = `${name}=${value};expires=${exdate.toGMTString()};path=/`
+    //永久有效
+    //document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT'
 }
 //获取cookie数据
 
 //先写一个方法
 function getCookie(name) {
-  //1.获取cookie字符串
-  var cookies = document.cookie;
-  //通过；来分割字符串
-  var cookie = cookies.split("; ");
-  // console.log('cookie', cookie)
-  //遍历，使键值对匹配上
-  for (var i = 0; i < cookie.length; i++) {
-    var arr = cookie[i].split("token=");
-    // console.log('arr', arr)
-    console.log('name', name)
-    // if (arr[0] == name) {
-    //   console.log('arr[1]', arr[1])
-    //   return arr[1];
-    // }
-    // console.log('arr[1]', arr[1])
-    return arr[1]
-  }
-  return "";
+    //1.获取cookie字符串
+    var cookies = document.cookie;
+    //通过；来分割字符串
+    var cookie = cookies.split("; ");
+    // console.log('cookie', cookie)
+    //遍历，使键值对匹配上
+    for (var i = 0; i < cookie.length; i++) {
+        var arr = cookie[i].split("token=");
+        // console.log('arr', arr)
+        console.log('name', name)
+        // if (arr[0] == name) {
+        //   console.log('arr[1]', arr[1])
+        //   return arr[1];
+        // }
+        // console.log('arr[1]', arr[1])
+        return arr[1]
+    }
+    return "";
 }
 
 
 //滚动加载信息
 const scrollLoad = (e) => {
-  // console.log("滚动", e, b);
-  const { target } = e;
-  const scrllHeight = target.scrollHeight - target.scrollTop;
-  const clientHeight = target.clientHeight;
-  // console.log("scrllHeight", scrllHeight, clientHeight);
-  if (scrllHeight === 0 && clientHeight === 0) {
-    return 1
-  } else if (scrllHeight - clientHeight == 0) {
-    return 2
-  }
+    // console.log("滚动", e, b);
+    const {target} = e;
+    const scrllHeight = target.scrollHeight - target.scrollTop;
+    const clientHeight = target.clientHeight;
+    // console.log("scrllHeight", scrllHeight, clientHeight);
+    if (scrllHeight === 0 && clientHeight === 0) {
+        return 1
+    } else if (scrllHeight - clientHeight == 0) {
+        return 2
+    }
 };
 
 
 //新建延迟
 const commonData = {
-  timeout: 50,
+    timeout: 50,
 }
 // const organizationalTree = [
 //   {
@@ -422,14 +436,15 @@ const organizationalTree = []
 
 const iframeUrl = "https://u-pre.boe.com/pc/iframe"
 export {
-  toDate,
-  getWeek,
-  autoComma,
-  formatNumber,
-  setCookie,
-  getCookie,
-  scrollLoad,
-  commonData,
-  organizationalTree,
-  iframeUrl,
+    throttle,
+    toDate,
+    getWeek,
+    autoComma,
+    formatNumber,
+    setCookie,
+    getCookie,
+    scrollLoad,
+    commonData,
+    organizationalTree,
+    iframeUrl,
 }
\ No newline at end of file
diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue
index 766d61d4..e3d8fee3 100644
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -20,7 +20,7 @@
 </template>
 <script>
 import {onMounted, reactive, toRefs, watch} from "vue";
-import {scrollLoad} from "@/api/method";
+import {scrollLoad, throttle} from "@/api/method";
 import * as api1 from "@/api/index1";
 
 export default {
@@ -46,8 +46,9 @@ export default {
       loading: false,
       init: false
     });
+    const getMemberThrottle = throttle(getMember, 500)
 
-    watch(() => state.memberParam, getMember)
+    watch(() => state.memberParam, getMemberThrottle)
     watch(props, init)
 
     onMounted(() => {
@@ -57,15 +58,24 @@ export default {
 
     function getMember() {
       state.loading = true
+      state.options = []
+      getMemberData()
+    }
+
+
+    function getMemberData() {
       api1.getMemberInfo(state.memberParam).then((res) => {
         const list = res.data.data.rows.filter(e => !props.value?.includes(e.id + '')).map(e => ({
           label: e.realName,
           value: e.id
         }));
-        state.options.push(...list)
+        if (state.memberParam.pageNo === 1 && props.value) {
+          const arrManagerId = props.value.split(',')
+          const arrManager = props.name.split(',')
+          state.options = [...arrManager.map((e, i) => ({label: e, value: arrManagerId[i]})), ...list]
+        } else state.options.push(...list)
         state.loading = false
       });
-
     }
 
     const memberScroll = (e) => {
@@ -82,16 +92,25 @@ export default {
     };
 
     function init() {
-      if (!props.value) {
-        state.managerArray = []
+      console.log('init--', props)
+      if (props.value !== state.managerArray.join(',')) {
+        if (props.value) {
+          const arrManager = props.name.split(',')
+          const arrManagerId = props.value.split(',')
+          state.managerArray = arrManagerId
+          state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
+        } else {
+          state.managerArray = []
+        }
+        getMemberData()
         return;
       }
-      if (props.value !== state.managerArray.join(',')) {
-        const arrManager = props.name.split(',')
-        const arrManagerId = props.value.split(',')
-        state.managerArray = arrManagerId
-        state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
-        getMember()
+      if (!props.value) {
+        if (!(state.options && state.options.length)) {
+          state.options = []
+          getMember()
+        }
+        return;
       }
     }
 
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 83498eea..27700af6 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -347,7 +347,7 @@
             </div>
           </div>
           <div class="modalMain">
-            <router-link :to="`/projectadd?parentId=${projectInfo.parentId}&parentName=${projectInfo.parentName}`">
+            <router-link :to="`/projectadd?parentId=${projectInfo.parentId  || ''}&parentName=${projectInfo.parentName || ''}`">
               <div
                   class="taskbox"
                   style="

From e0cceeac014b321229b52144be6db6870f83dda6 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 3 Dec 2022 00:43:17 +0800
Subject: [PATCH 10/13] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 27700af6..7b470d40 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1342,7 +1342,7 @@ export default {
                   编辑
                 </span>
                 : ''}
-            {(value.record.status === 0 || value.record.status === -2) && value.record.type !== 1 ?
+            {(value.record.status === 0 || value.record.status === -2) && value.record.type === 3 ?
                 <span
                     onClick={() => {
                       showReviewModal(value.record.projectId);
@@ -1484,7 +1484,7 @@ export default {
                     删除
                   </div>
                 </a-select-option>
-                {value.record.status === 3 || value.record.status === 2 ?
+                {value.record.type === 3 ?
                     <a-select-option value="存为模版" label="存为模版">
                       <div
                           onClick={() => {
@@ -1494,7 +1494,7 @@ export default {
                         存为模版
                       </div>
                     </a-select-option> : ''}
-                {value.record.status === 3 || value.record.status === 2 ?
+                {value.record.type === 3 ?
                     <a-select-option value="基础信息" label="基础信息">
                       <div
                           onClick={() => {

From 84beb3ca60f5ad212694cb1fb022e1e41d1c27b6 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 3 Dec 2022 00:46:10 +0800
Subject: [PATCH 11/13] -- bug

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

diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index cecfabf5..ca430f93 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -261,9 +261,10 @@ export default {
 
         {
           title: "审核时间",
-          dataIndex: "createName",
-          key: "createName",
+          dataIndex: "createTime",
+          key: "createTime",
           align: "center",
+          width: 220
         },
 
         {

From 463ecf97a2a2dbc5728f9649a61f016953a63fb1 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 3 Dec 2022 00:58:54 +0800
Subject: [PATCH 12/13] -- bug

---
 src/components/drawers/ProjectAudit.vue | 143 ++++++++++++++----------
 1 file changed, 83 insertions(+), 60 deletions(-)

diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index e863c007..19ffebf8 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -1,11 +1,11 @@
 <template>
   <a-drawer :visible="ProjAuditvisible" class="drawerStyle ProjectAudit" placement="right" width="60%"
-    @after-visible-change="afterVisibleChange">
+            @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">审核项目</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer" />
+             @click="closeDrawer"/>
       </div>
       <div class="main" style="padding-right: 10px">
         <a-tabs v-model:activeKey="activeSetKey">
@@ -15,62 +15,78 @@
                 <div class="set_content">
                   <div class="setc_name"><span>项目名称：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ name }}</span>
+                    <span style="color: #999999">{{ projectInfo.name }}</span>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>封面图：</span></div>
                   <div class="setc_main">
-                    <img style="width: 151px; height: 84px" :src="picUrl" alt="" />
+                    <img style="width: 151px; height: 84px" :src="projectInfo.picUrl" alt=""/>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>项目时间：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ startTime }} ～ {{ endTime }}</span>
+                    <span style="color: #999999">{{ projectInfo.beginTime }} ～ {{ projectInfo.endTime }}</span>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>项目经理：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ manager }}</span>
+                    <span style="color: #999999">{{ projectInfo.manager }}</span>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>资源归属：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ sourceBelongName }}</span>
+                    <span style="color: #999999">{{ projectInfo.sourceBelongName }}</span>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>项目说明：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ remark }}</span>
+                    <span style="color: #999999">{{ projectInfo.remark }}</span>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>同步学习记录：</span></div>
                   <div class="setc_main">
-                    <a-radio v-model:checked="checkedSty"><span
-                        style="color: #333333">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
+                    <a-switch
+                        v-model:checked="projectInfo.courseSyncFlag"
+                        :checkedValue="1"
+                        :unCheckedValue="0"
+                        :disabled="true"
+                    ><span
+                        style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+                    >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                    ></a-switch>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>项目级别：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ level }}</span>
+                    <ProjectLevel v-model:value="projectInfo.level" :disabled="true"></ProjectLevel>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>培训体系：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ systemId }}</span>
+                    <TrainClass v-model:value="projectInfo.systemId" :disabled="true"></TrainClass>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>是否BOEU实施：</span></div>
                   <div class="setc_main">
-                    <a-radio v-model:checked="checkedBOEU"><span style="color: #333333">BOEU实施</span></a-radio>
+                    <a-switch
+                        v-model:checked="projectInfo.boeFlag"
+                        :checkedValue="1"
+                        :unCheckedValue="0"
+                        :disabled="true"
+                    ></a-switch>
                   </div>
                 </div>
               </div>
@@ -96,11 +112,11 @@
           </div>
           <div class="set_content">
             <div class="sign" style="position:relative;left:70px;top:-3px;">
-              <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+              <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
             </div>
             <div class="setc_name"><span>审核意见：</span></div>
             <div class="setc_main">
-              <a-textarea v-model:value="valueSuggest" :rows="4" />
+              <a-textarea v-model:value="valueSuggest" :rows="4"/>
             </div>
           </div>
         </div>
@@ -115,15 +131,20 @@
 
 <script>
 import {toRefs, reactive, onMounted} from "vue";
-import { getTask } from "../../api/indexTaskadd";
-import { toDate } from "../../api/method";
-import { auditView } from "../../api/indexAudit";
-import { message } from "ant-design-vue";
+import {getTask} from "../../api/indexTaskadd";
+import {toDate} from "../../api/method";
+import {auditView} from "../../api/indexAudit";
+import {message} from "ant-design-vue";
 import * as api1 from "@/api/index1";
+import ProjectLevel from "@/components/project/ProjectLevel";
+import TrainClass from "@/components/project/TrainClass";
 
 export default {
   name: "ProjectAudit",
-  components: {},
+  components: {
+    ProjectLevel,
+    TrainClass,
+  },
   props: {
     ProjAuditvisible: {
       type: Boolean,
@@ -181,8 +202,9 @@ export default {
       noticeFlag: null, //未改
       templateId: null, //未改
       attach: null,
-      calssifyList:[],
-      faceclassScene:[]
+      calssifyList: [],
+      faceclassScene: [],
+      projectInfo: {}
     });
 
     const closeDrawer = () => {
@@ -199,6 +221,7 @@ export default {
         projectId: props.chooseProject,
       }).then((res) => {
         console.log("get task", res.data.data);
+        state.projectInfo = res.data.data.projectInfo;
         let info = res.data.data.projectInfo;
         let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
         let end = toDate(info.endTime / 1000, "Y-M-D h:m");
@@ -212,26 +235,26 @@ export default {
         state.manager = info.manager;
         state.remark = info.remark;
         state.level =
-          info.level == 1
-            ? "集团级"
-            : info.level == 2
-              ? "组织级"
-              : info.level == 3
-                ? "现地级"
-                : info.level == 4
-                  ? "部门级"
-                  : "-";
+            info.level == 1
+                ? "集团级"
+                : info.level == 2
+                    ? "组织级"
+                    : info.level == 3
+                        ? "现地级"
+                        : info.level == 4
+                            ? "部门级"
+                            : "-";
         state.tlevel = info.level;
         state.systemId =
-          info.systemId == 1
-            ? "集团级"
-            : info.systemId == 2
-              ? "组织级"
-              : info.systemId == 3
-                ? "现地级"
-                : info.systemId == 4
-                  ? "部门级"
-                  : "-";
+            info.systemId == 1
+                ? "集团级"
+                : info.systemId == 2
+                    ? "组织级"
+                    : info.systemId == 3
+                        ? "现地级"
+                        : info.systemId == 4
+                            ? "部门级"
+                            : "-";
         state.tsystemId = info.systemId;
         state.checkedSty = info.courseSyncFlag == 1 ? true : false;
         state.courseSyncFlag = info.courseSyncFlag;
@@ -247,13 +270,13 @@ export default {
         // state.attach = info.attach;
         // state.templateId = info.templateId;
         state.sourceBelong =
-          info.sourceBelongId == 1
-            ? "项目一"
-            : info.sourceBelongId == 2
-              ? "项目二"
-              : info.sourceBelongId == 3
-                ? "项目三"
-                : "-";
+            info.sourceBelongId == 1
+                ? "项目一"
+                : info.sourceBelongId == 2
+                    ? "项目二"
+                    : info.sourceBelongId == 3
+                        ? "项目三"
+                        : "-";
       });
     };
 
@@ -264,7 +287,7 @@ export default {
       state.showDetail = !state.showDetail;
     };
     const subMit = () => {
-      if(!state.valueSuggest){
+      if (!state.valueSuggest) {
         message.error(`请输入审核意见！`);
         return
       }
@@ -276,16 +299,16 @@ export default {
         pass: state.valuePass == "1" ? 1 : -1,
         projectId: props.chooseProject,
       })
-        .then((res) => {
-          console.log("提交成功", res);
-          message.destroy();
-          message.success("提交成功");
-          closeDrawer();
-        })
-        .catch((err) => {
-          console.log(err);
-          message.warning("提交失败");
-        });
+          .then((res) => {
+            console.log("提交成功", res);
+            message.destroy();
+            message.success("提交成功");
+            closeDrawer();
+          })
+          .catch((err) => {
+            console.log(err);
+            message.warning("提交失败");
+          });
     };
     const getDictList = async (param) => api1.getDict({
       pageNo: 1,
@@ -293,8 +316,8 @@ export default {
       setCode: param
     }).then((res) => res.data.data.rows)
     onMounted(async () => {
-      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode })) //内容
-      state.faceclassScene = (await getDictList("faceclassScene")).map(e => ({ label: e.dictName, value: e.dictCode })) //场景
+      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({label: e.dictName, value: e.dictCode})) //内容
+      state.faceclassScene = (await getDictList("faceclassScene")).map(e => ({label: e.dictName, value: e.dictCode})) //场景
     });
     return {
       ...toRefs(state),

From 10658c79f837455a630e556eb594bbfb23e7487f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 3 Dec 2022 01:08:07 +0800
Subject: [PATCH 13/13] =?UTF-8?q?--=20bug=20=E6=A8=A1=E6=9D=BF=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index dabb8383..82eb9b90 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -336,7 +336,10 @@ export default {
 
     const classificationChange5 = (key, option) => {
       state.projectInfo = option
+      state.projectInfo.type = 3
+      state.projectInfo.rangeTime = [option.beginTime, option.endTime]
       state.projectInfo.parentName = routers.query.parentName
+      state.projectInfo.parentId = routers.query.parentId
     };
     //获取模版列表
     const getTemplate = () => {