diff --git a/index.html b/index.html index 8bd05f0..b507463 100644 --- a/index.html +++ b/index.html @@ -2,12 +2,17 @@ + diff --git a/manifest.json b/manifest.json index c6a5125..fe3ae3c 100644 --- a/manifest.json +++ b/manifest.json @@ -70,6 +70,15 @@ }, "vueVersion" : "2", "h5" : { - "template" : "template.html" + "template" : "template.html", + "sdkConfigs" : { + "maps" : { + "amap" : { + "key" : "4799ff37874e604a22b910b44ca948e5", + "securityJsCode" : "", + "serviceHost" : "" + } + } + } } } diff --git a/package-lock.json b/package-lock.json index bb1346d..2c322f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,6 +6,7 @@ "packages": { "": { "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@escook/request-miniprogram": "^0.2.1", "crypto-js": "^4.2.0", "echarts": "^4.9.0", @@ -14,6 +15,11 @@ "moment": "^2.30.1" } }, + "node_modules/@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "node_modules/@escook/request-miniprogram": { "version": "0.2.1", "resolved": "https://registry.npmmirror.com/@escook/request-miniprogram/-/request-miniprogram-0.2.1.tgz", @@ -66,6 +72,11 @@ } }, "dependencies": { + "@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "@escook/request-miniprogram": { "version": "0.2.1", "resolved": "https://registry.npmmirror.com/@escook/request-miniprogram/-/request-miniprogram-0.2.1.tgz", diff --git a/package.json b/package.json index 3e051f4..547af8c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@escook/request-miniprogram": "^0.2.1", "crypto-js": "^4.2.0", "echarts": "^4.9.0", diff --git a/pages.json b/pages.json index 645b720..b63f3d1 100644 --- a/pages.json +++ b/pages.json @@ -172,60 +172,52 @@ } }, { - "path" : "pages/gqzq/gqxx/gqxx", - "style" : - { - "navigationBarTitleText" : "" - } + "path": "pages/gqzq/gqxx/gqxx", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/gqzq/gqxx/qk", - "style" : - { - "navigationBarTitleText" : "" - } + "path": "pages/gqzq/gqxx/qk", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/gqzq/gqxx/xq", - "style" : - { - "navigationBarTitleText" : "" - } + "path": "pages/gqzq/gqxx/xq", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/gqzq/gqxx/qkForm", - "style" : - { - "navigationBarTitleText" : "" - } + "path": "pages/gqzq/gqxx/qkForm", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/gqzq/gqxx/xqForm", - "style" : - { - "navigationBarTitleText" : "" - } + "path": "pages/gqzq/gqxx/xqForm", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/gqzq/zqxx/zqxx", - "style" : - { - "navigationBarTitleText" : "" - } + "path": "pages/gqzq/zqxx/zqxx", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/gqzq/zqxx/table", - "style" : - { - "navigationBarTitleText" : "" - } + "path": "pages/gqzq/zqxx/table", + "style": { + "navigationBarTitleText": "" + } }, { - "path" : "pages/gqzq/zqxx/form", - "style" : - { - "navigationBarTitleText" : "" - } + "path": "pages/gqzq/zqxx/form", + "style": { + "navigationBarTitleText": "" + } } ], "usingComponents": { diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index c40fc26..170f68d 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -477,10 +477,9 @@ export default { methods: { async getImgs () { uni.request({ - url: 'http://223.75.53.124:8005/grb/rainimglist?tm=2024061308', + url: 'http://223.75.53.124:8005/grb/rainimglist', data: { tm: `${this.imgtm}08` - // tm: `2024061308` }, success: res => { console.log(res.data.data) diff --git a/pages/xxsb/dsfrom.vue b/pages/xxsb/dsfrom.vue index 986e078..b0e86f3 100644 --- a/pages/xxsb/dsfrom.vue +++ b/pages/xxsb/dsfrom.vue @@ -1,335 +1,346 @@ - diff --git a/pages/xxsb/from.vue b/pages/xxsb/from.vue index 0d1f8d5..7da2dd5 100644 --- a/pages/xxsb/from.vue +++ b/pages/xxsb/from.vue @@ -171,7 +171,7 @@ diff --git a/pages/xxsb/fromSeverity.vue b/pages/xxsb/fromSeverity.vue index 4a4010e..9f58418 100644 --- a/pages/xxsb/fromSeverity.vue +++ b/pages/xxsb/fromSeverity.vue @@ -464,7 +464,9 @@ export default { // console.log('radioChange', n); }, navigateBack () { - uni.navigateBack() + uni.reLaunch({ + url: '/pages/xxsb/index' + }) }, severitySelect (e) { diff --git a/pages/xxsb/map.vue b/pages/xxsb/map.vue index 1cdd867..8ce8da4 100644 --- a/pages/xxsb/map.vue +++ b/pages/xxsb/map.vue @@ -1,30 +1,111 @@ - - diff --git a/static/tabs/add.png b/static/tabs/add.png new file mode 100644 index 0000000..3dc048a Binary files /dev/null and b/static/tabs/add.png differ diff --git a/static/tabs/dw-icon.png b/static/tabs/dw-icon.png new file mode 100644 index 0000000..6833c3b Binary files /dev/null and b/static/tabs/dw-icon.png differ