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

src/components/drawers/ActiveAttendance.vue

@@ -948,7 +948,7 @@ export default {
           process.env.VUE_APP_BASE_API +
           `/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${
             props.datasource.type
-          }&type=${2}`,
+          }&type=${1}`,
       };
       console.log("codeInfo", state.codeInfo);
       state.codeIndex = 0;

src/components/drawers/router/RouterExaminationManage.vue

@@ -286,7 +286,7 @@ export default {
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: ({record:{finishStatus}}) => ({1:'已完成',0:'未开始',9:'已完成'}[finishStatus] || '未开始'),
+          customRender: ({record:{status}}) => ({1:'已完成',0:'未开始',9:'已完成'}[status] || '未开始'),
         },
         {
           title: "操作",
@@ -299,7 +299,7 @@ export default {
           customRender: (text) => {
             {/* debugger */ }
             console.log("text" + text.record)
-            if (text.record.finishStatus === 1 || text.record.finishStatus === 9) {
+            if (text.record.status === 1 || text.record.status === 9) {
               return (
                 <div class="racona">
                   <a-button

src/components/student/TableCertificateStudent.vue

@@ -93,7 +93,6 @@ import { reactive, toRefs } from "vue";
 import * as api from "@/api/index1";
 import OrgClass from "@/components/project/OrgClass";
 import { message } from "ant-design-vue";
-import { toDate } from "@/api/method";
 import dayjs from "dayjs";
 export default {
   name: "TableCertificateStudent",
@@ -160,17 +159,7 @@ export default {
           key: "createTime",
           width: 60,
           align: "center",
-          className: "h",
-          customRender: (record) => {
-            // console.log(text.record.checked1);
-            return (
-              <div>
-                {record.record.createTime
-                  ? toDate(record.record.createTime / 1000, "Y-M-D h:m")
-                  : "-"}
-              </div>
-            );
-          },
+          className: "h"
         },
         {
           title: "操作",

src/views/learningpath/LevelAdd.vue

@@ -10,13 +10,13 @@
         <div class="fort">创建时间：{{ cretime }}</div>
       </div>
       <div class="right">
-        
         <img
           class="img1"
           src="../../assets/images/leveladd/ma.png"
           @click="showCodeModel2()"
+          v-if="action == 1"
         />
-        <div v-if="action == 1 || action == 0" class="line"></div>
+        <div v-if="action == 1" class="line"></div>
         <div
           class="pubIcon"
           v-if="(action == 1 || action == 0) && checkPer(permissions)"
@@ -2759,7 +2759,8 @@ export default {
       let obj = {
         title: "[学习路径]二维码",
         name: state.styTitle,
-        url:  window.location.protocol +
+        url:
+          window.location.protocol +
           process.env.VUE_APP_H5 +
           "/pathdetails?routerId=" +
           state.routerId,

src/views/learningpath/LevelAddDetail.vue

@@ -261,7 +261,7 @@
                                     size="small" active-color="red"/>
                           <div class="showt clearfix">
                             <div class="bi" :style="{
-                              'z-index': element.flag ? 999 : 998,
+                              'z-index': element.flag ? 889 : 887,
                             }">
                               必修
                             </div>
@@ -1946,7 +1946,7 @@ const cancelStorage = async () => {
           background-color: #5dc988;
           line-height: 23px;
           position: absolute;
-          z-index: 998;
+          z-index: 888;
           color: #ffffff;
           border-radius: 4px;
         }
@@ -1958,7 +1958,7 @@ const cancelStorage = async () => {
           line-height: 23px;
           // display: none;
           position: absolute;
-          z-index: 998;
+          z-index: 888;
           color: #5dc988;
           border-radius: 4px;
         }

src/views/projectcenter/ProjectManage.vue

@@ -1473,7 +1473,7 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record.status === 3
+              {value.record.status === 3 || value.record.status === 2 || value.record.status === -5  || value.record.status === 1
                 ? {
                     0: "草稿",
                     1: "提交待审核",
@@ -1482,6 +1482,10 @@ export default {
                     4: "发布",
                     "-1": "已结束",
                     "-6": "撤回已结束",
+                    "-2": "删除",
+                    "-3": "撤回审核",
+                    "-4": "撤回发布",
+                    "-5": "拒绝",
                   }[value.record.status + ""] || ""
                 : "-"}
             </div>

src/views/projectcenter/TaskAdd.vue

@@ -235,7 +235,7 @@
                                       v-model:checked="element.flag" size="small"
                                       active-color="red"/>
                             <div class="showt clearfix">
-                              <div class="bi" :style="{'z-index': element.flag ? 999 : 998,}">必修</div>
+                              <div class="bi" :style="{'z-index': element.flag ? 889 : 887,}">必修</div>
                               <div class="xuan">选修</div>
                             </div>
                           </div>
@@ -1585,7 +1585,7 @@ const cancelStorage = async () => {
           background-color: #5dc988;
           line-height: 23px;
           position: absolute;
-          z-index: 998;
+          z-index: 888;
           color: #ffffff;
           border-radius: 4px;
         }
@@ -1596,7 +1596,7 @@ const cancelStorage = async () => {
           background-color: #f2f6fc;
           line-height: 23px;
           position: absolute;
-          z-index: 998;
+          z-index: 888;
           color: #5dc988;
           border-radius: 4px;
         }

src/views/projectcenter/TaskPage.vue

@@ -18,17 +18,9 @@
           class="img1"
           src="../../assets/images/leveladd/ma.png"
           @click="showCodeModel2()"
+          v-if="action == 3"
         />
-        <div
-          class="line"
-          v-if="
-            action == 1 ||
-            action == 2 ||
-            action == 0 ||
-            action == 3 ||
-            action == -2
-          "
-        ></div>
+        <div class="line" v-if="action == 3"></div>
         <!-- 显示发布图标 -->
         <img
           v-if="action == 2 && checkPer(permissions)"
@@ -766,7 +758,10 @@
                     <a-button @click="showStudent(record)" type="link"
                       >查看
                     </a-button>
-                    <a-button @click="settingTopFlag(record)" v-if="checkPer(permissions)" type="link"
+                    <a-button
+                      @click="settingTopFlag(record)"
+                      v-if="checkPer(permissions)"
+                      type="link"
                       >{{ record.topFlag ? "取消优秀" : "优秀学员" }}
                     </a-button>
                     <a-button
@@ -1073,7 +1068,11 @@
             </div>
             <!-- 有证书显示的页面 -->
             <div v-else class="certificate1">
-              <div class="addcertificate1" @click="addCertificate" v-if="checkPer(permissions)">
+              <div
+                class="addcertificate1"
+                @click="addCertificate"
+                v-if="checkPer(permissions)"
+              >
                 <div class="addcertext">+添加证书</div>
               </div>
               <div
@@ -1083,7 +1082,7 @@
               >
                 <div class="certificatelistMain">
                   <img
-                    @click="previewPic" 
+                    @click="previewPic"
                     style="cursor: pointer; width: 140px; height: 200px"
                     :src="item.url"
                     alt=""
@@ -2355,7 +2354,7 @@ export default {
       ],
       changeGoods: [], //更改是否优秀的id数组
       choosedStageId: 1, // 选择的阶段id
-      choosedStageName:"",//阶段名称
+      choosedStageName: "", //阶段名称
       activeSetKey: "12", //12-基础信息 13-共享文档
       docChecked: true,
       //学员信息列表
@@ -2909,55 +2908,51 @@ export default {
         projectId: state.projectId,
       };
       apitl.getProjectDetail(objtl).then((res) => {
-            console.log("阶段列表", res);
-            for (let i = 0; i < res.data.data.stageList.length; i++) {
-              for (
-                let k = 0;
-                k < res.data.data.stageList[i].taskList.length;
-                k++
-              ) {
-                if (res.data.data.stageList[i].taskList[k].name == "面授") {
-                  state.morFaceT = true;
-                  break;
-                }
-              }
+        console.log("阶段列表", res);
+        for (let i = 0; i < res.data.data.stageList.length; i++) {
+          for (let k = 0; k < res.data.data.stageList[i].taskList.length; k++) {
+            if (res.data.data.stageList[i].taskList[k].name == "面授") {
+              state.morFaceT = true;
+              break;
             }
-            levelList.stageList = res.data.data.stageList;
-            if (levelList.stageList.length === 1) {
-              // 无解段任务
-              state.rankjieduan = [{ value: 0, label: "无阶段" }];
-              state.valuestu2 = 0;
-            } else {
-              // 有阶段任务
-              console.log(levelList.stageList);
-              let arrStage = [];
-              for (let i = 0; i < levelList.stageList.length; i++) {
-                if (levelList.stageList[i].id !== "0") {
-                  let obj = {
-                    value: levelList.stageList[i].id,
-                    label: levelList.stageList[i].name,
-                  };
-                  arrStage.push(obj);
-                }
-              }
-              state.rankjieduan = arrStage;
-              state.valuestu2 = arrStage[0].value;
-              state.choosedStageName = levelList.stageList[0].name;
+          }
+        }
+        levelList.stageList = res.data.data.stageList;
+        if (levelList.stageList.length === 1) {
+          // 无解段任务
+          state.rankjieduan = [{ value: 0, label: "无阶段" }];
+          state.valuestu2 = 0;
+        } else {
+          // 有阶段任务
+          console.log(levelList.stageList);
+          let arrStage = [];
+          for (let i = 0; i < levelList.stageList.length; i++) {
+            if (levelList.stageList[i].id !== "0") {
+              let obj = {
+                value: levelList.stageList[i].id,
+                label: levelList.stageList[i].name,
+              };
+              arrStage.push(obj);
             }
-            //暂时传个固定的id用 到时候看数据里面是否有在更换
-            // state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
-            let leng = res.data.data.stageList.length;
-            if (leng > 0) {
-              let taskarr = res.data.data.stageList;
-              console.log("11-22-33", taskarr);
-              if (taskarr.length == 1) {
-                if (taskarr[0].id == "0") {
-                  taskarr[0].name = "无阶段任务";
-                }
-              }
-              state.taskSyllabus = taskarr;
+          }
+          state.rankjieduan = arrStage;
+          state.valuestu2 = arrStage[0].value;
+          state.choosedStageName = levelList.stageList[0].name;
+        }
+        //暂时传个固定的id用 到时候看数据里面是否有在更换
+        // state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
+        let leng = res.data.data.stageList.length;
+        if (leng > 0) {
+          let taskarr = res.data.data.stageList;
+          console.log("11-22-33", taskarr);
+          if (taskarr.length == 1) {
+            if (taskarr[0].id == "0") {
+              taskarr[0].name = "无阶段任务";
             }
-        })
+          }
+          state.taskSyllabus = taskarr;
+        }
+      });
     };
     //学员学员管理渲染
     // const getTableDate = () => {