From 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 09:01:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/elecircle.content.js | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index afcc6b0..3b3767c 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -1036,6 +1036,24 @@
}
},
{
+ name: 'sdCard',
+ type: 'text',
+ status: 0,
+ notShow: false,
+ content: {
+ text: 'SD鍗＄姸鎬侊細锛燂紵锛�'
+ }
+ },
+ {
+ name:'devVersion',
+ type: 'text',
+ status: 0,
+ notShow: false,
+ content: {
+ text: '璁惧鐗堟湰鍙凤細锛燂紵锛�'
+ }
+ },
+ {
name: 'signal',
type: 'text',
status: 0,
@@ -1073,7 +1091,9 @@
var data = model.data[0];
var alarmstatus = data.dev_alarmstate; //[0:'鏃�',1:'鏆傚仠',2:'鏀剧數娴嬭瘯',3:'鏀剧數绛夊緟',4:'闄愭祦鍏呯數',5:'鐩存祦鍏呯數',6:'鍏呯數绛夊緟',7:'娴嬭瘯鏃堕棿鍒�',8:'娴嬭瘯瀹归噺鍒�',9:'鍗曚綋涓嬮檺鍒�',10:'缁勭涓嬮檺鍒�',11:'甯傜數寮傚父',12:'瀛樺偍鍗′笉瓒�',13:'璐熻浇娓╁害楂�',14:'鐢垫祦寮傚父',15:'杩滅▼閫氫俊鍧�',16:'璐熻浇閫氫俊鍧�',17:'閫夋嫨閫氫俊鍧�',18:'璐熻浇鐢垫祦鍧�',19:'鍐呭瓨鐢宠鍧�',20:'鏈煡'];
var workstatus =parseInt(data.dev_workstate) ; //[0:'鍦ㄧ嚎鐩戞祴',1:'鏀剧數娴嬭瘯',2:'鍏呯數娴嬭瘯',3:'鍐呴樆娴嬭瘯',4:'鏈煡'];
- // 鍒ゆ柇workstatus
+ // console.log(workstatus);
+ // console.log(data.dev_testgroupnum+'***'+(batt.GroupIndexInFBSDevice+1)+'***'+mygraph.battstate);
+ // 鍒ゆ柇workstatus
switch(workstatus) {
case 0: { // 娴厖鐘舵��
mygraph.graphtype = 0;
@@ -1141,6 +1161,7 @@
callback.apply({}, [batt, data, mygraph]);
}
}else {
+ // console.log(123);
mygraph.graphtype = 4 ;
_str = '(鏈繛鎺�)';
// 鍥炶皟鍑芥暟
@@ -1148,6 +1169,7 @@
callback();
}
}
+ // console.log(lasttype+"**"+mygraph.graphtype);
// 鍒ゆ柇鏄惁鏇存柊鎷撴墤鍥�
if(lasttype != mygraph.graphtype){
mygraph.ischange = 1;
--
Gitblit v1.9.1