From 0600f47f23f2a8971e590bec88ee92f8fb5792bf Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期一, 09 九月 2019 09:48:35 +0800
Subject: [PATCH] 修改内容
---
dist/js/components.js | 5
dist/pages/main/main.js | 33 ++
src/pages/battery/batteryInfo.js | 134 +++++++++++
dist/pages/main/main.html | 41 --
dist/index.html | 6
src/css/commons.css | 100 +++++++
src/pages/battery/battery.js | 2
src/pages/warn/warn.html | 6
src/pages/system/system.js | 0
dist/pages/battery/batteryInfo.js | 132 ++++++++++
dist/pages/warn/warn.html | 6
dist/pages/battery/battery.js | 2
src/js/load_lazy.js | 2
dist/pages/battery/batteryInfo.html | 14
src/js/components.js | 5
src/pages/system/system.html | 17 +
src/pages/main/main.html | 55 ++--
src/pages/main/main.js | 34 ++
dist/css/commons.css | 100 +++++++
src/pages/battery/batteryInfo.html | 15
20 files changed, 604 insertions(+), 105 deletions(-)
diff --git a/dist/css/commons.css b/dist/css/commons.css
index d6db550..66e8e59 100644
--- a/dist/css/commons.css
+++ b/dist/css/commons.css
@@ -1,5 +1,5 @@
body {
- font-size: .25rem;
+ font-size: 25px;
}
#bui-router .bui-page>.main, .bui-page>main{
background-color: #e1ecfa;
@@ -51,19 +51,103 @@
background-color: #2d8cf0;
}
.bui-table th, .bui-table td {
- padding: .1rem .1rem;
+ padding: 10 15px;
border: 1px solid #CCCCCC;
}
.tbl-container-header {
- padding: .5em;
+ padding: 5px;
font-weight: bold;
color: #2d8cf0;
}
.bui-btn-small {
- padding-top: .15rem;
- padding-bottom: .15rem;
+ padding-top: 15px;
+ padding-bottom: 15px;
+}
+.bui-icon {
+ width: 88px;
+ height: 88px;
+ line-height: 88px;
+}
+.bui-list .icon {
+ width: 54px;
+ height: 54px;
+ line-height: 54px;
+}
+.bui-nav-icon .bui-btn>.bui-icon, .bui-nav-icon .bui-btn>.icon {
+ margin-bottom: 20px;
+}
+[class*=bui-btn] {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 10px;
+ padding-right: 10px;
+ line-height: 16px;
+ min-height: 24px;
+}
+[class*=bui-btn] .bui-icon {
+ font-size: 48px;
+}
+.bui-nav-icon .bui-btn i, .bui-nav-icon .bui-btn .icon, .bui-nav-icon .bui-btn [class^=bui-icon-] {
+ font-size: 64px;
+ width: 88px;
+ height: 88px;
+}
+.round {
+ border-radius: 10px;
+}
+.bui-nav-icon .bui-badges {
+ min-width: 33px;
+ min-height: 33px;
+ line-height: 33px;
+}
+[class*=bui-badges] {
+ font-size: 25px;
}
+.item-title {
+ padding-right: 10px;
+ margin-bottom: 20px;
+ font-size: 18px;
+}
+.header.bui-bar .bui-bar-main,
+.header .bui-bar .bui-bar-main,
+header.bui-bar .bui-bar-main,
+header .bui-bar .bui-bar-main {
+ font-size: 18px;
+}
+.bui-bar .bui-bar-left,
+.bui-bar .bui-bar-right {
+ width: 120px;
+ height: 50px;
+}
+.bui-bar .bui-bar-left>[class*=bui-btn] {
+ padding-left: 20px;
+}
+.bui-bar .bui-bar-left>[class*=bui-btn],
+.bui-bar .bui-bar-right>[class*=bui-btn] {
+ height: 50px;
+ line-height: 50px;
+ font-size: 27px;
+}
+.bui-bar .bui-bar-left>[class*=bui-btn]>i,
+.bui-bar .bui-bar-right>[class*=bui-btn]>i {
+ height: 50px;
+ line-height: 50px;
+ font-size: 30px;
+}
+.bui-bar [class^="icon-"] {
+ width: 44px;
+ height: 44px;
+ line-height: 44px;
+}
+.bui-loading .bui-loading-block {
+ width: 20px !important;
+ height: 20px !important;
+}
+.bui-table th,
+.bui-table td {
+ padding: 5px 5px;
+}
/* iview */
.tbl-content .ivu-table th {
background-color: #2d8cf0;
@@ -77,9 +161,9 @@
/* component style */
.bui-list-header {
- padding-top: .1rem;
- padding-bottom: .1rem;
- font-size: .34rem;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ font-size: 18px;
color: #FFFFFF;
text-align: center;
background-color: #2d8cf0;
diff --git a/dist/index.html b/dist/index.html
index 81891fa..7b5a475 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -9,7 +9,7 @@
<link rel="stylesheet" href="css/bui.css">
<link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="css/iconfont/iconfont.css">
- <link rel="stylesheet" href="css/commons.css">
+ <link rel="stylesheet" href="css/commons.css?e6bd1a7f3f">
<link rel="stylesheet" href="css/iview/styles/iview.css">
</head>
@@ -25,7 +25,7 @@
<script src="js/const_var.js"></script>
- <script src="js/common_functions.js?637da5bf0c"></script>
+ <script src="js/common_functions.js"></script>
<script src="js/vue.min.js"></script>
@@ -34,7 +34,7 @@
<script src="index.js"></script>
<script src="js/lazyload.js"></script>
- <script src="js/load_lazy.js?bce3841820"></script>
+ <script src="js/load_lazy.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/dist/js/components.js b/dist/js/components.js
index 4eab17a..4ad4289 100644
--- a/dist/js/components.js
+++ b/dist/js/components.js
@@ -325,6 +325,11 @@
};
},
+ watch: {
+ height: function height(value) {
+ this.chart.setSize(undefined, value);
+ }
+ },
methods: {
init: function init() {
var self = this;
diff --git a/dist/pages/battery/battery.js b/dist/pages/battery/battery.js
index ad4bf74..e02acc9 100644
--- a/dist/pages/battery/battery.js
+++ b/dist/pages/battery/battery.js
@@ -233,7 +233,7 @@
// 渚ц竟鏍�
this.uiSidebar = bui.sidebar({
id: "#sidebarWrap", //鑿滃崟鐨処D(蹇呴』)
- width: 500,
+ width: 400,
trigger: "#menu",
isActive: true
});
diff --git a/dist/pages/battery/batteryInfo.html b/dist/pages/battery/batteryInfo.html
index d4579df..f189f91 100644
--- a/dist/pages/battery/batteryInfo.html
+++ b/dist/pages/battery/batteryInfo.html
@@ -27,7 +27,7 @@
<td>鐢垫睜鐘舵�侊細<span v-text="getBattState"></span></td>
<td>缁勭鐢靛帇锛�<span v-text="rtState.group_vol"></span>V</td>
<td>缁勭鐢垫祦锛�<span v-text="rtState.group_curr"></span>A</td>
- <td rowspan="3" style="width:2rem">
+ <td rowspan="3" style="width:300px">
<button class="bui-btn bui-btn-small bg-primary">鍐呴樆娴嬭瘯</button>
<button class="bui-btn bui-btn-small mt8 bg-primary">瀵煎嚭鏁版嵁</button>
</td>
@@ -56,26 +56,24 @@
</ul>
</div>
- <div class="bui-tab-main">
+ <div class="bui-tab-main" ref="tabMain">
<ul>
<li>
- <iview-table height="370" style="margin-top:8px;margin-left:0;margin-right:0" :columns="tbls.monList.columns" :data="tbls.monList.data"></iview-table>
+ <iview-table :height="getTabHt()" style="margin-top:8px;margin-left:0;margin-right:0" :columns="tbls.monList.columns" :data="tbls.monList.data"></iview-table>
</li>
<li style="display:none">
<iview-table style="margin-top:8px;margin-left:0;margin-right:0" :columns="tbls.totalInfo.columns" :data="tbls.totalInfo.data"></iview-table>
</li>
<li style="display:none">
- <high-bar-chart height="370px" id="monVolBar" name="鐢靛帇" unit="V" ref="monVolBar"></high-bar-chart>
+ <high-bar-chart :height="getTabHt('px')" id="monVolBar" name="鐢靛帇" unit="V" ref="monVolBar"></high-bar-chart>
</li>
<li style="display:none">
- <high-bar-chart height="370px" id="monResBar" name="鍐呴樆" unit="m惟" ref="monResBar"></high-bar-chart>
+ <high-bar-chart :height="getTabHt('px')" id="monResBar" name="鍐呴樆" unit="m惟" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monResBar"></high-bar-chart>
</li>
<li style="display:none">
- <high-bar-chart height="370px" id="monTmpBar" name="娓╁害" unit="鈩�" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monTmpBar"></high-bar-chart>
+ <high-bar-chart :height="getTabHt('px')" id="monTmpBar" name="娓╁害" unit="鈩�" :colors="{min:'#19be6b', max: '#ed4014'}" ref="monTmpBar"></high-bar-chart>
</li>
- <li style="display:none">褰撳墠鍛婅</li>
- <li style="display:none">娴嬭瘯鏁版嵁</li>
</ul>
</div>
</div>
diff --git a/dist/pages/battery/batteryInfo.js b/dist/pages/battery/batteryInfo.js
index 4067f43..1ba0fc8 100644
--- a/dist/pages/battery/batteryInfo.js
+++ b/dist/pages/battery/batteryInfo.js
@@ -28,6 +28,9 @@
var vm = this.vm = new Vue({
el: bs.$el[0],
data: {
+ block: {
+ tabMain: 0
+ },
params: params,
title: '鏈煡',
timer: {
@@ -329,10 +332,121 @@
type: '娓╁害',
avg: '0鈩�'
}];
- if (tabsState.totalInfo.state) {
+ if (tabsState.totalInfo.state && data.length != 0) {
+ var data0 = data[0];
+ // 鐢靛帇
+ var vol = {
+ max: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_vol
+ },
+ min: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_vol
+ }
+ // 鍐呴樆
+ };var res = {
+ max: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_res
+ },
+ min: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_res
+ }
+
+ // 娓╁害
+ };var tmp = {
+ max: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_tmp
+ },
+ min: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_tmp
+ }
+
+ // 鎬诲��
+ };var sum = {
+ vol: data0.mon_vol,
+ res: data0.mon_res,
+ tmp: data0.mon_tmp
+ };
+ // 闀垮害
+ var len = data.length;
+ for (var i = 1; i < len; i++) {
+ var _data = data[i];
+ this.setTotalMaxMin(vol, _data, 'mon_vol');
+ this.setTotalMaxMin(res, _data, 'mon_res');
+ this.setTotalMaxMin(tmp, _data, 'mon_tmp');
+ sum.vol += _data.mon_vol;
+ sum.res += _data.mon_res;
+ sum.tmp += _data.mon_tmp;
+ }
+
+ // 璁剧疆鐢靛帇
+ var volMaxMin = this.formatMaxMin(vol, 'V');
+ result[0].high = volMaxMin.max;
+ result[0].low = volMaxMin.min;
+ result[0].avg = this.getAvg(sum.vol, len, 'V');
+
+ // 璁剧疆鍐呴樆
+ var resMaxMin = this.formatMaxMin(res, 'm惟');
+ result[1].high = resMaxMin.max;
+ result[1].low = resMaxMin.min;
+ result[1].avg = this.getAvg(sum.res, len, 'm惟');
+
+ // 璁剧疆娓╁害
+ var tmpMaxMin = this.formatMaxMin(tmp, '鈩�');
+ result[2].high = tmpMaxMin.max;
+ result[2].low = tmpMaxMin.min;
+ result[2].avg = this.getAvg(sum.tmp, len, '鈩�');
+
this.tbls.totalInfo.data = result;
}
},
+ setTotalMaxMin: function setTotalMaxMin(target, item, key) {
+ if (item[key] > target.max.value) {
+ target.max.mon_num = [item.mon_num];
+ target.max.value = item[key];
+ } else if (item[key] == target.max.value) {
+ target.max.mon_num.push(item.mon_num);
+ }
+
+ if (item[key] < target.min.value) {
+ target.min.mon_num = [item.mon_num];
+ target.min.value = item[key];
+ } else if (item[key] == target.min.value) {
+ target.min.mon_num.push(item.mon_num);
+ }
+ },
+ formatMaxMin: function formatMaxMin(data, unit) {
+ var result = {
+ max: '',
+ min: ''
+ };
+ // 璁剧疆max
+ var max = data.max;
+ var num_str = '#' + max.mon_num[0];
+ for (var i = 1; i < max.mon_num.length; i++) {
+ num_str += ',#' + max.mon_num[i];
+ }
+ result.max = num_str + "锛�" + max.value + unit;
+
+ // 璁剧疆min
+ var min = data.min;
+ var num_str = '#' + min.mon_num[0];
+ for (var i = 1; i < min.mon_num.length; i++) {
+ num_str += ',#' + min.mon_num[i];
+ }
+ result.min = num_str + "锛�" + min.value + unit;
+
+ return result;
+ },
+ getAvg: function getAvg(sum, len, unit) {
+ return Number((sum / len).toFixed(2)) + unit;
+ },
+
setOptions: function setOptions(data) {
// 閬嶅巻data鐨勫��
var monNum = []; // 鍗曚綋缂栧彿
@@ -398,6 +512,18 @@
// 鍏抽棴椤甸潰鐨勮鏃跺櫒
this.timer.rtState.stop();
this.timer.rtData.stop();
+ },
+ setBlock: function setBlock() {
+ this.block.tabMain = this.$refs.tabMain.offsetHeight;
+ },
+ getTabHt: function getTabHt(unit) {
+ var result = 0;
+ if (unit) {
+ result = this.block.tabMain - 5 + unit;
+ } else {
+ result = this.block.tabMain - 10;
+ }
+ return result;
}
},
computed: {
@@ -434,6 +560,10 @@
});
this.startSearch();
+ setTimeout(function () {
+ // 璁剧疆妯″潡鐨勯珮搴�
+ self.setBlock();
+ }, 10);
},
beforeDestroy: function beforeDestroy() {
this.stopTimers();
diff --git a/dist/pages/main/main.html b/dist/pages/main/main.html
index 61c86e7..7314ab5 100644
--- a/dist/pages/main/main.html
+++ b/dist/pages/main/main.html
@@ -1,13 +1,13 @@
<div class="bui-page" id="main">
- <main>
+ <main ref="main">
<div class="main-inner">
- <ul class="bui-list bui-fluid exammine">
+ <ul class="bui-list bui-fluid exammine" ref="block1">
<li class="bui-btn bui-box span3" @click="handlerTabs('menu')">
<div class="thumbnail success"><i class="icon"></i></div>
<div class="span1">
- <h3 class="item-title approve">9</h3>
+ <h3 class="item-title approve">4</h3>
<p class="item-text">鑿滃崟</p>
</div>
</li>
@@ -44,51 +44,32 @@
<div class="bui-icon warning round"><i class="icon-bell"></i><span class="bui-badges" v-text="numbers.alarms">0</span></div>
<div class="span1">鍛婅绠＄悊</div>
</li>
- <li class="bui-btn">
+ <li class="bui-btn" @click="handerClick('system')">
<div class="bui-icon primary round"><i class="iconfont icon-canshushezhi1"></i></div>
<div class="span1">绯荤粺绠＄悊</div>
</li>
- <li class="bui-btn">
- <div class="bui-icon danger round"><i class="iconfont icon-dianchiguanli"></i></div>
- <div class="span1">鐢垫睜缁勭鐞�</div>
- </li>
- <li class="bui-btn">
- <div class="bui-icon primary round"><i class="iconfont icon-quanjucanshushezhi"></i></div>
- <div class="span1">鍙傛暟璁剧疆</div>
- </li>
- <li class="bui-btn">
- <div class="bui-icon success round"><i class="iconfont icon-jiedianguanli"></i></div>
- <div class="span1">鑺傜偣绠＄悊</div>
- </li>
- <li class="bui-btn">
- <div class="bui-icon warning round"><i class="icon-info"></i></div>
- <div class="span1">姹囬泦妯″潡璁剧疆</div>
- </li>
- <li class="bui-btn">
- <div class="bui-icon success round"><i class="iconfont icon-daochu"></i></div>
- <div class="span1">鏃ュ織瀵煎嚭</div>
- </li>
+
<li class="bui-btn" @click="outSystem()">
<div class="bui-icon danger round"><i class="iconfont icon-tuichu"></i></div>
<div class="span1">閫�鍑虹郴缁�</div>
- </li>
+ </li>
</ul>
</div>
<div class="tab-item" v-show="tabs.alarm" style="display:none">
- <iview-table :columns="tbls.alarm.columns" :data="tbls.alarm.data" :title="tbls.alarm.title" height="430" style="margin:0"></iview-table>
- <div class="tbl-page mt8" style="text-align:center">
+ <iview-table :columns="tbls.alarm.columns" :data="tbls.alarm.data" :title="tbls.alarm.title" :height="getAlarmHt()" style="margin:0"></iview-table>
+ <div class="tbl-page mt8" style="text-align:center" ref="alarmBlock1">
<i-button type="info" @click="pre('alarm')" :disabled="tbls.alarm.pageBtn.pre">涓婁竴椤�</i-button>
<i-button type="info" class="ml8" @click="next('alarm')" :disabled="tbls.alarm.pageBtn.next">涓嬩竴椤�</i-button>
</div>
</div>
<div class="tab-item" v-show="tabs.charge" style="display:none">
- <iview-table :columns="tbls.charge.columns" :data="tbls.charge.data" :title="tbls.charge.title" height="460" style="margin:0"></iview-table>
+ <iview-table :columns="tbls.charge.columns" :data="tbls.charge.data" :title="tbls.charge.title" :height="getTblHt()" style="margin:0"></iview-table>
</div>
<div class="tab-item" v-show="tabs.discharge" style="display:none">
- <iview-table :columns="tbls.discharge.columns" :data="tbls.discharge.data" :title="tbls.discharge.title" height="460" style="margin:0"></iview-table>
+ <iview-table :columns="tbls.discharge.columns" :data="tbls.discharge.data" :title="tbls.discharge.title" :height="getTblHt()" style="margin:0"></iview-table>
</div>
</div>
</div>
</main>
</div>
-<style scoped>.table{display:table;width:100vw;height:100vh}.table .table-cell{display:table-cell;vertical-align:top}.table-cell-inner{height:100vh;overflow:auto}.exammine{padding:.25rem 0;background-color:#fff}.exammine>[class*=bui-btn]{border:none;padding:0 .2rem;border-right:1px solid #f5f5f5}.activity .icon,.exammine .icon{color:#fff}.exammine li .span1 h3{font-size:.38rem;text-align:right}.exammine li .span1 h3.approve{color:#f90}.exammine li .span1 h3.respond{color:#70b4e1}.exammine li .span1 h3.due{color:#f16a7a}.exammine li .span1 p{font-size:.18rem;text-align:right}.exammine>[class*=bui-btn]:last-child{border:none}.exammine .thumbnail{line-height:.88rem;height:.88rem;width:.88rem;text-align:center;border-radius:50%;margin-right:0;color:#fff}.exammine .thumbnail.approve{background-color:#f90}.exammine .thumbnail.respond{background-color:#70b4e1}.exammine .thumbnail.due{background-color:#f16a7a}.exammine [class*=bui-btn] .icon{font-size:.54rem;margin:0}.activity{border-top:none;margin-top:.2rem;padding:0 .2rem;background-color:#fff}.activity .bui-btn{padding-top:.2rem;padding-bottom:.2rem;padding-left:0;padding-right:0}.bui-btn:active{background-color:#bbb}</style>
+<style scoped>.table{display:table;width:100vw;height:100vh}.table .table-cell{display:table-cell;vertical-align:top}.table-cell-inner{height:100vh;overflow:auto}.exammine{padding:25px 0;background-color:#fff}.exammine>[class*=bui-btn]{border:none;padding:0 20px;border-right:1px solid #f5f5f5}.activity .icon,.exammine .icon{color:#fff}.exammine li .span1 h3{font-size:38px;text-align:right}.exammine li .span1 h3.approve{color:#f90}.exammine li .span1 h3.respond{color:#70b4e1}.exammine li .span1 h3.due{color:#f16a7a}.exammine li .span1 p{font-size:18px;text-align:right}.exammine>[class*=bui-btn]:last-child{border:none}.exammine .thumbnail{line-height:88px;height:88px;width:88px;text-align:center;border-radius:50%;margin-right:0;color:#fff}.exammine .thumbnail.approve{background-color:#f90}.exammine .thumbnail.respond{background-color:#70b4e1}.exammine .thumbnail.due{background-color:#f16a7a}.exammine [class*=bui-btn] .icon,.exammine [class*=bui-btn] .iconfont{font-size:54px;margin:0}.exammine [class*=bui-btn] .iconfont{font-size:32px;margin:0}.activity{border-top:none;margin-top:20px;padding:0 20px;background-color:#fff}.activity .bui-btn{padding-top:20px;padding-bottom:20px;padding-left:0;padding-right:0}.bui-btn:active{background-color:#bbb}</style>
diff --git a/dist/pages/main/main.js b/dist/pages/main/main.js
index 266ae79..5418ead 100644
--- a/dist/pages/main/main.js
+++ b/dist/pages/main/main.js
@@ -14,6 +14,11 @@
var vm = new Vue({
el: bs.$el[0],
data: {
+ block: {
+ main: 0,
+ block1: 0,
+ alarmBlock1: 0
+ },
numbers: {
alarms: 0,
charge: 0,
@@ -53,7 +58,7 @@
key: 'battGroupName'
}, {
title: '鍛婅鍚嶇О',
- minWidth: 240,
+ minWidth: 200,
align: 'center',
key: 'note'
}, {
@@ -63,7 +68,7 @@
key: 'MonNum'
}, {
title: '鍛婅寮�濮嬫椂闂�',
- minWidth: 240,
+ minWidth: 200,
align: 'center',
key: 'alm_start_time'
}, {
@@ -191,6 +196,9 @@
}, {
path: 'battery',
url: '../battery/battery.html'
+ }, {
+ path: 'system',
+ url: '../system/system.html'
}]
},
methods: {
@@ -456,6 +464,26 @@
url: '../battery/batteryInfo.html',
param: param
});
+ },
+ setBlock: function setBlock() {
+ var main = this.$refs.main.offsetHeight;
+ var block1 = this.$refs.block1.offsetHeight;
+ var alarmBlock1 = this.$refs.alarmBlock1.offsetHeight;
+ this.block.main = main;
+ this.block.block1 = block1;
+ this.block.alarmBlock1 = alarmBlock1;
+ },
+ getAlarmHt: function getAlarmHt() {
+ return this.getTblHt() - 45;
+ },
+ getTblHt: function getTblHt() {
+ return this.block.main - this.block.block1 - 40;
+ }
+ },
+ computed: {
+ getAlarmHt: function getAlarmHt() {
+
+ return 400;
}
},
mounted: function mounted() {
@@ -470,6 +498,7 @@
// 鏌ヨ鍛婅锛屽厖鐢碉紝鏀剧數鐨勬暟鐩�
this.searchNums();
+ this.setBlock();
},
destroyed: function destroyed() {}
});
diff --git a/dist/pages/warn/warn.html b/dist/pages/warn/warn.html
index a43f5d6..8b3417f 100644
--- a/dist/pages/warn/warn.html
+++ b/dist/pages/warn/warn.html
@@ -18,19 +18,19 @@
<li class="bui-btn">鍘嗗彶鍛婅</li>
</ul>
</div>
- <div class="bui-tab-main">
+ <div class="bui-tab-main" ref="tabMain">
<ul>
<li>
<iview-table :columns="currTbl.columns" :data="currTbl.data" height="380" style="margin:0"></iview-table>
- <div class="tbl-page mt8" style="text-align:center">
+ <div class="tbl-page mt8" style="text-align:center" ref="currBlock1">
<i-button type="info" @click="pre('alarm')" :disabled="currTbl.pageBtn.pre">涓婁竴椤�</i-button>
<i-button type="info" class="ml8" @click="next('alarm')" :disabled="currTbl.pageBtn.next">涓嬩竴椤�</i-button>
</div>
</li>
<li style="display:none">
<iview-table :columns="hisTbl.columns" :data="hisTbl.data" height="380" style="margin:0"></iview-table>
- <div class="tbl-page mt8" style="text-align:center">
+ <div class="tbl-page mt8" style="text-align:center" ref="hisBlock1">
<i-button type="info" @click="pre('his')" :disabled="hisTbl.pageBtn.pre">涓婁竴椤�</i-button>
<i-button type="info" class="ml8" @click="next('his')" :disabled="hisTbl.pageBtn.next">涓嬩竴椤�</i-button>
</div>
diff --git a/src/css/commons.css b/src/css/commons.css
index d6db550..66e8e59 100644
--- a/src/css/commons.css
+++ b/src/css/commons.css
@@ -1,5 +1,5 @@
body {
- font-size: .25rem;
+ font-size: 25px;
}
#bui-router .bui-page>.main, .bui-page>main{
background-color: #e1ecfa;
@@ -51,19 +51,103 @@
background-color: #2d8cf0;
}
.bui-table th, .bui-table td {
- padding: .1rem .1rem;
+ padding: 10 15px;
border: 1px solid #CCCCCC;
}
.tbl-container-header {
- padding: .5em;
+ padding: 5px;
font-weight: bold;
color: #2d8cf0;
}
.bui-btn-small {
- padding-top: .15rem;
- padding-bottom: .15rem;
+ padding-top: 15px;
+ padding-bottom: 15px;
+}
+.bui-icon {
+ width: 88px;
+ height: 88px;
+ line-height: 88px;
+}
+.bui-list .icon {
+ width: 54px;
+ height: 54px;
+ line-height: 54px;
+}
+.bui-nav-icon .bui-btn>.bui-icon, .bui-nav-icon .bui-btn>.icon {
+ margin-bottom: 20px;
+}
+[class*=bui-btn] {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 10px;
+ padding-right: 10px;
+ line-height: 16px;
+ min-height: 24px;
+}
+[class*=bui-btn] .bui-icon {
+ font-size: 48px;
+}
+.bui-nav-icon .bui-btn i, .bui-nav-icon .bui-btn .icon, .bui-nav-icon .bui-btn [class^=bui-icon-] {
+ font-size: 64px;
+ width: 88px;
+ height: 88px;
+}
+.round {
+ border-radius: 10px;
+}
+.bui-nav-icon .bui-badges {
+ min-width: 33px;
+ min-height: 33px;
+ line-height: 33px;
+}
+[class*=bui-badges] {
+ font-size: 25px;
}
+.item-title {
+ padding-right: 10px;
+ margin-bottom: 20px;
+ font-size: 18px;
+}
+.header.bui-bar .bui-bar-main,
+.header .bui-bar .bui-bar-main,
+header.bui-bar .bui-bar-main,
+header .bui-bar .bui-bar-main {
+ font-size: 18px;
+}
+.bui-bar .bui-bar-left,
+.bui-bar .bui-bar-right {
+ width: 120px;
+ height: 50px;
+}
+.bui-bar .bui-bar-left>[class*=bui-btn] {
+ padding-left: 20px;
+}
+.bui-bar .bui-bar-left>[class*=bui-btn],
+.bui-bar .bui-bar-right>[class*=bui-btn] {
+ height: 50px;
+ line-height: 50px;
+ font-size: 27px;
+}
+.bui-bar .bui-bar-left>[class*=bui-btn]>i,
+.bui-bar .bui-bar-right>[class*=bui-btn]>i {
+ height: 50px;
+ line-height: 50px;
+ font-size: 30px;
+}
+.bui-bar [class^="icon-"] {
+ width: 44px;
+ height: 44px;
+ line-height: 44px;
+}
+.bui-loading .bui-loading-block {
+ width: 20px !important;
+ height: 20px !important;
+}
+.bui-table th,
+.bui-table td {
+ padding: 5px 5px;
+}
/* iview */
.tbl-content .ivu-table th {
background-color: #2d8cf0;
@@ -77,9 +161,9 @@
/* component style */
.bui-list-header {
- padding-top: .1rem;
- padding-bottom: .1rem;
- font-size: .34rem;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ font-size: 18px;
color: #FFFFFF;
text-align: center;
background-color: #2d8cf0;
diff --git a/src/js/components.js b/src/js/components.js
index 9929a85..dd726c1 100644
--- a/src/js/components.js
+++ b/src/js/components.js
@@ -386,6 +386,11 @@
chart: ''
}
},
+ watch: {
+ height: function(value) {
+ this.chart.setSize(undefined, value);
+ }
+ },
methods: {
init: function() {
var self = this;
diff --git a/src/js/load_lazy.js b/src/js/load_lazy.js
index 1f1adae..2198bae 100644
--- a/src/js/load_lazy.js
+++ b/src/js/load_lazy.js
@@ -8,7 +8,7 @@
lazyload.js([
// 'js/zepto.js',
// 'js/bui.js',
- 'js/echarts.min.js',
+ // 'js/echarts.min.js',
'css/highchart/highcharts.js',
// 'js/const_var.js',
// 'js/common_functions.js',
diff --git a/src/pages/battery/battery.js b/src/pages/battery/battery.js
index dce4571..c8daeef 100644
--- a/src/pages/battery/battery.js
+++ b/src/pages/battery/battery.js
@@ -240,7 +240,7 @@
// 渚ц竟鏍�
this.uiSidebar = bui.sidebar({
id: "#sidebarWrap", //鑿滃崟鐨処D(蹇呴』)
- width: 500,
+ width: 400,
trigger: "#menu",
isActive: true,
});
diff --git a/src/pages/battery/batteryInfo.html b/src/pages/battery/batteryInfo.html
index 64d633e..dfd2338 100644
--- a/src/pages/battery/batteryInfo.html
+++ b/src/pages/battery/batteryInfo.html
@@ -27,7 +27,7 @@
<td>鐢垫睜鐘舵�侊細<span v-text="getBattState"></span></td>
<td>缁勭鐢靛帇锛�<span v-text="rtState.group_vol"></span>V</td>
<td>缁勭鐢垫祦锛�<span v-text="rtState.group_curr"></span>A</td>
- <td rowspan="3" style="width: 2rem">
+ <td rowspan="3" style="width: 300px">
<button class="bui-btn bui-btn-small bg-primary">鍐呴樆娴嬭瘯</button>
<button class="bui-btn bui-btn-small mt8 bg-primary">瀵煎嚭鏁版嵁</button>
</td>
@@ -57,12 +57,12 @@
<li class="bui-btn">娴嬭瘯鏁版嵁</li> -->
</ul>
</div>
- <div class="bui-tab-main">
+ <div class="bui-tab-main" ref="tabMain">
<ul>
<!-- 鍐呭蹇呴』鍦╨i閲岄潰 -->
<li>
<iview-table
- height="370"
+ :height="getTabHt()"
style="margin-top: 8px; margin-left: 0; margin-right: 0;"
:columns="tbls.monList.columns"
:data="tbls.monList.data"></iview-table>
@@ -75,28 +75,27 @@
</li>
<li style="display: none">
<high-bar-chart
- height="370px"
+ :height="getTabHt('px')"
id="monVolBar"
name="鐢靛帇" unit="V"
ref="monVolBar"></high-bar-chart>
</li>
<li style="display: none">
<high-bar-chart
- height="370px"
+ :height="getTabHt('px')"
id="monResBar"
name="鍐呴樆" unit="m惟"
+ :colors="{min:'#19be6b', max: '#ed4014'}"
ref="monResBar"></high-bar-chart>
</li>
<li style="display: none">
<high-bar-chart
- height="370px"
+ :height="getTabHt('px')"
id="monTmpBar"
name="娓╁害" unit="鈩�"
:colors="{min:'#19be6b', max: '#ed4014'}"
ref="monTmpBar"></high-bar-chart>
</li>
- <li style="display: none">褰撳墠鍛婅</li>
- <li style="display: none">娴嬭瘯鏁版嵁</li>
</ul>
</div>
</div>
diff --git a/src/pages/battery/batteryInfo.js b/src/pages/battery/batteryInfo.js
index 861a2df..8782ded 100644
--- a/src/pages/battery/batteryInfo.js
+++ b/src/pages/battery/batteryInfo.js
@@ -26,6 +26,9 @@
var vm = this.vm = new Vue({
el: bs.$el[0],
data: {
+ block: {
+ tabMain: 0,
+ },
params: params,
title: '鏈煡',
timer: {
@@ -351,9 +354,122 @@
avg: '0鈩�',
}
];
- if(tabsState.totalInfo.state) {
+ if(tabsState.totalInfo.state && data.length != 0) {
+ var data0 = data[0];
+ // 鐢靛帇
+ var vol = {
+ max: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_vol
+ },
+ min: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_vol
+ },
+ }
+ // 鍐呴樆
+ var res = {
+ max: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_res,
+ },
+ min: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_res,
+ },
+ }
+
+ // 娓╁害
+ var tmp = {
+ max: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_tmp,
+ },
+ min: {
+ mon_num: [data0.mon_num],
+ value: data0.mon_tmp,
+ },
+ }
+
+ // 鎬诲��
+ var sum = {
+ vol: data0.mon_vol,
+ res: data0.mon_res,
+ tmp: data0.mon_tmp,
+ };
+ // 闀垮害
+ var len = data.length;
+ for(var i=1; i<len; i++) {
+ var _data = data[i];
+ this.setTotalMaxMin(vol, _data, 'mon_vol');
+ this.setTotalMaxMin(res, _data, 'mon_res');
+ this.setTotalMaxMin(tmp, _data, 'mon_tmp');
+ sum.vol += _data.mon_vol;
+ sum.res += _data.mon_res;
+ sum.tmp += _data.mon_tmp;
+ }
+
+ // 璁剧疆鐢靛帇
+ var volMaxMin = this.formatMaxMin(vol, 'V');
+ result[0].high = volMaxMin.max;
+ result[0].low = volMaxMin.min;
+ result[0].avg = this.getAvg(sum.vol, len, 'V');
+
+ // 璁剧疆鍐呴樆
+ var resMaxMin = this.formatMaxMin(res, 'm惟');
+ result[1].high = resMaxMin.max;
+ result[1].low = resMaxMin.min;
+ result[1].avg = this.getAvg(sum.res, len, 'm惟');
+
+ // 璁剧疆娓╁害
+ var tmpMaxMin = this.formatMaxMin(tmp, '鈩�');
+ result[2].high = tmpMaxMin.max;
+ result[2].low = tmpMaxMin.min;
+ result[2].avg = this.getAvg(sum.tmp, len, '鈩�');
+
this.tbls.totalInfo.data = result;
}
+ },
+ setTotalMaxMin: function(target, item, key) {
+ if(item[key] > target.max.value) {
+ target.max.mon_num = [item.mon_num];
+ target.max.value = item[key];
+ }else if(item[key] == target.max.value) {
+ target.max.mon_num.push(item.mon_num);
+ }
+
+ if(item[key] < target.min.value) {
+ target.min.mon_num = [item.mon_num];
+ target.min.value = item[key];
+ }else if(item[key] == target.min.value) {
+ target.min.mon_num.push(item.mon_num);
+ }
+ },
+ formatMaxMin: function(data, unit) {
+ var result = {
+ max: '',
+ min: ''
+ };
+ // 璁剧疆max
+ var max = data.max;
+ var num_str = '#'+max.mon_num[0];
+ for(var i=1; i<max.mon_num.length; i++) {
+ num_str += ',#'+max.mon_num[i];
+ }
+ result.max = num_str+"锛�"+max.value+unit;
+
+ // 璁剧疆min
+ var min = data.min;
+ var num_str = '#'+min.mon_num[0];
+ for(var i=1; i<min.mon_num.length; i++) {
+ num_str += ',#'+min.mon_num[i];
+ }
+ result.min = num_str+"锛�"+min.value+unit;
+
+ return result;
+ },
+ getAvg(sum, len, unit) {
+ return Number((sum/len).toFixed(2))+unit;
},
setOptions: function(data) {
// 閬嶅巻data鐨勫��
@@ -422,6 +538,18 @@
// 鍏抽棴椤甸潰鐨勮鏃跺櫒
this.timer.rtState.stop();
this.timer.rtData.stop();
+ },
+ setBlock: function() {
+ this.block.tabMain = this.$refs.tabMain.offsetHeight;
+ },
+ getTabHt: function(unit) {
+ var result = 0;
+ if(unit) {
+ result = this.block.tabMain - 5+unit;
+ }else {
+ result = this.block.tabMain - 10;
+ }
+ return result;
}
},
computed: {
@@ -458,6 +586,10 @@
});
this.startSearch();
+ setTimeout(function() {
+ // 璁剧疆妯″潡鐨勯珮搴�
+ self.setBlock();
+ }, 10);
},
beforeDestroy() {
this.stopTimers();
diff --git a/src/pages/main/main.html b/src/pages/main/main.html
index 0c4f345..1bc5ed2 100644
--- a/src/pages/main/main.html
+++ b/src/pages/main/main.html
@@ -1,13 +1,13 @@
<!-- 杩欓噷杩樻槸涓�涓爣鍑嗙殑BUI椤甸潰 -->
<div class="bui-page" id="main">
- <main>
+ <main ref="main">
<!-- 涓棿鍐呭 -->
<div class="main-inner">
- <ul class="bui-list bui-fluid exammine">
+ <ul class="bui-list bui-fluid exammine" ref="block1">
<li class="bui-btn bui-box span3" @click="handlerTabs('menu')">
<div class="thumbnail success"><i class="icon"></i></div>
<div class="span1">
- <h3 class="item-title approve">9</h3>
+ <h3 class="item-title approve">4</h3>
<p class="item-text">鑿滃崟</p>
</div>
</li>
@@ -44,11 +44,11 @@
<div class="bui-icon warning round"><i class="icon-bell"></i><span class="bui-badges" v-text="numbers.alarms">0</span></div>
<div class="span1">鍛婅绠＄悊</div>
</li>
- <li class="bui-btn">
+ <li class="bui-btn" @click="handerClick('system')">
<div class="bui-icon primary round"><i class="iconfont icon-canshushezhi1"></i></div>
<div class="span1">绯荤粺绠＄悊</div>
</li>
- <li class="bui-btn">
+ <!-- <li class="bui-btn">
<div class="bui-icon danger round"><i class="iconfont icon-dianchiguanli"></i></div>
<div class="span1">鐢垫睜缁勭鐞�</div>
</li>
@@ -67,11 +67,11 @@
<li class="bui-btn">
<div class="bui-icon success round"><i class="iconfont icon-daochu"></i></div>
<div class="span1">鏃ュ織瀵煎嚭</div>
- </li>
+ </li> -->
<li class="bui-btn" @click="outSystem()">
<div class="bui-icon danger round"><i class="iconfont icon-tuichu"></i></div>
<div class="span1">閫�鍑虹郴缁�</div>
- </li>
+ </li>
</ul>
</div>
<div class="tab-item" v-show="tabs.alarm" style="display: none">
@@ -79,9 +79,9 @@
:columns="tbls.alarm.columns"
:data="tbls.alarm.data"
:title="tbls.alarm.title"
- height="430"
+ :height="getAlarmHt()"
style="margin: 0"></iview-table>
- <div class="tbl-page mt8" style="text-align: center">
+ <div class="tbl-page mt8" style="text-align: center" ref="alarmBlock1">
<i-button
type="info"
@click="pre('alarm')"
@@ -94,7 +94,7 @@
:columns="tbls.charge.columns"
:data="tbls.charge.data"
:title="tbls.charge.title"
- height="460"
+ :height="getTblHt()"
style="margin: 0"></iview-table>
</div>
<div class="tab-item" v-show="tabs.discharge" style="display: none">
@@ -102,7 +102,7 @@
:columns="tbls.discharge.columns"
:data="tbls.discharge.data"
:title="tbls.discharge.title"
- height="460"
+ :height="getTblHt()"
style="margin: 0"></iview-table>
</div>
</div>
@@ -124,12 +124,12 @@
overflow: auto;
}
.exammine{
- padding: 0.25rem 0;
+ padding: 25px 0;
background-color: #ffffff;
}
.exammine>[class*=bui-btn]{
border: none;
- padding: 0 0.2rem;
+ padding: 0 20px;
border-right: 1px solid #f5f5f5;
}
.activity .icon,
@@ -137,7 +137,7 @@
color:#fff;
}
.exammine li .span1 h3{
- font-size: 0.38rem;
+ font-size: 38px;
text-align: right;
}
.exammine li .span1 h3.approve{
@@ -150,7 +150,7 @@
color: #f16a7a;
}
.exammine li .span1 p{
- font-size: 0.18rem;
+ font-size: 18px;
text-align: right;
}
.exammine>[class*=bui-btn]:last-child{
@@ -158,9 +158,9 @@
}
.exammine .thumbnail{
- line-height: 0.88rem;
- height: 0.88rem;
- width: 0.88rem;
+ line-height: 88px;
+ height: 88px;
+ width: 88px;
text-align: center;
border-radius: 50%;
margin-right: 0;
@@ -175,19 +175,24 @@
.exammine .thumbnail.due{
background-color: #f16a7a;
}
- .exammine [class*=bui-btn] .icon{
- font-size: 0.54rem;
+ .exammine [class*=bui-btn] .icon,
+ .exammine [class*=bui-btn] .iconfont{
+ font-size: 54px;
margin: 0;
- }
+ }
+ .exammine [class*=bui-btn] .iconfont {
+ font-size: 32px;
+ margin: 0;
+ }
.activity{
border-top: none;
- margin-top: 0.2rem;
- padding: 0 0.2rem;
+ margin-top: 20px;
+ padding: 0 20px;
background-color: #ffffff;
}
.activity .bui-btn{
- padding-top: .2rem;
- padding-bottom: .2rem;
+ padding-top: 20px;
+ padding-bottom: 20px;
padding-left: 0;
padding-right: 0;
}
diff --git a/src/pages/main/main.js b/src/pages/main/main.js
index 6db1852..c49cbec 100644
--- a/src/pages/main/main.js
+++ b/src/pages/main/main.js
@@ -12,6 +12,11 @@
var vm =new Vue({
el: bs.$el[0],
data: {
+ block: {
+ main: 0,
+ block1: 0,
+ alarmBlock1: 0
+ },
numbers: {
alarms: 0,
charge: 0,
@@ -54,7 +59,7 @@
},
{
title: '鍛婅鍚嶇О',
- minWidth: 240,
+ minWidth: 200,
align: 'center',
key: 'note'
},
@@ -66,7 +71,7 @@
},
{
title: '鍛婅寮�濮嬫椂闂�',
- minWidth: 240,
+ minWidth: 200,
align: 'center',
key: 'alm_start_time'
},
@@ -219,6 +224,10 @@
{
path: 'battery',
url: '../battery/battery.html'
+ },
+ {
+ path: 'system',
+ url: '../system/system.html'
}
]
},
@@ -477,6 +486,26 @@
url: '../battery/batteryInfo.html',
param: param
});
+ },
+ setBlock: function() {
+ var main = this.$refs.main.offsetHeight;
+ var block1 = this.$refs.block1.offsetHeight;
+ var alarmBlock1 = this.$refs.alarmBlock1.offsetHeight;
+ this.block.main = main;
+ this.block.block1 = block1;
+ this.block.alarmBlock1 = alarmBlock1;
+ },
+ getAlarmHt: function() {
+ return this.getTblHt() - 45;
+ },
+ getTblHt: function() {
+ return this.block.main - this.block.block1 - 40;
+ }
+ },
+ computed: {
+ getAlarmHt: function() {
+
+ return 400;
}
},
mounted() {
@@ -491,6 +520,7 @@
// 鏌ヨ鍛婅锛屽厖鐢碉紝鏀剧數鐨勬暟鐩�
this.searchNums();
+ this.setBlock();
},
destroyed() {
diff --git a/src/pages/system/system.html b/src/pages/system/system.html
new file mode 100644
index 0000000..18ec718
--- /dev/null
+++ b/src/pages/system/system.html
@@ -0,0 +1,17 @@
+<!-- 杩欓噷杩樻槸涓�涓爣鍑嗙殑BUI椤甸潰 -->
+<div class="bui-page">
+ <header class="bui-bar">
+ <div class="bui-bar-left">
+ <!-- 宸﹁竟鏈夊浘鏍囩ず渚� -->
+ <div class="bui-btn btn-back" @click="stopTimers"><i class="icon-back"></i></div>
+ </div>
+ <div class="bui-bar-main">绯荤粺绠＄悊</div>
+ <div class="bui-bar-right">
+ <!-- 鍙宠竟鏈夊浘鏍囩ず渚� -->
+ <div class="bui-btn" id="menu" class="menu"><i class="icon"></i></div>
+ </div>
+ </header>
+ <main>
+ <!-- 涓棿鍐呭 -->
+ </main>
+</div>
\ No newline at end of file
diff --git a/src/pages/system/system.js b/src/pages/system/system.js
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/pages/system/system.js
diff --git a/src/pages/warn/warn.html b/src/pages/warn/warn.html
index 21483d6..cf3f986 100644
--- a/src/pages/warn/warn.html
+++ b/src/pages/warn/warn.html
@@ -18,7 +18,7 @@
<li class="bui-btn">鍘嗗彶鍛婅</li>
</ul>
</div>
- <div class="bui-tab-main">
+ <div class="bui-tab-main" ref="tabMain">
<ul>
<!-- 鍐呭蹇呴』鍦╨i閲岄潰 -->
<li >
@@ -27,7 +27,7 @@
:data="currTbl.data"
height="380"
style="margin: 0"></iview-table>
- <div class="tbl-page mt8" style="text-align: center">
+ <div class="tbl-page mt8" style="text-align: center" ref="currBlock1">
<i-button
type="info"
@click="pre('alarm')"
@@ -45,7 +45,7 @@
:data="hisTbl.data"
height="380"
style="margin: 0"></iview-table>
- <div class="tbl-page mt8" style="text-align: center">
+ <div class="tbl-page mt8" style="text-align: center" ref="hisBlock1">
<i-button
type="info"
@click="pre('his')"
--
Gitblit v1.9.1