Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/api/indexAudit.js

@@ -1,7 +1,8 @@
 import http from "./config";
 
 //获取待审核面授课列表
-export const list = (obj) => http.post('/admin/offcourse/list', obj)
+export const list = (obj) => http.post('/admin/offcourse/listToBeReviewed', obj)
+// export const list = (obj) => http.post('/admin/offcourse/list', obj)
 
 //获取待审核项目列表
 export const projlist = (obj) => http.post('/admin/project/list', obj)

src/views/projectcenter/LibraryAdd.vue

@@ -2,7 +2,7 @@
   <div class="addwrapper">
     <div class="addhead">
       <div class="leftimg">
-        <img class="img" src="../../assets/images/projectadd/picture.png" />
+        <img class="img" :src="projectInfo.picUrl" />
       </div>
       <div class="imgfor">
         <div class="forz">{{ projectInfo.name || "-" }}</div>
@@ -310,9 +310,9 @@
                       />
                       <div class="btnarea">
                         <div>&nbsp;</div>
-                        <div class="area_btn">
+                        <div class="area_btn" @click="addNotice">
                           <div class="pub"></div>
-                          <div class="btnText" @click="addNotice">发布</div>
+                          <div class="btnText">发布</div>
                         </div>
                       </div>
                     </div>
@@ -497,7 +497,7 @@
                     <div class="setc_main">
                       <img
                         style="width: 151px; height: 84px"
-                        :src="picUrl"
+                        :src="projectInfo.picUrl"
                         alt=""
                       />
                     </div>
@@ -581,12 +581,12 @@
                       <div class="box"></div>
                       <div class="onetitle">上传共享文档</div>
                       <div class="oneedi">
-                        <a-switch v-model:checked="docChecked"></a-switch>
+                        <a-switch v-model:checked="attachSwitch" @change="checkedClose"></a-switch>
                       </div>
                     </div>
                     <div class="btnbox" style="margin: 20px">
                       <a-upload
-                        v-if="docChecked == true"
+                        v-if="attachSwitch == true"
                         v-model:file-list="fileList"
                         name="file"
                         action="/manageApi/file/upload"
@@ -604,7 +604,7 @@
                         />
                       </a-upload>
                       <div
-                        v-if="docChecked == true"
+                        v-if="attachSwitch == true"
                         class="btnbox"
                         style="margin: 20px"
                       >
