Browse Source

fix

- 设备功耗查看
    - 修复 监护角色数据解析错误导致相关页面显示错误的问
test
chenJinxu 1 year ago
parent
commit
3cc34f40fe
4 changed files with 111 additions and 20196 deletions
  1. +7
    -1
      README.md
  2. +100
    -20188
      package-lock.json
  3. +1
    -1
      src/config/models.js
  4. +3
    -6
      src/views/gps-card-frontend/device-setting/index.vue

+ 7
- 1
README.md View File

@@ -796,4 +796,10 @@ fix
- 周报列表 - 周报列表
- 优化 列表显示 - 优化 列表显示
- 周报详情 - 周报详情
- 增加 对比比例显示
- 增加 对比比例显示

## v1.0.100
`2023.11.10`
fix
- 设备功耗查看
- 修复 监护角色数据解析错误导致相关页面显示错误的问题

+ 100
- 20188
package-lock.json
File diff suppressed because it is too large
View File


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

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


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

@@ -99,7 +99,7 @@ export default {
// 获取设备场景模式参数 // 获取设备场景模式参数
getWatchConfig() { getWatchConfig() {
APICore.getWatchConfig({imei: this.imei}).then(res => { APICore.getWatchConfig({imei: this.imei}).then(res => {
let data = res.data;
let data = res.data.data;
if(data) { if(data) {
const modeId = data.modeId; const modeId = data.modeId;
const roleId = data.roleId; const roleId = data.roleId;
@@ -108,8 +108,8 @@ export default {
this.settingItems[0].text = `监护角色(${roleId === 1 ? '学生' : '老人'})`; this.settingItems[0].text = `监护角色(${roleId === 1 ? '学生' : '老人'})`;
this.settingItems[1].text = `场景模式(${this.getModeById(modeId)})`; this.settingItems[1].text = `场景模式(${this.getModeById(modeId)})`;
} else { } else {
this.settingItems[0].text = `监护角色(学生)`;
this.settingItems[1].text = `场景模式(无)`;
this.settingItems[0].text = `监护角色(无数据)`;
this.settingItems[1].text = `场景模式(无数据)`;
/* this.modeId = 1; /* this.modeId = 1;
this.roleId = 1; */ this.roleId = 1; */
} }
@@ -133,7 +133,6 @@ export default {
getIotCtlMode() { getIotCtlMode() {
APICore.getIotCtlMode(this.imei).then(res => { APICore.getIotCtlMode(this.imei).then(res => {
let data = res.data.data; let data = res.data.data;
console.log("data", data);
if(data) { if(data) {
this.checked = data.mode === 1; this.checked = data.mode === 1;
this.settingItems[2].text = this.concatTitle('加强省电模式', data.mode === 1 ? '打开' : '关闭', data.mode === 1 ? '耗电高' : '耗电低'); this.settingItems[2].text = this.concatTitle('加强省电模式', data.mode === 1 ? '打开' : '关闭', data.mode === 1 ? '耗电高' : '耗电低');
@@ -149,7 +148,6 @@ export default {
getLocationConfig() { getLocationConfig() {
APICore.getLocationConfig({imei: this.imei}).then(res => { APICore.getLocationConfig({imei: this.imei}).then(res => {
let data = res.data.data; let data = res.data.data;
console.log(data);
if(data) { if(data) {
this.settingItems[3].text = this.concatTitle('定位监测', data.enabled === 1 ? '打开': '关闭', data.enabled === 1 ? '耗电高' : '耗电低'); this.settingItems[3].text = this.concatTitle('定位监测', data.enabled === 1 ? '打开': '关闭', data.enabled === 1 ? '耗电高' : '耗电低');
this.settingItems[3].data = [ this.settingItems[3].data = [
@@ -367,7 +365,6 @@ export default {
}, },
// 点击左边树形图 // 点击左边树形图
onCkickNav(value) { onCkickNav(value) {
console.log("value", value);
this.active = value; this.active = value;
this.$store.commit('active', value); this.$store.commit('active', value);
switch(value) { switch(value) {


Loading…
Cancel
Save