Browse Source

Merge branch 'feat-water-area' into develop

feat
JinxChen 1 year ago
parent
commit
6c73f286c7
2 changed files with 4 additions and 3 deletions
  1. +3
    -2
      README.md
  2. +1
    -1
      src/views/alarm/alarm-details.vue

+ 3
- 2
README.md View File

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

+ 1
- 1
src/views/alarm/alarm-details.vue View File

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


Loading…
Cancel
Save