feat:合并

2025-12-12 12:26:47 +08:00 · 2022-12-07 21:15:09 +08:00
parent bdf6418b49 3f7f89eaea
commit ece2ceba9f
6 changed files with 8436 additions and 51 deletions
--- a/src/api/indexAudit.js
+++ b/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)
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3407,8 +3407,8 @@ const columns6 = [
  },
  {
    title: "创建人",
-    dataIndex: "name",
-    key: "name",
+    dataIndex: "createName",
+    key: "createName",
    width: "10%",
    align: "center",
    ellipsis: true,
@@ -4527,7 +4527,7 @@ export default defineComponent({
      let obj = {
        pageNo: state.currentPage222,
        pageSize: state.pageSize222,
-        name: state.kk_inputV1,
+        createName: state.kk_inputV1,
        teacher: state.kk_inputV2,
        beginTime: parseInt(new Date(state.selectTime).getTime() / 1000),
        offcourseId: state.offcourseId,
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/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
    };
  },
 });
--- a/src/views/projectcenter/temTask.vue
+++ b/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")
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -44,7 +44,7 @@
      <div class="btns">
        <div class="btn btn3" @click="handleNew">
          <div class="search"></div>
-          <div class="btnText">创建评估2</div>
+          <div class="btnText">创建评估</div>
        </div>
      </div>
    </div>