Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-24 18:07:06
+ * @LastEditTime: 2023-03-29 10:17:04
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -292,4 +292,5 @@ feature
 `2023.3.29`
 update
 - alarmDetails
-    - 修改 标题显示文字
+    - 修改 标题显示文字
+    - 修改 弹窗显示文字

src/views/alarm/alarm-details.vue

@@ -223,7 +223,7 @@ export default {
         } else {
             this.$dialog({
                 title: '',
-                message: '是否永不提示',
+                message: '点击确认后，进入这个区域将永不告警',
                 showCancelButton: true,
                 closeOnClickOverlay: true,
             }).then(() => {