From 5d6409091a05fc6bc45f4614b57426750d6088f9 Mon Sep 17 00:00:00 2001 From: qzc Date: Tue, 11 Jun 2024 15:33:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?qzc=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 7 +++++-- pages/addressBook/follow.vue | 5 +++++ pages/addressBook/myDept.vue | 7 ++++++- pages/forewarning/forewarning.vue | 12 +++++++----- pages/orderFeedback/orderInformation.vue | 11 ++++++----- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/manifest.json b/manifest.json index 52cb218..c6a5125 100644 --- a/manifest.json +++ b/manifest.json @@ -17,7 +17,9 @@ "delay" : 0 }, "modules" : { - "VideoPlayer" : {} + "VideoPlayer" : {}, + "Contacts" : {}, + "Messaging" : {} }, /* 模块配置 */ "distribute" : { @@ -39,7 +41,8 @@ "", "", "", - "" + "", + "" ] }, "ios" : { diff --git a/pages/addressBook/follow.vue b/pages/addressBook/follow.vue index fb1a047..437d393 100644 --- a/pages/addressBook/follow.vue +++ b/pages/addressBook/follow.vue @@ -90,6 +90,11 @@ uni.$showMsg() } + }, + callNum(num) { + uni.makePhoneCall({ + phoneNumber: num //仅为示例 + }); } }, created() { diff --git a/pages/addressBook/myDept.vue b/pages/addressBook/myDept.vue index 9537db4..35fb360 100644 --- a/pages/addressBook/myDept.vue +++ b/pages/addressBook/myDept.vue @@ -90,7 +90,12 @@ uni.$showMsg() } - } + }, + callNum(num) { + uni.makePhoneCall({ + phoneNumber: num //仅为示例 + }); + }, }, created() { this.getData() diff --git a/pages/forewarning/forewarning.vue b/pages/forewarning/forewarning.vue index 3491337..4024425 100644 --- a/pages/forewarning/forewarning.vue +++ b/pages/forewarning/forewarning.vue @@ -24,7 +24,9 @@ itemStyle="height: 44px" > - + + + @@ -41,18 +43,18 @@ tabsOptions:[ { name:'水库预警', - components:uniSk + components:'uniSk' }, { name:'河道预警', - components:uniHd + components:'uniHd' }, { name:'山洪预警', - components:uniSh + components:'uniSh' }, ], - tabsVal:uniSk + tabsVal:'uniSk' }; }, methods: { diff --git a/pages/orderFeedback/orderInformation.vue b/pages/orderFeedback/orderInformation.vue index 9e06c29..508ea12 100644 --- a/pages/orderFeedback/orderInformation.vue +++ b/pages/orderFeedback/orderInformation.vue @@ -2,7 +2,7 @@ - + + @@ -37,11 +38,11 @@ const tabsOptions = [ { name:'调度指令', - components:uniZl + components:'uniZl' }, { name:'执行反馈', - components:uniFk + components:'uniFk' }, ] @@ -50,7 +51,7 @@ data() { return { tabsOptions:tabsOptions, - tabsVal:uniZl, + tabsVal:'uniZl', record:{} }; }, From f2a1300a78aaca614074c605ace94f553b82a0dc Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Tue, 11 Jun 2024 15:35:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat():=20=E6=A8=A1=E5=9D=97=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/hdDetail/zbyq/zbyq.vue | 10 +++++--- pages/login/login.vue | 8 +++--- pages/rain/Table.vue | 11 ++++---- pages/rain/rain.vue | 42 +++++++++++++++++++------------ pages/rainDetail/rainDetail.vue | 8 +++--- pages/rainDetail/zbyq/zbyq.vue | 10 +++++--- pages/skDetail/jcsj/jcsjTable.vue | 2 +- pages/skDetail/zbyq/zbyq.vue | 10 +++++--- pages/water/hdWater/hdWater.vue | 5 ++-- pages/water/skWater/skWater.vue | 5 ++-- 10 files changed, 64 insertions(+), 47 deletions(-) diff --git a/pages/hdDetail/zbyq/zbyq.vue b/pages/hdDetail/zbyq/zbyq.vue index 4e38246..8059589 100644 --- a/pages/hdDetail/zbyq/zbyq.vue +++ b/pages/hdDetail/zbyq/zbyq.vue @@ -14,7 +14,6 @@ src="../../../static/images/filter.png" style="width: 20px; height: 20px; margin-right: 10px; margin-left: 10px;" @click="popupOpen = true" - v-show="!popupOpen" > @@ -42,14 +41,17 @@ 按距离 + - + (km) + + @@ -152,7 +154,7 @@ .bottom-btn1{ width: 100px; - margin-left: 130px; + margin-left: 70px; } .bottom-btn2{ width: 100px; diff --git a/pages/login/login.vue b/pages/login/login.vue index e583ebc..8798785 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -63,10 +63,10 @@ uni.setStorageSync('loginName',postForm.loginName) uni.setStorageSync('secretKey',postForm.secretKey) } else { - uni.removeStorageSync('loginName') - uni.removeStorageSync('secretKey') - this.formData.username = '' - this.formData.password = '' + // uni.removeStorageSync('loginName') + // uni.removeStorageSync('secretKey') + // this.formData.username = '' + // this.formData.password = '' } //提交表单 diff --git a/pages/rain/Table.vue b/pages/rain/Table.vue index 762f3e0..13c97cd 100644 --- a/pages/rain/Table.vue +++ b/pages/rain/Table.vue @@ -21,11 +21,12 @@
- {{ index + 1 }} - {{ item.stnm }} - {{ item.drp }} + {{ index + 1 }} + + {{ item.stnm }} + {{ item.drp || 0 }} {{ item.yesDrp || 0 }} - {{ item.adnm }} + {{ item.adnm }}
@@ -46,7 +47,7 @@ jumpDetail(params){ console.log(123) uni.navigateTo({ - url:`/pages/rainDetail/rainDetail?stcd=${params.stcd}` + url:`/pages/rainDetail/rainDetail?stcd=${params.stcd}&stnm=${params.stnm}` }) } } diff --git a/pages/rain/rain.vue b/pages/rain/rain.vue index 0c5ac99..2955af5 100644 --- a/pages/rain/rain.vue +++ b/pages/rain/rain.vue @@ -2,17 +2,19 @@ - + 雨情 - + - + + + @@ -70,23 +72,23 @@ - + 1h - + 3h - + 6h - + 12h - + 24h @@ -223,8 +225,10 @@ source:["SH","SW","QX","SK"], stArg:'', adcd:type == 1 ? undefined :adcd, - etm:moment().set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm"), - stm:moment().subtract(1, 'day').set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm") + etm:moment().format("YYYY-MM-DD HH:mm"), + stm:moment().subtract(1, 'day').format("YYYY-MM-DD HH:mm") + // etm:moment().set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm"), + // stm:moment().subtract(1, 'day').set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm") } } }, @@ -391,9 +395,13 @@ }, // 获取雨情列表 async getRainList(){ + let obj = { + ...this.formData, + timeType:undefined + } try{ const {data} = await uni.$http.post( - "/gunshiApp/xfflood/real/rain/list",{...this.formData,timeType:undefined} + "/gunshiApp/xfflood/real/rain/app/list",obj ) if(data.code == 200){ this.rainList = [...data.data]; @@ -499,12 +507,14 @@ background-color: #f2f2f2; } .bottom-btn1,.bottom-btn2{ - width: 30%; + width: 100px; } .bottom-btn1{ - margin-left: 130px; + margin-left: 70px; } .bottom-btn2{ margin-right: -12px; + margin-left: 10px; + } \ No newline at end of file diff --git a/pages/rainDetail/rainDetail.vue b/pages/rainDetail/rainDetail.vue index 38f3c1f..f6d05eb 100644 --- a/pages/rainDetail/rainDetail.vue +++ b/pages/rainDetail/rainDetail.vue @@ -3,7 +3,7 @@ - 雨情 + {{stnm}} @@ -33,7 +33,8 @@ data(){ return { activeOne:0, - stcd:'' + stcd:'', + stnm:'' } }, components:{ @@ -47,7 +48,8 @@ } }, onLoad(option) { - this.stcd = option.stcd + this.stcd = option.stcd; + this.stnm = option.stnm; } } diff --git a/pages/rainDetail/zbyq/zbyq.vue b/pages/rainDetail/zbyq/zbyq.vue index 4e38246..a650dfc 100644 --- a/pages/rainDetail/zbyq/zbyq.vue +++ b/pages/rainDetail/zbyq/zbyq.vue @@ -14,7 +14,6 @@ src="../../../static/images/filter.png" style="width: 20px; height: 20px; margin-right: 10px; margin-left: 10px;" @click="popupOpen = true" - v-show="!popupOpen" > @@ -42,14 +41,17 @@ 按距离 + - + (km) + + @@ -152,7 +154,7 @@ .bottom-btn1{ width: 100px; - margin-left: 130px; + margin-left: 70px; } .bottom-btn2{ width: 100px; diff --git a/pages/skDetail/jcsj/jcsjTable.vue b/pages/skDetail/jcsj/jcsjTable.vue index 77e4338..1a8300b 100644 --- a/pages/skDetail/jcsj/jcsjTable.vue +++ b/pages/skDetail/jcsj/jcsjTable.vue @@ -13,7 +13,7 @@ 水位(m) - + 库容(万m³) diff --git a/pages/skDetail/zbyq/zbyq.vue b/pages/skDetail/zbyq/zbyq.vue index 4e38246..8059589 100644 --- a/pages/skDetail/zbyq/zbyq.vue +++ b/pages/skDetail/zbyq/zbyq.vue @@ -14,7 +14,6 @@ src="../../../static/images/filter.png" style="width: 20px; height: 20px; margin-right: 10px; margin-left: 10px;" @click="popupOpen = true" - v-show="!popupOpen" > @@ -42,14 +41,17 @@ 按距离 + - + (km) + + @@ -152,7 +154,7 @@ .bottom-btn1{ width: 100px; - margin-left: 130px; + margin-left: 70px; } .bottom-btn2{ width: 100px; diff --git a/pages/water/hdWater/hdWater.vue b/pages/water/hdWater/hdWater.vue index e801f47..b1356f3 100644 --- a/pages/water/hdWater/hdWater.vue +++ b/pages/water/hdWater/hdWater.vue @@ -14,7 +14,6 @@ src="../../../static/images/filter.png" style="width: 20px; height: 20px; margin-left: 20px;" @click="popupOpen = true" - v-show="!popupOpen" > @@ -39,7 +38,7 @@ - + @@ -139,7 +138,7 @@ .bottom-btn1{ width: 100px; - margin-left: 130px; + margin-left: 70px; } .bottom-btn2{ width: 100px; diff --git a/pages/water/skWater/skWater.vue b/pages/water/skWater/skWater.vue index eb6e9f7..e69634a 100644 --- a/pages/water/skWater/skWater.vue +++ b/pages/water/skWater/skWater.vue @@ -14,7 +14,6 @@ src="../../../static/images/filter.png" style="width: 20px; height: 20px; margin-left: 20px;" @click="popupOpen = true" - v-show="!popupOpen" > @@ -39,7 +38,7 @@ - + @@ -140,7 +139,7 @@ .bottom-btn1{ width: 100px; - margin-left: 130px; + margin-left: 70px; } .bottom-btn2{ width: 100px;