diff --git a/manifest.json b/manifest.json index cc97e0e..c6ad4e1 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "黑石咀水库", "appid" : "__UNI__DB7153B", "description" : "", - "versionName" : "1.0.0", + "versionName" : "1.0.1", "versionCode" : 1, "transformPx" : false, "app-plus" : { diff --git a/pages/skInfo/index.vue b/pages/skInfo/index.vue index d7dee0e..3284ed7 100644 --- a/pages/skInfo/index.vue +++ b/pages/skInfo/index.vue @@ -50,7 +50,7 @@ "rz":'当前水位m', "today":'今日雨量mm', 'flLowLimLev':'汛限水位m', - "afsltdz":'比汛期m', + "afsltdz":'比汛限m', 'wcrstel':'堰顶高程m', 'crestElev':'坝顶高程m', "h24":'24h预报mm', @@ -184,7 +184,7 @@ } } .withd-2{ - width: 45%; + width: 45.5%; text-align: center; background-color: #caf982; margin-right: 5px; diff --git a/pages/upgrade/index.vue b/pages/upgrade/index.vue index 902da93..c77f418 100644 --- a/pages/upgrade/index.vue +++ b/pages/upgrade/index.vue @@ -87,7 +87,7 @@ this.isStartDownload = true //开始下载App // const baseUrl = `http://223.75.53.141:83/gunshiApp/hsz/${this.info.url}` - const baseUrl = uni.$http.baseUrl+`/gunshiApp/hsz/${this.info.url}` + const baseUrl = uni.$http.baseUrl+`/gunshiApp/hsz/appUpdate/getApp/${this.info.url}` downloadApp(baseUrl, current => { //下载进度监听 this.hasProgress = true diff --git a/pages/xcrw/detail/dbForm.vue b/pages/xcrw/detail/dbForm.vue index 747ca7a..714303d 100644 --- a/pages/xcrw/detail/dbForm.vue +++ b/pages/xcrw/detail/dbForm.vue @@ -250,10 +250,15 @@ list: [] } console.log(this.listData); + const userInfo = uni.getStorageSync("value") || {}; + console.log("userInfo",userInfo); + const userName = userInfo.nickName || ''; + const userId = userInfo.userId || ""; this.listData.map(i => { const arr=i.children.map(item=>{ - item.handleUserName = this.deptUserList.find(it=>it.userId==item.handleUserId)?.nickName - + item.handleUserName = this.deptUserList.find(it => it.userId == item.handleUserId)?.nickName || userName; + item.handleUserId = item.handleUserId || userId; + return item }) params.list=[...params.list,...arr] diff --git a/pages/yj/detail/riverDetail.vue b/pages/yj/detail/riverDetail.vue index a79b9df..18a7bb5 100644 --- a/pages/yj/detail/riverDetail.vue +++ b/pages/yj/detail/riverDetail.vue @@ -24,9 +24,8 @@ export default { data() { return { tabs: [ - { name: '超校核洪水位', key: 'calState' }, - { name: '超设计洪水位', key: 'desState' }, - { name: '超汛限水位', key: 'flState' } + { name: '超警戒', key: 'overWarn' }, + { name: '超保证', key: 'overPromise' }, ], cur: 0, map: {}, diff --git a/pages/yj/detail/skDetail.vue b/pages/yj/detail/skDetail.vue index d90110d..e7164e2 100644 --- a/pages/yj/detail/skDetail.vue +++ b/pages/yj/detail/skDetail.vue @@ -24,8 +24,9 @@ export default { data() { return { tabs: [ - { name: '超保证水位', key: 'overPromise' }, - { name: '超警戒水位', key: 'overWarn' } + { name: '超汛限水位', key: 'flState' }, + { name: '超校核水位', key: 'calState' }, + { name: '超设计水位', key: 'desState' } ], cur: 0, map: {}, @@ -36,6 +37,7 @@ export default { if (!this.tabs || !this.tabs.length || !this.tabs[this.cur]) return [] const k = this.tabs[this.cur].key const arr = this.map[k] + return Array.isArray(arr) ? arr : [] } }, diff --git a/pages/yj/detail/wyyj.vue b/pages/yj/detail/wyyj.vue index 063182a..ca2eb0b 100644 --- a/pages/yj/detail/wyyj.vue +++ b/pages/yj/detail/wyyj.vue @@ -58,8 +58,6 @@ export default { unitLabel(){ if (!this.tabs || !this.tabs.length || !this.tabs[this.cur]) return '' const k = this.tabs[this.cur].key - console.log("k",k); - if(k === 'shiftWarn') return '(mm)' if(k === 'pressWarn') return '(m)' if(k === 'flowWarn') return '(L/s)' diff --git a/pages/yj/index.vue b/pages/yj/index.vue index a06c322..fc1dd6d 100644 --- a/pages/yj/index.vue +++ b/pages/yj/index.vue @@ -84,7 +84,7 @@ export default { }, navigateSafe() { if (!this.safeCount) return; - const data = this.list || {}; + const data = this.list.osmoticWarnVoMap || {}; const map = { shiftWarn: data.shiftWarn || [], flowWarn: data.flowWarn || [], @@ -103,43 +103,7 @@ export default { url: '/pages/yj/detail/aiyj?map=' + arr }) }, - todetail(key, e) { - let arr = encodeURIComponent(JSON.stringify(e)) - console.log(key, e.length); - if (!e.length) { - return; - } - if (key == 'qxWarn') { - uni.navigateTo({ - url: '/pages/yj/detail/qxyj?list=' + arr - }) - } - if (key == 'shiftWarn') { - uni.navigateTo({ - url: '/pages/yj/detail/wyyj?list=' + arr - }) - } - if (key == 'flowWarn') { - uni.navigateTo({ - url: '/pages/yj/detail/wyyj?list=' + arr - }) - } - if (key == 'pressWarn') { - uni.navigateTo({ - url: '/pages/yj/detail/wyyj?list=' + arr - }) - } - if (key == 'aiWarnCount') { - uni.navigateTo({ - url: '/pages/yj/detail/aiyj?list=' + arr - }) - } - if (key == 'byWarn') { - uni.navigateTo({ - url: '/pages/yj/detail/byTable?list=' + arr - }) - } - }, + getList() { uni.$http.post('/gunshiApp/hsz/stQxWarnR/home/warn', this.model).then(res => { const data = res.data.data; @@ -160,9 +124,10 @@ export default { (riverMap.overPromise?.length || 0); // 3. 安全监测预警 (safeCount) - this.safeCount = (data.shiftWarn?.length || 0) + - (data.flowWarn?.length || 0) + - (data.pressWarn?.length || 0); + const safeMap = data.osmoticWarnVoMap || {}; + this.safeCount = (safeMap.shiftWarn?.length || 0) + + (safeMap.flowWarn?.length || 0) + + (safeMap.pressWarn?.length || 0); // 4. AI告警 (aiCount) const aiMap = data.aiWarnVoMap || {}; diff --git a/pages/ylzList/detail/tjsjTable.vue b/pages/ylzList/detail/tjsjTable.vue index 63f3adc..e129ebd 100644 --- a/pages/ylzList/detail/tjsjTable.vue +++ b/pages/ylzList/detail/tjsjTable.vue @@ -5,74 +5,74 @@ 近1h雨量(mm) - {{tableData.h1||0}} + {{tableData.h1 === null ? '-':tableData.h1}} 近3h雨量(mm) - {{tableData.h3||0}} + {{tableData.h3 === null ? '-':tableData.h3}} 近6h雨量(mm) - {{tableData.h6||0}} + {{tableData.h6 === null ? '-':tableData.h6}} 近12h雨量(mm) - {{tableData.h12||0}} + {{tableData.h12 === null ? '-':tableData.h12}} 近24h雨量(mm) - {{tableData.h24||0}} + {{tableData.h24 === null ? '-':tableData.h24}} 近48h雨量(mm) - {{tableData.h48||0}} + {{tableData.h48 === null ? '-':tableData.h48}} 今日雨量(mm) - {{tableData.today||0}} + {{tableData.today === null ? '-':tableData.today}} 昨日雨量(mm) - {{tableData.yesterdayDrp||0}} + {{tableData.yesterdayDrp === null ? '-':tableData.yesterdayDrp}} 本月雨量(mm) - {{tableData.monthDrp||0}} + {{tableData.monthDrp === null ? '-':tableData.monthDrp}} 本年雨量(mm) - {{tableData.yearDrp||0}} + {{tableData.yearDrp === null ? '-':tableData.yearDrp}} 本年降雨天数 - {{tableData.yearDrpDay||0}}/{{days}} + {{tableData.yearDrpDay === null ? '-':tableData.yearDrpDay}}/{{days}} 本年最大日雨量(mm) - {{tableData.maxDrp||0}} + {{tableData.maxDrp === null ? '-':tableData.maxDrp}} ({{maxDrpTime}}) diff --git a/pages/ylzList/index.vue b/pages/ylzList/index.vue index cd33830..84e18f9 100644 --- a/pages/ylzList/index.vue +++ b/pages/ylzList/index.vue @@ -14,7 +14,7 @@ {{k}} - {{item[k]}} + {{item[k] === null ? '-':item[k]}}