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

@@ -3,13 +3,13 @@
   <div class="projectAdd">
     <div class="header">
       <span class="title"
-      >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
+        >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
       >
       <div
-          @click="backPage"
-          style="cursor: pointer"
-          to="/projectmanage"
-          class="goback"
+        @click="backPage"
+        style="cursor: pointer"
+        to="/projectmanage"
+        class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -19,8 +19,8 @@
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目归属</div>
           </div>
@@ -33,26 +33,26 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目名称</div>
           </div>
           <div class="in">
             <a-input
-                v-model:value="projectInfo.name"
-                placeholder="请输入项目名称"
-                show-count
-                :maxlength="30"
-                :disabled="viewDetail ? true : false"
+              v-model:value="projectInfo.name"
+              placeholder="请输入项目名称"
+              show-count
+              :maxlength="30"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">分类</div>
           </div>
@@ -61,92 +61,97 @@
           </div>
         </div>
         <div class="name flex-top">
-          <div class="namebox" style="margin-top:10px">
+          <div class="namebox" style="margin-top: 10px">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
-          <div class="in select" style="flex:1">
+          <div class="in select" style="flex: 1">
             <a-select
-                :getPopupContainer="
-                        (triggerNode) => {
-                          return triggerNode.parentNode || document.body;
-                        }
-                      "
-                v-model:value="picUrlName"
-                dropdownClassName="dropdown-style"
-                style="width: 440px"
-                placeholder="请选择"
-                :options="projectPic"
-                @change="handleChangeSelect"
-                allowClear
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="picUrlName"
+              dropdownClassName="dropdown-style"
+              style="width: 440px"
+              placeholder="请选择"
+              :options="projectPic"
+              @change="handleChangeSelect"
+              allowClear
             ></a-select>
             <img
-                style="width:100px;height:100px;margin-top:20px;border-radius: 8px"
-                v-if="projectInfo.picUrl"
-                :src="projectInfo.picUrl"
-                alt="avatar"
+              style="
+                width: 100px;
+                height: 100px;
+                margin-top: 20px;
+                border-radius: 8px;
+              "
+              v-if="projectInfo.picUrl"
+              :src="projectInfo.picUrl"
+              alt="avatar"
             />
             <div class="i_bottom">
-                      <span style="color: #999ba3">
-                        高宽比为16:9 (如:800*450) png或jpg图片
-                      </span>
+              <span style="color: #999ba3">
+                高宽比为16:9 (如:800*450) png或jpg图片
+              </span>
             </div>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-                separator="至"
-                :placeholder="['      开始时间', '        结束时间']"
-                v-model:value="projectInfo.rangeTime"
-                style="width: 100%; height: 40px; border-radius: 5px"
-                valueFormat="YYYY-MM-DD HH:mm:ss"
-                @change="timeChange"
-                :disabled="viewDetail ? true : false"
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="projectInfo.rangeTime"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              valueFormat="YYYY-MM-DD HH:mm:ss"
+              @change="timeChange"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-                v-model:value="projectInfo.managerId"
-                v-model:name="projectInfo.manager"
-                @onChange="managerChange"
-                mode="multiple"
+              v-model:value="projectInfo.managerId"
+              v-model:name="projectInfo.manager"
+              @onChange="managerChange"
+              mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-                v-model:value="projectInfo.sourceBelongId"
-                v-model:name="projectInfo.sourceBelongName"
+              v-model:value="projectInfo.sourceBelongId"
+              v-model:name="projectInfo.sourceBelongName"
             ></OrgClass>
           </div>
         </div>
@@ -156,12 +161,12 @@
           </div>
           <div class="in">
             <a-textarea
-                v-model:value="projectInfo.remark"
-                style="height: 80px"
-                placeholder="请输入说明"
-                show-count
-                :maxlength="200"
-                :disabled="viewDetail ? true : false"
+              v-model:value="projectInfo.remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -171,16 +176,16 @@
           </div>
           <div class="in">
             <a-checkbox
-                v-model:checked="courseSyncFlag"
-                :disabled="viewDetail ? true : false"
-            ><span
+              v-model:checked="courseSyncFlag"
+              :disabled="viewDetail ? true : false"
+              ><span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
                 "
-            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-            ></a-checkbox
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-checkbox
             >
             <!-- <a-switch
               v-model:checked="projectInfo.courseSyncFlag"
@@ -201,8 +206,8 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -213,8 +218,8 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训分类</div>
           </div>
@@ -229,8 +234,8 @@
             <!--                src="../../assets/images/basicinfo/asterisk.png"-->
             <!--            />-->
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">是否BOEU实施</div>
           </div>
@@ -242,8 +247,8 @@
                 :disabled="viewDetail ? true : false"
             ></a-switch> -->
             <a-radio-group
-                v-model:value="projectInfo.boeFlag"
-                :disabled="viewDetail ? true : false"
+              v-model:value="projectInfo.boeFlag"
+              :disabled="viewDetail ? true : false"
             >
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
@@ -256,19 +261,19 @@
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
             <a-select
-                :getPopupContainer="
+              :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-                v-model:value="classifySelect5"
-                placeholder="请选择模版"
-                :size="size"
-                style="width: 100%"
-                :options="classifyList5"
-                @change="classificationChange5"
-                @popupScroll="templateScroll"
-                :fieldNames="{
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+              @popupScroll="templateScroll"
+              :fieldNames="{
                 label: 'name',
                 value: 'projectTemplateId',
               }"
@@ -281,7 +286,7 @@
     <div class="footer">
       <div class="btn">
         <a-button v-on:click="createProject" type="primary" class="btn1"
-        >确定
+          >确定
         </a-button>
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
@@ -289,18 +294,18 @@
   </div>
 </template>
 <script>
-import {onMounted, reactive, toRefs, watch} from "vue";
-import {message} from "ant-design-vue";
-import {useRoute, useRouter} from "vue-router";
+import { onMounted, reactive, toRefs, watch } from "vue";
+import { message } from "ant-design-vue";
+import { useRoute, useRouter } from "vue-router";
 import * as api from "../../api/index";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import ProjectLevel from "@/components/project/ProjectLevel";
-import {changeOwnership, scrollLoad} from "@/api/method";
-
+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)
-      state.projectInfo.picUrl= value
-    }
+      console.log(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();
@@ -359,29 +367,32 @@ export default {
         return;
       }
       api
-          .getProjectDetail({projectId: routers.query.projectId})
-          .then((res) => {
-            state.projectInfo = res.data.data.projectInfo;
+        .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
-              }
+          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;
-          });
+          state.projectInfo.rangeTime = [
+            state.projectInfo.beginTime,
+            state.projectInfo.endTime,
+          ];
+          state.projectInfo.parentName = routers.query.parentName;
+          state.courseSyncFlag = state.projectInfo.courseSyncFlag
+            ? true
+            : false;
+        });
     }
 
     const backPage = () => {
@@ -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(
-            "project",
-            res.data.data.projectId,
-            [{id: res.data.data.createId, name: res.data.data.createName}]
-        );
+        state.projectInfo.projectId ||
+          changeOwnership("project", res.data.data.projectId, [
+            { id: res.data.data.createId, name: res.data.data.createName },
+          ]);
         message.destroy();
-        message.success("编辑成功");
-        router.back();
+        message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
+        // 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,
     };
   },
 };