diff --git a/README.md b/README.md index 91a2ea6..9034403 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ @@ -271,3 +271,12 @@ feat - packageList,packageBuy - 增加 下单接口iccid参数 + + +## v1.0.32 +`2023.3.24` +feature +- alarmDetails + - 增加 涉水区域告警页面 +- amap.js + - 增加 高德地图js \ No newline at end of file diff --git a/src/config/amap.js b/src/config/amap.js new file mode 100644 index 0000000..b96e890 --- /dev/null +++ b/src/config/amap.js @@ -0,0 +1,40 @@ +export default function MapLoader(isSyncLoad = false, pluginsArr = []) { + // plugin: 字符串数组[ 'AMap.Geocoder', ... ] + return new Promise((resolve, reject) => { + try { + if (window.AMap && (pluginsArr === null || pluginsArr === undefined || pluginsArr.length === 0)) { + resolve(window.AMap); + } else { + var script = document.createElement('script'); + script.type = 'text/javascript'; + script.async = !isSyncLoad; + script.src = 'https://webapi.amap.com/maps?v=1.4.15&callback=initAMap&key=' + + '6e4a6c39ea6d18b8dd3151baa3a7c0d5' + + '&plugin=AMap.BezierCurveEditor' + + (pluginsArr ? ',' + pluginsArr.join(',') : ''); + script.onerror = reject; + document.head.appendChild(script); + + var script1 = document.createElement('script'); + script1.type = 'text/javascript'; + script1.async = false; + script1.src = 'https://webapi.amap.com/ui/1.0/main.js?v=1.0.11'; + script1.onerror = reject; + if (isSyncLoad) { + document.head.appendChild(script1); + } + + } + window.initAMap = () => { + resolve(window.AMap); + } + // JSAPI key搭配静态安全密钥以明文设置, 详情见: https://lbs.amap.com/api/jsapi-v2/guide/abc/load + window._AMapSecurityConfig = { + securityJsCode:'6a421e1233cd12dd4899e373e11bb641', + } + } catch (e) { + console.log(e); + } + + }) +} \ No newline at end of file diff --git a/src/config/models.js b/src/config/models.js index 8c8258a..02be0a7 100644 --- a/src/config/models.js +++ b/src/config/models.js @@ -1,11 +1,11 @@ /* * @Date: 2021-11-20 10:26:39 * @LastEditors: JinxChen - * @LastEditTime: 2023-03-13 09:35:07 + * @LastEditTime: 2023-03-24 18:07:12 * @FilePath: \TelpoH5FrontendWeb\src\config\models.js * @description: */ -export const VERSION_MODEL = '1.0.31F'; //版本号 +export const VERSION_MODEL = '1.0.32F'; //版本号 export const IMAGE_URL = { production: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/', diff --git a/src/main.js b/src/main.js index 46e0df2..dbe4580 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ /* * @Date: 2022-01-19 10:08:26 * @LastEditors: JinxChen - * @LastEditTime: 2023-02-26 14:40:46 + * @LastEditTime: 2023-03-24 17:54:06 * @FilePath: \TelpoH5FrontendWeb\src\main.js * @description: */ @@ -53,6 +53,7 @@ import { TabbarItem, Tabs, Toast, + ActionSheet, } from 'vant'; //按需加载vant组件 Vue @@ -94,6 +95,7 @@ Vue .use(TabbarItem) .use(Tabs) .use(Toast) +.use(ActionSheet) Vue.config.productionTip = false; Vue.config.devtools = true; diff --git a/src/router/index.js b/src/router/index.js index 66c6911..88fa066 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,7 +1,7 @@ /* * @Date: 2023-02-25 16:34:35 * @LastEditors: JinxChen - * @LastEditTime: 2023-03-14 09:33:17 + * @LastEditTime: 2023-03-24 14:40:54 * @FilePath: \TelpoH5FrontendWeb\src\router\index.js * @description: */ @@ -30,7 +30,7 @@ const routes = [ { path: '/activeStatus', name: 'activeStatus', component: resolve => require(['@/views/active-status'], resolve) }, { path: '/cardActive', name: 'cardActive', component: resolve => require(['@/views/card-active'], resolve) }, - + { path: '/alarmDetails', name: 'alarmDetails', component: resolve => require(['@/views/alarm/alarm-details'], resolve) }, ]; const router = new VueRouter({ diff --git a/src/views/alarm/alarm-details.vue b/src/views/alarm/alarm-details.vue new file mode 100644 index 0000000..855f610 --- /dev/null +++ b/src/views/alarm/alarm-details.vue @@ -0,0 +1,315 @@ + + + + +