diff --git a/src/views/Equipment/equipmentOnlineRecordList.vue b/src/views/Equipment/equipmentOnlineRecordList.vue index 1cb0cd6..af60503 100644 --- a/src/views/Equipment/equipmentOnlineRecordList.vue +++ b/src/views/Equipment/equipmentOnlineRecordList.vue @@ -444,8 +444,8 @@ export default { console.log(this.activeTotal, "888888888888888888888"); var url = ""; let obj = { - pageNum: this.page.pageNum, - pageSize: this.page.pageSize, + current: this.page.pageNum, + size: this.page.pageSize, imei: this.page.imei, }; this.tableData = []; diff --git a/src/views/Statistics/dataScreeSys.vue b/src/views/Statistics/dataScreeSys.vue index a8688a5..70b9c08 100644 --- a/src/views/Statistics/dataScreeSys.vue +++ b/src/views/Statistics/dataScreeSys.vue @@ -368,10 +368,6 @@ export default { orgCode: this.selValue == 1 ? this.choicValue : null, }) .then((res) => { - // console.log(res); - // this.firstTab = res.data; - // 对数据进行处理 - // 将数据给一个指定值然后设置一个方法还进行tab切换的时候调用 this.secondTab = res.data; // 调用方法 this.getChars1(1); @@ -390,7 +386,7 @@ export default { .then((res) => { // console.log(res); this.thirdTab = res.data; - this.getChars2(1); + this.getChars2(this.cardindex); }); }, // echars生成 @@ -518,7 +514,6 @@ export default { orgCode: this.selValue == 1 ? this.choicValue : null, }) .then((res) => { - // console.log(res); this.firstTab = res.data; }); }, @@ -532,7 +527,6 @@ export default { }, confirmtime(e) { this.dateType = null; - this.dataOverviewWithSystemWithLook(); }, tabtimetap(i) { @@ -545,7 +539,6 @@ export default { }, //卡片下折线图 SwitchCARDS(arr, str, timeDate, Strname) { - // console.log(arr,str,timeDate,Strname); var chartDom = document.getElementById(str); var myChart = echarts.init(chartDom); var option; diff --git a/src/views/Statistics/trend.vue b/src/views/Statistics/trend.vue index 97f51aa..ef6cb3e 100644 --- a/src/views/Statistics/trend.vue +++ b/src/views/Statistics/trend.vue @@ -166,7 +166,7 @@ compare2.receptionCount >= 0 ? 'color:green;' : 'color:red;' " > - {{ compare2.receptionCount || 0 }} + {{ compare2.receptionCount || 0 }}% @@ -191,7 +191,7 @@