From 48f57387ca095ac5981a3083e72b68bb42609b09 Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期二, 03 十二月 2019 13:40:00 +0800
Subject: [PATCH] 添加实时告警

---
 www/pages/main/main.html |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/www/pages/main/main.html b/www/pages/main/main.html
index 89b61f4..d6f4d13 100644
--- a/www/pages/main/main.html
+++ b/www/pages/main/main.html
@@ -23,7 +23,7 @@
 								<i class="iconfont icon-jinggao"></i>
 							</div>
 							<div class="tab-menu-fr">
-								<h3 class="item-title center" v-text="tabs.warning">0</h3>
+								<h3 class="item-title center" v-text="tbls.warning.page.PageAll">0</h3>
 								<p class="item-text">鍛婅涓�</p>
 							</div>
 						</div>
@@ -78,17 +78,19 @@
 			<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" header-align="center" label="鐢垫睜缁勭紪鍙�">
+					<el-table-column prop="num" align="center" align="center" label="鐢垫睜缁勭紪鍙�">
 					</el-table-column>
-					<el-table-column prop="BattGroupName" header-align="center" label="鐢垫睜缁勫悕绉�">
+					<el-table-column prop="BattGroupName" align="center" label="鐢垫睜缁勫悕绉�">
 					</el-table-column>
-					<el-table-column prop="WarningName" header-align="center" label="鍛婅鍚嶇О">
+					<el-table-column prop="alm_id" align="center" label="鍛婅鍚嶇О">
 					</el-table-column>
-					<el-table-column prop="monNum" header-align="center" label="鍗曚綋缂栧彿">
+					<el-table-column prop="MonNum" align="center" label="鍗曚綋缂栧彿">
 					</el-table-column>
-					<el-table-column prop="warningStartTime" header-align="center" label="鍛婅寮�濮嬫椂闂�">
+					<el-table-column prop="alm_start_time" align="center" align="center" label="鍛婅寮�濮嬫椂闂�">
 					</el-table-column>
 				</el-table>
+				<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>

--
Gitblit v1.9.1