feat:合并

2025-12-09 02:46:45 +08:00 · 2023-01-03 17:53:27 +08:00
parent cea80310dd 5d534cfcfd
commit 67ebff91ae
5 changed files with 157 additions and 79 deletions
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -1,11 +1,12 @@
 <template>
  <a-drawer
+    v-if="CommonModelVisible"
    :visible="CommonModelVisible"
    class="drawerStyle ProjectOnlineManage"
    placement="right"
    width="60%"
    @after-visible-change="afterVisibleChange"
-  >
+  > 
    <div class="drawerMain">
      <div class="header">
        <div class="headerTitle">
@@ -34,7 +35,8 @@
        />
      </div>
      <div class="main">
-        <div class="endtime">起止时间：2022-07-21 14:00 ～ 2022-7-30 14:00</div>
+        <div v-if="datasource.type !==6 || datasource.type !==9 " class="endtime">起止时间：—</div>
+        <div v-else class="endtime">起止时间：{{datasource.startTime}} ～ {{datasource.endTime}}</div>
        <div class="search">
          <div class="sealeft">
            <div class="namecon" style="margin-right: 30px">
@@ -183,81 +185,72 @@ export default {
          userName: "li",
          deptName: "开发",
          jobName: "前端开发",
+          level:"关卡一",
          time: "2022-07-22 14:00:30",
          status: "已完成",
        },
      ],
    });
    const tableDataFunc = () => {
-      if (
-        props.itemsType == 1 ||
-        props.itemsType == 3 ||
-        props.itemsType == 6 ||
-        props.itemsType == 7 ||
-        props.itemsType == 8 ||
-        props.itemsType == 9 ||
-        props.itemsType == 11
-      ) {
-        const columns = [
-          {
-            title: "工号",
-            dataIndex: "workNum",
-            key: "workNum",
-            width: 50,
-            align: "center",
-            className: "h head",
-          },
-          {
-            title: "姓名",
-            dataIndex: "userName",
-            key: "userName",
-            width: 50,
-            align: "center",
-            className: "h head",
-          },
-          {
-            title: "所在部门",
-            dataIndex: "deptName",
-            key: "deptName",
-            width: 60,
-            align: "center",
-            className: "h",
-          },
-          {
-            title: "所在岗位",
-            dataIndex: "jobName",
-            key: "jobName",
-            width: 60,
-            align: "center",
-            className: "h",
-          },
-          {
-            title: "学员关卡",
-            dataIndex: "level",
-            key: "level",
-            width: 60,
-            align: "center",
-            className: "h",
-          },
-          {
-            title: "完成时间",
-            dataIndex: "time",
-            key: "time",
-            width: 100,
-            align: "center",
-            className: "h",
-          },
-          {
-            title: "任务状态",
-            dataIndex: "status",
-            key: "status",
-            width: 60,
-            align: "center",
-            className: "h",
-          },
-        ];
-        return columns;
-      }
+      const columns = [
+        {
+          title: "工号",
+          dataIndex: "workNum",
+          key: "workNum",
+          width: 50,
+          align: "center",
+          className: "h head",
+        },
+        {
+          title: "姓名",
+          dataIndex: "userName",
+          key: "userName",
+          width: 50,
+          align: "center",
+          className: "h head",
+        },
+        {
+          title: "所在部门",
+          dataIndex: "deptName",
+          key: "deptName",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "所在岗位",
+          dataIndex: "jobName",
+          key: "jobName",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "学员关卡",
+          dataIndex: "level",
+          key: "level",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "完成时间",
+          dataIndex: "time",
+          key: "time",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "任务状态",
+          dataIndex: "status",
+          key: "status",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
+      ];
+      return columns;
    };

    const closeDrawer = () => {
@@ -269,7 +262,7 @@ export default {
    };
    const afterVisibleChange = (bol) => {
      if (bol == true) {
-        // getManageList();
+        getData();
      }
    };
    const selectProjectName = (value) => {
@@ -284,6 +277,20 @@ export default {
      console.log("Page: ", pageNumber);
    };

+    function getData() {
+      state.tabledata =  [
+        {
+          workNum: "123",
+          userName: "li",
+          deptName: "开发",
+          jobName: "前端开发",
+          level:"关卡一",
+          time: "2022-07-22 14:00:30",
+          status: "已完成",
+        },
+      ]
+    }
+
    return {
      ...toRefs(state),
      selectProjectName,
--- a/src/components/drawers/router/RouterEvaluationManage.vue
+++ b/src/components/drawers/router/RouterEvaluationManage.vue
@@ -1,5 +1,6 @@
  <template>
    <a-drawer
+      v-if="EvaluationModelVisible"
      :visible="EvaluationModelVisible"
      class="drawerStyle ProjectEvalManage"
      placement="right"
@@ -258,10 +259,11 @@
        state.projectName = "";
        state.selectedRowKeys = [];
        state.currentPage = 1;
+        state.tabledata = [];
      };
      const afterVisibleChange = (bol) => {
        if (bol == true) {
-          // getManageList();
+          getData();
        }
      };
      const selectProjectName = (value) => {
@@ -283,7 +285,22 @@
      const clearLine = () => {
        state.selectedRowKeys = [];
      };
-  
+
+      // 获取数据
+      function getData() {
+        state.tabledata =  [
+          {
+            workNum: "123",
+            userName: "li",
+            deptName: "开发",
+            jobName: "前端开发",
+            submitTime: "2022-07-22 14:00:30",
+            status: "已完成",
+            PDFstatus: "未生成",
+          },
+        ]
+      }
+
      return {
        ...toRefs(state),
        selectProjectName,
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -1,5 +1,6 @@
  <template>
    <a-drawer
+      v-if="ExaminationModelVisible"
      :visible="ExaminationModelVisible"
      class="drawerStyle ProjectExamManage"
      placement="right"
@@ -16,7 +17,7 @@
          />
        </div>
        <div class="main">
-          <div class="endtime">起止时间：2022-07-21 14:00 ～ 2022-7-30 14:00</div>
+          <div class="endtime">起止时间：{{datasource.startTime}} ～ {{datasource.endTime}}</div>
          <div class="search">
            <div class="namecon" style="margin-right: 30px">
              <div class="name">姓名：</div>
@@ -274,10 +275,11 @@
        state.projectName = "";
        state.selectedRowKeys = [];
        state.currentPage = 1;
+        state.tabledata = [];
      };
      const afterVisibleChange = (bol) => {
        if (bol == true) {
-          // getManageList();
+          getData();
        }
      };
      const selectProjectName = (value) => {
@@ -303,6 +305,22 @@
      const clearLine = () => {
        state.selectedRowKeys = [];
      };
+
+      // 获取数据
+      function getData() {
+        state.tabledata = [
+          {
+            workNum: "123",
+            userName: "li",
+            deptName: "开发",
+            jobName: "前端开发",
+            score: 89,
+            examNum: 1,
+            comptime: "2022-07-22 14:00:30",
+            status: "已完成",
+          },
+        ]
+      }
  
      return {
        ...toRefs(state),
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -1,5 +1,6 @@
  <template>
    <a-drawer
+      v-if="FaceTeachModelVisible"
      :visible="FaceTeachModelVisible"
      class="drawerStyle ProjectFaceTaskManage"
      placement="right"
@@ -368,10 +369,11 @@
        state.projectName = "";
        state.selectedRowKeys = [];
        state.currentPage = 1;
+        state.tabledata = [];
      };
      const afterVisibleChange = (bol) => {
        if (bol == true) {
-          // getManageList();
+          getData();
        }
      };
      const selectProjectName = (value) => {
@@ -400,6 +402,22 @@
        state.selectedRowKeys = [];
      };
  
+      // 获取数据
+      function getData() {
+        state.tabledata = [
+          {
+            workNum: "123",
+            userName: "li",
+            deptName: "开发",
+            jobName: "前端开发",
+            score: 89,
+            exam: 98,
+            testscore: 80,
+            status: "已完成",
+          },
+        ]
+      }
+
      return {
        ...toRefs(state),
        selectProjectName,
--- a/src/components/drawers/router/RouterHomeworkManage.vue
+++ b/src/components/drawers/router/RouterHomeworkManage.vue
@@ -1,5 +1,6 @@
  <template>
    <a-drawer
+      v-if="HomeworkModelVisible"
      :visible="HomeworkModelVisible"
      class="drawerStyle ProjectHomeWorkManage"
      placement="right"
@@ -346,10 +347,11 @@
        state.projectName = "";
        state.selectedRowKeys = [];
        state.currentPage = 1;
+        state.tabledata = [];
      };
      const afterVisibleChange = (bol) => {
        if (bol == true) {
-          // getManageList();
+          getData();
        }
      };
      const selectProjectName = (value) => {
@@ -377,7 +379,23 @@
      const clearLine = () => {
        state.selectedRowKeys = [];
      };
-  
+      
+      // 获取数据
+      function getData() {
+        state.tabledata = [
+          {
+            workNum: "123",
+            userName: "li",
+            deptName: "开发",
+            jobName: "前端开发",
+            score: 89,
+            group: "-",
+            comptime: "2022-07-22 14:00:30",
+            status: "已完成",
+          },
+        ]
+      }
+      
      return {
        ...toRefs(state),
        selectProjectName,