Browse Source

Merge branch 'fix' into test

test
chenJinxu 11 months ago
parent
commit
508a9079d7
3 changed files with 11 additions and 4 deletions
  1. +8
    -1
      README.md
  2. +1
    -1
      src/config/models.js
  3. +2
    -2
      src/views/gps-card-frontend/device-setting/index.vue

+ 8
- 1
README.md View File

@@ -817,4 +817,11 @@ update
update
- 心理监测
- 首页
- 修改 显示时间
- 修改 显示时间


## v1.0.103
`2023.11.22`
fix
- c1后台设备功耗查看页面
- 修复 涉水监测开关显示不正确的问题

+ 1
- 1
src/config/models.js View File

@@ -5,7 +5,7 @@
* @FilePath: \TelpoH5FrontendWeb\src\config\models.js
* @description:
*/
export const VERSION_MODEL = '1.0.102F'; //版本号
export const VERSION_MODEL = '1.0.103F'; //版本号
export const IMAGE_URL = {
production: 'http://zfb.ssjlai.com/web/',
test: 'http://zfb.ssjlai.com/web/',


+ 2
- 2
src/views/gps-card-frontend/device-setting/index.vue View File

@@ -177,9 +177,9 @@ export default {
APICore.getDrownConfig({imei: this.imei}).then(res => {
let data = res.data.data;
if(data) {
this.settingItems[4].text = this.concatTitle('危险区域监测', data.enabled === 1 ? '打开': '关闭', data.enabled === 1 ? '耗电高' : '耗电低');
this.settingItems[4].text = this.concatTitle('危险区域监测', data.config.enabled === 1 ? '打开': '关闭', data.config.enabled === 1 ? '耗电高' : '耗电低');
this.settingItems[4].data = [
{ name: '涉水监测:', value: data.enabled === 1 ? '打开': '关闭' },
{ name: '涉水监测:', value: data.config.enabled === 1 ? '打开': '关闭' },
{ name: '检测周期:', value: data.config.intervallvl1 + data.config.intervallvl2 + '分钟' },
{ name: '告警阈值:', value: data.config.warningdistance + '米' },
{ name: '涉水停留告警间隔:', value: (data.config.distancelvl2 / 60) + '分钟' },


Loading…
Cancel
Save