diff --git a/src/api/index.js b/src/api/index.js index 47f3236..3f5d542 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -112,7 +112,7 @@ export function getSoilSummry(data) { headers: {}, }) } -// 各个站坐标点 +// 获取企业列表 export function getCompanyList() { return requests({ url: '/zh-applet-admin/appmana/bigScreen/getEntList', diff --git a/src/pages/Home/index.vue b/src/pages/Home/index.vue index d8b67f2..725693e 100644 --- a/src/pages/Home/index.vue +++ b/src/pages/Home/index.vue @@ -633,7 +633,6 @@ export default { // }) // }, 2000) // 实时时间 - let that = this; setTimeout(() => { getCompanyList().then(res => { diff --git a/src/pages/MywrList/index.vue b/src/pages/MywrList/index.vue index 4e7e1fc..8f972ec 100644 --- a/src/pages/MywrList/index.vue +++ b/src/pages/MywrList/index.vue @@ -575,7 +575,6 @@ export default { this.getNowTime(); this.initMaintainLog(); this.stationInfoApi(); - this.getAlertRecord(); }, initMaintainLog(){//巡检日志 getMaintainLog({stationCode: this.stationCode, pageSize: 3}).then(res => { @@ -591,7 +590,7 @@ export default { doGetAlertRecord({stationCode: this.stationCode, pageSize: 3}).then(res => { console.warn('监测预警数据',res) if (res.code === 200) { - if(res.result.records.length === 0 && this.stationDetail.latestData !== 0){ + if(res.result.records.length === 0 && this.stationDetail && this.stationDetail.latestData && this.stationDetail.latestData.length !== 0){ //itemName survValue survUnit normalValue survUnit readStatus alertTime let tempData = []; this.stationDetail.latestData.map(item => { @@ -836,6 +835,7 @@ export default { setTimeout(() => { this.switchLive(true); }, 2000) + this.getAlertRecord(); }) }, switchLive(live, deployCode){