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,24 +316,52 @@ export default {
         })
         
       } else if (props.isLevel == 3) {
-        addTempTask({
+        IsExistenceProjectTemplate({
-          courseId: state.assessment.assessmentId,
+          courseTaskId: [Number(state.assessment.assessmentId)],
-          name: state.assessment.name,
           projectTemplateId: props.projectTemplateId,
-          projectTaskId: props.projectTaskId || 0,
+          templateStageId: props.chooseStageId || 0,
-          stageId: 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,
+                projectTemplateId: props.projectTemplateId,
+                projectTaskId: props.projectTaskId || 0,
+                stageId: props.chooseStageId || 0,
+                type: 11,
+              })
+                .then(() => {
+                  message.destroy();
+                  message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
+                  ctx.emit("changeData", false);
+                  closeDrawer();
+                })
+                .catch(() => {
+                  message.destroy();
+                  message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
+                });
+            }
+        }).catch(err=>{
+          console.log(err)
         })
-          .then(() => {
+
-            message.destroy();
+        
-            message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
-            ctx.emit("changeData", false);
-            closeDrawer();
-          })
-          .catch(() => {
-            message.destroy();
-            message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
-          });
       }
     };
 

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,27 +558,61 @@ export default {
             console.log(err);
           });
       } else if (props.isLevel == 3) {
-        state.addOnlineList.map((value) => {
+        console.log("我是要便利的数据3", state.addOnlineList);
-          console.log( props, props.projectTemplateId,props.projectTaskId)
+        let p_data = state.addOnlineList;
-          addTempTask({
+        let p_data_id = [];
-            courseId: value.num,
+        p_data.map((item) => {
-            name: value.name,
+          p_data_id.push(item["courseId"]);
-            projectTemplateId: localStorage.getItem("projectTemplateId"),
+        });
-            projectTaskId: props.projectTaskId || 0,
+        console.log("需要查询的在线课ID", p_data_id);
-            stageId: props.chooseStageId || 0,
+
-            type: 1,
+        IsExistenceProjectTemplate({
-          })
+          courseTaskId: p_data_id,
-            .then((res) => {
+          projectTemplateId: localStorage.getItem("projectTemplateId"),
-              console.log('新增或者编辑在线课',res)
+          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.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
+              message.warning("在线课（" + tipStr + "）重复添加");
-              ctx.emit("changeData", false);
+              return;
-              closeDrawer();
+            } else {
-            })
+              state.addOnlineList.map((value) => {
-            .catch(() => {
+                addTempTask({
-              message.destroy();
+                  courseId: value.num,
-              message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
+                  name: value.name,
-            });
+                  projectTemplateId: localStorage.getItem("projectTemplateId"),
+                  projectTaskId: props.projectTaskId || 0,
+                  stageId: props.chooseStageId || 0,
+                  type: 1,
+                })
+                  .then((res) => {
+                    console.log('新增或者编辑在线课',res)
+                    message.destroy();
+                    message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
+                    ctx.emit("changeData", false);
+                    closeDrawer();
+                  })
+                  .catch(() => {
+                    message.destroy();
+                    message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
+                  });
+              })
+            }
+        }).catch(err=>{
+          console.log(err)
         })
       }
       //if(state.addOnlineList.Target==undefined){

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

@@ -3,13 +3,13 @@
   <div class="projectAdd">
     <div class="header">
       <span class="title"
-        >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
+      >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
       >
       <div
-        @click="backPage"
+          @click="backPage"
-        style="cursor: pointer"
+          style="cursor: pointer"
-        to="/projectmanage"
+          to="/projectmanage"
-        class="goback"
+          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"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目归属</div>
           </div>
@@ -33,26 +33,26 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目名称</div>
           </div>
           <div class="in">
             <a-input
-              v-model:value="projectInfo.name"
+                v-model:value="projectInfo.name"
-              placeholder="请输入项目名称"
+                placeholder="请输入项目名称"
-              show-count
+                show-count
-              :maxlength="30"
+                :maxlength="30"
-              :disabled="viewDetail ? true : false"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">分类</div>
           </div>
@@ -63,36 +63,36 @@
         <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
           <div class="in select" style="flex: 1">
             <a-select
-              :getPopupContainer="
+                :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="picUrlName"
+                v-model:value="picUrlName"
-              dropdownClassName="dropdown-style"
+                dropdownClassName="dropdown-style"
-              style="width: 440px"
+                style="width: 440px"
-              placeholder="请选择"
+                placeholder="请选择"
-              :options="projectPic"
+                :options="projectPic"
-              @change="handleChangeSelect"
+                @change="handleChangeSelect"
-              allowClear
+                allowClear
             ></a-select>
             <img
-              style="
+                style="
                 width: 100px;
                 height: 100px;
                 margin-top: 20px;
                 border-radius: 8px;
               "
-              v-if="projectInfo.picUrl"
+                v-if="projectInfo.picUrl"
-              :src="projectInfo.picUrl"
+                :src="projectInfo.picUrl"
-              alt="avatar"
+                alt="avatar"
             />
             <div class="i_bottom">
               <span style="color: #999ba3">
@@ -104,55 +104,55 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-              show-time
+                show-time
-              separator="至"
+                separator="至"
-              :placeholder="['      开始时间', '        结束时间']"
+                :placeholder="['      开始时间', '        结束时间']"
-              v-model:value="projectInfo.rangeTime"
+                v-model:value="projectInfo.rangeTime"
-              style="width: 100%; height: 40px; border-radius: 5px"
+                style="width: 100%; height: 40px; border-radius: 5px"
-              valueFormat="YYYY-MM-DD HH:mm:ss"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
-              @change="timeChange"
+                @change="timeChange"
-              :disabled="viewDetail ? true : false"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-              v-model:value="projectInfo.managerId"
+                v-model:value="projectInfo.managerId"
-              v-model:name="projectInfo.manager"
+                v-model:name="projectInfo.manager"
-              @onChange="managerChange"
+                @onChange="managerChange"
-              mode="multiple"
+                mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-              v-model:value="projectInfo.sourceBelongId"
+                v-model:value="projectInfo.sourceBelongId"
-              v-model:name="projectInfo.sourceBelongName"
+                v-model:name="projectInfo.sourceBelongName"
             ></OrgClass>
           </div>
         </div>
@@ -162,12 +162,12 @@
           </div>
           <div class="in">
             <a-textarea
-              v-model:value="projectInfo.remark"
+                v-model:value="projectInfo.remark"
-              style="height: 80px"
+                style="height: 80px"
-              placeholder="请输入说明"
+                placeholder="请输入说明"
-              show-count
+                show-count
-              :maxlength="200"
+                :maxlength="200"
-              :disabled="viewDetail ? true : false"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -177,16 +177,16 @@
           </div>
           <div class="in">
             <a-checkbox
-              v-model:checked="courseSyncFlag"
+                v-model:checked="courseSyncFlag"
-              :disabled="viewDetail ? true : false"
+                :disabled="viewDetail ? true : false"
-              ><span
+            ><span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
                 "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-checkbox
+            ></a-checkbox
             >
             <!-- <a-switch
               v-model:checked="projectInfo.courseSyncFlag"
@@ -207,8 +207,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -219,8 +219,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训分类</div>
           </div>
@@ -235,8 +235,8 @@
             <!--                src="../../assets/images/basicinfo/asterisk.png"-->
             <!--            />-->
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">是否BOEU实施</div>
           </div>
@@ -248,8 +248,8 @@
                 :disabled="viewDetail ? true : false"
             ></a-switch> -->
             <a-radio-group
-              v-model:value="projectInfo.boeFlag"
+                v-model:value="projectInfo.boeFlag"
-              :disabled="viewDetail ? true : false"
+                :disabled="viewDetail ? true : false"
             >
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
@@ -262,19 +262,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"
+                v-model:value="classifySelect5"
-              placeholder="请选择模版"
+                placeholder="请选择模版"
-              :size="size"
+                :size="size"
-              style="width: 100%"
+                style="width: 100%"
-              :options="classifyList5"
+                :options="classifyList5"
-              @change="classificationChange5"
+                @change="classificationChange5"
-              @popupScroll="templateScroll"
+                @popupScroll="templateScroll"
-              :fieldNames="{
+                :fieldNames="{
                 label: 'name',
                 value: 'projectTemplateId',
               }"
