From dc4ed494184802363f768fb807bfa66fc04223ed Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 10 Dec 2022 16:00:54 +0800
Subject: [PATCH 1/6] =?UTF-8?q?--=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue    | 50 ++++++-----------------
 src/views/projectcenter/ProjectManage.vue | 12 +++++-
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index f229e533..a1ab3221 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -58,7 +58,7 @@
           </div>
           <div class="in select" style="flex: 1;display: flex">
             <div
-                :class="`box ${projectInfo.picUrl === src ? 'active' : ''}`"
+                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
                 style="
               width: 100px;
               height: 100px;
@@ -223,7 +223,6 @@
                   return triggerNode.parentNode || document.body;
                 }
               "
-                v-model:value="classifySelect5"
                 placeholder="请选择模版"
                 :size="size"
                 style="width: 100%"
@@ -243,7 +242,7 @@
     <div class="footer">
       <div class="btn">
         <a-button @click="backPage" class="btn2">取消</a-button>
-        <a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
+        <a-button v-on:click="createProject" type="primary" class="btn1" style="margin-left: 20px">确定</a-button>
       </div>
     </div>
   </div>
@@ -290,7 +289,6 @@ export default {
       },
       classifyList5: [],
       courseSyncFlag: false,
-      picUrlName: "请选择封面图",
     });
 
     // 封面图选择
