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

2025-12-18 07:16:46 +08:00 · 2022-11-03 17:50:23 +08:00
parent 88f3750d8e bd8191c568
commit 8de99d1ce8
4 changed files with 172 additions and 184 deletions
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -9,7 +9,8 @@
  >
    <div class="drawerMain">
      <div class="header">
-        <div class="headerTitle">添加测评</div>
+        <div v-if="edit" class="headerTitle">编辑测评</div>
+        <div v-else class="headerTitle">添加测评</div>
        <img
          style="width: 29px; height: 29px; cursor: pointer"
          src="../../assets/images/basicinfo/close.png"
@@ -121,6 +122,10 @@ export default {
      type: Boolean,
      default: false,
    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
  },
  setup(props, ctx) {
    const state = reactive({
@@ -140,6 +145,7 @@ export default {

    const closeDrawer = () => {
      ctx.emit("update:addevalVisible", false);
+      ctx.emit("update:edit", false);
      state.inputV1 = "";
      state.inputV2 = "";
    };
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -628,6 +628,8 @@ export default {
            })
            .then((res) => {
              console.log("调用项目添加接口后", res.data);
+              //自定义事件给父组件传值
+              ctx.emit("changeData", false);
              //重新获取任务列表
              // apiTask.getTask({ projectId: 28 });
              // router.push("/taskadd");
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -60,7 +60,7 @@
      <div class="main">
        <div class="inma">
          <div class="name">
-            <div class="d" style="margin-top: 2px;margin-right:2px">
+            <div class="d" style="margin-top: 2px; margin-right: 2px">
              <img
                style="width: 10px; height: 10px"
                src="../../assets/images/basicinfo/asterisk.png"
@@ -78,8 +78,15 @@
            <div class="co">{{ value1.length }}/20</div>
          </div>
          <div class="name">
-          <div class="d" style="width: 10px;height: 10px;margin-top: 2px;margin-right:2px">
-            </div>
+            <div
+              class="d"
+              style="
+                width: 10px;
+                height: 10px;
+                margin-top: 2px;
+                margin-right: 2px;
+              "
+            ></div>
            <div class="fir">关卡说明：</div>
            <div class="input">
              <a-textarea
@@ -167,8 +174,10 @@
          <!-- 添加作业侧弹窗 -->
          <div>
            <add-homework
-            flag=0  routerTaskId=ListChoosedId
-            v-model:addhomeworkVisible="addhomeworkvisible" />
+              flag="0"
+              routerTaskId="ListChoosedId"
+              v-model:addhomeworkVisible="addhomeworkvisible"
+            />
          </div>
          <div class="lin"></div>
        </div>
@@ -221,30 +230,45 @@
          </div>
          <div class="lin"></div>
        </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddEval">
          <div class="itcon">
            <div class="img">
              <img src="../../assets/images/leveladd/ce.png" />
            </div>
            <div class="text">测评</div>
+            <!-- 添加测评侧弹窗 -->
+            <div>
+              <add-eval v-model:addevalVisible="addevalvisible" v-model:edit="edit" />
+            </div>
+            <!-- 添加测评侧弹窗 -->
          </div>
          <div class="lin"></div>
        </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddInvist">
          <div class="itcon">
            <div class="img">
              <img src="../../assets/images/leveladd/diao.png" />
            </div>
            <div class="text">评估</div>
+            <!-- 添加评估侧弹窗 -->
+            <div>
+              <add-invist v-model:addinvistVisible="addinvistvisible" />
+            </div>
+            <!-- 添加评估侧弹窗 -->
          </div>
          <div class="lin"></div>
        </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddVote">
          <div class="itcon">
            <div class="img">
              <img src="../../assets/images/leveladd/tou.png" />
            </div>
            <div class="text">投票</div>
+            <!-- 添加投票侧弹窗 -->
+            <div>
+              <add-vote v-model:addvoteVisible="addvotevisible" />
+            </div>
+            <!-- 添加投票侧弹窗 -->
          </div>
          <div class="lin"></div>
        </div>
@@ -524,6 +548,9 @@ import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
+import AddEval from "../../components/drawers/AddEval.vue";
+import AddInvist from "../../components/drawers/AddInvist.vue";
+import AddVote from "../../components/drawers/AddVote.vue";
 import * as api from "../../api/indexLevel";
 import { GetRouterDetail, RouterDeleteTask } from "../../api/indexTask";
 import { message } from "ant-design-vue";
@@ -533,7 +560,10 @@ export default {
    AddStu,
    ImpStu,
    AddHomework,
-    AddTest
+    AddTest,
+    AddEval,
+    AddInvist,
+    AddVote,
  },
  setup() {
    const state = reactive({
@@ -542,7 +572,7 @@ export default {
          chapterId: "1",
          remark: "关卡说明",
          name: "默认关卡",
-        }
+        },
      ],
      tableData: [
        {
@@ -739,19 +769,23 @@ export default {
      value1: "",
      value2: "",
      selectedRowKeys: [],
+      edit:false, //是否点击编辑
      gqxy_hs: true,
      isactive: 0,
      projectChecked: null, //项目单选框
      addhomeworkvisible: false,
-      addtestvisible:false,
+      addtestvisible: false,
+      addevalvisible: false,
+      addinvistvisible: false,
+      addvotevisible: false,
      updateChapterID: null, //修改关卡id
      // 表示当前触发列表的id,用来发送编辑和删除
-      ListChoosedId:0
+      ListChoosedId: 0,
    });

    //新建关卡
    const editChapter = () => {
-       if(!state.value1) return message.warning("请输入关卡名称");
+      if (!state.value1) return message.warning("请输入关卡名称");
      let obj = {
        name: state.value1,
        remark: state.value2,
@@ -774,7 +808,7 @@ export default {
        .catch((err) => {
          console.log("创建失败", err);
        });
-    }
+    };

    //编辑关卡
    // const updateChapter = () => {
@@ -800,31 +834,42 @@ export default {
    // 作业和考试的抽屉
    const showDrawerAddHomework = () => {
      state.addhomeworkvisible = true;
-      state.ListChoosedId = 0
+      state.ListChoosedId = 0;
    };
    const showDrawerAddTest = () => {
      state.addtestvisible = true;
-      state.ListChoosedId = 0
+      state.ListChoosedId = 0;
+    };
+    //测试评估投票抽屉
+    const showDrawerAddEval = () => {
+      state.addevalvisible = true;
+    };
+    const showDrawerAddInvist = () => {
+      state.addinvistvisible = true;
+    };
+    const showDrawerAddVote = () => {
+      state.addvotevisible = true;
    };

    // tableData数据赋值方法
    const dataAssignment = () => {
-      console.log((state.level));
-      state.level[0].taskList.forEach((element,index) => {
-        state.tableData[index] = {
-          key:element.routerTaskId,
-          lei:checkType(element.type),
-          creater:element.name,
-          cretime:element.duration,
-          checked1:element.flag
-        }
-      });
-    }
-    const getDetail = (index) => {
-      GetRouterDetail(92).then((res) => {
-        state.level = res.data.data.chapterList
      console.log(state.level);
-        if(index == 0) {
+      state.level[0].taskList.forEach((element, index) => {
+        state.tableData[index] = {
+          key: element.routerTaskId,
+          lei: checkType(element.type),
+          creater: element.name,
+          cretime: element.duration,
+          checked1: element.flag,
+        };
+      });
+    };
+    const getDetail = (index) => {
+      GetRouterDetail(92)
+        .then((res) => {
+          state.level = res.data.data.chapterList;
+          console.log(state.level);
+          if (index == 0) {
            //   state.tableData[1] = {
            //   key: 2,
            //   lei: "在线",
@@ -832,12 +877,13 @@ export default {
            //   cretime: "60",
            //   checked1: true,
            // }
-        dataAssignment(0)
+            dataAssignment(0);
          }
-      }).catch((err) => {
-        message.error(err)
        })
-    }
+        .catch((err) => {
+          message.error(err);
+        });
+    };
    const closeDrawer = () => {
      state.visible = false;
    };
@@ -960,12 +1006,23 @@ export default {
            return (
              <div class="opa">
                <div class="opacation">
-                  <span style="color:#4EA6FF;margin-right:25px;cursor:pointer">
+                  <span
+                    style="color:#4EA6FF;margin-right:25px;cursor:pointer"
+                    onClick={()=>{
+                      state.edit = true;
+                      state.addevalvisible = true;
+                    }}
+                  >
                    编辑
                  </span>
-                  <span style="color:#4EA6FF;cursor:pointer" onClick={() => {
-                    deleteLevelTask()
-                  }}>删除</span>
+                  <span
+                    style="color:#4EA6FF;cursor:pointer"
+                    onClick={() => {
+                      deleteLevelTask();
+                    }}
+                  >
+                    删除
+                  </span>
                </div>
              </div>
            );
@@ -975,9 +1032,22 @@ export default {
      return columns;
    };
    const checkType = (index) => {
-      let typeRules = ["","在线","面授","案例","作业","考试","直播","外链","讨论","测评","评估","投票"];
+      let typeRules = [
+        "",
+        "在线",
+        "面授",
+        "案例",
+        "作业",
+        "考试",
+        "直播",
+        "外链",
+        "讨论",
+        "测评",
+        "评估",
+        "投票",
+      ];
      return typeRules[index];
-    }
+    };
    const tableDataFunc2 = () => {
      const columns = [
        {
@@ -1162,7 +1232,7 @@ export default {
      document.getElementsByTagName("main")[0].style.background =
        "rgb(245, 247, 250,1)";
      document.getElementsByTagName("main")[0].style.boxShadow = "none";
-      getDetail(0)
+      getDetail(0);
    });
    onUnmounted(() => {
      document.getElementsByTagName("main")[0].style.background = "#ffffff";
@@ -1183,13 +1253,15 @@ export default {
      state.deleteAll = false;
    };
    const deleteLevelTask = () => {
-      RouterDeleteTask(state.listChoosedId).then((res) => {
+      RouterDeleteTask(state.listChoosedId)
+        .then((res) => {
          console.log(`删除成功${res}`);
-        message.success('删除成功')
-      }).catch((err) => {
-        console.log(`删除失败${err}`);
+          message.success("删除成功");
        })
-    }
+        .catch((err) => {
+          console.log(`删除失败${err}`);
+        });
+    };

    return {
      ...toRefs(state),
@@ -1213,6 +1285,9 @@ export default {
      // updateChapter,
      showDrawerAddHomework,
      showDrawerAddTest,
+      showDrawerAddEval,
+      showDrawerAddInvist,
+      showDrawerAddVote,
      deleteLevelTask,
    };
  },
@@ -1339,9 +1414,9 @@ export default {
                width: 100px;
                height: 40px;
                border-radius: 4px;
-                border: 1px solid #409EFF;
+                border: 1px solid #409eff;
                font-size: 14px;
-                color: #409EFF;
+                color: #409eff;
                cursor: pointer;
                background: #ffffff;
                margin-right: 20px;
@@ -1354,7 +1429,7 @@ export default {
                color: #fff;
                cursor: pointer;
                border: 0;
-                background: #409EFF;
+                background: #409eff;
              }
            }
          }
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -154,11 +154,14 @@
            </div>
            <div class="text">直播</div>
          </div>
-          <!-- 添加考试侧弹窗 -->
+          <!-- 添加直播侧弹窗 -->
          <div>
-            <add-live v-model:addliveVisible="addlivevisible" />
+            <add-live
+              v-model:addliveVisible="addlivevisible"
+              @changeData="updateTableData"
+            />
          </div>
-          <!-- 添加考试侧弹窗 -->
+          <!-- 添加直播侧弹窗 -->
          <div class="lin"></div>
        </div>
        <div class="item" @click="showDrawerAddRef">
@@ -492,7 +495,7 @@
        </div>
      </div>
    </a-modal>
-    <!-- 确认删除阶段弹窗 -->
+    <!-- 确认删除任务弹窗 -->
    <a-modal
      v-model:visible="deleteModal"
      :footer="null"
@@ -526,14 +529,7 @@
 </template>

 <script>
-import {
-  reactive,
-  toRefs,
-  onMounted,
-  onUnmounted,
-  onUpdated,
-  watch,
-} from "vue";
+import { reactive, toRefs, onMounted, onUnmounted, onUpdated } from "vue";
 import AddOnline from "../../components/drawers/AddOnline.vue";
 import EditOnline from "../../components/drawers/EditOnline.vue";
 import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
@@ -677,97 +673,7 @@ export default {
      ],

      //任务数据
-      tableData: [
-        // {
-        //   key: 1,
-        //   lei: "在线",
-        //   // state: "已发布",
-        //   creater: "管理者课程",
-        //   // pubtime: "2022-07-20 14:00:03",
-        //   cretime: "60分钟",
-        //   haspub: false,
-        //   checked1: false,
-        //   checkedd: false,
-        //   id: "ssss",
-        // },
-        // {
-        //   key: 2,
-        //   lei: "面授",
-        //   // state: "草稿",
-        //   creater: "管理者面授",
-        //   // pubtime: "2022-07-20 14:00:03",
-        //   cretime: "20分钟",
-        //   haspub: true,
-        //   checked1: false,
-        //   checkedd: false,
-        // },
-        // {
-        //   key: 1,
-        //   lei: "在线",
-        //   // state: "已发布",
-        //   creater: "管理者课程",
-        //   // pubtime: "2022-07-20 14:00:03",
-        //   cretime: "60分钟",
-        //   haspub: false,
-        //   checked1: false,
-        //   checkedd: false,
-        // },
-        // {
-        //   key: 3,
-        //   lei: "作业",
-        //   // state: "已停用",
-        //   creater: "管理者作业",
-        //   // pubtime: "2022-07-20 14:00:03",
-        //   cretime: "60分钟",
-        //   haspub: false,
-        //   checked1: false,
-        //   checkedd: false,
-        // },
-        // {
-        //   key: 4,
-        //   lei: "考试",
-        //   // state: "草稿",
-        //   creater: "管理者考试",
-        //   // pubtime: "2022-07-20 14:00:03",
-        //   cretime: "20分钟",
-        //   haspub: true,
-        //   checked1: false,
-        //   checkedd: false,
-        // },
-        // {
-        //   key: 5,
-        //   lei: "案例",
-        //   // state: "草稿",
-        //   creater: "腾飞班1案例",
-        //   // pubtime: "2022-07-20 14:00:03",
-        //   cretime: "20分钟",
-        //   haspub: true,
-        //   checked1: true,
-        //   checkedd: false,
-        // },
-        // {
-        //   key: 4,
-        //   lei: "考试",
-        //   // state: "草稿",
-        //   creater: "管理者考试",
-        //   // pubtime: "2022-07-20 14:00:03",
-        //   cretime: "20分钟",
-        //   haspub: true,
-        //   checked1: false,
-        //   checkedd: false,
-        // },
-        // {
-        //   key: 5,
-        //   lei: "案例",
-        //   // state: "草稿",
-        //   creater: "腾飞班1案例",
-        //   // pubtime: "2022-07-20 14:00:03",
-        //   cretime: "20分钟",
-        //   haspub: true,
-        //   checked1: true,
-        //   checkedd: false,
-        // },
-      ],
+      tableData: [],
      drawertableData: [
        {
          key: 1,
@@ -882,7 +788,6 @@ export default {
      deleteActivityID: null, //删除活动id
      deleteID: "",
    });
-
    const selectProjectName = (value, index) => {
      console.log("value", value, index);
    };
@@ -1095,7 +1000,7 @@ export default {
        .then((res) => {
          if (res.status == 200) {
            console.log("22222", res.data.data.stageList[0].taskList);
-            let arr = res.data.data.stageList[0].taskList;
+            let arr = res.data.data.stageList[1].taskList;
            getTableData(arr);
          }
        })
@@ -1104,15 +1009,12 @@ export default {
        });
    };

-    watch(
-      state.tableData,
-      () => {
+    //数据变化
+    const updateTableData = (data) => {
+      console.log("添加数据", data);
      getTask();
-      },
-      {
-        deep: true,
-      }
-    );
+    };
+
    //删除直播
    const deleteLiveBroadcast = () => {
      let obj = {
@@ -1490,12 +1392,14 @@ export default {
      state.stage = true;
      //关闭确认框
      closeConfirm();
+      
    };
    const showModal1 = () => {
      //关闭确认框
      state.deleteModal = false;
      deleteTask();
      message.success("删除成功");
+      getTask()
    };
    const closeModal = () => {
      state.stage = false;
@@ -1624,18 +1528,19 @@ export default {
      getTableData,
      deleteTask,
      editStage,
+      updateTableData,
    };
  },
 };
 </script>

 <style lang="scss">
-.ant-input {
-  border-radius: 8px;
-  // height: 120%;
-  width: 384px;
-  height: 88px;
-}
+// .ant-input {
+//   border-radius: 8px;
+//   // height: 120%;
+//   width: 384px;
+//   height: 88px;
+// }
 .ConfirmModal {
  .ant-modal {
    width: 424px !important;