Merge branch 'develop'

src/views/gps-card-frontend/device-setting/index.vue

@@ -179,7 +179,7 @@ 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.config.enabled === 1 ? '打开': '关闭' },
                     { name: '检测周期:', value: data.config.intervallvl1 + data.config.intervallvl2 + '分钟' },