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" /> 平车: - + {{ item.name }} 类型: @@ -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 @@ +