组织学习数据概览创建时间

2025-12-07 01:46:43 +08:00 · 2023-08-23 10:38:39 +08:00
parent e18c3801d4
commit 482eca3d5f
1 changed files with 75 additions and 31 deletions
--- a/src/views/report/Overvoew.vue
+++ b/src/views/report/Overvoew.vue
@@ -46,6 +46,15 @@
        >
        </a-input>
      </div>
+      <div class="select">
+        <a-range-picker
+          v-model:value="publishTime"
+          type="date"
+          valueFormat="YYYY-MM-DD"
+          :placeholder="['创建开始时间','结束时间']"
+          style="width: 100%; margin-right: 0px"
+        />
+      </div>
      <div style="display: flex; margin-bottom: 20px">
        <div class="btnzx btnzx1" @click="searchClick">
          <div class="search"></div>
@@ -310,6 +319,7 @@ export default {
      resetOrgId: [],
      allowClear: true,
      type: null,
+      publishTime: [], // 创建时间
    });
    // 获取tab数据
    const getTabData = async () => {
@@ -339,6 +349,7 @@ export default {
    const reset = async () => {
      state.tableLoading = true;
      state.creator = "";
+      state.publishTime = [];
      state.name = "";
      state.orgId = state.resetOrgId;
      getTableData();
@@ -450,6 +461,8 @@ export default {
              ? state.orgId[state.orgId.length - 1]
              : null,
            createName: state.creator,
+            startTime: state.publishTime[0],
+            endTime: state.publishTime[1],
          },
          responseType: "blob",
          headers: {
@@ -468,6 +481,8 @@ export default {
              ? state.orgId[state.orgId.length - 1]
              : null,
            createName: state.creator,
+            startTime: state.publishTime[0],
+            endTime: state.publishTime[1],
          },
          responseType: "blob",
          headers: {
@@ -486,6 +501,8 @@ export default {
              ? state.orgId[state.orgId.length - 1]
              : null,
            createName: state.creator,
+            startTime: state.publishTime[0],
+            endTime: state.publishTime[1],
          },
          responseType: "blob",
          headers: {
@@ -504,6 +521,8 @@ export default {
              ? state.orgId[state.orgId.length - 1]
              : null,
            createName: state.creator,
+            startTime: state.publishTime[0],
+            endTime: state.publishTime[1],
          },
          responseType: "blob",
          headers: {
@@ -522,6 +541,8 @@ export default {
              ? state.orgId[state.orgId.length - 1]
              : null,
            createName: state.creator,
+            startTime: state.publishTime[0],
+            endTime: state.publishTime[1],
          },
          responseType: "blob",
          headers: {
@@ -538,6 +559,8 @@ export default {
            name: state.name,
            orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
            createName: state.creator,
+            startTime: state.publishTime[0],
+            endTime: state.publishTime[1],
          },
          responseType: "blob",
          headers: {
@@ -560,6 +583,8 @@ export default {
        //考试列表
        const res = await api.boeuExamPageList({
          creator: state.creator,
+          startTime: state.publishTime[0],
+          endTime: state.publishTime[1],
          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
          testName: state.name,
          page: state.pageNo,
@@ -580,6 +605,8 @@ export default {
        //案例列表
        const res = await api.boeuCasePageList({
          author: state.creator,
+          startTime: state.publishTime[0],
+          endTime: state.publishTime[1],
          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
          title: state.name,
          page: state.pageNo,
@@ -605,6 +632,8 @@ export default {
            ? state.orgId[state.orgId.length - 1]
            : null,
          createName: state.creator,
+          startTime: state.publishTime[0],
+          endTime: state.publishTime[1],
        });
        const list = res.data.result.rows.map((item) => {
          return {
@@ -622,6 +651,8 @@ export default {
          teachingName: state.name,
          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
          createName: state.creator,
+          startTime: state.publishTime[0],
+          endTime: state.publishTime[1],
        });
        const list = res.data.result.rows?.map((item) => {
          return {
@@ -639,6 +670,8 @@ export default {
          routerName: state.name,
          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
          createName: state.creator,
+          startTime: state.publishTime[0],
+          endTime: state.publishTime[1],
        });
        const list = res.data.result.rows?.map((item) => {
          return {
@@ -656,6 +689,8 @@ export default {
          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
          createName: state.creator,
          projectName: state.name,
+          startTime: state.publishTime[0],
+          endTime: state.publishTime[1],
        });
        if (res) {
          const fun = (arr) => {
@@ -930,7 +965,7 @@ export default {
      } else if (index === 4) {
        columns.value = [
          {
-            title: "名称",
+            title: "考试名称",
            dataIndex: "testName",
            key: "id",
            width: 120,
@@ -948,8 +983,8 @@ export default {
            fixed: "left",
          },
          {
-            title: "参加人数",
-            dataIndex: "totalNumber",
+            title: "题量",
+            dataIndex: "numOfQuest",
            ellipsis: true,

            width: 120,
@@ -964,13 +999,22 @@ export default {
            align: "center",
          },
          {
-            title: "题量",
-            dataIndex: "numOfQuest",
+            title: "参加人数",
+            dataIndex: "totalNumber",
            ellipsis: true,

            width: 120,
            align: "center",
          },
+          {
+            title: "参与率",
+            dataIndex: "answerRate",
+            ellipsis: true,
+
+            width: 120,
+            align: "center",
+          },
+          
          {
            title: "通过人数",
            dataIndex: "numOfPass",
@@ -988,10 +1032,10 @@ export default {
            align: "center",
          },
          {
-            title: "发布时间",
-            dataIndex: "publishTime",
+            title: "创建时间",
+            dataIndex: "createTime",
            ellipsis: true,
-            key: "publishTime",
+            key: "createTime",
            width: 120,
            align: "center",
          },
@@ -1223,7 +1267,7 @@ export default {
      } else if (index === 2) {
        columns.value = [
          {
-            title: "开课名称",
+            title: "课程名称",
            dataIndex: "name",
            key: "name",
            width: 120,
@@ -1241,7 +1285,7 @@ export default {
            fixed: "left",
          },
          {
-            title: "分类",
+            title: "课程分类",
            dataIndex: "typeName",
            ellipsis: true,
            key: "typeName",
@@ -1250,19 +1294,11 @@ export default {
            fixed: "left",
          },
          {
-            title: "授课时长(分钟)",
+            title: "授课时长（小时）",
            dataIndex: "teachingLength",
            ellipsis: true,
            key: "teachingLength",
-            width: 120,
-            align: "center",
-          },
-          {
-            title: "授课教师",
-            dataIndex: "teacher",
-            ellipsis: true,
-            key: "teacher",
-            width: 120,
+            width: 150,
            align: "center",
          },
          {
@@ -1274,21 +1310,13 @@ export default {
            align: "center",
          },
          {
-            title: "评分",
+            title: "课程评分",
            dataIndex: "score",
            ellipsis: true,
            key: "score",
            width: 120,
            align: "center",
          },
-          {
-            title: "授课时间",
-            dataIndex: "teachingTime",
-            ellipsis: true,
-            key: "teachingTime",
-            width: 120,
-            align: "center",
-          },
          {
            title: "创建时间",
            dataIndex: "createTime",
@@ -1297,6 +1325,14 @@ export default {
            width: 120,
            align: "center",
          },
+          {
+            title: "授课时间",
+            dataIndex: "teachingTime",
+            ellipsis: true,
+            key: "teachingTime",
+            width: 120,
+            align: "center",
+          },
          {
            title: "状态",
            dataIndex: "status",
@@ -1313,6 +1349,14 @@ export default {
            width: 120,
            align: "center",
          },
+          // {
+          //   title: "授课教师",
+          //   dataIndex: "teacher",
+          //   ellipsis: true,
+          //   key: "teacher",
+          //   width: 120,
+          //   align: "center",
+          // },
        ];
      } else if (index === 1) {
        columns.value = [
@@ -1371,9 +1415,9 @@ export default {
          },
          {
            title: "参与率",
-            dataIndex: "participantsTotal",
+            dataIndex: "participantsRate",
            ellipsis: true,
-            key: "participantsTotal",
+            key: "participantsRate",
            width: 120,
            align: "center",
          },