@@ -315,39 +313,16 @@ export default {
     });
 
     function getProjectInfo() {
-      if (!routers.query.projectId) {
-        state.projectInfo = {
-          parentName: routers.query.parentName,
-          parentId: routers.query.parentId,
-        };
-        return;
-      }
-      api
-          .getProjectDetail({projectId: routers.query.projectId})
-          .then((res) => {
-            state.projectInfo = res.data.data.projectInfo;
-
-            console.log(res);
-            let picurl = res.data.data.projectInfo.picUrl;
-            let dates = store.state.projectPic.map((e) => ({
-              value: e.dictValue,
-              label: e.dictName,
-            }));
-            console.log(dates, picurl);
-            for (let i = 0; i < dates.length; i++) {
-              if (dates[i].value == picurl) {
-                state.picUrlName = dates[i].label;
-              }
-            }
-
-            state.projectInfo.rangeTime = [
-              state.projectInfo.beginTime,
-              state.projectInfo.endTime,
-            ];
-            state.projectInfo.parentName = routers.query.parentName;
-            state.courseSyncFlag = state.projectInfo.courseSyncFlag
-                ? true
-                : false;
+      let projectId;
+      routers.query.parentId && (projectId = routers.query.parentId)
+      routers.query.projectId && (projectId = routers.query.projectId)
+      state.projectInfo.parentName = routers.query.parentName;
+      state.projectInfo.parentId = routers.query.parentId;
+      projectId && api.getProjectDetail({projectId})
+          .then(res => {
+            state.projectInfo = {...state.projectInfo, ...res.data.data.projectInfo};
+            state.projectInfo.rangeTime = [state.projectInfo.beginTime, state.projectInfo.endTime,];
+            state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
           });
     }
 
@@ -395,7 +370,6 @@ export default {
 
     const errorMsgs = {
       name: "请输入项目名称",
-      category: "请选择项目分类",
       picUrl: "请上传项目封面图",
       beginTime: "请选择项目开始时间",
       endTime: "请选择项目结束时间",
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 9e9901f5..266eaef9 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -195,9 +195,9 @@
                   src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
-            <div class="inname">分类:</div>
+            <div class="inname">培训分类:</div>
             <div class="in select">
-              <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
+              <TrainClass v-model:value="projectInfo.systemId"></TrainClass>
             </div>
           </div>
           <div class="name">
@@ -823,6 +823,7 @@ import * as api1 from "../../api/index1";
 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";
@@ -837,6 +838,7 @@ export default {
     ProjectManager,
     ProjectClass,
     OrgClass,
+    TrainClass,
     // ProjManageShip
   },
   setup() {
@@ -1541,6 +1543,12 @@ export default {
                           state.projectInfo = {
                             parentName: value.record.name,
                             parentId: value.record.projectId,
+                            name: value.record.name,
+                            sourceBelongId: value.record.sourceBelongId,
+                            sourceBelongame: value.record.sourceBelongName,
+                            manager: value.record.manager,
+                            managerId: value.record.managerId,
+                            systemId: value.record.systemId,
                             type: 2,
                           };
                           state.reminderModal = true;

From 9627d7675b18d66516ca1eb5a87d3c7bf8ada6d0 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 10 Dec 2022 16:11:24 +0800
Subject: [PATCH 2/6] =?UTF-8?q?--=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 266eaef9..a54607d2 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -958,7 +958,7 @@ export default {
       // 接口需要传递的参数信息
       const errorMsgs = {
         name: "请输入项目名称",
-        category: "请选择项目分类",
+        systemId: "请选择培训分类",
         manager: "请选择项目经理",
         sourceBelongId: "请选择资源归属",
       };

From 2aa428b17ff1f14ffd4a7b63305a27906d42919c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 10 Dec 2022 16:13:51 +0800
Subject: [PATCH 3/6] =?UTF-8?q?--=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index a1ab3221..4bac22dd 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -370,7 +370,7 @@ export default {
 
     const errorMsgs = {
       name: "请输入项目名称",
-      picUrl: "请上传项目封面图",
+      picUrl: "请选择项目封面图",
       beginTime: "请选择项目开始时间",
       endTime: "请选择项目结束时间",
       manager: "请选择项目经理",

From 56a52e6e77ce39ff744a6e78d6389f9dad994989 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 10 Dec 2022 16:16:32 +0800
Subject: [PATCH 4/6] =?UTF-8?q?--=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 4bac22dd..72d142c2 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -320,7 +320,7 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       projectId && api.getProjectDetail({projectId})
           .then(res => {
-            state.projectInfo = {...state.projectInfo, ...res.data.data.projectInfo};
+            state.projectInfo = {...res.data.data.projectInfo,...state.projectInfo};
             state.projectInfo.rangeTime = [state.projectInfo.beginTime, state.projectInfo.endTime,];
             state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
           });

From 57916500fb0adbf82d8f47ef808e01e6a8065f34 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 10 Dec 2022 16:25:05 +0800
Subject: [PATCH 5/6] =?UTF-8?q?--=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 72d142c2..066bbdd8 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -313,14 +313,12 @@ export default {
     });
 
     function getProjectInfo() {
-      let projectId;
-      routers.query.parentId && (projectId = routers.query.parentId)
-      routers.query.projectId && (projectId = routers.query.projectId)
       state.projectInfo.parentName = routers.query.parentName;
       state.projectInfo.parentId = routers.query.parentId;
-      projectId && api.getProjectDetail({projectId})
+      state.projectInfo.projectId = routers.query.projectId;
+      (state.projectInfo.projectId || state.projectInfo.parentId) && api.getProjectDetail({projectId: state.projectInfo.projectId || state.projectInfo.parentId})
           .then(res => {
-            state.projectInfo = {...res.data.data.projectInfo,...state.projectInfo};
+            state.projectInfo = {...res.data.data.projectInfo, ...state.projectInfo};
             state.projectInfo.rangeTime = [state.projectInfo.beginTime, state.projectInfo.endTime,];
             state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
           });

From e905422a8e06789b1682b4f5c59a7cadf21f0a6d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 10 Dec 2022 16:33:48 +0800
Subject: [PATCH 6/6] =?UTF-8?q?--=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/project/ProjectLevel.vue b/src/components/project/ProjectLevel.vue
index 539865a9..10b9c9b6 100644
--- a/src/components/project/ProjectLevel.vue
+++ b/src/components/project/ProjectLevel.vue
@@ -34,7 +34,7 @@ const props = defineProps({
 })
 
 const id = computed(() => {
-  return props.value
+  return props.value || null
 })
 
 const emit = defineEmits({})