@@ -833,6 +833,8 @@ export default defineComponent({
       seven1: null,
       seven2: null,
       edit: true,
+      fileList:[],
+      attachSwitch:true,
       // 共享文档列表
       docList: [
         {
@@ -936,35 +938,35 @@ export default defineComponent({
           state.taskSyllabus = [];
           console.log(res);
           state.projectInfo.name = res.data.data.projectTemplateInfo.name;
-          state.projectInfo.beginTime =
-            res.data.data.projectTemplateInfo.beginTime;
+          state.projectInfo.beginTime = res.data.data.projectTemplateInfo.beginTime;
           state.projectInfo.endTime = res.data.data.projectTemplateInfo.endTime;
           state.projectInfo.manager = res.data.data.projectTemplateInfo.manager;
           state.projectInfo.notice = res.data.data.projectTemplateInfo.notice;
-          state.projectInfo.sourceBelongId =
-            res.data.data.projectTemplateInfo.sourceBelongId;
-          state.projectInfo.managerId =
-            res.data.data.projectTemplateInfo.managerId;
+          state.projectInfo.sourceBelongId = res.data.data.projectTemplateInfo.sourceBelongId;
+          state.projectInfo.managerId = res.data.data.projectTemplateInfo.managerId;
           state.projectInfo.remark = res.data.data.projectTemplateInfo.remark;
-          state.projectInfo.courseSyncFlag =
-            res.data.data.projectTemplateInfo.courseSyncFlag;
+          state.projectInfo.courseSyncFlag = res.data.data.projectTemplateInfo.courseSyncFlag;
           state.projectInfo.level = res.data.data.projectTemplateInfo.level;
-          state.projectInfo.systemId =
-            res.data.data.projectTemplateInfo.systemId;
+          state.projectInfo.systemId = res.data.data.projectTemplateInfo.systemId;
           state.projectInfo.boeFlag = res.data.data.projectTemplateInfo.boeFlag;
-          state.projectInfo.noticeFlag =
-            res.data.data.projectTemplateInfo.noticeFlag;
+          state.projectInfo.noticeFlag = res.data.data.projectTemplateInfo.noticeFlag;
           state.projectInfo.remark = res.data.data.projectTemplateInfo.remark;
           state.projectInfo.status = res.data.data.projectTemplateInfo.status;
           state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl;
+          state.picUrl = res.data.data.projectTemplateInfo.picUrl;
           state.projectInfo.attach = res.data.data.projectTemplateInfo.attach;
-          state.projectInfo.category =
-            res.data.data.projectTemplateInfo.category;
+          state.projectInfo.category = res.data.data.projectTemplateInfo.category;
+          try{
+            state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach);
+          }catch{
+            state.fileList = [];
+          }
+          state.attachSwitch = res.data.data.projectTemplateInfo.attachSwitch == 1 ? true : false
           let data = res.data.data.stageList;
           console.log("data=====", data);
           for (let i in data) {
             console.log("what ------ > ", i, data);
-            state.taskSyllabus.push({ text: data[i].name, children: [] });
+            state.taskSyllabus.push({ text: data[i].name?data[i].name:'无阶段任务', children: [] });
             for (let j in data[i].taskList) {
               state.taskSyllabus[i].children.push({
                 course: checkType(data[i].taskList[j].type),
@@ -991,8 +993,6 @@ export default defineComponent({
         name: state.projectInfo.name,
         category: state.projectInfo.category,
         picUrl: state.projectInfo.picUrl,
-        beginTime: new Date(state.projectInfo.beginTime).getTime(),
-        endTime: new Date(state.projectInfo.endTime).getTime(),
         manager: state.projectInfo.manager,
         managerId: state.projectInfo.managerId || 0,
         sourceBelongId: state.projectInfo.sourceBelongId,
@@ -1136,25 +1136,23 @@ export default defineComponent({
         let str = JSON.stringify(fileList);
         console.log("str", str);
         console.table({
-          name: state.projectInfo.name,
-          category: state.projectInfo.category,
-          picUrl: state.projectInfo.picUrl,
-          beginTime: new Date(state.projectInfo.beginTime).getTime() / 1000,
-          endTime: new Date(state.projectInfo.endTime).getTime() / 1000,
-          manager: state.projectInfo.manager,
-          managerId: state.projectInfo.managerId || 0,
-          sourceBelongId: state.projectInfo.sourceBelongId,
-          level: state.projectInfo.level,
-          systemId: state.projectInfo.systemId,
-          boeFlag: state.projectInfo.boeFlag ? 1 : 0,
-          courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
-          notice: state.projectInfo.notice,
-          noticeFlag: state.projectInfo.noticeFlag,
-          projectTemplateId: Number(localStorage.getItem("projectTemplateId")),
-          remark: state.projectInfo.remark,
-          status: state.projectInfo.status,
-          attach: str,
-        });
+            name: state.projectInfo.name,
+            category: state.projectInfo.category,
+            picUrl: state.projectInfo.picUrl,
+            manager: state.projectInfo.manager,
+            managerId: state.projectInfo.managerId || 0,
+            sourceBelongId: state.projectInfo.sourceBelongId,
+            level: state.projectInfo.level,
+            systemId: state.projectInfo.systemId,
+            boeFlag: state.projectInfo.boeFlag ? 1 : 0,
+            courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
+            notice: state.projectInfo.notice,
+            noticeFlag: state.projectInfo.noticeFlag,
+            projectTemplateId: localStorage.getItem("projectTemplateId"),
+            remark: state.projectInfo.remark,
+            status: state.projectInfo.status,
+            attach: str,
+          });
         //要编辑项目
         api
           .templateEdit({
@@ -1189,6 +1187,27 @@ export default defineComponent({
         message.error(`${file.name} 文件上传失败.`);
       }
     };
+
+    // 设置上传图片开关
+    const checkedClose = (data, a) => {
+      console.log(data, a);
+      state.attachSwitch = data;
+
+      // 更新开关状态
+      api
+          .templateEdit({
+            sourceBelongId: state.projectInfo.sourceBelongId,
+            projectTemplateId: localStorage.getItem("projectTemplateId"),
+            attachSwitch: state.attachSwitch?1:-1
+          })
+          .then((res) => {
+            console.log("开关更新成功", res);
+          })
+          .catch((err) => {
+            console.log("开关更新失败", err);
+          });
+    };
+
     //设置积分规则
     const editRule = () => {
       let obj = {
@@ -1269,6 +1288,7 @@ export default defineComponent({
       editRule,
       handleChange2,
       scoresum,
+      checkedClose
     };
   },
 });

src/views/projectcenter/TaskPage.vue

@@ -17,31 +17,33 @@
           @click="showCodeModel2()"
         />
         <div class="line" v-if="action == 1 || action == 0"></div>
+        <!-- 显示发布图标 -->
         <img
-          v-if="action == 1 || action == 0"
+          v-if="action == 2"
           class="img2"
           src="../../assets/images/leveladd/pub.png"
         />
-        <!-- <div class="pub">发布</div> -->
-        <!-- 已发布的显示 -->
-        <div
-          class="pub"
-          style="width: 28px"
+        <!-- 显示撤回发布图标 -->
+        <img
+          v-if="action == 3"
+          class="img2"
+          src="../../assets/images/leveladd/pub.png"
+        />
+        <!-- 显示审核图标 -->
+        <img
+          v-if="action == 0"
+          class="img2"
+          src="../../assets/images/project/reviewsubmit.png"
+        />
+        <!-- 显示撤回审核图标 -->
+        <img
           v-if="action == 1"
-          @click="showBackModal"
-        >
-          {{ act }}
-        </div>
-        <!-- 未发布/草稿的显示 -->
-        <div
-          class="pub"
-          style="width: 28px"
-          v-if="action == 2"
-          @click="showProjectPub"
-        >
-          {{ act }}
-        </div>
+          class="img2"
+          src="../../assets/images/project/reviewrecall.png"
+        />
+        <!-- <div class="pub">发布</div> -->
 
+        <!-- 显示提交审核 -->
         <div
           class="pub"
           style="width: 56px"
@@ -50,6 +52,34 @@
         >
           {{ act }}
         </div>
+        <!-- 显示撤回审核 -->
+        <div
+          class="pub"
+          style="width: 56px"
+          v-if="action == 1"
+          @click="showRecallReviewModal"
+        >
+          {{ act }}
+        </div>
+        <!-- 显示发布 -->
+        <div
+          class="pub"
+          style="width: 28px"
+          v-if="action == 2"
+          @click="showProjectPub"
+        >
+          {{ act }}
+        </div>
+        <!-- 显示撤回发布 -->
+        <div
+          class="pub"
+          style="width: 56px"
+          v-if="action == 3"
+          @click="showBackModal"
+        >
+          {{ act }}
+        </div>
+
         <!-- 项目提交审核弹窗 -->
         <a-modal
           v-model:visible="reviewModal"
@@ -74,7 +104,7 @@
                 <div class="del_btn btn1" @click="closeReviewModal">
                   <div class="btnText">取消</div>
                 </div>
-                <div class="del_btn btn2" @click="recallReviewProject">
+                <div class="del_btn btn2" @click="submitReviewProject">
                   <div class="btnText">确定</div>
                 </div>
               </div>
@@ -1725,7 +1755,37 @@
         </div>
       </div>
     </a-modal>
-
+    <!-- 项目撤回审核弹窗 -->
+    <a-modal
+      v-model:visible="recallReviewModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeRecallReviewModal"></div>
+          </div>
+          <div class="body">
+            <span>您确定要撤回审核吗</span>
+            <div class="back"></div>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeRecallReviewModal">
+              <div class="btnText">取消</div>
+            </div>
+            <div class="del_btn btn2" @click="recallReviewProject">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
     <!-- 结束项目弹窗 -->
     <a-modal
       v-model:visible="stopModal"
@@ -2028,6 +2088,7 @@ export default {
       releaseProjectName: null, //发布的项目名称
       releaseProjectTime: null, //发布的项目时间
       backModal: false, //撤回弹窗
+      recallReviewModal: false, //撤回审核
       closeBack: false,
       stopModal: false,
       closeStop: false,
@@ -2873,7 +2934,7 @@ export default {
       state.reviewModal = true;
     };
 
-    const recallReviewProject = () => {
+    const submitReviewProject = () => {
       let obj = {
         projectId: state.projectId,
         type: 3,
@@ -2887,6 +2948,8 @@ export default {
           message.success("提交成功");
           state.reviewModal = false;
           getTaskInfo();
+          // getTask();
+          reget();
         })
         .catch((err) => {
           console.log("提交失败", err);
@@ -3802,6 +3865,7 @@ export default {
       getTask({
         projectId: state.projectId,
       }).then((res) => {
+        console.log("获取项目状态", res);
         state.action = res.data.data.projectInfo.status;
         state.act =
           state.action == 2
@@ -3809,7 +3873,9 @@ export default {
             : state.action == 0
             ? "提交审核"
             : state.action == 1
-            ? "撤回"
+            ? "撤回审核"
+            : state.action == 3
+            ? "撤回发布"
             : state.action == -1
             ? ""
             : "-";
@@ -3852,9 +3918,10 @@ export default {
       console.log("点击发布");
       let obj = {
         projectId: state.releaseProjectId,
+        type: 4,
       };
       apiproj
-        .releaseProject(obj)
+        .handleProject(obj)
         .then((res) => {
           console.log("发布成功", res);
           message.destroy();
@@ -3878,7 +3945,7 @@ export default {
     const recallProject = () => {
       let obj = {
         projectId: state.projectId,
-        type: 0,
+        type: -4,
       };
       apiproj
         .handleProject(obj)
@@ -3893,6 +3960,36 @@ export default {
           console.log("撤回失败", err);
         });
     };
+
+    //打开撤回审核弹窗
+    const showRecallReviewModal = () => {
+      state.recallReviewModal = true;
+    };
+    //确认撤回审核
+    const recallReviewProject = () => {
+      let obj = {
+        projectId: state.projectId,
+        type: -3,
+      };
+      console.log("撤回成功obj", obj);
+      apiproj
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.recallReviewModal = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("撤回成功", err);
+        });
+    };
+    //关闭提交审核弹窗
+    const closeRecallReviewModal = () => {
+      state.recallReviewModal = false;
+    };
+
     //关闭结束弹窗
     const closeStopModal = () => {
       state.stopModal = false;
@@ -4162,7 +4259,10 @@ export default {
       checkedClose,
       submitExamine,
       closeReviewModal,
+      showRecallReviewModal,
       recallReviewProject,
+      closeRecallReviewModal,
+      submitReviewProject,
       showCodeModel,
       showCodeModel2,
       checkType,

src/views/projectcenter/temTask.vue

@@ -148,7 +148,7 @@
               <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
               <div class="pub">保存</div>
               <div class="line"></div> -->
-              <router-link to="/taskpage">
+              <router-link to="/libraryAdd">
                 <div style="display: flex">
                   <img
                     class="img2"
@@ -1388,7 +1388,13 @@ export default {
         };
         array.push(obj);
       });
-      state.level = array;
+      console.log(array)
+      if(array[0].id=='0'){
+        state.level = [];
+      }else{
+        state.level = array;
+      }
+      
     };
 
     const tableDataFunc = () => {
@@ -1525,11 +1531,12 @@ export default {
       api
         .templateDetail(localStorage.getItem("projectTemplateId"))
         .then((res) => {
+          console.log('获取的任务列表信息',res)
           if (res.status == 200) {
             console.log("22222", res.data.data.stageList);
             state.projectTitle = res.data.data.projectTemplateInfo.name;
             state.picUrl = res.data.data.projectTemplateInfo.picUrl;
-            let leng = res.data.data.stageList.length;
+            let leng = res.data.data.stageList[0].name!==null ?res.data.data.stageList.length:0;
             if (leng > 0) {
               let stage = localStorage.getItem("templateStageId")
                 ? localStorage.getItem("templateStageId")