From 3662634bf8a3e51f63ede11cd66dcd3501c09016 Mon Sep 17 00:00:00 2001
From: unknown <binbin0314@126.com>
Date: Thu, 11 Mar 2021 10:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                |  5 ++
 package.json                     |  1 +
 src/common/portrait.styl         |  1 +
 src/components/Search/Search.vue | 87 ++++++++++++--------------------
 src/components/Table/Table.vue   |  2 +-
 src/main.js                      |  1 -
 src/views/Index/Index.vue        | 16 ++++++
 7 files changed, 55 insertions(+), 58 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 60cefeb..805a1e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12699,6 +12699,11 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
+    "vuetify": {
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.4.6.tgz",
+      "integrity": "sha512-oqAWKAin07ip/QuT/p4bL1LegE3MYPbfojrOcj80RATZDSnJyco2PZD8QuIzd0RhYfdAuSTkY8elvHsLu90RuQ=="
+    },
     "vuex": {
       "version": "3.5.1",
       "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.5.1.tgz?cache=0&sync_timestamp=1604065438225&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.5.1.tgz",
diff --git a/package.json b/package.json
index 570b1fe..482fc73 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "vue": "^2.6.11",
     "vue-dompurify-html": "^2.3.0",
     "vue-router": "^3.2.0",
+    "vuetify": "^2.4.6",
     "vuex": "^3.4.0"
   },
   "devDependencies": {
diff --git a/src/common/portrait.styl b/src/common/portrait.styl
index 0189af9..8507500 100644
--- a/src/common/portrait.styl
+++ b/src/common/portrait.styl
@@ -46,6 +46,7 @@
 .mx-2{
   margin-left: 8px;
   margin-right: 8px;
+  color: #fff;
 }
 
 .my-2{
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index d6f10b9..9c86147 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -3,28 +3,10 @@
 <template>
   <div class="d-flex flex-wrap pb-3">
     <div>
-      <a-date-picker
-        v-model="startValue"
-        :disabled-date="disabledStartDate"
-        show-time
-        placeholder="开始时间"
-        :default-value="$moment(`${timeObj.startTime}`, dateFormat)"
+      <a-range-picker
+        :default-value="[$moment(timeObj.startTime, dateFormat), $moment(timeObj.endTime, dateFormat)]"
         :format="dateFormat"
-        @openChange="handleStartOpenChange"
-        @change="getStartDate"
-        :allow-clear="clear"
-      />
-      <a-date-picker
-        v-model="endValue"
-        :disabled-date="disabledEndDate"
-        show-time
-        placeholder="结束时间"
-        :open="endOpen"
-        :default-value="$moment(timeObj.endTime, dateFormat)"
-        :format="dateFormat"
-        @openChange="handleEndOpenChange"
-        @change="getEndDate"
-        :allow-clear="clear"
+        @change="onChange"
       />
       <a-button @click="handleTableChange" class="mx-2" type="primary">搜索</a-button>
       <a-button @click="downFile" icon="download" class="mx-2 down-btn" type="primary">下载</a-button>
@@ -44,40 +26,15 @@ export default {
         endTime: this.$moment(Date.parse(new Date())).format('YYYY-MM-DD'),
       },
       dateFormat: 'YYYY-MM-DD',
-      startValue: null,
-      endValue: null,
-      endOpen: false,
-      clear: false,
+      clear: true,
     };
   },
   methods: {
-    disabledStartDate(startValue) {
-      const endValue = this.endValue;
-      if (!startValue || !endValue) {
-        return false;
-      }
-      return startValue.valueOf() > endValue.valueOf() || startValue.valueOf() < endValue.valueOf() - 3600 * 30 * 24 * 1000;
-    },
-    disabledEndDate(endValue) {
-      const startValue = this.startValue;
-      if (!endValue || !startValue) {
-        return false;
-      }
-      return startValue.valueOf() >= endValue.valueOf() || startValue.valueOf() < endValue.valueOf() - 3600 * 30 * 24 * 1000;
-    },
-    handleStartOpenChange(open) {
-      if (!open) {
-        this.endOpen = true;
-      }
-    },
-    handleEndOpenChange(open) {
-      this.endOpen = open;
-    },
-    getStartDate(e) {
-      this.timeObj.startTime = this.$moment(e._d).unix() * 1000;
-    },
-    getEndDate(e) {
-      this.timeObj.endTime = this.$moment(e._d).unix() * 1000;
+    onChange(e) {
+      // this.timeObj.endTime = this.$moment(e._d).unix() * 1000 + 3600 * 24 * 1000;
+      console.log(e);
+      this.timeObj.startTime = this.$moment(e[0]._d).unix() * 1000;
+      this.timeObj.endTime = this.$moment(e[1]._d).unix() * 1000;
     },
     handleTableChange() {
       if (typeof this.timeObj.startTime === 'string') {
@@ -86,13 +43,31 @@ export default {
       if (typeof this.timeObj.endTime === 'string') {
         this.timeObj.endTime = this.$moment(this.timeObj.endTime).unix() * 1000;
       }
-      this.$emit('getData', this.timeObj);
+      const mistake = this.timeObj.endTime - this.timeObj.startTime;
+      if (mistake > 3600 * 24 * 30 * 1000) {
+        this.$message.error('时间跨度请不要超过30天');
+      } else {
+        this.$emit('getData', this.timeObj);
+      }
     },
     // 下载附件
     downFile() {
-      window.open(
-        `http://test.tall.wiki/gateway/wisdomcar/record/weightExport?startTime=${this.timeObj.startTime}&&endTime=${this.timeObj.endTime}`,
-      );
+      if (typeof this.timeObj.startTime === 'string') {
+        this.timeObj.startTime = this.$moment(this.timeObj.startTime).unix() * 1000;
+      }
+      if (typeof this.timeObj.endTime === 'string') {
+        this.timeObj.endTime = this.$moment(this.timeObj.endTime).unix() * 1000;
+      }
+      const mistake = this.timeObj.endTime - this.timeObj.startTime;
+      if (mistake > 3600 * 24 * 30 * 1000) {
+        this.$message.error('时间跨度请不要超过30天');
+      } else {
+        this.$message.success('导出成功');
+        window.open(
+          `http://test.tall.wiki/gateway/wisdomcar/record/weightExport?
+          startTime=${this.timeObj.startTime}&&endTime=${this.timeObj.endTime}`,
+        );
+      }
     },
   },
 };
diff --git a/src/components/Table/Table.vue b/src/components/Table/Table.vue
index 41fd5f4..afc239f 100644
--- a/src/components/Table/Table.vue
+++ b/src/components/Table/Table.vue
@@ -14,7 +14,7 @@
           <span>{{ index + 1 }}</span>
         </template>
         <template slot="time" slot-scope="text, record">
-          <span>{{ $moment(parseInt(record.time)).format('YYYY-MM-DD HH:MM:SS') }}</span>
+          <span>{{ $moment(+record.time).format('YYYY-MM-DD HH:mm:ss') }}</span>
         </template>
         <template slot="value" slot-scope="text, record">
           <span v-if="record.type === 1">{{ record.value / 1000 }}kg</span>
diff --git a/src/main.js b/src/main.js
index 8c6a2c7..f6db3ed 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,6 @@ Vue.prototype.$echarts = echarts;
 import moment from 'moment'; //导入文件
 Vue.prototype.$moment = moment; //赋值使用
 Vue.config.productionTip = false;
-
 window.vm = new Vue({
   router,
   store,
diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue
index 7dc630a..be632c2 100644
--- a/src/views/Index/Index.vue
+++ b/src/views/Index/Index.vue
@@ -28,6 +28,7 @@ export default {
     return {
       list: [],
       str: '',
+      disProgress: true,
     };
   },
 
@@ -37,7 +38,9 @@ export default {
 
   methods: {
     async getData(timeData) {
+      const hide = this.$message.loading('正在获取数据...', 0);
       try {
+        this.disProgress = true;
         const params = {
           param: {
             carId: 1,
@@ -51,7 +54,10 @@ export default {
           let { list } = this;
           list = data;
           this.list = [...list];
+          setTimeout(hide, 500);
+          this.$message.success('获取数据成功');
           // this.list = data;
+          this.disProgress = false;
         } else {
           this.$message.error(msg);
         }
@@ -72,4 +78,14 @@ export default {
   font-size: 18px;
   font-weight: bold;
 }
+
+.progress {
+  z-index: 1001;
+  position: fixed;
+  left: 0;
+  top: 0;
+  right: 0;
+  margin: 0;
+  height: 8px;
+}
 </style>