|
|
@@ -65,7 +65,8 @@
|
|
|
position: relative;
|
|
|
float: left;
|
|
|
width: 41%;
|
|
|
- height: 180px;
|
|
|
+ /*height: 180px;*/
|
|
|
+ height: 90px;
|
|
|
background: rgba(255, 255, 255, 0.3);
|
|
|
border-radius: 10px;
|
|
|
margin-left: 6%;
|
|
|
@@ -76,10 +77,12 @@
|
|
|
background: rgba(255, 255, 255, 0.35);
|
|
|
border-radius: 50%;
|
|
|
position: absolute;
|
|
|
- width: 2.5em;
|
|
|
- height: 2.5em;
|
|
|
- top: 10px;
|
|
|
- left: 10px;
|
|
|
+ /*width: 2.5em;
|
|
|
+ height: 2.5em;*/
|
|
|
+ width: 3.5em;
|
|
|
+ height: 3.5em;
|
|
|
+ top: 15px;
|
|
|
+ left: 25px;
|
|
|
line-height: 3.8em;
|
|
|
text-align: center;
|
|
|
vertical-align: middle;
|
|
|
@@ -87,6 +90,7 @@
|
|
|
|
|
|
.sensorIcon>img {
|
|
|
width: 74%;
|
|
|
+ margin: 7px 0 0 0;
|
|
|
}
|
|
|
|
|
|
.sensorAisle {
|
|
|
@@ -101,17 +105,23 @@
|
|
|
.sensorResult {
|
|
|
color: #ffffff;
|
|
|
font-size: 16px;
|
|
|
- line-height: 200px;
|
|
|
+ /*line-height: 200px;*/
|
|
|
+ line-height: 60px;
|
|
|
text-align: center;
|
|
|
+ /*margin: 0 0 0 30px;*/
|
|
|
+ margin: 0 0 0 45%;
|
|
|
}
|
|
|
|
|
|
.sensorUnit {
|
|
|
- position: absolute;
|
|
|
- bottom: 10px;
|
|
|
- right: 10px;
|
|
|
+ /*position: absolute;
|
|
|
+ bottom: 20px;
|
|
|
+ right: 70px;*/
|
|
|
color: rgba(255, 255, 255, 0.76);
|
|
|
font-size: 12px;
|
|
|
letter-spacing: 1px;
|
|
|
+ text-align: center;
|
|
|
+ width: 41%;
|
|
|
+ margin: -15px 0 0 80px;
|
|
|
}
|
|
|
/*24小时数据*/
|
|
|
|
|
|
@@ -170,7 +180,6 @@
|
|
|
</div>
|
|
|
<div class="seeMore">
|
|
|
<button type="button" onclick="setTimingFun()" class="">定时控制</button>
|
|
|
-
|
|
|
<button type="button" onclick="manualCtrl()" class="">手动控制</button>
|
|
|
</div>
|
|
|
<div class="seeMore">
|
|
|
@@ -184,8 +193,7 @@
|
|
|
<script src="../js/mui.picker.min.js" type="text/javascript" charset="utf-8"></script>
|
|
|
<script src="../js/common.js"></script>
|
|
|
<script type="text/javascript">
|
|
|
-
|
|
|
- var equipId,equipName,qxz_switch,switch_name,timing_list,auto_list,conf,qxzDat;
|
|
|
+ var equipId, equipName, qxz_switch, switch_name, timing_list, auto_list, conf, qxzDat;
|
|
|
mui.init();
|
|
|
mui.plusReady(function() {
|
|
|
var self = plus.webview.currentWebview();
|
|
|
@@ -209,24 +217,24 @@
|
|
|
dataType: 'json',
|
|
|
success: function(data) {
|
|
|
console.log(JSON.stringify(data))
|
|
|
- if(data.qxz_switch.length>2){
|
|
|
- qxz_switch = eval('('+data.qxz_switch+')');
|
|
|
- }else{
|
|
|
+ if(data.qxz_switch.length > 2) {
|
|
|
+ qxz_switch = eval('(' + data.qxz_switch + ')');
|
|
|
+ } else {
|
|
|
qxz_switch = {}
|
|
|
}
|
|
|
- if(data.switch_name.length>2){
|
|
|
- switch_name = eval('('+data.switch_name+')');
|
|
|
- }else{
|
|
|
+ if(data.switch_name.length > 2) {
|
|
|
+ switch_name = eval('(' + data.switch_name + ')');
|
|
|
+ } else {
|
|
|
switch_name = {}
|
|
|
}
|
|
|
- if(data.timing_list.length>2){
|
|
|
- timing_list = eval('('+data.timing_list+')');
|
|
|
- }else{
|
|
|
+ if(data.timing_list.length > 2) {
|
|
|
+ timing_list = eval('(' + data.timing_list + ')');
|
|
|
+ } else {
|
|
|
timing_list = {}
|
|
|
}
|
|
|
- if(data.auto_list.length>2){
|
|
|
- auto_list = eval('('+data.auto_list+')');
|
|
|
- }else{
|
|
|
+ if(data.auto_list.length > 2) {
|
|
|
+ auto_list = eval('(' + data.auto_list + ')');
|
|
|
+ } else {
|
|
|
auto_list = {}
|
|
|
}
|
|
|
conf = data.conf;
|
|
|
@@ -238,26 +246,30 @@
|
|
|
var dat = data.dat;
|
|
|
var datlen = Object.keys(dat).length;
|
|
|
var html = '';
|
|
|
- for(var i = 1;i<=datlen;i++){
|
|
|
- var key = 'e'+ i;
|
|
|
- if(dat[key]){
|
|
|
- if(dat[key].split('#')[0] == -99.99){
|
|
|
+ for(var i = 1; i <= datlen; i++) {
|
|
|
+ var key = 'e' + i;
|
|
|
+ if(dat[key]) {
|
|
|
+ if(dat[key].split('#')[0] == -99.99) {
|
|
|
var val = 'N/A';
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
var val = dat[key].split('#')[0];
|
|
|
}
|
|
|
var eNum = dat[key].split('#')[1];
|
|
|
var unitTxt = data.conf[key].split('#')[0];
|
|
|
var unit = data.conf[key].split('#')[1];
|
|
|
html += '<div class="sensor"><div class="sensorIcon"><img src="../images/dev/icon_' + eNum + '.png"/>' +
|
|
|
- '</div><div class="sensorAisle">通道' + i + '</div>' +
|
|
|
+ '</div>' +
|
|
|
'<div class="sensorResult">' + val + unit + '</div><div class="sensorUnit">' + unitTxt + '</div></div>'
|
|
|
+
|
|
|
+
|
|
|
+ // html += '<div class="sensor">' +
|
|
|
+ // '<div class="sensorResult">' + val + unit + '</div><div class="sensorUnit">' + unitTxt + '</div></div>'
|
|
|
}
|
|
|
- if(i == datlen){
|
|
|
- if(!html){
|
|
|
+ if(i == datlen) {
|
|
|
+ if(!html) {
|
|
|
html = '<div class="sensor" style="width: 88%;"><div class="sensorResult">暂无数据</div></div>';
|
|
|
}
|
|
|
- $('#newResultDat').html(html);
|
|
|
+ $('#newResultDat').html(html);
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -307,9 +319,9 @@
|
|
|
'equipName': equipName,
|
|
|
'qxz_switch': qxz_switch,
|
|
|
'switch_name': switch_name,
|
|
|
- 'auto_list':auto_list,
|
|
|
- 'conf':conf,
|
|
|
- 'qxzDat':qxzDat
|
|
|
+ 'auto_list': auto_list,
|
|
|
+ 'conf': conf,
|
|
|
+ 'qxzDat': qxzDat
|
|
|
},
|
|
|
})
|
|
|
} else {
|
|
|
@@ -327,9 +339,9 @@
|
|
|
'equipName': equipName,
|
|
|
'qxz_switch': qxz_switch,
|
|
|
'switch_name': switch_name,
|
|
|
- 'timing_list':timing_list,
|
|
|
- 'conf':conf,
|
|
|
- 'qxzDat':qxzDat
|
|
|
+ 'timing_list': timing_list,
|
|
|
+ 'conf': conf,
|
|
|
+ 'qxzDat': qxzDat
|
|
|
},
|
|
|
})
|
|
|
} else {
|
