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

2025-12-24 18:22:55 +08:00 · 2022-12-05 23:43:45 +08:00
parent ac758dd54e 65358d260c
commit fc4aa7d5a8
14 changed files with 1103 additions and 904 deletions
--- a/src/api/config.js
+++ b/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-05 16:33:28
+ * @LastEditTime: 2022-12-05 21:56:56
 * @FilePath: /fe-manage/src/api/config.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
@@ -24,7 +24,7 @@ const http = axios.create({

 http.interceptors.request.use(
  (config) => {
-    console.log("config", config);
+    // console.log("config", config);
    // const token = localStorage.getItem("token");
    // // const token = getCookie('token')
    // // console.log('token', token)
--- a/src/api/indexEval.js
+++ b/src/api/indexEval.js
@@ -45,29 +45,39 @@ export const fileUp = (data) =>
    headers: { "Content-Type": "multipart/form-data" },
  });

-//删除测评信息
-export const deleteEvaluationById = (obj) => http.post('/evaluation/deleteEvaluationById', { params: obj }, {
-    header: {
-        'token': '123',
-    }
-})
+//上传文件
+export const baseVoteupload = (data) =>
+  http.post("/vote/baseVoteupload", data, {
+    headers: { "Content-Type": "multipart/form-data" },
+  });

+//删除测评信息
+export const deleteEvaluationById = (obj) =>
+  http.post(
+    "/evaluation/deleteEvaluationById",
+    { params: obj },
+    {
+      header: {
+        token: "123",
+      },
+    }
+  );

 //根据ID获取测评信息详情
 export const queryEvaluationDetailById = (obj) =>
-  http.post("/evaluation/queryEvaluationDetailById", obj,{
+  http.post("/evaluation/queryEvaluationDetailById", obj, {
    headers: {
-      'token': '123',
-      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-    }
-});
+      token: "123",
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+    },
+  });

 //修改测评信息
 export const updateEvaluation = (obj) =>
  http.post("/evaluation/updateEvaluation", obj);

 //测评列表查询接口
-  export const choiceEvaluation = (obj) =>
+export const choiceEvaluation = (obj) =>
  http.post("/evaluation/choiceEvaluation", obj);

 // 测试方法
@@ -79,9 +89,9 @@ export const updateEvaluation = (obj) =>
 // })
 //根据name获取测评信息详情
 export const getEvalListByName = (obj) =>
-  http.post("/evaluation/queryEvaluationDetailById", obj,{
+  http.post("/evaluation/queryEvaluationDetailById", obj, {
    headers: {
-      'token': '123',
-      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-    }
-});
+      token: "123",
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+    },
+  });
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -216,6 +216,7 @@ export default {
      state.apiTaskList = selectedRows;
    };
    const handelChangePage = (page, pageSize) => {
+      state.selectedRowKeys = []
      state.currentPage = page;
      state.pageSize = pageSize;
      getAllCaseText();
@@ -250,7 +251,14 @@ export default {
          isTop: "",
        })
        .then((res) => {
+          console.log('案例列表',res)
          if (res.status === 200) {
+            state.selectedRowKeys=[0]
+            for(let i=0;i<res.data.data.length;i++){
+              if(Number(res.data.data[i].casesId) == props.EditCaseId){
+                state.selectedRowKeys = [i]
+              }
+            }
            getTableDate(res.data.data);
          }
        })
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -66,8 +66,10 @@
            </div>
            <div class="btnbox">
              <a-range-picker
+                  show-time
                  style="width: 424px"
                  v-model:value="time"
+                  format="YYYY/MM/DD HH:mm"
                  :placeholder="['      开始时间', '        结束时间']"
              />
            </div>
