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 00:00:40
+ * @LastEditTime: 2022-12-05 10:24:53
  * @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/api/indexProjStu.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-18 14:09:43
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-05 15:27:36
+ * @FilePath: /fe-manage/src/api/indexProjStu.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import http from "./config";
 
 //获取项目学员列表
@@ -14,7 +22,8 @@ export const deleteGroup = (obj) => http.delete('/admin/project/deleteGroup', {
 
 //新增或编辑小组
 export const editGroup = (obj) => http.post('/admin/project/editGroup', obj)
-
+//移除小组成员
+export const removeGroupStudent = (obj) => http.post('/admin/project/removeGroupStudent', obj)
 //查看学员
 export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj })
 

src/components/drawers/MemberList.vue

@@ -140,7 +140,7 @@
             <div class="right" @click="closedeleone"></div>
           </div>
         </div>
-        <div class="main">请确认是否批量删除组员</div>
+        <div class="main">请确认是否删除组员</div>
         <div class="butn">
           <button class="btn btn1" @click="closedeleone">取消</button>
           <button class="btn btn2" @click="yesdele">确定</button>
@@ -160,7 +160,7 @@
 <script>
 import { toRefs, reactive } from "vue";
 // import StuAdd from "./StuAdd.vue";
-import { getProjStu, deleteStu } from "../../api/indexProjStu";
+import { getProjStu, removeGroupStudent } from "../../api/indexProjStu";
 import { toDate } from "../../api/method";
 import { message } from "ant-design-vue";
 import AddGroupMembers from "./AddGroupMembers.vue";
