From 3c8b17e39ec7a92401f17e4d0054c924712e6536 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 03 十二月 2019 13:47:54 +0800
Subject: [PATCH] Merge branch 'FBS9600' of http://whyclxw@118.89.139.230:10101/r/FBS9600App.git into FBS9600
---
www/pages/main/main.html | 14 ++++---
www/pages/main/main.js | 38 ++++++++++++++++++-
platforms/android/app/src/main/assets/www/index.js | 2
www/index.js | 2
platforms/android/app/src/main/assets/www/pages/main/main.html | 14 ++++---
platforms/android/app/src/main/assets/www/index.html | 4 +-
platforms/android/app/src/main/assets/www/pages/main/main.js | 38 ++++++++++++++++++-
www/index.html | 4 +-
8 files changed, 94 insertions(+), 22 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..7039eb0 100644
--- a/platforms/android/app/src/main/assets/www/index.html
+++ b/platforms/android/app/src/main/assets/www/index.html
@@ -22,14 +22,14 @@
<script src="js/bui.js"></script>
<script src="js/common_functions.js"></script>
<script src="js/vue.min.js"></script>
- <script src="css/element-ui/index.js?3aa0e315ae"></script>
+ <script src="css/element-ui/index.js?5b3f4281e8"></script>
<script src="js/componets.js?ec02efd5f7"></script>
<script src="css/highchart/highcharts.js"></script>
<script src="js/hammer.min.js"></script>
<script src="js/vue-touch.js"></script>
<script src="js/vconsole.min.js"></script>
- <script src="index.js?3aa0e315ae"></script>
+ <script src="index.js?5b3f4281e8"></script>
</body>
</html>
\ No newline at end of file
diff --git a/platforms/android/app/src/main/assets/www/index.js b/platforms/android/app/src/main/assets/www/index.js
index d453e0e..2d857a8 100644
--- a/platforms/android/app/src/main/assets/www/index.js
+++ b/platforms/android/app/src/main/assets/www/index.js
@@ -1,7 +1,7 @@
"use strict";
window.router = bui.router();
-new VConsole();
+//new VConsole();
bui.ready(function () {
// 鍒濆鍖栬矾鐢�
router.init({
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 89b61f4..d6f4d13 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
@@ -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>
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 3795647..67ed2bd 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
@@ -182,23 +182,54 @@
searchAlarmInfo: function searchAlarmInfo() {
// 鏌ヨ瀹炴椂鍛婅淇℃伅
var self = this;
- var page = this.warning.page;
+ var page = this.tbls.warning.page;
// 鏋勯�犳煡璇㈡潯浠�
var searchParams = {
alm_cleared_type: 0,
page: page
};
// 鍒ゆ柇鏄惁涓烘墜鏈虹
- if (typeof Battalram_dataService == "undefined") {
+ if (typeof Battalram_dataService != "undefined") {
Battalram_dataService.serchByCondition(JSON.stringify(searchParams));
} else {
+ this.setAlarmInfo({
+ code: 1,
+ cmd_type: 0,
+ data: [{
+ num: 1,
+ BattGroupName: '鐢垫睜缁�1',
+ MonNum: 1,
+ alm_start_time: '2019-12-3 00:00:00',
+ alm_id: 2,
+ page: {
+ PageAll: 40
+ }
+ }]
+ });
// 寮�鍚鏃跺櫒
this.tbls.charge.timer.open();
}
},
setAlarmInfo: function setAlarmInfo(res) {
// 璁剧疆瀹炴椂鍛婅淇℃伅
+ if (res.code == 1) {
+ // 璁剧疆鏁版嵁
+ this.tbls.warning.data = res.data;
+ // 璁剧疆鍒嗛〉
+ this.tbls.warning.page.PageAll = res.data[res.data.length - 1].page.PageAll;
+ } else {
+ // 璁剧疆鏁版嵁
+ this.tbls.warning.data = [];
+ // 璁剧疆鍒嗛〉
+ this.tbls.warning.page.PageAll = 0;
+ }
console.log(res);
+ },
+ // 璁剧疆褰撳墠椤�
+ warningCurrentChange: function warningCurrentChange(curr) {
+ this.tbls.warning.PageCurr = curr;
+ // 鏌ヨ鐢垫睜鍛婅淇℃伅
+ this.startSearchAlarmInfo();
},
routerTo: function routerTo(path) {
var routes = this.routes;
@@ -229,6 +260,9 @@
// 鏌ヨ鍏呯數娴嬭瘯淇℃伅
this.startReadBattCharInfo();
+ // 鏌ヨ鍛婅
+ this.startSearchAlarmInfo();
+
// 鍚庡彴瑙﹀彂浜嬩欢鏌ヨ鎵�鏈夌殑鐢垫睜缁勬斁鐢典俊鎭�
window['DeviceServicereadBattDiscInfocalljs'] = function (res) {
// 璁剧疆鐢垫睜淇℃伅
diff --git a/www/index.html b/www/index.html
index ce0a01b..7039eb0 100644
--- a/www/index.html
+++ b/www/index.html
@@ -22,14 +22,14 @@
<script src="js/bui.js"></script>
<script src="js/common_functions.js"></script>
<script src="js/vue.min.js"></script>
- <script src="css/element-ui/index.js?3aa0e315ae"></script>
+ <script src="css/element-ui/index.js?5b3f4281e8"></script>
<script src="js/componets.js?ec02efd5f7"></script>
<script src="css/highchart/highcharts.js"></script>
<script src="js/hammer.min.js"></script>
<script src="js/vue-touch.js"></script>
<script src="js/vconsole.min.js"></script>
- <script src="index.js?3aa0e315ae"></script>
+ <script src="index.js?5b3f4281e8"></script>
</body>
</html>
\ No newline at end of file
diff --git a/www/index.js b/www/index.js
index d453e0e..2d857a8 100644
--- a/www/index.js
+++ b/www/index.js
@@ -1,7 +1,7 @@
"use strict";
window.router = bui.router();
-new VConsole();
+//new VConsole();
bui.ready(function () {
// 鍒濆鍖栬矾鐢�
router.init({
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>
diff --git a/www/pages/main/main.js b/www/pages/main/main.js
index 3795647..67ed2bd 100644
--- a/www/pages/main/main.js
+++ b/www/pages/main/main.js
@@ -182,23 +182,54 @@
searchAlarmInfo: function searchAlarmInfo() {
// 鏌ヨ瀹炴椂鍛婅淇℃伅
var self = this;
- var page = this.warning.page;
+ var page = this.tbls.warning.page;
// 鏋勯�犳煡璇㈡潯浠�
var searchParams = {
alm_cleared_type: 0,
page: page
};
// 鍒ゆ柇鏄惁涓烘墜鏈虹
- if (typeof Battalram_dataService == "undefined") {
+ if (typeof Battalram_dataService != "undefined") {
Battalram_dataService.serchByCondition(JSON.stringify(searchParams));
} else {
+ this.setAlarmInfo({
+ code: 1,
+ cmd_type: 0,
+ data: [{
+ num: 1,
+ BattGroupName: '鐢垫睜缁�1',
+ MonNum: 1,
+ alm_start_time: '2019-12-3 00:00:00',
+ alm_id: 2,
+ page: {
+ PageAll: 40
+ }
+ }]
+ });
// 寮�鍚鏃跺櫒
this.tbls.charge.timer.open();
}
},
setAlarmInfo: function setAlarmInfo(res) {
// 璁剧疆瀹炴椂鍛婅淇℃伅
+ if (res.code == 1) {
+ // 璁剧疆鏁版嵁
+ this.tbls.warning.data = res.data;
+ // 璁剧疆鍒嗛〉
+ this.tbls.warning.page.PageAll = res.data[res.data.length - 1].page.PageAll;
+ } else {
+ // 璁剧疆鏁版嵁
+ this.tbls.warning.data = [];
+ // 璁剧疆鍒嗛〉
+ this.tbls.warning.page.PageAll = 0;
+ }
console.log(res);
+ },
+ // 璁剧疆褰撳墠椤�
+ warningCurrentChange: function warningCurrentChange(curr) {
+ this.tbls.warning.PageCurr = curr;
+ // 鏌ヨ鐢垫睜鍛婅淇℃伅
+ this.startSearchAlarmInfo();
},
routerTo: function routerTo(path) {
var routes = this.routes;
@@ -229,6 +260,9 @@
// 鏌ヨ鍏呯數娴嬭瘯淇℃伅
this.startReadBattCharInfo();
+ // 鏌ヨ鍛婅
+ this.startSearchAlarmInfo();
+
// 鍚庡彴瑙﹀彂浜嬩欢鏌ヨ鎵�鏈夌殑鐢垫睜缁勬斁鐢典俊鎭�
window['DeviceServicereadBattDiscInfocalljs'] = function (res) {
// 璁剧疆鐢垫睜淇℃伅
--
Gitblit v1.9.1