From d91308801f8e9feb9ab13ed82f8c175c6dd6bf94 Mon Sep 17 00:00:00 2001
From: "weixiaobo@boe.com.cn" <weixiaobo@boe.com.cn>
Date: Mon, 21 Aug 2023 18:25:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/Curriculum.vue | 66 ++++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue
index e22895d8..0f46fcb1 100644
--- a/src/views/report/Curriculum.vue
+++ b/src/views/report/Curriculum.vue
@@ -15,11 +15,12 @@
       </div>
       <div class="select">
         <a-cascader
+          change-on-select
           :options="option"
-          placeholder="请选择组织"
           v-model:value="orgId"
-          :allowClear="allowClear"
           style="width: 100%"
+          placeholder="请选择归属组织"
+          :allowClear="allowClear"
           :fieldNames="{
             label: 'orgName',
             value: 'organizationId',
@@ -54,6 +55,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="searchData">
           <div class="search"></div>
@@ -156,6 +166,7 @@ export default {
       name: "",
       type: null,
       createName: "",
+      publishTime: "", // 发布时间
       allowClear: true,
       option: [],
       selectedRowKeys: [],
@@ -194,6 +205,9 @@ export default {
         pageSize: state.pageSize,
         type: state.type ? state.type[state.type.length - 1]:null,
         createName: state.createName,
+        // publishTime: state.publishTime,
+        startTime: state.publishTime[0],
+        endTime: state.publishTime[1],
       };
       const res = await api.boeuCourseListPageV2(params);
       if (res) {
@@ -209,14 +223,14 @@ export default {
     };
     // cloumns 表头
     const columns = ref([
-      {
-        title: "编号",
-        dataIndex: "num",
-        ellipsis: true,
-        key: "num",
-        align: "center",
-        width: 80,
-      },
+      // {
+      //   title: "编号",
+      //   dataIndex: "num",
+      //   ellipsis: true,
+      //   key: "num",
+      //   align: "center",
+      //   width: 80,
+      // },
       {
         title: "课程名称",
         dataIndex: "name",
@@ -226,7 +240,7 @@ export default {
         width: 120,
       },
       {
-        title: "类型",
+        title: "课程类型",
         dataIndex: "courseType",
         ellipsis: true,
         key: "courseType",
@@ -241,14 +255,6 @@ export default {
         align: "center",
         width: 120,
       },
-      {
-        title: "归属路径图",
-        dataIndex: "routerName",
-        ellipsis: true,
-        key: "routerName",
-        align: "center",
-        width: 120,
-      },
       {
         title: "归属项目",
         dataIndex: "projectName",
@@ -257,6 +263,14 @@ export default {
         align: "center",
         width: 120,
       },
+      {
+        title: "归属路径图",
+        dataIndex: "routerName",
+        ellipsis: true,
+        key: "routerName",
+        align: "center",
+        width: 120,
+      },
       {
         title: "一级分类",
         dataIndex: "oneType",
@@ -298,7 +312,7 @@ export default {
         width: 120,
       },
       {
-        title: "学习总人数",
+        title: "学习人数",
         dataIndex: "learnerNumber",
         ellipsis: true,
         key: "learnerNumber",
@@ -399,6 +413,7 @@ export default {
       state.pageSize = 10;
       state.type = null;
       state.createName = "";
+      state.publishTime = [];
       getTableData();
     };
     const exportList = () => {
@@ -429,6 +444,9 @@ export default {
           pageSize: state.pageSize,
           type: state.type ? state.type[state.type.length - 1]:null,
           createName: state.createName,
+          // publishTime: state.publishTime,
+          startTime: state.publishTime[0],
+          endTime: state.publishTime[1],
         };
         axios({
           method: "post",
@@ -476,6 +494,9 @@ export default {
           pageSize: state.pageSize,
           type: state.type ? state.type[state.type.length - 1]:null,
           createName: state.createName,
+          // publishTime: state.publishTime,
+          startTime: state.publishTime[0],
+          endTime: state.publishTime[1],
         };
         axios({
           method: "post",
@@ -541,6 +562,9 @@ export default {
           pageSize: state.pageSize,
           type: state.type ? state.type[state.type.length - 1]:null,
           createName: state.createName,
+          // publishTime: state.publishTime,
+          startTime: state.publishTime[0],
+          endTime: state.publishTime[1],
         };
         axios({
           method: "post",
@@ -617,7 +641,7 @@ export default {
     .select {
       margin-right: 20px;
       margin-bottom: 20px;
-      width: calc((100% - 76px - 240px) / 4);
+      width: calc((100% - 76px - 220px) / 3);
     }
 
     .btnz {