From e4e92ce9eee6d39ae6bddaeca8f212d9b3b52ecc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 23 Sep 2022 14:25:51 +0800
Subject: [PATCH] 事件管理、巡检计划、维修管理添加时间查询

---
 src/api/eventgm/eventgm.js              |    2 
 src/const/eventgm/eventgm.js            |   16 ++++++++
 src/views/repairsorder/repairsorder.vue |    5 ++
 src/const/repairsorder/repairsorder.js  |   16 ++++++++
 src/const/taskinfo/taskinfoPlan.js      |   16 ++++++++
 src/views/taskinfo/taskinfoPlan.vue     |    5 ++
 src/views/eventgm/eventgm.vue           |    5 ++
 7 files changed, 64 insertions(+), 1 deletions(-)

diff --git a/src/api/eventgm/eventgm.js b/src/api/eventgm/eventgm.js
index 6489492..9cd14f7 100644
--- a/src/api/eventgm/eventgm.js
+++ b/src/api/eventgm/eventgm.js
@@ -2,7 +2,7 @@
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/eventgm/eventgm/list',
+    url: '/api/eventgm/eventgm/page',
     method: 'get',
     params: {
       ...params,
diff --git a/src/const/eventgm/eventgm.js b/src/const/eventgm/eventgm.js
index a69b754..bfe4e5c 100644
--- a/src/const/eventgm/eventgm.js
+++ b/src/const/eventgm/eventgm.js
@@ -41,6 +41,22 @@
     },
     {
       label: "上报时间",
+      prop: "daterange",
+      type: "daterange",
+      format:'yyyy-MM-dd',
+      valueFormat:'yyyy-MM-dd',
+      startPlaceholder: '',
+      endPlaceholder: '',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide:true,
+      search: true,
+      searchOrder:-99,
+      searchRange:true
+    },
+    {
+      label: "上报时间",
       prop: "createTime",
       type: "input",
       addDisplay: false,
diff --git a/src/const/repairsorder/repairsorder.js b/src/const/repairsorder/repairsorder.js
index cdde214..c387ec9 100644
--- a/src/const/repairsorder/repairsorder.js
+++ b/src/const/repairsorder/repairsorder.js
@@ -114,6 +114,22 @@
     },
     {
       label: "创建时间",
+      prop: "daterange",
+      type: "daterange",
+      format:'yyyy-MM-dd',
+      valueFormat:'yyyy-MM-dd',
+      startPlaceholder: '',
+      endPlaceholder: '',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide:true,
+      search: true,
+      searchOrder:-99,
+      searchRange:true
+    },
+    {
+      label: "创建时间",
       prop: "createTime",
       type: "input",
       addDisplay: false,
diff --git a/src/const/taskinfo/taskinfoPlan.js b/src/const/taskinfo/taskinfoPlan.js
index 68fc3ea..95a0343 100644
--- a/src/const/taskinfo/taskinfoPlan.js
+++ b/src/const/taskinfo/taskinfoPlan.js
@@ -39,6 +39,22 @@
       search: true,
     },
     {
+      label: "创建时间",
+      prop: "daterange",
+      type: "daterange",
+      format:'yyyy-MM-dd',
+      valueFormat:'yyyy-MM-dd',
+      startPlaceholder: '',
+      endPlaceholder: '',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide:true,
+      search: true,
+      searchOrder:-99,
+      searchRange:true
+    },
+    {
       label: "执行周期",
       prop: "type",
       type: "select",
diff --git a/src/views/eventgm/eventgm.vue b/src/views/eventgm/eventgm.vue
index 8d6b045..b90d0c7 100644
--- a/src/views/eventgm/eventgm.vue
+++ b/src/views/eventgm/eventgm.vue
@@ -204,6 +204,11 @@
       },
       searchChange(params, done) {
         this.query = params;
+        if (this.query.daterange){
+          this.query.startTime = this.query.daterange[0]
+          this.query.endTime = this.query.daterange[1]
+          this.query.daterange = null
+        }
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
         done();
diff --git a/src/views/repairsorder/repairsorder.vue b/src/views/repairsorder/repairsorder.vue
index 3e1d449..9852705 100644
--- a/src/views/repairsorder/repairsorder.vue
+++ b/src/views/repairsorder/repairsorder.vue
@@ -181,6 +181,11 @@
       },
       searchChange(params, done) {
         this.query = params;
+        if (this.query.daterange){
+          this.query.startTime = this.query.daterange[0]
+          this.query.endTime = this.query.daterange[1]
+          this.query.daterange = null
+        }
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
         done();
diff --git a/src/views/taskinfo/taskinfoPlan.vue b/src/views/taskinfo/taskinfoPlan.vue
index 9785e34..0159d1d 100644
--- a/src/views/taskinfo/taskinfoPlan.vue
+++ b/src/views/taskinfo/taskinfoPlan.vue
@@ -195,6 +195,11 @@
       },
       searchChange(params, done) {
         this.query = params;
+        if (this.query.daterange){
+          this.query.startCreateTime = this.query.daterange[0]
+          this.query.endCreateTime = this.query.daterange[1]
+          this.query.daterange = null
+        }
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
         done();

--
Gitblit v1.9.3