Merge remote-tracking branch 'origin/develop' into develop

src/App.vue

@@ -43,7 +43,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.13------------");
+    console.log("版本0.17------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

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-04 13:27:07
+ * @LastEditTime: 2022-12-05 00:00:40
  * @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/components/drawers/MemberList.vue

@@ -97,8 +97,8 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn2" @click="closeDrawer">确定</button>
       </div>
       <!-- 批量删除的弹窗 -->
       <a-modal
@@ -270,6 +270,8 @@ export default {
     });
     const closeDrawer = () => {
       ctx.emit("update:Lvisible", false);
+      state.tabledata = [];
+      console.log("tabledata", state.tabledata);
     };
     const showModal = () => {
       if (state.selectedRows.length == 0) {
@@ -345,18 +347,25 @@ export default {
       state.tableDataTotal = -1;
       getProjStu(objf).then((res) => {
         console.log(res.data.data, "获取学员列表");
-        let leng = res.data.data.rows.length;
+        if (res.data.code === 200) {
           state.total = res.data.data.total;
           state.tableDataTotal = res.data.data.total;
-        if (leng > 0) {
           let arr = res.data.data.rows;
           getTableDataList(arr);
         }
+        // let leng = res.data.data.rows.length;
+
+        // state.tableDataTotal = res.data.data.total;
+        // if (leng > 0) {
+
+        // }
       });
     };
 
-    const afterVisibleChange = () => {
+    const afterVisibleChange = (bool) => {
+      if (bool) {
         getStu();
+      }
     };
     //分页
     const changePaginationStu = (page) => {

src/views/courselibrary/CoursewareManage.vue

@@ -167,10 +167,10 @@
                 :style="{ display: hideshow ? 'block' : 'none' }"
               >
                 <span style="color: #999ba3">
-                  1、课程名称统一不加书名号。<br/>
+                  1、课程名称统一不加书名号。<br />
                   2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
                   之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先
-                  看到的是课程内容主题。<br/>
+                  看到的是课程内容主题。<br />
                   3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用
                   版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。
                 </span>
@@ -351,10 +351,10 @@
                     :style="{ display: hideshow ? 'block' : 'none' }"
                   >
                     <span style="color: #999ba3">
-                      1、课程名称统一不加书名号。<br/>
+                      1、课程名称统一不加书名号。<br />
                       2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
                       之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先
-                      看到的是课程内容主题。<br/>
+                      看到的是课程内容主题。<br />
                       3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用
                       版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。
                     </span>
@@ -768,10 +768,10 @@
                     :style="{ display: hideshow ? 'block' : 'none' }"
                   >
                     <span style="color: #999ba3">
-                      1、课程名称统一不加书名号。<br/>
+                      1、课程名称统一不加书名号。<br />
                       2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
                       之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先
-                      看到的是课程内容主题。<br/>
+                      看到的是课程内容主题。<br />
                       3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用
                       版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。
                     </span>
@@ -1187,7 +1187,7 @@
                 </template>
                 <a>
                   授权
-                  <down-outlined/>
+                  <down-outlined />
                 </a>
               </a-dropdown>
               <a
@@ -1285,7 +1285,7 @@
                 </template>
                 <a>
                   授权
-                  <down-outlined/>
+                  <down-outlined />
                 </a>
               </a-dropdown>
             </span>
@@ -1402,7 +1402,7 @@
                 </template>
                 <a>
                   授权
-                  <down-outlined/>
+                  <down-outlined />
                 </a>
               </a-dropdown>
               <span>
@@ -1531,7 +1531,7 @@
                 </template>
                 <a>
                   授权
-                  <down-outlined/>
+                  <down-outlined />
                 </a>
               </a-dropdown>
               <a
@@ -1639,7 +1639,7 @@
                 </template>
                 <a>
                   授权
-                  <down-outlined/>
+                  <down-outlined />
                 </a>
               </a-dropdown>
               <a
@@ -2067,7 +2067,7 @@
                         </template>
                         <a>
                           更多
-                          <down-outlined/>
+                          <down-outlined />
                         </a>
                       </a-dropdown>
                     </span>
@@ -2885,13 +2885,13 @@
               class="del-icons"
               :style="{ display: del_hs ? 'block' : 'none' }"
             >
-              <img src="@/assets/images/coursewareManage/notice.png" alt=""/>
+              <img src="@/assets/images/coursewareManage/notice.png" alt="" />
             </div>
             <div
               class="del-icons"
               :style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"
             >
-              <img src="@/assets/images/coursewareManage/QR.png" alt=""/>
+              <img src="@/assets/images/coursewareManage/QR.png" alt="" />
             </div>
             <span>提示</span>
             <div class="close_exit" @click="delete_exit1"></div>
@@ -2975,7 +2975,7 @@
   </div>
 
   <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-    <a-spin :spinning="addLoading" tip="保存中..."/>
+    <a-spin :spinning="addLoading" tip="保存中..." />
   </div>
 </template>
 <script>
@@ -2989,7 +2989,7 @@ import {
   onBeforeUnmount,
   watch,
 } from "vue";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 // import StuAdd from "../../components/drawers/StuAdd";
 // import OwnPower from "../../components/drawers/OwnPower.vue";
 // import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
@@ -3023,12 +3023,12 @@ import {
   getdateToDate,
 } from "../../utils/utils";
 // import { toDate } from "../../api/method.js";
-import {fileUp} from "../../api/indexEval";
+import { fileUp } from "../../api/indexEval";
 import dayjs from "dayjs";
 import * as api1 from "../../api/index1";
 
 import "@wangeditor/editor/dist/css/style.css";
-import {Editor, Toolbar} from "@wangeditor/editor-for-vue";
+import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 import ProjectManager from "@/components/project/ProjectManager";
 
 //列表表格
@@ -3039,7 +3039,7 @@ const columns1 = [
     dataIndex: "num",
     key: "num",
     align: "center",
-    customRender: ({index}) => {
+    customRender: ({ index }) => {
       return index + 1;
     },
   },
@@ -3050,7 +3050,7 @@ const columns1 = [
     key: "name",
     ellipsis: true,
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3060,7 +3060,7 @@ const columns1 = [
     dataIndex: "contentTxt",
     key: "1",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3070,7 +3070,7 @@ const columns1 = [
     dataIndex: "courseform",
     key: "2",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.courseform)) {
         case "1":
           return "线上";
@@ -3086,7 +3086,7 @@ const columns1 = [
     key: "3",
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3096,7 +3096,7 @@ const columns1 = [
     dataIndex: "stunum",
     key: "4",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "0";
     },
   },
@@ -3106,7 +3106,7 @@ const columns1 = [
     dataIndex: "grade",
     key: "5",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "0";
     },
   },
@@ -3116,7 +3116,7 @@ const columns1 = [
     dataIndex: "status",
     key: "6",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.status)) {
         case "0":
           return "未提交";
@@ -3135,7 +3135,7 @@ const columns1 = [
     dataIndex: "ynpub",
     key: "7",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.ynpub)) {
         case "0":
           return "未发布";
@@ -3150,7 +3150,7 @@ const columns1 = [
     dataIndex: "creator",
     key: "8",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3160,7 +3160,7 @@ const columns1 = [
     dataIndex: "createtime",
     key: "9",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3170,7 +3170,7 @@ const columns1 = [
     dataIndex: "pubtime",
     key: "10",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? getdateToTime(text * 1000) : "-";
     },
   },
@@ -3180,7 +3180,7 @@ const columns1 = [
     key: "either",
     dataIndex: "kkty",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.kkty)) {
         case "0":
           return "停用";
@@ -3276,7 +3276,7 @@ const columns6 = [
     key: "num",
     width: "8%",
     align: "center",
-    customRender: ({index}) => {
+    customRender: ({ index }) => {
       //{ text, record, index, column }
       return index + 1;
     },
@@ -3287,7 +3287,7 @@ const columns6 = [
     key: "organization",
     width: "10%",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3297,7 +3297,7 @@ const columns6 = [
     key: "saddress",
     width: "10%",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3307,7 +3307,7 @@ const columns6 = [
     key: "starttime",
     width: "18%",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? getdateToTime(text * 1000) : "-";
     },
   },
@@ -3317,7 +3317,7 @@ const columns6 = [
     key: "createtime",
     width: "18%",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? getdateToTime(text * 1000) : "-";
     },
   },
@@ -3337,7 +3337,7 @@ const columns7 = [
     dataIndex: "num",
     key: "num",
     align: "center",
-    customRender: ({index}) => {
+    customRender: ({ index }) => {
       //{ text, record, index, column }
       return index + 1;
     },
@@ -3347,7 +3347,7 @@ const columns7 = [
     width: 200,
     dataIndex: "name",
     key: "name",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3357,7 +3357,7 @@ const columns7 = [
     dataIndex: "number",
     key: "1",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3367,7 +3367,7 @@ const columns7 = [
     dataIndex: "department",
     key: "2",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3377,7 +3377,7 @@ const columns7 = [
     dataIndex: "postion",
     key: "3",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3387,7 +3387,7 @@ const columns7 = [
     dataIndex: "band",
     key: "4",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -3397,7 +3397,7 @@ const columns7 = [
     dataIndex: "status",
     key: "5",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.source)) {
         case "0":
           return "待审核";
@@ -3414,7 +3414,7 @@ const columns7 = [
     dataIndex: "join",
     key: "6",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.source)) {
         case "1":
           return "手动加入";
@@ -3429,7 +3429,7 @@ const columns7 = [
     dataIndex: "signstatus",
     key: "7",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.source)) {
         case "0":
           return "未签到";
@@ -3446,7 +3446,7 @@ const columns7 = [
     dataIndex: "evastatus",
     key: "8",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.source)) {
         case "0":
           return "未评估";
@@ -3509,7 +3509,7 @@ export default defineComponent({
       teacher: null,
       selectedRowKeys7: [],
       isEdit: 0,
-      member: {name: "", value: ""},
+      member: { name: "", value: "" },
       //列表表格
       tableData1: [
         // {
@@ -3754,7 +3754,7 @@ export default defineComponent({
 
     const showStuAdd = () => {
       state.viewpowervisible = true;
-      state.shipType=2
+      state.shipType = 2;
       state.authClassify = 3;
     };
 
@@ -3770,7 +3770,7 @@ export default defineComponent({
       //   }, 1500);
     });
     const toolbarConfig = {};
-    const editorConfig = {placeholder: "请输入内容..."};
+    const editorConfig = { placeholder: "请输入内容..." };
     // 组件销毁时，也及时销毁编辑器
     onBeforeUnmount(() => {
       const editor = editorRef.value;
@@ -3915,8 +3915,8 @@ export default defineComponent({
         endTime: endTime,
         beginTime: startTime,
       });
-      const {rows, total} = res.data.data;
+      const { rows, total } = res.data.data;
-      console.log(res.data.data)
+      console.log(res.data.data);
       state.tableDataTotal1 = total;
       const datas = traverseArr(
         rows,
@@ -4195,7 +4195,7 @@ export default defineComponent({
       // console.log("获取学员信息", obj);
       let res = await studentList(obj);
       // console.log("获取学员列表", res);
-      const {rows, total} = res.data.data;
+      const { rows, total } = res.data.data;
       state.tableDataTotal3 = total;
       rows.forEach((item, index) => {
         rows[index] = {
@@ -4295,7 +4295,7 @@ export default defineComponent({
       console.log("获取开课", obj);
       let res = await planList(obj);
       console.log("开课res", res);
-      const {rows, total} = res.data.data;
+      const { rows, total } = res.data.data;
       state.tableDataTotal222 = total;
       const datas = traverseArr(
         rows,
@@ -4433,8 +4433,8 @@ export default defineComponent({
     };
     // 关闭查看
     const handlelookMs = () => {
-      state.lookMs = false
+      state.lookMs = false;
-    }
+    };
     //保存面授课
     const handlePush = (param) => {
       //state.isEdit = 1;
@@ -4620,7 +4620,7 @@ export default defineComponent({
         state.xjkkradioV1 = "";
       }
       */
-      state.member = {value: item.teacherId, name: item.teacher};
+      state.member = { value: item.teacherId, name: item.teacher };
 
       state.cstm_hs = true;
       state.kk_eidt = true;
@@ -4955,7 +4955,7 @@ export default defineComponent({
         .catch((err) => {
           console.log("获取授课教师失败", err);
         });
-      const {rows, total} = item1;
+      const { rows, total } = item1;
       state.tableDataTotalTea1 = total;
       state.tableDataTotalTea2 = total;
       let newArr = [];
@@ -5013,7 +5013,7 @@ export default defineComponent({
       state.teacher = item.teacher;
       state.teacherId = item.teacherId;
       state.qdms_inputV6 = item.intro;
-      state.member = {value: item.teacherId, name: item.teacher};
+      state.member = { value: item.teacherId, name: item.teacher };
 
       if (item.attach == "") {
         state.imgList = [];
@@ -5021,10 +5021,10 @@ export default defineComponent({
         if (item.attach.indexOf(",")) {
           const arr = item.attach.split(",");
           arr.forEach((item) => {
-            state.imgList.push({img: item});
+            state.imgList.push({ img: item });
           });
         } else {
-          state.imgList = [{img: item.attach}];
+          state.imgList = [{ img: item.attach }];
         }
       }
 
@@ -5034,7 +5034,6 @@ export default defineComponent({
       state.ft_eidt = true;
     };
 
-
     const handleLook = async (itm, type) => {
       state.isEdit = 0;
       console.log(45555);
@@ -5065,7 +5064,7 @@ export default defineComponent({
       state.teacher = item.teacher;
       state.teacherId = item.teacherId;
       state.qdms_inputV6 = item.intro;
-      state.member = {value: item.teacherId, name: item.teacher};
+      state.member = { value: item.teacherId, name: item.teacher };
 
       if (item.attach == "") {
         state.imgList = [];
@@ -5073,10 +5072,10 @@ export default defineComponent({
         if (item.attach.indexOf(",")) {
           const arr = item.attach.split(",");
           arr.forEach((item) => {
-            state.imgList.push({img: item});
+            state.imgList.push({ img: item });
           });
         } else {
-          state.imgList = [{img: item.attach}];
+          state.imgList = [{ img: item.attach }];
         }
       }
 
@@ -5331,7 +5330,7 @@ export default defineComponent({
       // console.log("record", record);
       state.viewpowervisible = true;
       state.selectCourseId = record.offcourseId;
-      state.shipType=1
+      state.shipType = 1;
       state.authClassify = 2;
     };
     //添加权限
@@ -5513,7 +5512,7 @@ export default defineComponent({
 
       closeOnlineCoursevisible,
       handlelookMs,
-      handleLook
+      handleLook,
     };
   },
 });

src/views/projectcenter/TaskPage.vue

@@ -777,7 +777,7 @@
                   </div>
                 </div>
                 <div class="second2">
-                  <div class="btn1" @click="showModal2">
+                  <div class="btn1" @click="showModal2(1, null)">
                     <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">创建小组</span>
                   </div>
@@ -803,7 +803,9 @@
                             >. . .</span
                           >
                           <div class="moreItems">
-                            <div class="sammo">编辑</div>
+                            <div class="sammo" @click="showModal2(2, item)">
+                              编辑
+                            </div>
                             <div
                               class="sammo"
                               @click="deleteGroupBtn(item.projectGroupId)"
@@ -1936,6 +1938,8 @@ export default {
       valuestub: "", //学员管理部门
       valuestug: "", //学员小组管理名称
       valuestugroup: "", //学员管理小组名称
+      projectGroupId: null, //是编辑小组id
+      stuMemberClassify: null, //1：新建小组 2：编辑小组
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "",
@@ -2642,11 +2646,23 @@ export default {
       state.canclestu1 = false;
     };
 
-    const showModal2 = () => {
+    const showModal2 = (classify, item) => {
+      state.stuMemberClassify = classify;
+      state.projectGroupId =
+        item && item.projectGroupId ? item.projectGroupId : null;
       state.stugroup = true;
+      if (item) {
+        state.valueaddg = item.groupName;
+        state.valueaddm = item.leaderName;
+      }
+      console.log("编辑小组item", item);
     };
     const closeModal2 = () => {
       state.stugroup = false;
+      state.valueaddg = null;
+      state.valueaddm = null;
+      state.projectGroupId = null;
+      state.stuMemberClassify = null;
     };
     //点击确定创建小组
     const createG = () => {
@@ -2655,7 +2671,7 @@ export default {
         return message.warning("请输入必填项");
       } else {
         createGroup();
-        state.stugroup = false;
+        closeModal2();
       }
     };
     const showFaceIn = () => {
@@ -3234,6 +3250,7 @@ export default {
         array.push(obj);
       });
       state.groupList = array;
+      console.log("编辑小组", state.groupList);
     };
     //学员搜索
     const searchStu = () => {
@@ -3294,7 +3311,7 @@ export default {
     };
     //获取学员列表
     const getStu = (obj) => {
-      state.loading = true
+      state.loading = true;
       let objf = obj || {
         deptIds: [], //部门
         groupId: 0,
@@ -3394,11 +3411,14 @@ export default {
       getGroupList(objf)
         .then((res) => {
           console.log(res.data.data.rows, "获取小组列表成功");
-          let leng = res.data.data.rows.length;
+          if (res.data.code === 200) {
-          if (leng > 0) {
             let arr = res.data.data.rows;
             setGroupList(arr);
           }
+          // let leng = res.data.data.rows.length;
+          // if (leng > 0) {
+
+          // }
         })
         .catch((err) => {
           console.log(err, "获取列表失败");
@@ -3416,11 +3436,13 @@ export default {
     };
     //创建小组
     const createGroup = () => {
+      //新建
+      if (state.stuMemberClassify === 1) {
         let obj = {
           groupName: state.valueaddg,
           leaderId: 0,
           leaderName: state.valueaddm,
-        projectGroupId: 0,
+          // projectGroupId: 0,
           projectId: state.projectId,
         };
         editGroup(obj)
@@ -3433,6 +3455,28 @@ export default {
             console.log("小组创建失败", err);
             message.warning("小组创建失败");
           });
+      }
+      //编辑
+      if (state.stuMemberClassify === 2) {
+        let obj = {
+          groupName: state.valueaddg,
+          leaderId: 0,
+          leaderName: state.valueaddm,
+          projectGroupId: state.projectGroupId,
+          projectId: state.projectId,
+        };
+        console.log("编辑小组obj", obj);
+        editGroup(obj)
+          .then((res) => {
+            console.log("小组编辑成功", res);
+            message.success("小组编辑成功");
+            getGroup();
+          })
+          .catch((err) => {
+            console.log("小组编辑失败", err);
+            message.warning("小组编辑失败");
+          });
+      }
     };
     //搜索小组重置
     const resetGroupName = () => {