From 8ffc0d761f4f70c27e9cc888aed1b1eeefc11e97 Mon Sep 17 00:00:00 2001 From: zhanglin Date: Thu, 13 Jun 2024 13:50:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 209 ++--- pages/homeIndex/index.vue | 6 +- pages/xxsb/dsfrom.vue | 777 ++++++++++++++++++ pages/xxsb/from.vue | 283 ++++++- pages/xxsb/fromSeverity.vue | 689 ++++++++++++++++ pages/xxsb/index.vue | 30 +- pages/xxsb/map.vue | 30 + static/images/home.png | Bin 0 -> 4289 bytes static/images/home1.png | Bin 0 -> 18631 bytes static/images/home2.png | Bin 0 -> 18631 bytes static/images/my2_icon@2x.png | Bin 0 -> 6585 bytes static/images/my2_icon@2x2.png | Bin 0 -> 19679 bytes static/images/phone_icon@2x.png | Bin 0 -> 5255 bytes static/images/phone_icon@2x2.png | Bin 0 -> 24732 bytes static/tabs/home2.png | Bin 0 -> 18631 bytes static/tabs/my2_icon@2x.png | Bin 6242 -> 6585 bytes static/tabs/my2_icon@2x2.png | Bin 0 -> 19679 bytes static/tabs/phone_icon@2x.png | Bin 3745 -> 5255 bytes static/tabs/phone_icon@2x2.png | Bin 0 -> 24732 bytes .../dist/dev/app-plus/app-config-service.js | 4 +- unpackage/dist/dev/app-plus/manifest.json | 2 +- 21 files changed, 1898 insertions(+), 132 deletions(-) create mode 100644 pages/xxsb/dsfrom.vue create mode 100644 pages/xxsb/fromSeverity.vue create mode 100644 pages/xxsb/map.vue create mode 100644 static/images/home.png create mode 100644 static/images/home1.png create mode 100644 static/images/home2.png create mode 100644 static/images/my2_icon@2x.png create mode 100644 static/images/my2_icon@2x2.png create mode 100644 static/images/phone_icon@2x.png create mode 100644 static/images/phone_icon@2x2.png create mode 100644 static/tabs/home2.png create mode 100644 static/tabs/my2_icon@2x2.png create mode 100644 static/tabs/phone_icon@2x2.png diff --git a/pages.json b/pages.json index d819442..b5cabff 100644 --- a/pages.json +++ b/pages.json @@ -4,16 +4,16 @@ }, "pages": [ { - "path" : "pages/login/login", - "style" : { - "navigationBarTitleText" : "" + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/rain/rain", - "style" : { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "path": "pages/rain/rain", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false } }, { @@ -34,6 +34,24 @@ "navigationBarTitleText": "" } }, + { + "path": "pages/xxsb/fromSeverity", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/xxsb/dsfrom", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/xxsb/map", + "style": { + "navigationBarTitleText": "地图示例" + } + }, { "path": "pages/gqzq/index", "style": { @@ -65,118 +83,121 @@ } }, { - "path" : "pages/personInfo/personInfo", + "path": "pages/personInfo/personInfo", "style": { - "navigationBarTitleText" : "" + "navigationBarTitleText": "" } }, { - "path" : "pages/modifyPassword/modifyPassword", - "style" : { - "navigationBarTitleText" : "" + "path": "pages/modifyPassword/modifyPassword", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/forewarning/forewarning", - "style" : { - "navigationBarTitleText" : "" - } + "path": "pages/forewarning/forewarning", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/forewarning/sh", - "style" : { - "navigationBarTitleText" : "" - } + "path": "pages/forewarning/sh", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/forewarning/shInformation/shInformation", - "style" : { - "navigationBarTitleText" : "" - } + "path": "pages/forewarning/shInformation/shInformation", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/addressBook/addressBook", - "style" : { - "navigationBarTitleText" : "" - } + "path": "pages/addressBook/addressBook", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/water/water", - "style" : { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "path": "pages/water/water", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false }, "onMessage": "handleMessage" }, { - "path" : "pages/rainDetail/rainDetail", - "style" : { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "path": "pages/rainDetail/rainDetail", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false } }, { - "path" : "pages/hdDetail/hdDetail", - "style" : { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "path": "pages/hdDetail/hdDetail", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false } }, { - "path" : "pages/skDetail/skDetail", - "style" : { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "path": "pages/skDetail/skDetail", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false } }, { - "path" : "pages/addressBook/follow", - "style" : { - "navigationBarTitleText" : "" + "path": "pages/addressBook/follow", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/addressBook/myDept", - "style" : { - "navigationBarTitleText" : "" + "path": "pages/addressBook/myDept", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/orderFeedback/orderFeedback", - "style" : { - "navigationBarTitleText" : "" + "path": "pages/orderFeedback/orderFeedback", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/orderFeedback/orderInformation", - "style" : { - "navigationBarTitleText" : "" + "path": "pages/orderFeedback/orderInformation", + "style": { + "navigationBarTitleText": "" } } ], + "usingComponents": { + "map": "/uni_modules/@dcloudio/uni-map/components/uni-map/uni-map" + }, "tabBar": { "color": "#333333", - "selectedColor": "#eb4450", + "selectedColor": "#59A7FF", "list": [ - { - "pagePath": "pages/homeIndex/index", - "iconPath": "/static/tabs/home.png", - "selectedIconPath": "static/tabs/home1.png", - "text": "首页" - }, - { - "pagePath": "pages/addressBook/addressBook", - "iconPath": "/static/tabs/my2_icon@2x.png", - "selectedIconPath": "static/tabs/my2_icon@2x.png", - "text": "通讯录" - }, - { - "pagePath": "pages/mypage/mypage", - "iconPath": "/static/images/my1.png", - "selectedIconPath": "static/images/my.png", - "text": "我的" - } + { + "pagePath": "pages/homeIndex/index", + "iconPath": "/static/tabs/home.png", + "selectedIconPath": "static/tabs/home2.png", + "text": "首页" + }, + { + "pagePath": "pages/addressBook/addressBook", + "iconPath": "/static/tabs/phone_icon@2x.png", + "selectedIconPath": "static/tabs/phone_icon@2x2.png", + "text": "通讯录" + }, + { + "pagePath": "pages/mypage/mypage", + "iconPath": "/static/images/my2_icon@2x.png", + "selectedIconPath": "static/images/my2_icon@2x2.png", + "text": "我的" + } ] }, "globalStyle": { @@ -190,21 +211,25 @@ "background": "#efeff4" } }, - "subPackages":[{ - "root": "subpkg", - "pages": [{ - "path": "rainDetail/rainDetail" - }] - }], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8", - "backgroundColorTop":"transparent", - "navigationStyle": "custom", - "app-plus": { - "background": "#efeff4" - } - } + "subPackages": [ + { + "root": "subpkg", + "pages": [ + { + "path": "rainDetail/rainDetail" + } + ] + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8", + "backgroundColorTop": "transparent", + "navigationStyle": "custom", + "app-plus": { + "background": "#efeff4" + } + } } diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index 168961f..4cf8182 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -65,9 +65,11 @@ >24小时中共有{{ list.data.stationNum }}个降雨测站(山洪测站{{ list.data.shStationNum }}个),其中最大降雨测站为{{ - list.data.maxRain.stnm || '-' + list.data.maxRain ? list.data.maxRain.stnm : '-' + }},降雨量{{ + list.data.maxRain ? list.data.maxRain.drp : '-' }},降雨量{{ list.data.maxRain.drp || '-' }}mm,