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

src/components/drawers/AddCase.vue

@@ -154,8 +154,12 @@ const rowSelection = computed(() => ({
   selectedRowKeys: rowSelectKeys.value,
   onChange: onSelectChange,
   preserveSelectedRowKeys: true,
+  getCheckboxProps: getCheckboxProps
 }));
-
+const getCheckboxProps = () => ({
+  // 某几项默认禁止选中(R: 当state等于1时)
+  disabled: true
+})
 function onSelectChange(e, l) {
   rowSelectKeys.value = e;
   selectsData.value = l;

src/components/drawers/AssessmentAll.vue

@@ -156,7 +156,12 @@ const rowSelection = computed(() => ({
   selectedRowKeys: rowSelectKeys.value,
   onChange: onSelectChange,
   preserveSelectedRowKeys: true,
+  getCheckboxProps: getCheckboxProps
 }));
+const getCheckboxProps = () => ({
+  // 某几项默认禁止选中(R: 当state等于1时)
+  disabled: true
+})
 
 function onSelectChange(e, l) {
   rowSelectKeys.value = e;

src/components/drawers/CheckStu.vue

@@ -22,8 +22,8 @@
             <img src="../../assets/images/studentimg/character.png" />
           </div>
           <div class="stumation">
-            <div class="stuname">{{pro.routerInfo.userName}}</div>
+            <div class="stuname">{{pro.routerInfo.name}}</div>
-            <div class="stugangw">{{pro.routerInfo.deptName?pro.routerInfo.deptName:"" + '-' + pro.routerInfo.jobName?pro.routerInfo.jobName:""}}</div>
+            <div class="stugangw">{{pro.routerInfo.organizationName?pro.routerInfo.organizationName:"" + '-' + pro.routerInfo.jobName?pro.routerInfo.jobName:""}}</div>
           </div>
           <div class="sortbox">
             <div class="sortname">进度排名</div>
@@ -57,7 +57,7 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">已修证书</div>
             <div class="sortnub">
-              <span class="nub1">{{pro.certCnt?pro.certCnt:0}}</span>
+              <span class="nub1">{{pro.routerInfo.certCnt?pro.routerInfo.certCnt:0}}</span>
             </div>
           </div>
         </div>

src/components/drawers/EvList.vue

@@ -163,7 +163,12 @@ const rowSelection = computed(() => ({
   selectedRowKeys: rowSelectKeys.value,
   onChange: onSelectChange,
   preserveSelectedRowKeys: true,
+  getCheckboxProps: getCheckboxProps
 }));
+const getCheckboxProps = () => ({
+  // 某几项默认禁止选中(R: 当state等于1时)
+  disabled: true
+})
 
 function onSelectChange(e, l) {
   rowSelectKeys.value = e;

src/components/drawers/MemberList.vue

@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">组员名单</div>
+        <div class="headerTitle">组员名单1</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"

src/components/drawers/SeeStu.vue

@@ -1,20 +1,12 @@
 <!-- eslint-disable vue/no-use-v-if-with-v-for -->
 <template>
-  <a-drawer
+  <a-drawer :visible="Seevisible" class="drawerStyle seestu" placement="right" width="70%"
-    :visible="Seevisible"
+    @after-visible-change="afterVisibleChange">
-    class="drawerStyle seestu"
-    placement="right"
-    width="70%"
-    @after-visible-change="afterVisibleChange"
-  >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">查看</div>
-        <img
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          style="width: 29px; height: 29px; cursor: pointer"
+          @click="closeDrawer" />
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
       </div>
       <a-spin v-if="loading" :spinning="loading" />
       <div v-if="!loading" class="main">
@@ -33,14 +25,11 @@
               <span class="total">/{{ rank.total }}</span>
             </div>
           </div>
-          <a-divider
+          <a-divider type="vertical" style="
-            type="vertical"
-            style="
                 height: 49px;
                 margin-left: 34px;
                 background-color: rgba(170, 166, 166, 0.3);
-            "
+              " />
-          />
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">完成必修</div>
             <div class="sortnub">
@@ -49,17 +38,14 @@
             </div>
           </div>
 
-          <a-divider
+          <a-divider type="vertical" style="
-            type="vertical"
-            style="
                 height: 49px;
                 margin-left: 34px;
-              background-color: rgba(170, 166, 166, 0.3);"
+                background-color: rgba(170, 166, 166, 0.3);" />
-          />
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">已修证书</div>
             <div class="sortnub">
-              <span class="nub1">{{ certCnt?certCnt:0 }}</span>
+              <span class="nub1">{{ 0 }}</span>
             </div>
           </div>
 
@@ -71,22 +57,14 @@
         <div class="mainbox">
           <a-collapse v-model:activeKey="stageListActive">
             <template #expandIcon="{ isActive }">
-              <img
+              <img style="margin-right: 20px" :src="
-                style="margin-right: 20px"
-                :src="
                 isActive
                   ? require('../../assets/images/studentimg/open.png')
                   : require('../../assets/images/studentimg/close.png')
-                "
+              " />
-              />
               <div></div>
             </template>
-            <a-collapse-panel
+            <a-collapse-panel v-for="value in stageList" :key="value.stageId" :header="value.stageName">
-              v-for="value in stageList"
-              :key="value.stageId"
-              :header="value.stageName"
-             
-            > 
               <template #extra>
                 <div @click.stop="">
                   <div class="rowbox">
@@ -101,16 +79,11 @@
                 </div>
               </template>
 
-              <div 
+              <div class="rowclass" v-for="(item, key) in value.taskList" :key="key">
-                class="rowclass"
-                v-for="(item, key) in value.taskList"
-                :key="key"
-              >
 
                 <div class="leftclass">
                   <div>
-                    <img
+                    <img :src="
-                      :src="
                       item.course === '在线'
                         ? require('../../assets/images/leveladd/zai.png')
                         : item.course === '面授'
@@ -138,21 +111,18 @@
                                               : item.course === '评估'
                                                 ? require('../../assets/images/leveladd/diao.png')
                                                 : null
-                      "
+                    " />
-                    />
                   </div>
                   <div class="text1">{{ item.course }}</div>
                   <div class="text2">{{ item.name }}</div>
                 </div>
                 <div class="alreadyclass">
                   <div class="alimg">
-                    <img
+                    <img :src="
-                      :src="
                       item.complete === '已完成'
                         ? require('../../assets/images/studentimg/complete.png')
                         : require('../../assets/images/studentimg/notice.png')
-                      "
+                    " />
-                    />
                   </div>
                   <div class="altext">{{ item.complete }}</div>
                 </div>
@@ -277,6 +247,7 @@ export default {
       let array = [];
       if (data != undefined) {
         data.map((value) => {
+          console.log('我排序了吗---------value-----------------》', value)
           let obj = {
             course:
               value.type == 1
@@ -318,6 +289,7 @@ export default {
             currentRatio: value.currentRatio,
             routerTaskId: value.routerTaskId,
           };
+          console.log('我排序了吗---------obj-----------------》', obj)
           array.push(obj);
         });
         array.sort((a, b) => { return a.projectId - b.projectId })
@@ -331,7 +303,8 @@ export default {
       console.log("查看了学员1", data);
       let array = [];
       //无阶段任务
-      if(data?.length ==1 && data[0].stageId ==0){
+      if (data?.length == 1 && data[0].id == 0) {
+        console.log("无阶段任务", data);
         data.map((value) => {
           let obj = {
             stageName: "无阶段任务",
@@ -342,17 +315,19 @@ export default {
           array.push(obj);
         });
       } else { //有阶段
+        console.log("有阶段", data);
         data.map((value) => {
+          console.log("有阶段value", value);
           let obj = {
-          stageName: value.stageName,
+            stageName: value.name,
-          stageId: value.stageId,
+            stageId: value.id,
             remark: value.remark,
             taskList: taskList(value.taskList),
           };
-        if(value.stageId >0){
+          if (value.id > 0) {
             array.push(obj);
           }
-       
+          console.log("有阶段array", array);
         });
       }
 
@@ -366,9 +341,10 @@ export default {
       };
       studentProcess(obj).then((res) => {
         state.loading = false
-        console.log("查看了学员", res.data.data);
+        console.log("查看了学员", res.data);
         let result = res.data.data;
-        state.userName = result.projectInfo.userName;
+        console.log("查看了学员result:", result);
+        state.userName = result.projectInfo.name;
         state.deptName = result.projectInfo.deptName;
         state.jobName = result.projectInfo.jobName;
         state.certCnt = result.projectInfo.certCnt == null ? 0 : result.projectInfo.certCnt;
@@ -403,20 +379,24 @@ export default {
 <style lang="scss">
 .seestu {
   .ant-drawer-content-wrapper {
+
     // max-width: 1000px;
     .ant-drawer-header {
       display: none !important;
     }
+
     .ant-drawer-body {
       padding: 0;
     }
   }
+
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
     overflow-x: auto;
     display: flex;
     flex-direction: column;
+
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -426,6 +406,7 @@ export default {
       // background-color: red;
       margin-bottom: 20px;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -434,11 +415,13 @@ export default {
         // margin-left: 24px;
       }
     }
+
     .main {
       display: flex;
       flex-direction: column;
       overflow-y: auto;
       padding-bottom: 80px;
+
       .stuinfor {
         display: flex;
         align-items: center;
@@ -448,35 +431,43 @@ export default {
         background-image: url("../../assets/images/studentimg/bgimg.png");
         background-repeat: no-repeat;
         background-position: right;
+
         .stumation {
           margin-left: 24px;
+
           .stuname {
             color: #333333;
             font-size: 18px;
           }
+
           .stugangw {
             color: #999999;
             font-size: 16px;
             margin-top: 7px;
           }
         }
+
         .sortbox {
           display: flex;
           flex-direction: column;
           justify-content: center;
           margin-left: 114px;
+
           .sortname {
             color: #666660;
             font-size: 14px;
           }
+
           .sortnub {
             display: flex;
             justify-content: center;
             margin-top: 7px;
+
             .nub1 {
               color: #0060ff;
               font-size: 22px;
             }
+
             .total {
               color: #999999;
               font-size: 22px;
@@ -484,19 +475,23 @@ export default {
           }
         }
       }
+
       .secondrow {
         margin-top: 32px;
         display: flex;
+
         .rowleft {
           color: rgba(51, 51, 51, 1);
           font-size: 16px;
         }
 
       }
+
       .mainbox {
         // height: 463px;
         margin-right: 37px;
         margin-top: 32px;
+
         //border: 1px solid rgba(221, 238, 255, 1);
         //border-radius: 6px;
         .rowbox {
@@ -510,6 +505,7 @@ export default {
           background: rgba(64, 158, 255, 0.1);
           margin-right: 480px;
           cursor: pointer;
+
           .shuom {
             color: rgba(64, 158, 255, 1);
             font-size: 14px;
@@ -517,23 +513,28 @@ export default {
             margin-right: 5px;
           }
         }
+
         .ant-collapse {
           background-color: #ffffff;
           border: 0;
         }
+
         .ant-collapse-content>.ant-collapse-content-box {
           padding: 0;
           border: 0;
         }
+
         .ant-collapse>.ant-collapse-item {
           border: 1px solid rgba(221, 238, 255, 1);
           border-radius: 6px;
           margin-bottom: 15px;
           border-bottom: 0px;
         }
+
         .ant-collapse-content {
           border-top: 0;
         }
+
         .ant-collapse-header {
           display: flex;
           align-items: center;
@@ -543,16 +544,19 @@ export default {
           color: rgba(51, 51, 51, 1);
           font-weight: 500;
         }
+
         .rowclass {
           height: 81px;
           border-bottom: 1px solid rgba(221, 238, 255, 1);
           display: flex;
           justify-content: space-between;
           align-items: center;
+
           .leftclass {
             display: flex;
             margin-left: 25px;
             align-items: center;
+
             .text1 {
               color: #000000;
               font-size: 14px;
@@ -561,6 +565,7 @@ export default {
               word-break: keep-all;
               white-space: nowrap;
             }
+
             .text2 {
               color: rgba(51, 51, 51, 0.8);
               font-size: 14px;
@@ -571,13 +576,16 @@ export default {
               text-overflow: ellipsis;
             }
           }
+
           .alreadyclass {
             display: flex;
             margin-right: 57px;
+
             .alimg {
               height: 16px;
               width: 16px;
             }
+
             .altext {
               color: rgba(56, 125, 247, 1);
               font-size: 14px;
@@ -589,6 +597,7 @@ export default {
         }
       }
     }
+
     .btnn {
       height: 72px;
       width: 100%;
@@ -600,6 +609,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
       .btn2 {
         cursor: pointer;
         width: 100px;
@@ -612,5 +622,4 @@ export default {
       }
     }
   }
-}
+}</style>
-</style>

src/components/drawers/SelectTest.vue

@@ -175,7 +175,12 @@ const rowSelection = computed(() => ({
   selectedRowKeys: rowSelectKeys.value,
   onChange: onSelectChange,
   preserveSelectedRowKeys: true,
+  getCheckboxProps: getCheckboxProps
 }));
+const getCheckboxProps = () => ({
+  // 某几项默认禁止选中(R: 当state等于1时)
+  disabled: true
+})
 
 function onSelectChange(e, l) {
   rowSelectKeys.value = e;

src/views/learningpath/LearningPath.vue

@@ -222,7 +222,7 @@
                       ? '2px solid rgba(78, 166, 255, 1)'
                       : '1px solid #C7CBD2',
                   'background-image': 'url(' + item.value.split(',')[0] + ')',
-                  display: index >= 5 ? 'none' : 'flex',
+                  display: index >= 3 ? 'none' : 'flex',
                 }"
                 style="background-size: 100% 100%"
               ></div>
@@ -352,7 +352,7 @@
               </div>
               <div
                 @click="showLearnBgMore"
-                v-if="imgData.length > 5"
+                v-if="imgData.length > 3"
                 class="learnBgItem learnBgMore"
               >
                 查看更多 <img src="../../assets/images/projectadd/go.png" />
@@ -1419,6 +1419,7 @@ export default {
       //   state.imgData = ;
       // }
     });
+    debugger
     const imgData = computed(() => store.state.router_pic);
     //添加权限
     watch(

src/views/projectcenter/ProjectAdd.vue

@@ -1,5 +1,5 @@
 <!---- 创建项目页面 --->
-<template>
+<template xmlns:display="http://www.w3.org/1999/xhtml">
   <div class="projectAdd">
     <div class="header">
       <span class="title"
@@ -73,6 +73,9 @@
                 overflow: hidden;
               "
                 v-for="(src, index) in projectPic"
+                :style="{
+                  display: index >= 3 ? 'none' : 'flex',
+                }"
                 :key="index"
                 @click="() => (projectInfo.picUrl = src.value)"
             >
@@ -87,6 +90,29 @@
                   alt="avatar"
               />
             </div>
+            <div
+                    @click="showLearnBgMore"
+                    v-if="projectPic.length > 3"
+                    style="
+                      width: 100px;
+                      height: 100px;
+                      padding-left: 15px;
+                      border-radius: 5px;
+                      cursor: pointer;
+                      position: relative;
+                      overflow: hidden;
+                      display: flex;
+                      align-items: center;
+                      justify-content: center;
+                      border: 1px solid #c7cbd2;
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #4ea6ff;
+                      line-height: 36px;
+                    "
+            >
+              查看更多 <img src="../../assets/images/projectadd/go.png"  alt=""/>
+            </div>
           </div>
         </div>
         <div class="name">
@@ -283,6 +309,36 @@
         </a-button>
       </div>
     </div>
+    <!-- 更多背景图 v-model:visible="learnBgMore"  -->
+    <a-modal
+            :closable="sh"
+            centered="true"
+            v-model:visible="learnBgMore"
+            :footer="null"
+            :width="650"
+            wrapClassName="learnBgMoreModal"
+            :z-index="9999"
+    >
+      <div class="main">
+        <div class="top">
+          <div class="topc">封面图</div>
+        </div>
+        <div class="imagesBox">
+          <div
+                  @click="() => (projectInfo.picUrl = src.value)"
+                  v-for="item in projectPic"
+                  :key="item.code"
+                  class="learnBgItem"
+          >
+            <!-- <img class="im" :src="item.source" /> -->
+          </div>
+        </div>
+        <div class="btn">
+          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 <script>
@@ -336,10 +392,10 @@ export default {
       ptojectType: "",
       changeCondition: false,
       clickNum: 0,
-      timeRange: []
+      timeRange: [],
+      learnBgMore: false
     });
 
-
     // 封面图选择
     const handleChangeSelect = (value) => {
       console.log(value);
@@ -534,9 +590,23 @@ export default {
       return current && current < dayjs().subtract(1, 'days').endOf('day')
     };
 
+    //显示更多路径背景弹窗
+    const showLearnBgMore = () => {
+      state.learnBgMore = true;
+    };
+    //关闭更多路径背景弹窗
+    const closeLearnBgMore = () => {
+      state.learnBgMore = false;
+    };
     function calendarChange(date, dateStr, partial) {
       state.datePartial = partial
     }
+    const chooseImg2 = (item) => {
+      // console.log(item);
+      state.pathBgId = item.code;
+      state.pathBg = item.value.split(',')[0];
+      state.mobilePicUrl = item.value.split(',')[1];
+    };
 
     return {
       ...toRefs(state),
@@ -550,6 +620,9 @@ export default {
       backPage,
       templateScroll,
       handleChangeSelect,
+      showLearnBgMore,
+      closeLearnBgMore,
+      chooseImg2
     };
   },
 };
@@ -729,6 +802,33 @@ export default {
             width: 100%;
             // height: 40px;
           }
+
+          .btn {
+            width: 33%;
+            margin-top: 30px;
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 30px;
+
+            .samtn {
+              width: 100px;
+              height: 40px;
+              font-size: 14px;
+              border: 1px solid #4ea6ff;
+              border-radius: 8px;
+              cursor: pointer;
+            }
+
+            .btn1 {
+              background-color: #fff;
+              color: #4ea6ff;
+            }
+
+            .btn2 {
+              background-color: #4ea6ff;
+              color: #fff;
+            }
+          }
         }
 
         .filebox {
@@ -871,6 +971,106 @@ export default {
   }
 }
 
+.learnBgMoreModal {
+  .ant-modal {
+    width: 680px !important;
+    height: 528px !important;
+
+    .ant-modal-content {
+      width: 680px !important;
+      height: 528px !important;
+
+      .ant-modal-body {
+        width: 680px !important;
+        height: 528px !important;
+        padding: 0 !important;
+
+        .main {
+          display: flex;
+          flex-direction: column;
+
+          .top {
+            padding-left: 51px;
+            padding-right: 51px;
+            padding-top: 28px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            cursor: pointer;
+
+            .topc {
+              font-size: 16px;
+              font-weight: bold;
+              color: #000000;
+              line-height: 36px;
+            }
+          }
+
+          .imagesBox {
+            display: flex;
+            //  justify-content: space-between;
+            flex-wrap: wrap;
+            padding-left: 51px;
+            padding-right: 39px;
+            margin-top: 20px;
+            height: 350px;
+            overflow-y: auto;
+
+            .learnBgItem {
+              border-radius: 8px;
+              width: 136px;
+              height: 106px;
+              background-size: 100%;
+              background-repeat: no-repeat;
+              margin-bottom: 20px;
+              margin-right: 10px;
+            }
+          }
+
+          .btn {
+            width: 100%;
+            position: absolute;
+            bottom: 30px;
+            margin-top: 30px;
+            display: flex;
+            justify-content: center;
+
+            .samtn {
+              width: 100px;
+              height: 40px;
+              font-size: 14px;
+              border: 1px solid #4ea6ff;
+              border-radius: 8px;
+              cursor: pointer;
+            }
+
+            .btn1 {
+              background-color: #fff;
+              color: #4ea6ff;
+            }
+
+            .btn2 {
+              background-color: #4ea6ff;
+              color: #fff;
+              margin-left: 16px;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.btn1 {
+  background-color: #fff;
+  color: #4ea6ff;
+}
+
+.btn2 {
+  background-color: #4ea6ff;
+  color: #fff;
+  margin-left: 16px;
+}
 .treeDropdown {
   // width: 240px !important;
   // border-radius: 5px;