diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index b791fa2..b744b01 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -35,7 +35,7 @@
@@ -56,7 +56,7 @@ mode="aspectFit" >当前防汛应急响应: - {{ !level ? '无' : level }} + {{ !level || !yjStatus ? '无' : level }} @@ -291,6 +291,7 @@
监测时间:{{ item.tm }}
+
暂无内容
监测时间:{{ item.tm }}
+
暂无内容
+ @@ -352,6 +355,7 @@ export default { tableData: {}, tm: '', level: '', + yjStatus:0, limit: disType(uni.getStorageSync('value').adcd), timeList: [ { text: '昨天08:00~当前时间', value: 1 }, @@ -378,8 +382,9 @@ export default { current: 0, hdList: [], skList: [], - readStatus: false, - readYjStatus: false, + readStatus: false, //工灾情状态 + readYjStatus: false, //预警状态 + dispatchStatus:false, //调令状态 default_src: uni.getStorageSync('avatar'), imgList: {}, imgtm: moment().format('YYYYMMDD'), @@ -388,7 +393,8 @@ export default { imgHourstm: [], imgHoursList: {}, interval: null, - numPic: 0 + numPic: 0, + allStatus: false } }, computed: { @@ -487,6 +493,13 @@ export default { } }, immediate: true + }, + allStatus:{ + handler (newValue) { + const newArr = this.getNavList() + + }, + immediate: true } }, methods: { @@ -629,6 +642,16 @@ export default { uni.$showMsg() } }, + async getDispatchStatus(){ + try { + const res = await uni.$http.post('/gunshiApp/xfflood/xfEmerDispatchR/app/list',{status:1,dispatchTypeList:["0","1"]}) + if(res.data.code == 200){ + this.dispatchStatus = res.data.data.length > 0 ? true : false + } + } catch (error) { + console.log(error); + } + }, jumpHdDetail (params) { uni.navigateTo({ url: `/pages/hdDetail/hdDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&wrz=${params.wrz}&grz=${params.grz}` @@ -834,6 +857,7 @@ export default { if (data.data.records.length > 0) { console.log('1111111data', data) this.level = level(data.data.records[0].level) + this.yjStatus = data.data.records[0].status } else { this.level = '无' } @@ -859,6 +883,7 @@ export default { onShow () { this.getReadStatus() this.getResponseLevel() + this.getDispatchStatus() if (this.limit == 1) { this.getYjRead() // this.getInterval() diff --git a/pages/utils/dicType.js b/pages/utils/dicType.js index 22dbac3..7c98997 100644 --- a/pages/utils/dicType.js +++ b/pages/utils/dicType.js @@ -20,7 +20,7 @@ export function disType(e) { let type; if (e.endsWith('000000000')) { type = 1; - } else if (e.endsWith('000000')) { + } else{ type = 0; } return type; diff --git a/pages/water/hdWater/hdWater.vue b/pages/water/hdWater/hdWater.vue index d116fe9..8709808 100644 --- a/pages/water/hdWater/hdWater.vue +++ b/pages/water/hdWater/hdWater.vue @@ -79,7 +79,7 @@ formData:{ args:'', sources:["SH","SW"], - adcd:type == 1 ? undefined :adcd, + // adcd:type == 1 ? undefined : adcd, }, list:[], //搜索结果 saveList:[], //保存搜索结果 @@ -103,6 +103,9 @@ this.getList() }, async getList(){ + const adcd = uni.getStorageSync('value').adcd + let newAdcd = adcd.endsWith('000000000') ? "" : adcd + this.formData = {...this.formData,adcd:newAdcd} console.log(1111,this.formData); try{ const {data} = await uni.$http.post( diff --git a/pages/water/skWater/skWater.vue b/pages/water/skWater/skWater.vue index 837c301..74eaa5b 100644 --- a/pages/water/skWater/skWater.vue +++ b/pages/water/skWater/skWater.vue @@ -80,7 +80,7 @@ formData:{ args:'', sources:["SW","SK"], - adcd:type == 1 ? undefined :adcd, + // adcd:uni.getStorageSync('value').adcd, }, list:[], //搜索结果 saveList:[] //保存搜索结果 @@ -104,6 +104,9 @@ this.getList() }, async getList(){ + const adcd = uni.getStorageSync('value').adcd + let newAdcd = adcd.endsWith('000000000') ? "" : adcd + this.formData = {...this.formData,adcd:newAdcd} try{ const {data} = await uni.$http.post( "/gunshiApp/xfflood/reservoir/water/list",{...this.formData}