@@ -284,10 +284,13 @@ export default {
     };
     //点击确认批量删除弹窗
     const sureDeModal = () => {
-      deleteStu({
+      let obj = {
+        projectGroupId: props.chooseGroupId,
         projectId: props.projectId,
         studentIds: state.selectedRows,
-      })
+      };
+
+      removeGroupStudent(obj)
         .then((res) => {
           console.log(res, "删除成功");
           message.success("删除成功");
@@ -302,6 +305,8 @@ export default {
     };
     const closeModal = () => {
       state.showmodal = false;
+      state.selectedRows = [];
+      state.selectedRowKeys = [];
     };
     const showStuAdd = () => {
       state.Stuvisible = true;
@@ -434,20 +439,26 @@ export default {
       // console.log(id, "fewfew");
       console.log(`${id}`);
       state.deone = true;
+      state.selectedRows = [];
       state.selectedRows.push(id);
+      // state.deleteClassify=1
     };
     //点击取消删除单个学员
     const closedeleone = () => {
       state.deone = false;
       state.selectedRows = [];
+      state.selectedRowKeys = [];
     };
     const yesdele = () => {
-      state.deone = false;
-      deleteStu({
+      let obj = {
+        projectGroupId: props.chooseGroupId,
         projectId: props.projectId,
         studentIds: state.selectedRows,
-      })
+      };
+      console.log("删除小组学员obj", obj);
+      removeGroupStudent(obj)
         .then((res) => {
+          state.deone = false;
           console.log(res, "单个删除成功");
           message.success("删除成功");
           getStu();
@@ -787,4 +798,111 @@ export default {
     }
   }
 }
+
+.FacMa {
+  .ant-modal {
+    width: 424px;
+    height: 258px;
+
+    .ant-modal-content {
+      width: 424px;
+      height: 258px;
+
+      .ant-modal-body {
+        width: 424px;
+        height: 258px;
+        padding: 0px;
+
+        .head {
+          width: 424px;
+          height: 68px;
+          // position: absolute;
+          // left: 0;
+          // top: 0;
+          background: linear-gradient(
+            180deg,
+            rgba(78, 166, 255, 0.2) 0%,
+            rgba(78, 166, 255, 0) 100%
+          );
+          display: flex;
+
+          justify-content: center;
+
+          .inhead {
+            width: 90%;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .left {
+              display: flex;
+              align-items: center;
+
+              .gan {
+                width: 16px;
+                height: 16px;
+                background-image: url(../../assets/images/taskpage/gan.png);
+              }
+
+              .tis {
+                margin-left: 5px;
+                width: 32px;
+                font-size: 16px;
+                font-weight: 600;
+                color: #333333;
+              }
+            }
+
+            .right {
+              width: 22px;
+              height: 22px;
+              background-image: url(../../assets/images/basicinfo/close.png);
+              background-size: 100% 100%;
+              cursor: pointer;
+            }
+          }
+        }
+
+        .main {
+          margin-top: 20px;
+          width: 100%;
+          display: flex;
+          justify-content: center;
+          font-size: 14px;
+          font-weight: 400;
+          color: #333333;
+        }
+
+        .butn {
+          width: 100%;
+          display: flex;
+          margin-top: 60px;
+          justify-content: center;
+
+          .btn {
+            width: 100px;
+            height: 40px;
+            border-radius: 4px;
+            cursor: pointer;
+          }
+
+          .btn1 {
+            color: #387df7;
+
+            background: #ffffff;
+            border: 1px solid #387df7;
+          }
+
+          .btn2 {
+            background: #409eff;
+            color: #fff;
+            border: 0;
+            margin-left: 10px;
+          }
+        }
+      }
+    }
+  }
+}
 </style>

src/views/learningpath/LearningPath.vue

@@ -161,7 +161,10 @@
             </div>
             <div class="inname">归属组织</div>
             <div class="select in">
-              <OrgClass v-model:value="organizationSelectId" v-model:name="organizationSelectName"></OrgClass>
+              <OrgClass
+                v-model:value="organizationSelectId"
+                v-model:name="organizationSelectName"
+              ></OrgClass>
             </div>
             <!-- <div class="in">
               <a-input
@@ -276,7 +279,10 @@
             </div>
             <div class="inname">归属组织</div>
             <div class="select in">
-              <OrgClass v-model:value="organizationSelectId" v-model:name="organizationSelectName"></OrgClass>
+              <OrgClass
+                v-model:value="organizationSelectId"
+                v-model:name="organizationSelectName"
+              ></OrgClass>
             </div>
             <!-- <div class="in">
               <a-input
@@ -376,7 +382,7 @@
         </div>
       </div>
       <div class="modalMain">
-        <div class="projectname">产品经理上升路径</div>
+        <div class="projectname">{{ releasePathName }}</div>
         <!-- <div class="projecttime">
           <span class="timeti">路径时间：</span
           ><span class="timeme">2022/08/01-2022/08/30</span>
@@ -784,6 +790,7 @@ export default {
       endTime: null, //结束时间
       //发布---------------
       releasePathId: null, //发布路径id
+      releasePathName: null, //发布路径的名称
       routeStudentsNum: 0, //学员总数
       routeChapters: 0, //关卡总数
       routeTasks: 0, //任务总数
@@ -842,11 +849,13 @@ export default {
       state.pathBg = item.dictValue;
     };
     //发布弹窗
-    const showPub = (routerId) => {
+    const showPub = (router) => {
+      console.log("router", router);
       state.pub = true;
-      state.releasePathId = routerId;
+      state.releasePathId = router.id;
+      state.releasePathName = router.manager;
       api
-        .getLearnCount(routerId)
+        .getLearnCount(router.id)
         .then((res) => {
           if (res.status === 200) {
             // console.log("获取关卡、任务、学员统计数据", res.data);
@@ -1103,7 +1112,7 @@ export default {
                         class="jc"
                         onClick={() => {
                           // console.log("text.record.", text.record);
-                          showPub(text.record.id);
+                          showPub(text.record);
                         }}
                       >
                         发布

src/views/learningpath/LevelAdd.vue

@@ -1095,7 +1095,7 @@
         </div>
       </div>
       <div class="modalMain">
-        <div class="projectname">产品经理上升路径</div>
+        <div class="projectname">{{ styTitle }}</div>
         <!-- <div class="projecttime">
           <span class="timeti">路径时间：</span
           ><span class="timeme">2022/08/01-2022/08/30</span>

src/views/learningpath/LevelAddDetail.vue

@@ -522,11 +522,9 @@
                 <div class="btn btn1" @click="showChangeModal">
                   <div class="btnText">移动任务到关卡</div>
                 </div>
-                <div class="btn btn2">
+                <div class="btn btn2" @click="showDeleteALLModal(1)">
                   <div class="imgIcon"></div>
-                  <div class="btnText" @click="showDeleteALLModal(1)">
-                    批量删除
-                  </div>
+                  <div class="btnText">批量删除</div>
                 </div>
               </div>
             </div>
@@ -904,7 +902,7 @@
           <div class="header">
             <div class="icon"></div>
             <span>提示</span>
-            <div class="close_exit" @click="delete_exit"></div>
+            <div class="close_exit" @click="closedeleteAll"></div>
           </div>
           <div class="body">
             <span
@@ -912,11 +910,11 @@
             >
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+            <div class="del_btn btn1" @click="closedeleteAll">
+              <div class="btnText">取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+            <div class="del_btn btn2" @click="subdeleteAll">
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -943,11 +941,11 @@
             <span>您确定要删除此任务吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="closeConfirm">取消</div>
+            <div class="del_btn btn1" @click="closeConfirm">
+              <div class="btnText">取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="deleteLevelTask">确定</div>
+            <div class="del_btn btn2" @click="deleteLevelTask">
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -1632,11 +1630,16 @@ export default {
       state.gqxy_hs = !state.gqxy_hs;
     };
     const showDeleteALLModal = (type) => {
+      if (state.selectRow.length === 0)
+        return message.warning("请选择要删除的任务");
       state.deleteAll = true;
       state.deleteType = type;
     };
-    const delete_exit = () => {
+    const closedeleteAll = () => {
       state.deleteAll = false;
+      state.deleteType = null;
+    };
+    const subdeleteAll = () => {
       deletecTaskAll();
       state.deleteType = null;
     };
@@ -1655,6 +1658,8 @@ export default {
         .then((res) => {
           state.deleteModal = false;
           message.success("删除成功");
+          state.selectRow = []; //选择行
+          state.selectAll = 0; //0：未选择，1：全选，2：部分选择
           getDetail();
           console.log("删除成功", res);
         })
@@ -1736,7 +1741,10 @@ export default {
           .deleteTask(obj)
           .then((res) => {
             console.log(res);
+            state.deleteAll = false;
             message.destroy();
+            state.selectRow = []; //选择行
+            state.selectAll = 0; //0：未选择，1：全选，2：部分选择
             message.success("批量删除成功");
             getDetail();
           })
@@ -1887,7 +1895,7 @@ export default {
       changebgc,
       gqxy_hShow,
       showDeleteALLModal,
-      delete_exit,
+      // delete_exit,
       closeConfirm,
       drawertableColumns,
       editChapter,
@@ -1929,6 +1937,9 @@ export default {
       temporaryStorage,
       submitStorage,
       cancelStorage,
+
+      closedeleteAll,
+      subdeleteAll,
     };
   },
 };