diff --git a/README.md b/README.md index 9034403..85821e9 100644 --- a/README.md +++ b/README.md @@ -279,4 +279,10 @@ feature - alarmDetails - 增加 涉水区域告警页面 - amap.js - - 增加 高德地图js \ No newline at end of file + - 增加 高德地图js + +## v1.0.33 +`2023.3.27` +feature +- alarmDetails + - 增加 误报功能,设置该设备IMEI与该水域告警poi_id不做任何报警信息处理 \ No newline at end of file diff --git a/src/api/core.js b/src/api/core.js index 47ca481..9c8668f 100644 --- a/src/api/core.js +++ b/src/api/core.js @@ -1,7 +1,7 @@ /* * @Date: 2021-12-18 15:49:01 * @LastEditors: JinxChen - * @LastEditTime: 2023-02-25 17:04:23 + * @LastEditTime: 2023-03-27 15:29:01 * @FilePath: \TelpoH5FrontendWeb\src\api\core.js * @description: * b端的接口, 每次调用前先获取token @@ -29,6 +29,7 @@ export const APICore = { GpsDeviceFence, //围栏 redis cardPackageList, //零川基础套餐列表 devicePayPackage, + drownReportFilterAdd,//添加过滤危险水域区域 } /* const headerAuth = this.$store.getters.gatewayToken; */ // 获取告警详情 @@ -93,4 +94,11 @@ function devicePayPackage(imei) { params: {imei}, }) } +function drownReportFilterAdd(data) { + return service({ + url: `${baseUrl}/core/api/v1/Device/DrownReportFilterAdd`, + method: 'post', + data, + }); +} export default APICore; diff --git a/src/config/models.js b/src/config/models.js index 02be0a7..e2283b5 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-24 18:07:12 + * @LastEditTime: 2023-03-27 16:19:56 * @FilePath: \TelpoH5FrontendWeb\src\config\models.js * @description: */ -export const VERSION_MODEL = '1.0.32F'; //版本号 +export const VERSION_MODEL = '1.0.33F'; //版本号 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 dbe4580..19f8ae2 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ /* * @Date: 2022-01-19 10:08:26 * @LastEditors: JinxChen - * @LastEditTime: 2023-03-24 17:54:06 + * @LastEditTime: 2023-03-27 16:04:16 * @FilePath: \TelpoH5FrontendWeb\src\main.js * @description: */ @@ -101,7 +101,7 @@ Vue.config.productionTip = false; Vue.config.devtools = true; // 全局配置 loading Toast.setDefaultOptions('success', { - duration: 1500, + duration: 2500, forbidClick: true, }); Toast.setDefaultOptions('loading', { diff --git a/src/views/alarm/alarm-details.vue b/src/views/alarm/alarm-details.vue index 855f610..230a88e 100644 --- a/src/views/alarm/alarm-details.vue +++ b/src/views/alarm/alarm-details.vue @@ -1,19 +1,19 @@