From 3825fdbd8579a3f6394902d09049a2971e0dba3e Mon Sep 17 00:00:00 2001
From: yinsiyu <516159562@qq.com>
Date: Mon, 15 Jul 2024 10:37:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                               |  1 +
 .../followupStatistical/listPage/index.vue                 | 14 ++++++++------
 src/views/userManage/roleManage/roleList/index.vue         |  2 +-
 vue.config.js                                              |  1 -
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index a6dde05..073c0b6 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
+    "dayjs": "^1.11.11",
     "echarts": "5.4.0",
     "element-ui": "2.15.13",
     "file-saver": "2.0.5",
diff --git a/src/views/statisticalManage/followupStatistical/listPage/index.vue b/src/views/statisticalManage/followupStatistical/listPage/index.vue
index 715481d..da61a97 100644
--- a/src/views/statisticalManage/followupStatistical/listPage/index.vue
+++ b/src/views/statisticalManage/followupStatistical/listPage/index.vue
@@ -383,25 +383,27 @@ export default {
     },
     // 面板展示数据
     async getViewData() {
-      const params = JSON.parse(JSON.stringify(this.queryParams));
-      Reflect.deleteProperty(params, "pageNum");
-      Reflect.deleteProperty(params, "pageSize");
+      const { pageNum, pageSize, ...params } = this.queryParams;
+      params.startTime = this.dateRange?.[0] ? this.dateRange[0] + ' 00:00:00' : undefined;
+      params.endTime = this.dateRange?.[1] ? this.dateRange[1] + ' 23:59:59' : undefined;
       params.deptId =
         params.deptId?.length === 2
           ? params.deptId.slice(-1).toString()
           : (params.deptId?.length === 1 && params.deptId.slice(-1).toString()) || "";
-      const res = await statisticalViewData(this.addDateRange(params, this.dateRange));
+      const res = await statisticalViewData(params);
       this.viewData = res.data;
     },
     /** 查询角色列表 */
     getList() {
       this.loading = true;
-      const params = JSON.parse(JSON.stringify(this.queryParams));
+      const { ...params } = this.queryParams;
+      params.startTime = this.dateRange && this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined;
+      params.endTime = this.dateRange && this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined;
       params.deptId =
         params.deptId?.length === 2
           ? params.deptId.slice(-1).toString()
           : (params.deptId?.length === 1 && params.deptId.slice(-1).toString()) || "";
-      statisticalPageList(this.addDateRange(params, this.dateRange))
+      statisticalPageList(params)
         .then((res) => {
           const {
             data: { list, page },
diff --git a/src/views/userManage/roleManage/roleList/index.vue b/src/views/userManage/roleManage/roleList/index.vue
index df67ed5..e5601fd 100644
--- a/src/views/userManage/roleManage/roleList/index.vue
+++ b/src/views/userManage/roleManage/roleList/index.vue
@@ -18,7 +18,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+    <div class="text-red">111</div>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">
diff --git a/vue.config.js b/vue.config.js
index e4722e3..da9797f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,5 @@
 "use strict";
 const path = require("path");
-
 function resolve(dir) {
   return path.join(__dirname, dir);
 }