Merge branch 'merge-master'

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-05-10 09:20:53
+ * @LastEditTime: 2023-05-13 22:19:45
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -418,3 +418,10 @@ update
 `2023.5.10`
 feature
 - 增加 百度页面访问统计
+
+
+## v1.0.51
+`2023.5.13`
+update
+- 告警
+    - 修改 误报文字为 免告警

src/config/models.js

@@ -1,11 +1,11 @@
 /*
  * @Date: 2021-11-20 10:26:39
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-05-10 09:49:09
+ * @LastEditTime: 2023-05-13 22:16:53
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.50F'; //版本号
+export const VERSION_MODEL = '1.0.51F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/alarm/alarm-details.vue

@@ -63,7 +63,7 @@ export default {
        },
        buttonList: [
         { name: 'goHere', text: '去这里', type: 'primary', icon: 'guide-o', show: true},
-        { name: 'errorReport', text: '误报', type: 'primary', icon: 'warn-o', show: true },
+        { name: 'errorReport', text: '免告警', type: 'primary', icon: 'warn-o', show: true },
        ],
        map: {
            geocoder: null,
@@ -233,7 +233,7 @@ export default {
             }
         })
     },
-    // 误报
+    // 免告警
     onErrorReport(name) {
         if(name === 'goHere') {
             // 根据选择的地图跳转不同地图app的url