@@ -287,7 +287,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>
@@ -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,32 +369,32 @@ export default {
         return;
       }
       api
-        .getProjectDetail({ projectId: routers.query.projectId })
+          .getProjectDetail({projectId: routers.query.projectId})
-        .then((res) => {
+          .then((res) => {
-          state.projectInfo = res.data.data.projectInfo;
+            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) => ({
+            let dates = store.state.projectPic.map((e) => ({
-            value: e.dictValue,
+              value: e.dictValue,
-            label: e.dictName,
+              label: e.dictName,
-          }));
+            }));
-          console.log(dates, picurl);
+            console.log(dates, picurl);
-          for (let i = 0; i < dates.length; i++) {
+            for (let i = 0; i < dates.length; i++) {
-            if (dates[i].value == picurl) {
+              if (dates[i].value == picurl) {
-              state.picUrlName = dates[i].label;
+                state.picUrlName = dates[i].label;
+              }
             }
-          }
 
-          state.projectInfo.rangeTime = [
+            state.projectInfo.rangeTime = [
-            state.projectInfo.beginTime,
+              state.projectInfo.beginTime,
-            state.projectInfo.endTime,
+              state.projectInfo.endTime,
-          ];
+            ];
-          state.projectInfo.parentName = routers.query.parentName;
+            state.projectInfo.parentName = routers.query.parentName;
-          state.courseSyncFlag = state.projectInfo.courseSyncFlag
+            state.courseSyncFlag = state.projectInfo.courseSyncFlag
-            ? true
+                ? true
-            : false;
+                : false;
-        });
+          });
     }
 
     const backPage = () => {
@@ -479,22 +480,23 @@ export default {
       state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
       api.createProject(state.projectInfo).then((res) => {
         state.projectInfo.projectId ||
-          changeOwnership("project", res.data.data.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 {