fix(): 修改热更新下载路径
parent
955ac1d27f
commit
c3d32a0734
|
|
@ -2,7 +2,7 @@
|
||||||
"name" : "黑石咀水库",
|
"name" : "黑石咀水库",
|
||||||
"appid" : "__UNI__DB7153B",
|
"appid" : "__UNI__DB7153B",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.0.0",
|
"versionName" : "1.0.1",
|
||||||
"versionCode" : 1,
|
"versionCode" : 1,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
"rz":'当前水位m',
|
"rz":'当前水位m',
|
||||||
"today":'今日雨量mm',
|
"today":'今日雨量mm',
|
||||||
'flLowLimLev':'汛限水位m',
|
'flLowLimLev':'汛限水位m',
|
||||||
"afsltdz":'比汛期m',
|
"afsltdz":'比汛限m',
|
||||||
'wcrstel':'堰顶高程m',
|
'wcrstel':'堰顶高程m',
|
||||||
'crestElev':'坝顶高程m',
|
'crestElev':'坝顶高程m',
|
||||||
"h24":'24h预报mm',
|
"h24":'24h预报mm',
|
||||||
|
|
@ -184,7 +184,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.withd-2{
|
.withd-2{
|
||||||
width: 45%;
|
width: 45.5%;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
background-color: #caf982;
|
background-color: #caf982;
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@
|
||||||
this.isStartDownload = true
|
this.isStartDownload = true
|
||||||
//开始下载App
|
//开始下载App
|
||||||
// const baseUrl = `http://223.75.53.141:83/gunshiApp/hsz/${this.info.url}`
|
// 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 => {
|
downloadApp(baseUrl, current => {
|
||||||
//下载进度监听
|
//下载进度监听
|
||||||
this.hasProgress = true
|
this.hasProgress = true
|
||||||
|
|
|
||||||
|
|
@ -250,10 +250,15 @@
|
||||||
list: []
|
list: []
|
||||||
}
|
}
|
||||||
console.log(this.listData);
|
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 => {
|
this.listData.map(i => {
|
||||||
const arr=i.children.map(item=>{
|
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
|
return item
|
||||||
})
|
})
|
||||||
params.list=[...params.list,...arr]
|
params.list=[...params.list,...arr]
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,8 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
tabs: [
|
tabs: [
|
||||||
{ name: '超校核洪水位', key: 'calState' },
|
{ name: '超警戒', key: 'overWarn' },
|
||||||
{ name: '超设计洪水位', key: 'desState' },
|
{ name: '超保证', key: 'overPromise' },
|
||||||
{ name: '超汛限水位', key: 'flState' }
|
|
||||||
],
|
],
|
||||||
cur: 0,
|
cur: 0,
|
||||||
map: {},
|
map: {},
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,9 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
tabs: [
|
tabs: [
|
||||||
{ name: '超保证水位', key: 'overPromise' },
|
{ name: '超汛限水位', key: 'flState' },
|
||||||
{ name: '超警戒水位', key: 'overWarn' }
|
{ name: '超校核水位', key: 'calState' },
|
||||||
|
{ name: '超设计水位', key: 'desState' }
|
||||||
],
|
],
|
||||||
cur: 0,
|
cur: 0,
|
||||||
map: {},
|
map: {},
|
||||||
|
|
@ -36,6 +37,7 @@ export default {
|
||||||
if (!this.tabs || !this.tabs.length || !this.tabs[this.cur]) return []
|
if (!this.tabs || !this.tabs.length || !this.tabs[this.cur]) return []
|
||||||
const k = this.tabs[this.cur].key
|
const k = this.tabs[this.cur].key
|
||||||
const arr = this.map[k]
|
const arr = this.map[k]
|
||||||
|
|
||||||
return Array.isArray(arr) ? arr : []
|
return Array.isArray(arr) ? arr : []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -58,8 +58,6 @@ export default {
|
||||||
unitLabel(){
|
unitLabel(){
|
||||||
if (!this.tabs || !this.tabs.length || !this.tabs[this.cur]) return ''
|
if (!this.tabs || !this.tabs.length || !this.tabs[this.cur]) return ''
|
||||||
const k = this.tabs[this.cur].key
|
const k = this.tabs[this.cur].key
|
||||||
console.log("k",k);
|
|
||||||
|
|
||||||
if(k === 'shiftWarn') return '(mm)'
|
if(k === 'shiftWarn') return '(mm)'
|
||||||
if(k === 'pressWarn') return '(m)'
|
if(k === 'pressWarn') return '(m)'
|
||||||
if(k === 'flowWarn') return '(L/s)'
|
if(k === 'flowWarn') return '(L/s)'
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ export default {
|
||||||
},
|
},
|
||||||
navigateSafe() {
|
navigateSafe() {
|
||||||
if (!this.safeCount) return;
|
if (!this.safeCount) return;
|
||||||
const data = this.list || {};
|
const data = this.list.osmoticWarnVoMap || {};
|
||||||
const map = {
|
const map = {
|
||||||
shiftWarn: data.shiftWarn || [],
|
shiftWarn: data.shiftWarn || [],
|
||||||
flowWarn: data.flowWarn || [],
|
flowWarn: data.flowWarn || [],
|
||||||
|
|
@ -103,43 +103,7 @@ export default {
|
||||||
url: '/pages/yj/detail/aiyj?map=' + arr
|
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() {
|
getList() {
|
||||||
uni.$http.post('/gunshiApp/hsz/stQxWarnR/home/warn', this.model).then(res => {
|
uni.$http.post('/gunshiApp/hsz/stQxWarnR/home/warn', this.model).then(res => {
|
||||||
const data = res.data.data;
|
const data = res.data.data;
|
||||||
|
|
@ -160,9 +124,10 @@ export default {
|
||||||
(riverMap.overPromise?.length || 0);
|
(riverMap.overPromise?.length || 0);
|
||||||
|
|
||||||
// 3. 安全监测预警 (safeCount)
|
// 3. 安全监测预警 (safeCount)
|
||||||
this.safeCount = (data.shiftWarn?.length || 0) +
|
const safeMap = data.osmoticWarnVoMap || {};
|
||||||
(data.flowWarn?.length || 0) +
|
this.safeCount = (safeMap.shiftWarn?.length || 0) +
|
||||||
(data.pressWarn?.length || 0);
|
(safeMap.flowWarn?.length || 0) +
|
||||||
|
(safeMap.pressWarn?.length || 0);
|
||||||
|
|
||||||
// 4. AI告警 (aiCount)
|
// 4. AI告警 (aiCount)
|
||||||
const aiMap = data.aiWarnVoMap || {};
|
const aiMap = data.aiWarnVoMap || {};
|
||||||
|
|
|
||||||
|
|
@ -5,74 +5,74 @@
|
||||||
<view class="first-row">近1h雨量(mm)</view>
|
<view class="first-row">近1h雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.h1||0}}</view>
|
<view class="second-row">{{tableData.h1 === null ? '-':tableData.h1}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row">近3h雨量(mm)</view>
|
<view class="first-row">近3h雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.h3||0}}</view>
|
<view class="second-row">{{tableData.h3 === null ? '-':tableData.h3}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row">近6h雨量(mm)</view>
|
<view class="first-row">近6h雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.h6||0}}</view>
|
<view class="second-row">{{tableData.h6 === null ? '-':tableData.h6}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row">近12h雨量(mm)</view>
|
<view class="first-row">近12h雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.h12||0}}</view>
|
<view class="second-row">{{tableData.h12 === null ? '-':tableData.h12}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row">近24h雨量(mm)</view>
|
<view class="first-row">近24h雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.h24||0}}</view>
|
<view class="second-row">{{tableData.h24 === null ? '-':tableData.h24}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row">近48h雨量(mm)</view>
|
<view class="first-row">近48h雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.h48||0}}</view>
|
<view class="second-row">{{tableData.h48 === null ? '-':tableData.h48}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row">今日雨量(mm)</view>
|
<view class="first-row">今日雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.today||0}}</view>
|
<view class="second-row">{{tableData.today === null ? '-':tableData.today}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row">昨日雨量(mm)</view>
|
<view class="first-row">昨日雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.yesterdayDrp||0}}</view>
|
<view class="second-row">{{tableData.yesterdayDrp === null ? '-':tableData.yesterdayDrp}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row">本月雨量(mm)</view>
|
<view class="first-row">本月雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.monthDrp||0}}</view>
|
<view class="second-row">{{tableData.monthDrp === null ? '-':tableData.monthDrp}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row">本年雨量(mm)</view>
|
<view class="first-row">本年雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.yearDrp||0}}</view>
|
<view class="second-row">{{tableData.yearDrp === null ? '-':tableData.yearDrp}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row">本年降雨天数</view>
|
<view class="first-row">本年降雨天数</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row">{{tableData.yearDrpDay||0}}/{{days}}</view>
|
<view class="second-row">{{tableData.yearDrpDay === null ? '-':tableData.yearDrpDay}}/{{days}}</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="first-row" style="border-bottom: 1px solid #dfdfdf;">本年最大日雨量(mm)</view>
|
<view class="first-row" style="border-bottom: 1px solid #dfdfdf;">本年最大日雨量(mm)</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="12">
|
<uni-col :span="12">
|
||||||
<view class="second-row" style="display: flex; justify-content: center;border-bottom: 1px solid #dfdfdf;">
|
<view class="second-row" style="display: flex; justify-content: center;border-bottom: 1px solid #dfdfdf;">
|
||||||
<text>{{tableData.maxDrp||0}}</text>
|
<text>{{tableData.maxDrp === null ? '-':tableData.maxDrp}}</text>
|
||||||
<text style="color: #E69224;">({{maxDrpTime}})</text>
|
<text style="color: #E69224;">({{maxDrpTime}})</text>
|
||||||
</view>
|
</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
{{k}}
|
{{k}}
|
||||||
</view>
|
</view>
|
||||||
<view class="bottom">
|
<view class="bottom">
|
||||||
{{item[k]}}
|
{{item[k] === null ? '-':item[k]}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue