From ffb4456cff1f6c7342b9d02f65a5971f229389ea Mon Sep 17 00:00:00 2001
From: aBin <binbin0314@126.com>
Date: Fri, 6 Aug 2021 09:28:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Day/Day.vue       |  2 +-
 src/components/Search/Search.vue | 17 +++++++++--------
 src/components/Table/Table.vue   |  4 ++++
 src/views/Index/Index.vue        |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/components/Day/Day.vue b/src/components/Day/Day.vue
index 8958c12..67802a4 100644
--- a/src/components/Day/Day.vue
+++ b/src/components/Day/Day.vue
@@ -177,7 +177,7 @@ export default {
           obj = {
             value: list[i].name,
             xAxis: this.$moment(parseInt(list[i].time)).format('YYYY-MM-DD HH:mm:ss'),
-            yAxis: parseInt(list[i].value) / 1000,
+            yAxis: parseInt(list[i].serial, 16),
           };
           this.weight1.push(obj);
         }
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index 2dc103b..13cd1e0 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -16,7 +16,7 @@
         @change="onChange"
       />
       <span class="ml-3">平车：</span>
-      <a-select style="width: 120px" :default-value="1" @change="handleChangeCar" placeholder="全部">
+      <a-select style="width: 120px" :default-value="2" @change="handleChangeCar" placeholder="全部">
         <a-select-option v-for="item in carList" :value="item.carId" :key="item.carId"> {{ item.name }} </a-select-option>
       </a-select>
       <span class="ml-3">类型：</span>
@@ -35,7 +35,7 @@ export default {
   data() {
     return {
       timeObj: {
-        carId: 1,
+        carId: 2,
         startTime: this.$moment(Date.parse(new Date()) - 3600 * 24 * 1000).format('YYYY-MM-DD'),
         types: [1, 2],
         endTime: this.$moment(Date.parse(new Date())).format('YYYY-MM-DD'),
@@ -59,11 +59,11 @@ export default {
       carList: [
         {
           carId: 1,
-          name: '91',
+          name: 'V1.0',
         },
         {
           carId: 2,
-          name: '92',
+          name: 'V2.0',
         },
       ],
       btnObj: null,
@@ -129,9 +129,10 @@ export default {
           // startTime=${this.btnObj.startTime}&&endTime=${this.btnObj.endTime}
           // &&types=${this.btnObj.types[0]}&&types=${this.btnObj.types[1]}`);
           window.open(
-            `https://www.tall.wiki/gateway/wisdomcar/record/weightExport?startTime=` +
+            `https://www.tall.wiki/gateway/qcp/v3.0/record/weightExport?startTime=` +
               `${this.btnObj.startTime}&&endTime=${this.btnObj.endTime}&&types=` +
-              `${this.btnObj.types[0]}&&types=${this.btnObj.types[1]}`,
+              `${this.btnObj.types[0]}&&types=${this.btnObj.types[1]}&&carId=` +
+              `${this.btnObj.carId}`,
           );
           // window.open(
           //   `http://www.tall.wiki/gateway/wisdomcar/record/weightExport?startTime=161
@@ -139,8 +140,8 @@ export default {
           // );
         } else {
           window.open(
-            `https://www.tall.wiki/gateway/wisdomcar/record/weightExport?startTime` +
-              `=${this.btnObj.startTime}&&endTime=${this.btnObj.endTime}&&types=${this.btnObj.types[0]}`,
+            `https://www.tall.wiki/gateway/qcp/v3.0/record/weightExport?startTime` +
+              `=${this.btnObj.startTime}&&endTime=${this.btnObj.endTime}&&types=${this.btnObj.types[0]}]}&&carId=${this.btnObj.carId}`,
           );
         }
       }
diff --git a/src/components/Table/Table.vue b/src/components/Table/Table.vue
index b7aba85..6d26e61 100644
--- a/src/components/Table/Table.vue
+++ b/src/components/Table/Table.vue
@@ -24,6 +24,10 @@
         <template slot="time" slot-scope="text, record">
           <span>{{ $moment(+record.time).format('YYYY-MM-DD HH:mm:ss') }}</span>
         </template>
+        <template slot="name" slot-scope="text, record">
+          <span v-if="record.type === 1">{{ record.name }}</span>
+          <span v-else-if="record.type === 2">RFID</span>
+        </template>
         <template slot="value" slot-scope="text, record">
           <span v-if="record.type === 1">{{ record.value / 1000 }}kg</span>
           <span v-else-if="record.type === 2">{{ record.name }}</span>
diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue
index 9d31115..1bde55e 100644
--- a/src/views/Index/Index.vue
+++ b/src/views/Index/Index.vue
@@ -42,7 +42,7 @@ export default {
       str: '',
       disProgress: true,
       timeObj: {
-        carId: 1,
+        carId: 2,
         startTime: Date.parse(new Date()) - 3600 * 24 * 1000,
         endTime: Date.parse(new Date()),
         types: [1, 2],
@@ -85,7 +85,7 @@ export default {
         this.disProgress = true;
         const params = {
           param: {
-            carId: 1,
+            carId: 2,
             startTime: timeData && timeData.startTime ? timeData.startTime : this.timeObj.startTime,
             endTime: timeData && timeData.endTime ? timeData.endTime : this.timeObj.endTime,
             types: timeData && timeData.types ? timeData.types : this.timeObj.types,