From b6f0fbd68c5eef78bb8004a579fea4cee8b2dbaf Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期二, 03 十二月 2019 15:13:01 +0800
Subject: [PATCH] 首页添加告警信息
---
www/js/common_functions.js | 63 ++++++++
www/pages/main/main.html | 93 +++++++-----
platforms/android/app/src/main/assets/www/js/common_functions.js | 63 ++++++++
www/pages/main/main.js | 34 ++++
platforms/android/app/src/main/assets/www/pages/main/main.html | 93 +++++++-----
platforms/android/app/src/main/assets/www/index.html | 2
platforms/android/app/src/main/assets/www/pages/main/main.js | 34 ++++
www/index.html | 2
8 files changed, 288 insertions(+), 96 deletions(-)
diff --git a/platforms/android/app/src/main/assets/www/index.html b/platforms/android/app/src/main/assets/www/index.html
index ce0a01b..520d473 100644
--- a/platforms/android/app/src/main/assets/www/index.html
+++ b/platforms/android/app/src/main/assets/www/index.html
@@ -20,7 +20,7 @@
<link rel="stylesheet" href="css/common.css">
<script src="js/zepto.js"></script>
<script src="js/bui.js"></script>
- <script src="js/common_functions.js"></script>
+ <script src="js/common_functions.js?1a05af30a1"></script>
<script src="js/vue.min.js"></script>
<script src="css/element-ui/index.js?3aa0e315ae"></script>
<script src="js/componets.js?ec02efd5f7"></script>
diff --git a/platforms/android/app/src/main/assets/www/js/common_functions.js b/platforms/android/app/src/main/assets/www/js/common_functions.js
index 5d12c52..a811c20 100644
--- a/platforms/android/app/src/main/assets/www/js/common_functions.js
+++ b/platforms/android/app/src/main/assets/www/js/common_functions.js
@@ -305,4 +305,65 @@
for (var k in o) {
if (new RegExp("(" + k + ")").test(format)) format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
}return format;
-};
\ No newline at end of file
+};
+
+// 鐢垫睜鍛婅鍚嶇О
+var battAlarmTypes = [{
+ value: 119001,
+ text: '缁勭鐢靛帇鍛婅',
+ unit: "V"
+}, {
+ value: 119002,
+ text: '鐢垫睜鐢垫祦鍛婅',
+ unit: "A"
+}, {
+ value: 119003,
+ text: '鍗曚綋鐢靛帇鍛婅',
+ unit: 'V'
+}, {
+ value: 119004,
+ text: '鍗曚綋娓╁害鍛婅',
+ unit: '鈩�'
+}, {
+ value: 119005,
+ text: '鍗曚綋鍐呴樆鍛婅',
+ unit: 'm惟'
+}];
+
+// 鐢垫睜鍛婅绫诲瀷
+var almSignalId = [{
+ value: 0,
+ text: '鏃犲憡璀�'
+}, {
+ value: 1,
+ text: '涓嬮檺鍛婅'
+}, {
+ value: 2,
+ text: '涓婇檺鍛婅'
+}];
+
+// 鏍规嵁value鐨勫�艰幏鍙栨枃鏈��
+function getTextByVal(value, list) {
+ var rs = "鏈煡";
+ // 閬嶅巻list
+ for (var i = 0; i < list.length; i++) {
+ var _list = list[i];
+ if (_list.value == value) {
+ rs = _list.text;
+ }
+ }
+ return rs;
+}
+
+// 鏍规嵁value鐨勫�艰幏鍙栧崟浣�
+function getTextByUnit(value, list) {
+ var rs = "";
+ // 閬嶅巻list
+ for (var i = 0; i < list.length; i++) {
+ var _list = list[i];
+ if (_list.value == value && _list.unit) {
+ rs = _list.unit;
+ }
+ }
+ return rs;
+}
\ No newline at end of file
diff --git a/platforms/android/app/src/main/assets/www/pages/main/main.html b/platforms/android/app/src/main/assets/www/pages/main/main.html
index d6f4d13..069aa1c 100644
--- a/platforms/android/app/src/main/assets/www/pages/main/main.html
+++ b/platforms/android/app/src/main/assets/www/pages/main/main.html
@@ -1,6 +1,6 @@
<div class="bui-page">
- <main>
+ <main ref="main">
<div class="tab-menus">
<div class="bui-box">
<div class="span1">
@@ -77,54 +77,65 @@
</div>
<div class="tab-item" style="display:none" v-show="tabs.active == 'warning'">
<div class="tab-item-name">{{tbls.warning.name}}</div>
- <el-table stripe border size="mini" header-row-class-name="header-primary" :height="tbls.warning.height" :data="tbls.warning.data">
- <el-table-column prop="num" align="center" align="center" label="鐢垫睜缁勭紪鍙�">
- </el-table-column>
- <el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
- </el-table-column>
- <el-table-column prop="alm_id" align="center" label="鍛婅鍚嶇О">
- </el-table-column>
- <el-table-column prop="MonNum" align="center" label="鍗曚綋缂栧彿">
- </el-table-column>
- <el-table-column prop="alm_start_time" align="center" align="center" label="鍛婅寮�濮嬫椂闂�">
- </el-table-column>
- </el-table>
+ <div :style="{height:tbls.warning.height+'px'}">
+ <el-table stripe border height="100%" size="mini" header-row-class-name="header-primary" :data="tbls.warning.data">
+ <el-table-column prop="number" align="center" align="center" label="鐢垫睜缁勭紪鍙�">
+ </el-table-column>
+ <el-table-column prop="note" align="center" label="鐢垫睜缁勫悕绉�">
+ </el-table-column>
+ <el-table-column prop="alm_name" align="center" label="鍛婅鍚嶇О">
+ </el-table-column>
+ <el-table-column prop="alm_type" align="center" label="鍛婅绫诲瀷">
+ </el-table-column>
+ <el-table-column prop="MonNum" align="center" label="鍗曚綋缂栧彿">
+ </el-table-column>
+ <el-table-column prop="alm_value" align="center" label="鍛婅鍊�">
+ </el-table-column>
+ <el-table-column prop="alm_start_time" align="center" align="center" label="鍛婅寮�濮嬫椂闂�">
+ </el-table-column>
+ </el-table>
+ </div>
<el-pagination large style="text-align:center" background layout="prev, pager, next" :total="tbls.warning.page.PageAll" @current-change="warningCurrentChange">
</el-pagination>
</div>
<div class="tab-item" style="display:none" v-show="tabs.active == 'charge'">
<div class="tab-item-name">{{tbls.charge.name}}</div>
- <el-table border stripe size="mini" header-row-class-name="header-primary" :height="tbls.charge.height" :data="tbls.charge.data">
- <el-table-column prop="num" align="center" label="鐢垫睜缁勭紪鍙�">
- </el-table-column>
- <el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
- </el-table-column>
- <el-table-column prop="testStartTime" align="center" label="娴嬭瘯寮�濮嬫椂闂�">
- </el-table-column>
- <el-table-column prop="testTimelong" align="center" label="娴嬭瘯鏃堕暱">
- </el-table-column>
- <el-table-column prop="groupvol" align="center" label="缁勭鐢靛帇锛圴锛�">
- </el-table-column>
- <el-table-column prop="groupvol" align="center" label="缁勭鐢垫祦锛圓锛�">
- </el-table-column>
- </el-table>
+ <div :style="{height:tbls.charge.height+'px'}">
+ <el-table border stripe size="mini" header-row-class-name="header-primary" :data="tbls.charge.data">
+ <el-table-column prop="num" align="center" label="鐢垫睜缁勭紪鍙�">
+ </el-table-column>
+ <el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
+ </el-table-column>
+ <el-table-column prop="testStartTime" align="center" label="娴嬭瘯寮�濮嬫椂闂�">
+ </el-table-column>
+ <el-table-column prop="testTimelong" align="center" label="娴嬭瘯鏃堕暱">
+ </el-table-column>
+ <el-table-column prop="groupvol" align="center" label="缁勭鐢靛帇锛圴锛�">
+ </el-table-column>
+ <el-table-column prop="groupvol" align="center" label="缁勭鐢垫祦锛圓锛�">
+ </el-table-column>
+ </el-table>
+ </div>
+
</div>
<div class="tab-item" style="display:none" v-show="tabs.active == 'discharge'">
<div class="tab-item-name">{{tbls.discharge.name}}</div>
- <el-table border stripe size="mini" header-row-class-name="header-primary" :height="tbls.discharge.height" :data="tbls.discharge.data">
- <el-table-column prop="num" align="center" label="鐢垫睜缁勭紪鍙�">
- </el-table-column>
- <el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
- </el-table-column>
- <el-table-column prop="testStartTime" align="center" label="娴嬭瘯寮�濮嬫椂闂�">
- </el-table-column>
- <el-table-column prop="testTimelong" align="center" label="娴嬭瘯鏃堕暱">
- </el-table-column>
- <el-table-column prop="groupvol" align="center" label="缁勭鐢靛帇锛圴锛�">
- </el-table-column>
- <el-table-column prop="groupcurr" header-align="center" align="center" label="缁勭鐢垫祦锛圓锛�">
- </el-table-column>
- </el-table>
+ <div :style="{height:tbls.discharge.height+'px'}">
+ <el-table border stripe size="mini" header-row-class-name="header-primary" :data="tbls.discharge.data">
+ <el-table-column prop="num" align="center" label="鐢垫睜缁勭紪鍙�">
+ </el-table-column>
+ <el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
+ </el-table-column>
+ <el-table-column prop="testStartTime" align="center" label="娴嬭瘯寮�濮嬫椂闂�">
+ </el-table-column>
+ <el-table-column prop="testTimelong" align="center" label="娴嬭瘯鏃堕暱">
+ </el-table-column>
+ <el-table-column prop="groupvol" align="center" label="缁勭鐢靛帇锛圴锛�">
+ </el-table-column>
+ <el-table-column prop="groupcurr" header-align="center" align="center" label="缁勭鐢垫祦锛圓锛�">
+ </el-table-column>
+ </el-table>
+ </div>
</div>
</div>
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();
diff --git a/www/index.html b/www/index.html
index ce0a01b..520d473 100644
--- a/www/index.html
+++ b/www/index.html
@@ -20,7 +20,7 @@
<link rel="stylesheet" href="css/common.css">
<script src="js/zepto.js"></script>
<script src="js/bui.js"></script>
- <script src="js/common_functions.js"></script>
+ <script src="js/common_functions.js?1a05af30a1"></script>
<script src="js/vue.min.js"></script>
<script src="css/element-ui/index.js?3aa0e315ae"></script>
<script src="js/componets.js?ec02efd5f7"></script>
diff --git a/www/js/common_functions.js b/www/js/common_functions.js
index 5d12c52..a811c20 100644
--- a/www/js/common_functions.js
+++ b/www/js/common_functions.js
@@ -305,4 +305,65 @@
for (var k in o) {
if (new RegExp("(" + k + ")").test(format)) format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
}return format;
-};
\ No newline at end of file
+};
+
+// 鐢垫睜鍛婅鍚嶇О
+var battAlarmTypes = [{
+ value: 119001,
+ text: '缁勭鐢靛帇鍛婅',
+ unit: "V"
+}, {
+ value: 119002,
+ text: '鐢垫睜鐢垫祦鍛婅',
+ unit: "A"
+}, {
+ value: 119003,
+ text: '鍗曚綋鐢靛帇鍛婅',
+ unit: 'V'
+}, {
+ value: 119004,
+ text: '鍗曚綋娓╁害鍛婅',
+ unit: '鈩�'
+}, {
+ value: 119005,
+ text: '鍗曚綋鍐呴樆鍛婅',
+ unit: 'm惟'
+}];
+
+// 鐢垫睜鍛婅绫诲瀷
+var almSignalId = [{
+ value: 0,
+ text: '鏃犲憡璀�'
+}, {
+ value: 1,
+ text: '涓嬮檺鍛婅'
+}, {
+ value: 2,
+ text: '涓婇檺鍛婅'
+}];
+
+// 鏍规嵁value鐨勫�艰幏鍙栨枃鏈��
+function getTextByVal(value, list) {
+ var rs = "鏈煡";
+ // 閬嶅巻list
+ for (var i = 0; i < list.length; i++) {
+ var _list = list[i];
+ if (_list.value == value) {
+ rs = _list.text;
+ }
+ }
+ return rs;
+}
+
+// 鏍规嵁value鐨勫�艰幏鍙栧崟浣�
+function getTextByUnit(value, list) {
+ var rs = "";
+ // 閬嶅巻list
+ for (var i = 0; i < list.length; i++) {
+ var _list = list[i];
+ if (_list.value == value && _list.unit) {
+ rs = _list.unit;
+ }
+ }
+ return rs;
+}
\ No newline at end of file
diff --git a/www/pages/main/main.html b/www/pages/main/main.html
index d6f4d13..069aa1c 100644
--- a/www/pages/main/main.html
+++ b/www/pages/main/main.html
@@ -1,6 +1,6 @@
<div class="bui-page">
- <main>
+ <main ref="main">
<div class="tab-menus">
<div class="bui-box">
<div class="span1">
@@ -77,54 +77,65 @@
</div>
<div class="tab-item" style="display:none" v-show="tabs.active == 'warning'">
<div class="tab-item-name">{{tbls.warning.name}}</div>
- <el-table stripe border size="mini" header-row-class-name="header-primary" :height="tbls.warning.height" :data="tbls.warning.data">
- <el-table-column prop="num" align="center" align="center" label="鐢垫睜缁勭紪鍙�">
- </el-table-column>
- <el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
- </el-table-column>
- <el-table-column prop="alm_id" align="center" label="鍛婅鍚嶇О">
- </el-table-column>
- <el-table-column prop="MonNum" align="center" label="鍗曚綋缂栧彿">
- </el-table-column>
- <el-table-column prop="alm_start_time" align="center" align="center" label="鍛婅寮�濮嬫椂闂�">
- </el-table-column>
- </el-table>
+ <div :style="{height:tbls.warning.height+'px'}">
+ <el-table stripe border height="100%" size="mini" header-row-class-name="header-primary" :data="tbls.warning.data">
+ <el-table-column prop="number" align="center" align="center" label="鐢垫睜缁勭紪鍙�">
+ </el-table-column>
+ <el-table-column prop="note" align="center" label="鐢垫睜缁勫悕绉�">
+ </el-table-column>
+ <el-table-column prop="alm_name" align="center" label="鍛婅鍚嶇О">
+ </el-table-column>
+ <el-table-column prop="alm_type" align="center" label="鍛婅绫诲瀷">
+ </el-table-column>
+ <el-table-column prop="MonNum" align="center" label="鍗曚綋缂栧彿">
+ </el-table-column>
+ <el-table-column prop="alm_value" align="center" label="鍛婅鍊�">
+ </el-table-column>
+ <el-table-column prop="alm_start_time" align="center" align="center" label="鍛婅寮�濮嬫椂闂�">
+ </el-table-column>
+ </el-table>
+ </div>
<el-pagination large style="text-align:center" background layout="prev, pager, next" :total="tbls.warning.page.PageAll" @current-change="warningCurrentChange">
</el-pagination>
</div>
<div class="tab-item" style="display:none" v-show="tabs.active == 'charge'">
<div class="tab-item-name">{{tbls.charge.name}}</div>
- <el-table border stripe size="mini" header-row-class-name="header-primary" :height="tbls.charge.height" :data="tbls.charge.data">
- <el-table-column prop="num" align="center" label="鐢垫睜缁勭紪鍙�">
- </el-table-column>
- <el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
- </el-table-column>
- <el-table-column prop="testStartTime" align="center" label="娴嬭瘯寮�濮嬫椂闂�">
- </el-table-column>
- <el-table-column prop="testTimelong" align="center" label="娴嬭瘯鏃堕暱">
- </el-table-column>
- <el-table-column prop="groupvol" align="center" label="缁勭鐢靛帇锛圴锛�">
- </el-table-column>
- <el-table-column prop="groupvol" align="center" label="缁勭鐢垫祦锛圓锛�">
- </el-table-column>
- </el-table>
+ <div :style="{height:tbls.charge.height+'px'}">
+ <el-table border stripe size="mini" header-row-class-name="header-primary" :data="tbls.charge.data">
+ <el-table-column prop="num" align="center" label="鐢垫睜缁勭紪鍙�">
+ </el-table-column>
+ <el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
+ </el-table-column>
+ <el-table-column prop="testStartTime" align="center" label="娴嬭瘯寮�濮嬫椂闂�">
+ </el-table-column>
+ <el-table-column prop="testTimelong" align="center" label="娴嬭瘯鏃堕暱">
+ </el-table-column>
+ <el-table-column prop="groupvol" align="center" label="缁勭鐢靛帇锛圴锛�">
+ </el-table-column>
+ <el-table-column prop="groupvol" align="center" label="缁勭鐢垫祦锛圓锛�">
+ </el-table-column>
+ </el-table>
+ </div>
+
</div>
<div class="tab-item" style="display:none" v-show="tabs.active == 'discharge'">
<div class="tab-item-name">{{tbls.discharge.name}}</div>
- <el-table border stripe size="mini" header-row-class-name="header-primary" :height="tbls.discharge.height" :data="tbls.discharge.data">
- <el-table-column prop="num" align="center" label="鐢垫睜缁勭紪鍙�">
- </el-table-column>
- <el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
- </el-table-column>
- <el-table-column prop="testStartTime" align="center" label="娴嬭瘯寮�濮嬫椂闂�">
- </el-table-column>
- <el-table-column prop="testTimelong" align="center" label="娴嬭瘯鏃堕暱">
- </el-table-column>
- <el-table-column prop="groupvol" align="center" label="缁勭鐢靛帇锛圴锛�">
- </el-table-column>
- <el-table-column prop="groupcurr" header-align="center" align="center" label="缁勭鐢垫祦锛圓锛�">
- </el-table-column>
- </el-table>
+ <div :style="{height:tbls.discharge.height+'px'}">
+ <el-table border stripe size="mini" header-row-class-name="header-primary" :data="tbls.discharge.data">
+ <el-table-column prop="num" align="center" label="鐢垫睜缁勭紪鍙�">
+ </el-table-column>
+ <el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
+ </el-table-column>
+ <el-table-column prop="testStartTime" align="center" label="娴嬭瘯寮�濮嬫椂闂�">
+ </el-table-column>
+ <el-table-column prop="testTimelong" align="center" label="娴嬭瘯鏃堕暱">
+ </el-table-column>
+ <el-table-column prop="groupvol" align="center" label="缁勭鐢靛帇锛圴锛�">
+ </el-table-column>
+ <el-table-column prop="groupcurr" header-align="center" align="center" label="缁勭鐢垫祦锛圓锛�">
+ </el-table-column>
+ </el-table>
+ </div>
</div>
</div>
diff --git a/www/pages/main/main.js b/www/pages/main/main.js
index 8c50e37..77584ea 100644
--- a/www/pages/main/main.js
+++ b/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