feat:合并

src/components/BreadCrumb.vue

@@ -70,7 +70,7 @@ export default {
               href: "/leveladd",
             },
             {
-              name: "创建关卡",
+              name: "管理",
             },
           ];
         }

src/components/NavLeft.vue

@@ -332,7 +332,7 @@ export default {
           href: "/leveladd",
           openKeys: "sub1",
           selectedKeys: "sub1",
-          pagename: "关卡",
+          pagename: "管理",
         },
         {
           href: "/levelcheck",
@@ -344,7 +344,7 @@ export default {
           href: "/leveladddetail",
           openKeys: "sub1",
           selectedKeys: "sub1",
-          pagename: "创建关卡",
+          pagename: "关卡",
         },
         {
           href: "/projectmanage",

src/components/drawers/AddInvist.vue

@@ -104,7 +104,7 @@
 import { reactive, toRefs } from "vue";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
-import { RouterEditTask, IsExistence, IsExistenceProject} from "@/api/indexTask";
+import { RouterEditTask, IsExistence, IsExistenceProject, IsExistenceProjectTemplate} from "@/api/indexTask";
 import * as api from "../../api/indexInvist";
 import { addTempTask } from "../../api/indexTaskadd";
 import AssessmentList from "@/components/drawers/AssessmentList.vue";
@@ -316,6 +316,28 @@ export default {
         })
         
       } else if (props.isLevel == 3) {
+        IsExistenceProjectTemplate({
+          courseTaskId: [Number(state.assessment.assessmentId)],
+          projectTemplateId: props.projectTemplateId,
+          templateStageId: props.chooseStageId || 0,
+          type: 11,
+        }).then(res=>{
+          console.log('shifouchongfu',res)
+            console.log("模板路径图中是否包含此评估了", res);
+            if (res.data.data.length) {
+              let strdata = res.data.data;
+              let tipStr = "";
+              for (let i = 0; i < strdata.length; i++) {
+                if (i == strdata.length - 1) {
+                  tipStr += strdata[i].courseName;
+                } else {
+                  tipStr += strdata[i].courseName + "/";
+                }
+              }
+              message.destroy();
+              message.warning("评估（" + tipStr + "）重复添加");
+              return;
+            } else {
               addTempTask({
                 courseId: state.assessment.assessmentId,
                 name: state.assessment.name,
@@ -334,6 +356,12 @@ export default {
                   message.destroy();
                   message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
                 });
+            }
+        }).catch(err=>{
+          console.log(err)
+        })
+
+        
       }
     };
 

src/components/drawers/AddOnline.vue

@@ -119,6 +119,7 @@
               :row-selection="{
                 selectedRowKeys: selectedRowKeys,
                 onChange: onSelectChange,
+                type: 'radio',
               }"
               :columns="tableDataFunc()"
               :data-source="tableData"