@@ -492,9 +494,11 @@ export default {
            console.log("获取的数据",res)
            state.inputV1 = res.data.data.liveName;
            state.time = [
-              dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"),
-              dayjs(res.data.data.liveEndTime, "YYYY-MM-DD"),
+              dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
+              dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
            ];
+            console.log(state.time)
+
            state.inputV2 = res.data.data.liveDuration;
            state.inputV3 = res.data.data.liveTeacherId;
            //state.fileList= res.data.data
@@ -632,11 +636,11 @@ export default {
      }
      let startTime = toDate(
          new Date(state.time[0].$d).getTime() / 1000,
-          "Y-M-D"
+          "Y-M-D h:m"
      );
      let endTime = toDate(
          new Date(state.time[1].$d).getTime() / 1000,
-          "Y-M-D"
+          "Y-M-D h:m"
      );
      state.obj = {
        afterSignIn: state.inputV6,
@@ -661,6 +665,7 @@ export default {
        isEvaluate: state.needEval ? "1" : "0",
      };
      console.log('我是要更新的数据',state.obj )
+      
      if (props.edit) {
        api
            .updateLiveBroadcastMessage(state.obj)
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -79,24 +79,7 @@
        <div class="main_table">
          <!-- 编辑的表格 -->
          <div v-if="edit">
-            <div
-              v-if="choicecourse"
-              class="main_btns"
-              style="justify-content: flex-start"
-            >
-              <div
-                class="btn2"
-                style="
-                  display: flex;
-                  justify-content: center;
-                  align-items: center;
-                "
-                @click="ChoiceCourse"
-              >
-                选择在线课
-              </div>
-            </div>
-            <div v-else>
+            <div>
              <a-table
                class="ant-table-striped"
                :row-class-name="
@@ -338,6 +321,7 @@ export default {
    };
    const handelChangePage = (page) => {
      state.currentPage = page;
+      state.selectedRowKeys = []
      getAllOnlineText();
    };
    const getTableDate = (tableData) => {
@@ -381,6 +365,11 @@ export default {
          state.tableDataTotal = res.data.data.count;
          if (res.status === 200) {
            console.log("获取在线课列表数据", res);
+            for(let i=0;i<res.data.data.list.length;i++){
+              if(Number(res.data.data.list[i].onlineClassesId) == props.EditOnlineId){
+                state.selectedRowKeys = [i+1]
+              }
+            }
            getTableDate(arr);
          }
        })
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -69,7 +69,7 @@ export default {

    onMounted(() => {
      console.log('onMounted')
-      init()
+      // init()
    })

    function getMember() {
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -55,7 +55,7 @@
              <div v-if="ballotId > 0">
                <a-tag closable color="processing" @close="handlelog">
                  <span style="font-size: 14px; line-height: 33px">
-                    删除投票
+                    {{ ballot_name }}
                  </span>
                </a-tag>
              </div>
@@ -64,6 +64,7 @@
                  v-model:createVoteVisible="createVoteVisible"
                  v-model:ballotId="ballotId"
                  v-model:editChild="editChild"
+                  v-model:ballot_name="ballot_name"
                />
              </div>
              <button
@@ -75,7 +76,7 @@
              </button>
              <div :style="{ display: creVote ? 'block' : 'none' }">
                <div class="fileTigan">
-                  <span style="color: #388be1">{{ ballotName }}</span>
+                  <span style="color: #388be1">{{ ballot_name }}</span>
                  <div class="delBox" @click="dleVoteStem()"></div>
                </div>
              </div>
@@ -93,6 +94,12 @@
          </div>
          <div class="main_item">
            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
              <span style="margin-right: 3px">起止时间：</span>
            </div>
            <div class="btnbox">
@@ -105,19 +112,31 @@
          </div>
          <div class="main_item">
            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
              <span style="margin-right: 3px">基础投票数：</span>
            </div>
            <div class="btnbox">
-              <a-upload
+              <!-- <a-upload
                @change="handleChange"
                :before-upload="beforeUpload"
                :multiple="true"
                :max-count="1"
                action="/manageApi/vote/baseVoteupload"
                v-model:file-list="fileList"
+              > -->
+              <a-upload
+                :before-upload="beforeUpload"
+                :multiple="false"
+                :max-count="1"
+                v-model:file-list="fileList"
              >
-                <button class="xkbtn">点击上传</button></a-upload
-              >
+                <button class="xkbtn">点击上传</button>
+              </a-upload>
              <div v-if="voteCount > 0">
                <a-tag color="processing">
                  <span style="font-size: 14px; line-height: 33px">
@@ -142,6 +161,7 @@
                v-model:value="textV1"
                placeholder="请输入投票说明"
                allow-clear
+                :rows="6"
                maxlength="150"
              />
            </div>
@@ -164,6 +184,7 @@ import { RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import * as apiTask from "../../api/indexTaskadd";
 import { addTempTask } from "../../api/indexTaskadd";
+import { baseVoteupload } from "../../api/indexEval";

 export default {
  name: "AddVote",
@@ -231,7 +252,7 @@ export default {
      voteStemId: null,
      EditVoteId: "",
      voteStemName: "",
-      ballotName: "",
+      ballot_name: "",
      editStem: false, //编辑状态
      ballotId: 0, //题干id
      optionId: "", //删除，修改选项id
@@ -264,13 +285,9 @@ export default {
    };

    // 限制文件格式上传
-    const beforeUpload = (obj) => {
-      console.log(obj);
-    };
-
-    const handleChange = (info) => {
-      console.log(info.file.type, info.file.type.indexOf("sheet"));
-      if (info.file.type.indexOf("sheet") == -1) {
+    const beforeUpload = (file) => {
+      console.log(file);
+      if (file.type.indexOf("sheet") == -1) {
        message.destroy();
        message.error("请上传正确的文件格式");

@@ -280,18 +297,25 @@ export default {
        return;
      }

-      let resFileList = [...info.fileList];
+      // let resFileList = [...info.fileList];

-      resFileList.map((file) => {
-        if (file.response) {
-          // Component will show file.url as link
-          file.url = file.response.url;
-          console.log("file========", file);
-          console.log("file========", file.response);
-          state.voteCount = file.response.data;
+      // resFileList.map((file) => {
+      //   if (file.response) {
+      //     // Component will show file.url as link
+      //     file.url = file.response.url;
+      //     console.log("file========", file);
+      //     console.log("file========", file.response);
+      //     state.voteCount = file.response.data;
+      //   }
+      // });
+
+      const formData = new FormData();
+      formData.append("uploadFile", file);
+      baseVoteupload(formData).then((res) => {
+        if (res.data.code === 200) {
+          console.log(res);
        }
      });
-      //fileList.value = resFileList;
    };

    //删除题干信息接口
@@ -386,8 +410,12 @@ export default {
        return message.info("请创建题干信息");
      }

-      if (state.basevote == "") {
-        state.basevote = 1;
+      if (!state.time) {
+        message.destroy();
+        return message.warning("请输入直播时间");
+      }
+      if (!state.basevote) {
+        return message.info("请上传投票基数");
      }
      if (state.time != undefined) {
        state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
@@ -452,7 +480,6 @@ export default {
      updateVoteInfo,
      queryStem,
      closeStem,
-      handleChange,
      beforeUpload,
      handlelog,
    };
@@ -672,6 +699,27 @@ export default {
          display: flex;
          align-items: flex-start;
          margin-bottom: 32px;
+          .textarea {
+            width: 423px;
+
+            .ant-input {
+              width: 100%;
+            }
+
+            .ant-input-textarea-show-count {
+              position: relative;
+            }
+
+            .ant-input-textarea-show-count::after {
+              position: absolute;
+              right: 10px;
+              bottom: 0px;
+            }
+
+            .ant-input {
+              border-radius: 8px;
+            }
+          }

          .signbox {
            width: 120px;
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -118,6 +118,10 @@ export default {
      type: Number,
      default: null,
    },
+    ballot_name: {
+      type: String,
+      default: null,
+    },
    editChild: {
      type: Boolean,
      default: false,
@@ -150,6 +154,7 @@ export default {
      handleAllCancel();
      ctx.emit("update:createVoteVisible", false);
      ctx.emit("update:ballotId", state.ballotId);
+      ctx.emit("update:ballot_name", state.ballotName);
    };
    // 详情
    const getInfoDate = async () => {
@@ -267,7 +272,7 @@ export default {
          }
        });
      } else {
-        virtualDel();
+        virtualDel(id);
      }
    };
    const virtualDel = (id) => {
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3101,7 +3101,8 @@ const columns1 = [
    customRender: ({ text }) => {
      return text ? text : "-";
    },
-  },{
+  },
+  {
    title: " 所属路径",
    width: 250,
    dataIndex: "routerName",
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -878,11 +878,16 @@ export default {
      api
        .handleLearnPath(obj)
        .then((res) => {
-          console.log("发布成功", res);
-          message.destroy();
-          message.success("发布成功");
-          state.pub = false;
-          getLearnPath();
+          console.log("发布", res);
+          if (res.data.code === 200) {
+            message.destroy();
+            message.success("发布成功");
+            state.pub = false;
+            getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
        })
        .catch((err) => {
          console.log("发布失败", err);
@@ -909,11 +914,16 @@ export default {
      api
        .handleLearnPath(obj)
        .then((res) => {
-          console.log("复制成功", res);
-          message.destroy();
-          message.success("复制成功");
-          state.copyModal = false;
-          getLearnPath();
+          if (res.data.code === 200) {
+            console.log("复制成功", res);
+            message.destroy();
+            message.success("复制成功");
+            state.copyModal = false;
+            getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
        })
        .catch((err) => {
          console.log("复制失败", err);
@@ -937,11 +947,16 @@ export default {
      api
        .handleLearnPath(obj)
        .then((res) => {
-          console.log("停用成功", res);
-          message.destroy();
-          message.success("停用成功");
-          state.stopModal = false;
-          getLearnPath();
+          if (res.data.code === 200) {
+            console.log("停用成功", res);
+            message.destroy();
+            message.success("停用成功");
+            state.stopModal = false;
+            getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
        })
        .catch((err) => {
          console.log("停用失败", err);
@@ -979,11 +994,16 @@ export default {
      api
        .handleLearnPath(obj)
        .then((res) => {
-          console.log("撤回成功", res);
-          message.destroy();
-          message.success("撤回成功");
-          state.backModal = false;
-          getLearnPath();
+          if (res.data.code === 200) {
+            console.log("撤回成功", res);
+            message.destroy();
+            message.success("撤回成功");
+            state.backModal = false;
+            getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
        })
        .catch((err) => {
          console.log("撤回失败", err);
@@ -1502,11 +1522,16 @@ export default {
      api
        .handleLearnPath(obj)
        .then((res) => {
-          console.log("删除成功", res);
-          message.destroy();
-          message.success("删除成功");
-          state.deleteModal = false;
-          getLearnPath();
+          if (res.data.code === 200) {
+            console.log("删除成功", res);
+            message.destroy();
+            message.success("删除成功");
+            state.deleteModal = false;
+            getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
        })
        .catch((err) => {
          console.log("删除失败", err);
@@ -1579,23 +1604,28 @@ export default {
      api
        .createLearnPath(obj)
        .then((res) => {
-          console.log("修改成功", res);
-          message.destroy();
-          message.success("修改成功");
-          // state.createLoading = false;
-          // state.currentPage = 1;
-          state.out1 = false;
-          // router.push("/leveladd");
-          getLearnPath();
-          // setTimeout(() => {
-          //   console.log("修改成功", res);
-          //   message.success("修改成功");
-          //   // state.createLoading = false;
-          //   // state.currentPage = 1;
-          //   state.out1 = false;
-          //   // router.push("/leveladd");
-          //   getLearnPath();
-          // }, 1000);
+          if (res.data.code === 200) {
+            console.log("修改成功", res);
+            message.destroy();
+            message.success("修改成功");
+            // state.createLoading = false;
+            // state.currentPage = 1;
+            state.out1 = false;
+            // router.push("/leveladd");
+            getLearnPath();
+            // setTimeout(() => {
+            //   console.log("修改成功", res);
+            //   message.success("修改成功");
+            //   // state.createLoading = false;
+            //   // state.currentPage = 1;
+            //   state.out1 = false;
+            //   // router.push("/leveladd");
+            //   getLearnPath();
+            // }, 1000);
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
        })
        .catch((err) => {
          console.log("修改失败", err);
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -138,10 +138,11 @@
                <div class="centermain">快速添加学员</div>
              </div>
              <!-- 2022-12-2注释 后面放开 -->
-              <!-- <div
+              <div
                class="taskbox"
                @click="showPub"
                style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
+                v-if="action === 0"
              >
                <div class="leftt">
                  <img src="../../assets/images/taskpage/left3.png" />
@@ -156,7 +157,7 @@
                  发布
                </div>
                <div class="centermain">快速发布项目</div>
-              </div> -->
+              </div>
            </div>
          </div>
          <!-- 概览（有数据） -->
@@ -1770,12 +1771,17 @@ export default {
      };
      handleLearnPath(obj)
        .then((res) => {
-          console.log("发布成功", res);
-          message.destroy();
-          message.success("发布成功");
-          state.pub = false;
-          state.nodata = false;
-          // getLearnPath();
+          if (res.data.code === 200) {
+            console.log("发布成功", res);
+            message.destroy();
+            message.success("发布成功");
+            state.pub = false;
+            state.nodata = false;
+            // getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }

          reget();
        })
@@ -2407,7 +2413,9 @@ export default {
  .ant-modal {
    width: 424px !important;
    height: 258px !important;
-
+    .ant-modal-close-x {
+      display: none;
+    }
    .ant-modal-content {
      width: 424px !important;
      height: 258px !important;
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -905,9 +905,7 @@
            <div class="close_exit" @click="closedeleteAll"></div>
          </div>
          <div class="body">
-            <span
-              >请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }}</span
-            >
+            <span>请确认是否批量删除任务</span>
          </div>
          <div class="del_btnbox">
            <div class="del_btn btn1" @click="closedeleteAll">
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -460,7 +460,7 @@ export default {
          });
        }
      } else {
-        virtualDel();
+        virtualDel(id);
      }
    };
    const virtualDel = (id) => {