fix:修改bug

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-05 16:33:28
+ * @LastEditTime: 2022-12-05 17:39:23
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -24,7 +24,7 @@ const http = axios.create({
 
 http.interceptors.request.use(
   (config) => {
-    console.log("config", config);
+    // console.log("config", config);
     // const token = localStorage.getItem("token");
     // // const token = getCookie('token')
     // // console.log('token', token)
@@ -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/learningpath/LearningPath.vue

@@ -878,11 +878,16 @@ export default {
       api
         .handleLearnPath(obj)
         .then((res) => {
-          console.log("发布成功", res);
+          console.log("发布", res);
+          if (res.data.code === 200) {
             message.destroy();
             message.success("发布成功");
             state.pub = false;
             getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("发布失败", err);
@@ -909,11 +914,16 @@ export default {
       api
         .handleLearnPath(obj)
         .then((res) => {
+          if (res.data.code === 200) {
             console.log("复制成功", res);
             message.destroy();
             message.success("复制成功");
             state.copyModal = false;
             getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("复制失败", err);
@@ -937,11 +947,16 @@ export default {
       api
         .handleLearnPath(obj)
         .then((res) => {
+          if (res.data.code === 200) {
             console.log("停用成功", res);
             message.destroy();
             message.success("停用成功");
             state.stopModal = false;
             getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("停用失败", err);
@@ -979,11 +994,16 @@ export default {
       api
         .handleLearnPath(obj)
         .then((res) => {
+          if (res.data.code === 200) {
             console.log("撤回成功", res);
             message.destroy();
             message.success("撤回成功");
             state.backModal = false;
             getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("撤回失败", err);
@@ -1502,11 +1522,16 @@ export default {
       api
         .handleLearnPath(obj)
         .then((res) => {
+          if (res.data.code === 200) {
             console.log("删除成功", res);
             message.destroy();
             message.success("删除成功");
             state.deleteModal = false;
             getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("删除失败", err);
@@ -1579,6 +1604,7 @@ export default {
       api
         .createLearnPath(obj)
         .then((res) => {
+          if (res.data.code === 200) {
             console.log("修改成功", res);
             message.destroy();
             message.success("修改成功");
@@ -1596,6 +1622,10 @@ export default {
             //   // router.push("/leveladd");
             //   getLearnPath();
             // }, 1000);
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("修改失败", err);

src/views/learningpath/LevelAdd.vue

@@ -138,10 +138,11 @@
                 <div class="centermain">快速添加学员</div>
               </div>
               <!-- 2022-12-2注释 后面放开 -->
-              <!-- <div
+              <div
                 class="taskbox"
                 @click="showPub"
                 style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
+                v-if="action === 0"
               >
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left3.png" />
@@ -156,7 +157,7 @@
                   发布
                 </div>
                 <div class="centermain">快速发布项目</div>
-              </div> -->
+              </div>
             </div>
           </div>
           <!-- 概览（有数据） -->
@@ -1770,12 +1771,17 @@ export default {
       };
       handleLearnPath(obj)
         .then((res) => {
+          if (res.data.code === 200) {
             console.log("发布成功", res);
             message.destroy();
             message.success("发布成功");
             state.pub = false;
             state.nodata = false;
             // getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
 
           reget();
         })
@@ -2407,7 +2413,9 @@ export default {
   .ant-modal {
     width: 424px !important;
     height: 258px !important;
-
+    .ant-modal-close-x {
+      display: none;
+    }
     .ant-modal-content {
       width: 424px !important;
       height: 258px !important;

src/views/learningpath/LevelAddDetail.vue

@@ -905,9 +905,7 @@
             <div class="close_exit" @click="closedeleteAll"></div>
           </div>
           <div class="body">
-            <span
-              >请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }}</span
-            >
+            <span>请确认是否批量删除任务</span>
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closedeleteAll">

src/views/projectcenter/TaskPage.vue

@@ -3,7 +3,7 @@
   <div class="taskpage">
     <div class="addhead" style="flex-shrink: 0">
       <div class="leftimg">
-        <img class="img" :src="picUrl"/>
+        <img class="img" :src="picUrl" />
       </div>
       <div class="imgfor">
         <div class="forz">{{ name }}</div>
@@ -11,7 +11,7 @@
         <div class="fort">起止时间：{{ startTime }}至{{ endTime }}</div>
       </div>
       <div class="right">
-        <img class="img1" src="../../assets/images/leveladd/ma.png"/>
+        <img class="img1" src="../../assets/images/leveladd/ma.png" />
         <div class="line" v-if="action == 1 || action == 0"></div>
         <img
           v-if="action == 1 || action == 0"
@@ -88,7 +88,7 @@
         <div class="line"></div>
         <router-link to="/projectmanage">
           <div style="display: flex">
-            <img class="img2" src="../../assets/images/leveladd/back.png"/>
+            <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
           </div>
         </router-link>
@@ -117,13 +117,13 @@
                 style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
               >
                 <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/picture1.png"/>
+                  <img src="../../assets/images/taskpage/picture1.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)">
                   添加任务
@@ -136,13 +136,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/taskpage/picture2.png"/>
+                  <img src="../../assets/images/taskpage/picture2.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)">
                   添加学员
@@ -546,13 +546,13 @@
                 v-if="taskSyllabus.length == 0"
               >
                 <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/picture8.png"/>
+                  <img src="../../assets/images/taskpage/picture8.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)">
                   创建任务
@@ -575,13 +575,13 @@
                 style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
               >
                 <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/picture1.png"/>
+                  <img src="../../assets/images/taskpage/picture1.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)">
                   添加任务
@@ -679,18 +679,18 @@
                   </div>
                   <div class="groupright">
                     <div class="btn1" @click="searchStu">
-                      <img src="../../assets/images/courseManage/search0.png"/>
+                      <img src="../../assets/images/courseManage/search0.png" />
                       <span class="btn1text">搜索</span>
                     </div>
                     <div class="btn2" @click="resetCancel">
-                      <img src="../../assets/images/courseManage/reset1.png"/>
+                      <img src="../../assets/images/courseManage/reset1.png" />
                       <span class="btn2text">重置</span>
                     </div>
                   </div>
                 </div>
                 <div class="second2" style="margin-top: 20px">
                   <div class="btn1" @click="showStuAdd">
-                    <img src="../../assets/images/courseManage/add0.png"/>
+                    <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">添加学员</span>
                   </div>
                   <!-- 2022-11-30注释 后面放开 -->
@@ -699,12 +699,12 @@
                     <span class="btn2text">导入学员</span>
                   </div> -->
                   <div class="btn2" @click="showAllDelete">
-                    <img src="../../assets/images/projectadd/delete.png"/>
+                    <img src="../../assets/images/projectadd/delete.png" />
                     <span class="btn2text">批量删除</span>
                   </div>
                 </div>
                 <div class="talk">
-                  <img class="im" src="../../assets/images/leveladd/gan.png"/>
+                  <img class="im" src="../../assets/images/leveladd/gan.png" />
                   <div class="xu">
                     <span class="yi">已选择</span>
                     <div style="width: 5px; display: inline-block"></div>
@@ -767,18 +767,18 @@
                   </div>
                   <div class="groupright">
                     <div class="btn1" @click="searchGroup">
-                      <img src="../../assets/images/courseManage/search0.png"/>
+                      <img src="../../assets/images/courseManage/search0.png" />
                       <span class="btn1text">搜索</span>
                     </div>
                     <div class="btn2" @click="resetGroupName">
-                      <img src="../../assets/images/courseManage/reset1.png"/>
+                      <img src="../../assets/images/courseManage/reset1.png" />
                       <span class="btn2text">重置</span>
                     </div>
                   </div>
                 </div>
                 <div class="second2">
                   <div class="btn1" @click="showModal2(1, null)">
-                    <img src="../../assets/images/courseManage/add0.png"/>
+                    <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">创建小组</span>
                   </div>
                   <!-- 2022-12-2注释 后面放开 -->
@@ -818,7 +818,7 @@
                       <div class="leader">组长：{{ item.leaderName }}</div>
                       <div class="grocenter">
                         <div class="leader1">进度</div>
-                        <a-progress :percent="item.completeRatio"/>
+                        <a-progress :percent="item.completeRatio" />
                       </div>
                       <div
                         class="grofooter"
@@ -1178,7 +1178,7 @@
       :title="showFaceText"
     />
     <!-- 学员（小组管理）创建小组抽屉 -->
-    <subset-manage v-model:Svisible="subsetVisivle"/>
+    <subset-manage v-model:Svisible="subsetVisivle" />
     <!-- 学员管理-添加学员抽屉 -->
     <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
     <!-- 添加学员抽屉 -->
@@ -1191,7 +1191,7 @@
       :type="2"
     />
     <!-- 学员管理-导入学员抽屉 -->
-    <import-stu v-model:Importvisible="Importvisible"/>
+    <import-stu v-model:Importvisible="Importvisible" />
     <!-- 查看学员 传入查看学员的id-->
     <see-stu
       v-model:Seevisible="Seevisible"
@@ -1214,9 +1214,9 @@
       v-model:projectId="projectId"
     />
     <!-- 面授学员抽屉 -->
-    <face-stu v-model:FSvisible="FSvisible"/>
+    <face-stu v-model:FSvisible="FSvisible" />
     <!-- 活动考勤抽屉 -->
-    <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText"/>
+    <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
     <!-- 作业管理抽屉 -->
     <work-manage
       v-model:Wvisible="Wvisible"
@@ -1231,7 +1231,7 @@
       :itemsType="itemstype"
     />
     <!-- 批量面授报名 -->
-    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible"/>
+    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
 
     <!-- 概览（无数据）-项目发布弹窗 -->
     <div>
@@ -1290,7 +1290,7 @@
             </div>
           </div>
           <div class="send">
-            <a-switch v-model:checked="checked" size="small"/>
+            <a-switch v-model:checked="checked" size="small" />
             <span class="sendtext">发送项目通知</span>
           </div>
           <div class="ckb">
@@ -1333,7 +1333,9 @@
           "
         >
           <div class="headerLeft" style="margin-left: 32px">
-            <span class="headerLeftText" style="font-size: 16px">创建小组</span>
+            <span class="headerLeftText" style="font-size: 16px">{{
+              stuMemberClassify === 1 ? "创建小组" : "编辑小组"
+            }}</span>
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
             <img
@@ -1368,11 +1370,15 @@
             </div>
             <div class="inname">小组长:</div>
             <div class="in">
-              <a-input
+              <ProjectManager
+                v-model:value="stuGroupId"
+                v-model:name="stuGroupName"
+              ></ProjectManager>
+              <!-- <a-input
                 v-model:value="valueaddm"
                 placeholder="请输入小组长"
                 style="border-radius: 8px; height: 40px"
-              />
+              /> -->
             </div>
           </div>
           <div class="pubtn">
@@ -1548,7 +1554,7 @@
       </a-modal>
     </div>
     <!-- 编辑项目弹窗 -->
-    <proj-set v-model:editHs="editHs" v-model:projectId="projectId"/>
+    <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />
 
     <!-- 二维码弹窗 -->
     <two-dimensional-code
@@ -1733,9 +1739,9 @@
   </div>
 </template>
 <script>
-import {reactive, toRefs, onMounted, watch, computed} from "vue";
-import {useRoute} from "vue-router";
-import {useRouter} from "vue-router";
+import { reactive, toRefs, onMounted, watch, computed } from "vue";
+import { useRoute } from "vue-router";
+import { useRouter } from "vue-router";
 // import { CaretRightOutlined } from "@ant-design/icons-vue";
 import TimeManage from "../../components/drawers/TimeManage";
 import FaceManage from "../../components/drawers/FaceManage";
@@ -1754,7 +1760,7 @@ import NoticePub from "../../components/drawers/NoticePub";
 import NoticeHis from "../../components/drawers/NoticeHis";
 // import ProjectScore from "../../components/drawers/ProjectScore";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
-import {storage} from "../../api/storage";
+import { storage } from "../../api/storage";
 import * as api from "../../api/index1";
 import * as apiproj from "../../api/index";
 import {
@@ -1765,18 +1771,18 @@ import {
   editGroup,
   topStudent,
 } from "../../api/indexProjStu";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 import * as apitl from "../../api/index";
-import {getTask} from "../../api/indexTaskadd";
-import {editProj} from "../../api/indexTaskadd";
-import {toDate} from "../../api/method";
+import { getTask } from "../../api/indexTaskadd";
+import { editProj } from "../../api/indexTaskadd";
+import { toDate } from "../../api/method";
 import projSet from "../../components/Modals/projSet";
-import {overview} from "../../api/indexProjStu";
+import { overview } from "../../api/indexProjStu";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import TrainClass from "@/components/project/TrainClass";
-
+import ProjectManager from "@/components/project/ProjectManager";
 export default {
   name: "taskPage",
   components: {
@@ -1801,6 +1807,7 @@ export default {
     projSet,
     NoticeHis,
     TwoDimensionalCode,
+    ProjectManager,
   },
   setup() {
     const store = useStore();
@@ -1872,23 +1879,23 @@ export default {
       projectTaskId: "", //项目任务任务id
       //进度排行学员
       rankjindu: [
-        {value: "学员", label: "学员"},
-        {value: "小组", label: "小组"},
+        { value: "学员", label: "学员" },
+        { value: "小组", label: "小组" },
       ],
       valuestu1: "学员",
       //进度排行阶段
-      rankjieduan: [{value: "第一阶段", label: "第一阶段"}],
+      rankjieduan: [{ value: "第一阶段", label: "第一阶段" }],
       valuestu2: "第一阶段",
       //积分排行
       rankxuefen: [
-        {value: "学员", label: "学员"},
-        {value: "小组", label: "小组"},
+        { value: "学员", label: "学员" },
+        { value: "小组", label: "小组" },
       ],
       valuestu3: "学员",
       //学时排行
       rankxueshi: [
-        {value: "学员", label: "学员"},
-        {value: "小组", label: "小组"},
+        { value: "学员", label: "学员" },
+        { value: "小组", label: "小组" },
       ],
       valuestu4: "学员",
       visible: false, //时间管理
@@ -1940,6 +1947,8 @@ export default {
       valuestugroup: "", //学员管理小组名称
       projectGroupId: null, //是编辑小组id
       stuMemberClassify: null, //1：新建小组 2：编辑小组
+      stuGroupId: null, //选择的小组长id
+      stuGroupName: null, //选择的小组长名字
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "",
@@ -2032,21 +2041,21 @@ export default {
             if (text.record.rank == "1") {
               return (
                 <img
-                      style={{width: 24, height: 24}}
+                  style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/one.png")}
                 />
               );
             } else if (text.record.rank == "2") {
               return (
                 <img
-                      style={{width: 24, height: 24}}
+                  style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/two.png")}
                 />
               );
             } else if (text.record.rank == "3") {
               return (
                 <img
-                      style={{width: 24, height: 24}}
+                  style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/three.png")}
                 />
               );
@@ -2139,21 +2148,21 @@ export default {
             if (text.record.rank == "1") {
               return (
                 <img
-                      style={{width: 24, height: 24}}
+                  style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/one.png")}
                 />
               );
             } else if (text.record.rank == "2") {
               return (
                 <img
-                      style={{width: 24, height: 24}}
+                  style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/two.png")}
                 />
               );
             } else if (text.record.rank == "3") {
               return (
                 <img
-                      style={{width: 24, height: 24}}
+                  style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/three.png")}
                 />
               );
@@ -2246,21 +2255,21 @@ export default {
             if (text.record.rank == "1") {
               return (
                 <img
-                      style={{width: 24, height: 24}}
+                  style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/one.png")}
                 />
               );
             } else if (text.record.rank == "2") {
               return (
                 <img
-                      style={{width: 24, height: 24}}
+                  style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/two.png")}
                 />
               );
             } else if (text.record.rank == "3") {
               return (
                 <img
-                      style={{width: 24, height: 24}}
+                  style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/three.png")}
                 />
               );
@@ -2651,22 +2660,25 @@ export default {
       state.projectGroupId =
         item && item.projectGroupId ? item.projectGroupId : null;
       state.stugroup = true;
+      console.log("item", item);
       if (item) {
         state.valueaddg = item.groupName;
-        state.valueaddm = item.leaderName;
+        state.stuGroupName = item.leaderName;
+        state.stuGroupId = item.leaderId;
       }
       console.log("编辑小组item", item);
     };
     const closeModal2 = () => {
       state.stugroup = false;
       state.valueaddg = null;
-      state.valueaddm = null;
+      state.stuGroupName = null;
+      state.stuGroupId = null;
       state.projectGroupId = null;
       state.stuMemberClassify = null;
     };
     //点击确定创建小组
     const createG = () => {
-      if (state.valueaddm == "" || state.valueaddg == "") {
+      if (state.stuGroupName == "" || state.valueaddg == "") {
         message.destroy();
         return message.warning("请输入必填项");
       } else {
@@ -2978,7 +2990,7 @@ export default {
           // width: 60,
           align: "center",
           className: "h",
-          scopedSlots: {customRender: "action"}, //引入的插槽
+          scopedSlots: { customRender: "action" }, //引入的插槽
           customRender: (text) => {
             // console.log(text);
             return (
@@ -3434,8 +3446,8 @@ export default {
       if (state.stuMemberClassify === 1) {
         let obj = {
           groupName: state.valueaddg,
-          leaderId: 0,
-          leaderName: state.valueaddm,
+          leaderId: state.stuGroupId,
+          leaderName: state.stuGroupName,
           // projectGroupId: 0,
           projectId: state.projectId,
         };
@@ -3454,8 +3466,8 @@ export default {
       if (state.stuMemberClassify === 2) {
         let obj = {
           groupName: state.valueaddg,
-          leaderId: 0,
-          leaderName: state.valueaddm,
+          leaderId: state.stuGroupId,
+          leaderName: state.stuGroupName,
           projectGroupId: state.projectGroupId,
           projectId: state.projectId,
         };
@@ -3501,7 +3513,7 @@ export default {
     //start---------项目概览
     // 获取项目概览
     const getOverview = () => {
-      overview({projectId: state.projectId})
+      overview({ projectId: state.projectId })
         .then((res) => {
           Object.keys(res.data.data.projectInfoOverview).forEach((item) => {
             levelList.projectInfoOverview[item] =
@@ -3525,7 +3537,7 @@ export default {
     };
     //end---------项目概览
 
-    const handleChange = ({file, fileList}) => {
+    const handleChange = ({ file, fileList }) => {
       let list = [];
       if (file.status !== "uploading") {
         console.log("上传的list", fileList);