@@ -158,6 +159,7 @@ import {
   RouterEditTask,
   IsExistence,
   IsExistenceProject,
+  IsExistenceProjectTemplate
 } from "@/api/indexTask";
 import { addTempTask } from "../../api/indexTaskadd";
 export default {
@@ -556,8 +558,38 @@ export default {
             console.log(err);
           });
       } else if (props.isLevel == 3) {
+        console.log("我是要便利的数据3", state.addOnlineList);
+        let p_data = state.addOnlineList;
+        let p_data_id = [];
+        p_data.map((item) => {
+          p_data_id.push(item["courseId"]);
+        });
+        console.log("需要查询的在线课ID", p_data_id);
+
+        IsExistenceProjectTemplate({
+          courseTaskId: p_data_id,
+          projectTemplateId: localStorage.getItem("projectTemplateId"),
+          projectTaskId: props.projectTaskId || 0,
+          stageId: props.chooseStageId || 0,
+          type: 1,
+        }).then(res=>{
+          console.log(res)
+          console.log("模板项目中是否包含此在线课了", res);
+            if (res.data.data.length) {
+              let strdata = res.data.data;
+              let tipStr = "";
+              for (let i = 0; i < strdata.length; i++) {
+                if (i == strdata.length - 1) {
+                  tipStr += strdata[i].courseName;
+                } else {
+                  tipStr += strdata[i].courseName + "/";
+                }
+              }
+              message.destroy();
+              message.warning("在线课（" + tipStr + "）重复添加");
+              return;
+            } else {
               state.addOnlineList.map((value) => {
-          console.log( props, props.projectTemplateId,props.projectTaskId)
                 addTempTask({
                   courseId: value.num,
                   name: value.name,
@@ -579,6 +611,10 @@ export default {
                   });
               })
             }
+        }).catch(err=>{
+          console.log(err)
+        })
+      }
       //if(state.addOnlineList.Target==undefined){
       // closeDrawer();
       //}

src/components/project/ProjectManagerNew.vue

@@ -78,7 +78,6 @@ onMounted(() => {
 
 
 function getMemberData() {
-  console.log(memberParam)
   if (!memberParam.value.keyWord) {
     return
   }
@@ -93,9 +92,12 @@ function getMemberData() {
       return;
     }
     const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({
-      label: e.realName,
+      label: e.realName + e.userNo,
       value: e.id,
-      deptId: e.departId
+      deptId: e.departId,
+      departName: e.departName,
+      userNo: e.userNo,
+      name: e.realName
     }));
     memberParam.value.pageNo === 1 && props.value ? (options.value = list) : options.value.push(...list)
     loading.value = false
@@ -125,10 +127,10 @@ function blur() {
 function change(e, l) {
   isOpen.value = false
   Array.isArray(l) && (selectOptions.value = l)
-  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId)
+  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId, selectOptions.value.find(e => e.deptId)?.departName)
   if (Array.isArray(l)) {
     emit('update:name', l.map(t => t.label).join(','))
-    emit('update:value', l.map(t => t.value).join(','))
+    emit('update:value', l.map(t => t.label).join(','))
   } else {
     emit('update:name', l?.label)
     emit('update:value', l?.value)

src/views/courselibrary/courseModal.vue

@@ -21,7 +21,7 @@
       </div>
       <div style="margin-right: 57px; cursor: pointer">
         <img
-          @click="visibleClose"
+          @click="noEditClose"
           style="width: 22px; height: 22px"
           src="@/assets/images/basicinfo/close22.png"
         />
@@ -338,7 +338,7 @@
             </div>
           </div>
           <div class="m_btn">
-            <div class="btn btn5" @click="visibleClose">
+            <div class="btn btn5" @click="noEditClose">
               <div class="btnText">取消</div>
             </div>
             <div class="btn btn6" @click="handlePush">
@@ -424,6 +424,13 @@ export default defineComponent({
       emit("visibleClose");
     };
 
+    // 未编辑直接离开的 不予刷新
+    const noEditClose = () => {
+      state.ft_hs = false;
+      ft_exit();
+      emit("noEdit");
+    }
+
     expose({
       visibleOpen,
       visibleClose,
@@ -735,7 +742,7 @@ export default defineComponent({
       handleTagClose,
       handlePush,
       reviewClick,
-
+      noEditClose,
       editorRef,
       valueHtml,
       mode: "simple", // 或 'simple'

src/views/projectcenter/LibraryAdd.vue

@@ -534,7 +534,7 @@
                     <div class="setc_name"><span>资源归属：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">{{
-                        projectInfo.sourceBelong
+                        projectInfo.sourceBelongName
                       }}</span>
                     </div>
                   </div>
@@ -559,17 +559,13 @@
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
-                      <span style="color: #999999">{{
+                      <ProjectLevel :value="projectInfo.level" :tag="true"></ProjectLevel>
-                        projectInfo.level
-                      }}</span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>培训体系：</span></div>
                     <div class="setc_main">
-                      <span style="color: #999999">{{
+                      <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
-                        projectInfo.systemId
-                      }}</span>
                     </div>
                   </div>
                   <div class="set_content">
@@ -712,8 +708,14 @@ import { message } from "ant-design-vue";
 import * as api from "@/api/indexTemplate";
 import { useRouter } from "vue-router";
 import { scoreRule, setScoreRule } from "@/api/indexTaskadd";
+import ProjectLevel from "@/components/project/ProjectLevel";
+import TrainClass from "@/components/project/TrainClass";
 export default defineComponent({
   name: "LibraryAdd",
+  components: {
+    ProjectLevel,
+    TrainClass,
+  },
   setup() {
     const state = reactive({
       //任务大纲列表

src/views/projectcenter/ProjectAdd.vue

@@ -295,18 +295,19 @@
   </div>
 </template>
 <script>
-import { onMounted, reactive, toRefs, watch } from "vue";
+import {onMounted, reactive, toRefs, watch} from "vue";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
-import { useRoute, useRouter } from "vue-router";
+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";
+import {storage} from "../../api/storage";
+
 export default {
   name: "projectAdd",
   components: {
@@ -368,7 +369,7 @@ export default {
         return;
       }
       api
-        .getProjectDetail({ projectId: routers.query.projectId })
+          .getProjectDetail({projectId: routers.query.projectId})
           .then((res) => {
             state.projectInfo = res.data.data.projectInfo;
 
@@ -480,21 +481,22 @@ export default {
       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 },
+          {id: res.data.data.createId, name: res.data.data.createName},
         ]);
         message.destroy();
         message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
         // router.back();
         router.push({
           path: "/taskpage",
-          query: { projectId: res.data.data.projectId },
+          query: {projectId: res.data.data.projectId},
         });
         storage.set("projectId", res.data.data.projectId);
       });
     };
 
-    function managerChange(e, l, d) {
+    function managerChange(e, l, d, t) {
-      state.projectInfo.sourceBelongId = d;
+      !state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongId = d)
+      !state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongName = d)
     }
 
     return {

src/views/projectcenter/ProjectManage.vue

@@ -112,13 +112,13 @@
           style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
       >
         <div class="leftt">
-          <img src="../../assets/images/taskpage/left2.png" />
+          <img src="../../assets/images/taskpage/left2.png"/>
         </div>
         <div class="photo">
-          <img src="../../assets/images/projectadd/nopro.png" />
+          <img src="../../assets/images/projectadd/nopro.png"/>
         </div>
         <div class="rightt">
-          <img src="../../assets/images/taskpage/right2.png" />
+          <img src="../../assets/images/taskpage/right2.png"/>
         </div>
         <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
           创建项目
@@ -285,13 +285,13 @@
             "
           >
             <div class="leftt">
-              <img src="../../assets/images/taskpage/left2.png" />
+              <img src="../../assets/images/taskpage/left2.png"/>
             </div>
             <div class="photo">
-              <img src="../../assets/images/taskpage/picture4.png" />
+              <img src="../../assets/images/taskpage/picture4.png"/>
             </div>
             <div class="rightt">
-              <img src="../../assets/images/taskpage/right2.png" />
+              <img src="../../assets/images/taskpage/right2.png"/>
             </div>
             <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
               单层子项目
@@ -305,13 +305,13 @@
             "
           >
             <div class="leftt">
-              <img src="../../assets/images/taskpage/left1.png" />
+              <img src="../../assets/images/taskpage/left1.png"/>
             </div>
             <div class="photo">
-              <img src="../../assets/images/taskpage/picture5.png" />
+              <img src="../../assets/images/taskpage/picture5.png"/>
             </div>
             <div class="rightt">
-              <img src="../../assets/images/taskpage/right1.png" />
+              <img src="../../assets/images/taskpage/right1.png"/>
             </div>
             <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
               多层子项目
@@ -372,13 +372,13 @@
                 "
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png" />
+                  <img src="../../assets/images/taskpage/left2.png"/>
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture6.png" />
+                  <img src="../../assets/images/taskpage/picture6.png"/>
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png" />
+                  <img src="../../assets/images/taskpage/right2.png"/>
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   单层{{ projectInfo.parentId ? "子" : "" }}项目
@@ -397,13 +397,13 @@
               "
             >
               <div class="leftt">
-                <img src="../../assets/images/taskpage/left3.png" />
+                <img src="../../assets/images/taskpage/left3.png"/>
               </div>
               <div class="photo">
-                <img src="../../assets/images/taskpage/picture7.png" />
+                <img src="../../assets/images/taskpage/picture7.png"/>
               </div>
               <div class="rightt">
-                <img src="../../assets/images/taskpage/right3.png" />
+                <img src="../../assets/images/taskpage/right3.png"/>
               </div>
               <div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
                 多层{{ projectInfo.parentId ? "子" : "" }}项目
@@ -625,7 +625,7 @@
           class="aeLoading"
           :style="{ display: projectPubLoading ? 'flex' : 'none' }"
       >
-        <a-spin :spinning="projectPubLoading" />
+        <a-spin :spinning="projectPubLoading"/>
       </div>
     </a-modal>
     <!-- 撤回路径弹窗 -->
@@ -812,21 +812,21 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref, watch } from "vue";
+import {reactive, toRefs, ref, watch} from "vue";
-import { message, Modal } from "ant-design-vue";
+import {message, Modal} from "ant-design-vue";
-import { useRouter } from "vue-router";
+import {useRouter} from "vue-router";
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import * as api from "../../api/index";
 import * as api1 from "../../api/index1";
-import { storage } from "../../api/storage";
+import {storage} from "../../api/storage";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import ProjectClass from "@/components/project/ProjectClass";
 import OrgClass from "@/components/project/OrgClass";
 import dayjs from "dayjs";
 import * as moment from "moment";
-import { changeOwnership } from "@/api/method";
+import {changeOwnership} from "@/api/method";
 
 export default {
   name: "projectManage",
@@ -913,15 +913,15 @@ export default {
     // 数据接入 - start -
     const router = useRouter();
     const sProjectStateList = ref([
-      { value: 0, label: "草稿" },
+      {value: 0, label: "草稿"},
-      { value: 1, label: "审核中" },
+      {value: 1, label: "审核中"},
-      { value: 2, label: "审核通过" },
+      {value: 2, label: "审核通过"},
-      { value: 3, label: "已发布" },
+      {value: 3, label: "已发布"},
-      { value: -2, label: "未通过" },
+      {value: -2, label: "未通过"},
-      { value: -1, label: "已结束" },
+      {value: -1, label: "已结束"},
     ]);
     const searchReset = () => {
-      state.searchParam = { pageNo: 1, pageSize: 10 };
+      state.searchParam = {pageNo: 1, pageSize: 10};
       getTableDate();
     };
     const searchSubmit = () => {
@@ -970,7 +970,7 @@ export default {
         state.currentPage = 1;
         state.projectInfo.projectId ||
         changeOwnership("project", res.data.data.projectId, [
-            { id: res.data.data.createId, name: res.data.data.createName },
+          {id: res.data.data.createId, name: res.data.data.createName},
         ]);
         getTableDate();
       });
@@ -1200,7 +1200,7 @@ export default {
           message.success("模版保存成功");
           return;
         }
-        Modal.error({ title: res.data.msg });
+        Modal.error({title: res.data.msg});
       });
     };
     //关闭存为模版弹窗
@@ -1641,7 +1641,7 @@ export default {
                               onClick={() => {
                                 router.push({
                                   path: "/taskpage",
-                            query: { projectId: value.record.projectId },
+                                  query: {projectId: value.record.projectId},
                                 });
                                 storage.set("projectId", value.record.projectId);
                               }}
@@ -1782,8 +1782,9 @@ export default {
         }
     );
 
-    function managerChange(e, l, d) {
+    function managerChange(e, l, d, t) {
-      state.projectInfo.sourceBelongId = d;
+      !state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongId = d)
+      !state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongName = d)
     }
 
     return {