From b6f0fbd68c5eef78bb8004a579fea4cee8b2dbaf Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期二, 03 十二月 2019 15:13:01 +0800
Subject: [PATCH] 首页添加告警信息
---
platforms/android/app/src/main/assets/www/pages/main/main.js | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/platforms/android/app/src/main/assets/www/pages/main/main.js b/platforms/android/app/src/main/assets/www/pages/main/main.js
index 8c50e37..77584ea 100644
--- a/platforms/android/app/src/main/assets/www/pages/main/main.js
+++ b/platforms/android/app/src/main/assets/www/pages/main/main.js
@@ -198,10 +198,12 @@
cmd_type: 0,
data: [{
num: 1,
- BattGroupName: '鐢垫睜缁�1',
+ note: '鐢垫睜缁�1',
MonNum: 1,
alm_start_time: '2019-12-3 00:00:00',
- alm_id: 2,
+ alm_id: 119001,
+ alm_signal_id: 2,
+ alm_value: 39.7,
page: {
PageAll: 40
}
@@ -214,8 +216,23 @@
setAlarmInfo: function setAlarmInfo(res) {
// 璁剧疆瀹炴椂鍛婅淇℃伅
if (res.code == 1) {
+ var page = this.tbls.warning.page;
// 璁剧疆鏁版嵁
- this.tbls.warning.data = res.data;
+ var data = [];
+ for (var i = 0; i < res.data.length; i++) {
+ var _data = res.data[i];
+ var tmp = {};
+ var number = i + 1 + (page.PageCurr - 1) * page.PageSize;
+ tmp.number = number; // 缂栧彿
+ tmp.note = _data.note; // 鐢垫睜缁勫悕绉�
+ tmp.alm_name = getTextByVal(_data.alm_id, battAlarmTypes); // 鍛婅鍚嶇О
+ tmp.alm_type = getTextByVal(_data.alm_signal_id, almSignalId); // 鍛婅绫诲瀷
+ tmp.MonNum = _data.MonNum; // 鍗曚綋缂栧彿
+ tmp.alm_value = _data.alm_value + getTextByUnit(_data.alm_id, battAlarmTypes); // 鍛婅鍊�
+ tmp.alm_start_time = _data.alm_start_time; // 鍛婅寮�濮嬫椂闂�
+ data.push(tmp);
+ }
+ this.tbls.warning.data = data;
// 璁剧疆鍒嗛〉
this.tbls.warning.page.PageAll = res.data[res.data.length - 1].page.PageAll;
} else {
@@ -224,11 +241,11 @@
// 璁剧疆鍒嗛〉
this.tbls.warning.page.PageAll = 0;
}
- console.log(res);
+ //console.log(res);
},
// 璁剧疆褰撳墠椤�
warningCurrentChange: function warningCurrentChange(curr) {
- this.tbls.warning.PageCurr = curr;
+ this.tbls.warning.page.PageCurr = curr;
// 鏌ヨ鐢垫睜鍛婅淇℃伅
this.startSearchAlarmInfo();
},
@@ -250,10 +267,17 @@
},
reload: true
});
+ },
+ setTblsHt: function setTblsHt() {
+ var totalHt = this.$refs.main.offsetHeight;
+ this.tbls.warning.height = totalHt - 168;
+ this.tbls.charge.height = totalHt - 136;
+ this.tbls.discharge.height = totalHt - 136;
}
},
mounted: function mounted() {
var self = this;
+ this.setTblsHt();
// 鏌ヨ鏀剧數淇℃伅
this.startReadBattDiscInfo();
--
Gitblit v1.9.1