历史数据展示bug修改完成

pages/history/history.vue

@@ -365,11 +365,8 @@ export default {
       this.devices = [];
       data.forEach((element) => {
         const deviceObj = {
-          id: element.deviceId
-            ? element.deviceId
-            : element.deviceID
-            ? element.deviceID
-            : "",
+          // id: element.deviceID,
+          ID: element.deviceID,
           strinstallpos: element.strinstallpos,
           type: element.deviceType,
           stationtype: element.stationtype,
@@ -380,7 +377,8 @@ export default {
     },
     //选择设备  点击确定按钮  保存id
     selectDevice(e) {
-      this.deviceID = e.value[0].id;
+      // this.deviceId = e.value[0].id;
+      this.deviceID = e.value[0].ID;
       this.stationType = e.value[0].stationtype;
       this.strType = e.value[0].strtype;
       this.deviceType1 = e.value[0].type;
@@ -421,6 +419,7 @@ export default {
       } else {
         this.getHistoryData2();
       }
+      // this.getHistoryData2();
     },
     // 查询历史数据
     getHistoryData() {
@@ -474,17 +473,6 @@ export default {
               this.historyData = result1.records;
             }
             // this.pageNo = response1.data.result.datalist.current;
-            uni.showModal({
-              title: "数据提示",
-              content: this.historyData.length
-                ? `共${
-                    this.historyData.length
-                  }条数据：\n${this.historyData.join("\n\n")}`
-                : "暂无历史数据",
-              showCancel: false,
-              confirmText: "知道了",
-            });
-            return this.historyData;
           } else {
             reject(new Error(`请求失败，错误码：${response.data.code}`));
           }