From 65226e3826a50957d973aae2f9ad3b5342fdb7ad Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期二, 15 一月 2019 17:19:05 +0800
Subject: [PATCH] 添加设备版本号
---
gx_tieta/WebRoot/js/elecircle.content.js | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index d8bd338..3b3767c 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -930,6 +930,18 @@
}
}
};
+
+ // 鏇存柊閰嶇疆椤圭殑鍊�
+ _prop.updateOpts = function(name, options, update) {
+ // 閬嶅巻閰嶇疆椤�
+ for(var i =0; i<options.length; i++) {
+ var _opts = options[i]; // 鑾峰彇褰撳墠寰幆鐨勫彉閲�
+ // 鏍规嵁鍚嶇О纭畾鏇存敼鐨勫唴瀹�
+ if(_opts.name == name) {
+ $.extend(_opts, update);
+ }
+ }
+ };
var options = [
{
name: 'workstatus',
@@ -1011,7 +1023,7 @@
status: 0,
notShow: false,
content: {
- text: '閫氫俊璁℃暟:'
+ text: '閫氫俊璁℃暟锛�'
}
},
{
@@ -1020,15 +1032,47 @@
status: 0,
notShow: false,
content: {
- text:'閫氫俊涓㈠寘鐜�:'
+ text:'閫氫俊涓㈠寘鐜囷細'
+ }
+ },
+ {
+ 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,
+ notShow: true,
+ content: {
+ text: '淇″彿寮哄害锛�'
}
}
];
// bts9100閰嶇疆椤�
gl.circleStatus.btsOpts = optionsBts;
+ // 61850鎷撴墤鍥剧姸鎬�
var status = new Status($('#eleCircleStatus'), options);
gl.circleStatus.status = status;
+
+ // BTS9100鎷撴墤鍥剧姸鎬�
+ var statusBts = new Status($('#eleCircleStatus'), optionsBts);
+ gl.circleStatus.statusBts = statusBts;
// 璁剧疆鍏ㄥ眬楠岃瘉璁惧绫诲瀷鐨勬鍒欒〃杈惧紡
var globalPattern = {
@@ -1047,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;
@@ -1115,6 +1161,7 @@
callback.apply({}, [batt, data, mygraph]);
}
}else {
+ // console.log(123);
mygraph.graphtype = 4 ;
_str = '(鏈繛鎺�)';
// 鍥炶皟鍑芥暟
@@ -1122,6 +1169,7 @@
callback();
}
}
+ // console.log(lasttype+"**"+mygraph.graphtype);
// 鍒ゆ柇鏄惁鏇存柊鎷撴墤鍥�
if(lasttype != mygraph.graphtype){
mygraph.ischange = 1;
--
Gitblit v1.9.1