Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

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-08 08:48:26
+ * @LastEditTime: 2022-12-08 15:47:05
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -56,7 +56,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        window.open("https://u-pre.boe.com/web/", '_self');
+        // window.open("https://u-pre.boe.com/web/", '_self');
         // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);

src/views/projectcenter/ProjectAdd.vue

@@ -84,7 +84,12 @@
               allowClear
             ></a-select>
             <img
-                style="width:100px;height:100px;margin-top:20px;border-radius: 8px"
+              style="
+                width: 100px;
+                height: 100px;
+                margin-top: 20px;
+                border-radius: 8px;
+              "
               v-if="projectInfo.picUrl"
               :src="projectInfo.picUrl"
               alt="avatar"
@@ -300,7 +305,7 @@ import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import { changeOwnership, scrollLoad } from "@/api/method";
-
+import { storage } from "../../api/storage";
 export default {
   name: "projectAdd",
   components: {
@@ -329,16 +334,19 @@ export default {
       },
       classifyList5: [],
       courseSyncFlag: false,
-      picUrlName:'请选择封面图'
+      picUrlName: "请选择封面图",
     });
 
     // 封面图选择
     const handleChangeSelect = (value) => {
-      console.log(value)
+      console.log(value);
-      state.projectInfo.picUrl= value
+      state.projectInfo.picUrl = value;
-    }
+    };
     onMounted(() => {
-      state.projectPic = store.state.projectPic.map((e) => ({value: e.dictValue, label: e.dictName}));
+      state.projectPic = store.state.projectPic.map((e) => ({
+        value: e.dictValue,
+        label: e.dictName,
+      }));
       state.viewDetail = routers.query.viewDetail;
       getProjectInfo();
       getTemplate();
@@ -363,13 +371,16 @@ export default {
         .then((res) => {
           state.projectInfo = res.data.data.projectInfo;
 
-            console.log(res)
+          console.log(res);
-            let picurl = res.data.data.projectInfo.picUrl
+          let picurl = res.data.data.projectInfo.picUrl;
-            let dates = store.state.projectPic.map((e) => ({value: e.dictValue, label: e.dictName}));
+          let dates = store.state.projectPic.map((e) => ({
-            console.log(dates,picurl)
+            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.picUrlName = dates[i].label;
             }
           }
 
@@ -466,19 +477,23 @@ export default {
       state.projectInfo.type = 3;
       state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
       api.createProject(state.projectInfo).then((res) => {
-        state.projectInfo.projectId || changeOwnership(
+        state.projectInfo.projectId ||
-            "project",
+          changeOwnership("project", res.data.data.projectId, [
-            res.data.data.projectId,
+            { id: res.data.data.createId, name: res.data.data.createName },
-            [{id: res.data.data.createId, name: res.data.data.createName}]
+          ]);
-        );
         message.destroy();
-        message.success("编辑成功");
+        message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
-        router.back();
+        // router.back();
+        router.push({
+          path: "/taskpage",
+          query: { projectId: res.data.data.projectId },
+        });
+        storage.set("projectId", res.data.data.projectId);
       });
     };
 
     function managerChange(e, l, d) {
-      state.projectInfo.sourceBelongId = d
+      state.projectInfo.sourceBelongId = d;
     }
 
     return {
@@ -490,7 +505,7 @@ export default {
       createProject,
       backPage,
       templateScroll,
-      handleChangeSelect
+      handleChangeSelect,
     };
   },
 };