From b4b9c8587e72bc27804551b406f2e4f6ffc2cbb0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.27>
Date: 星期二, 06 十一月 2018 11:24:07 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/common.js | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 2708ce0..ab36427 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -295,8 +295,13 @@
gl.BTS9100.alarmstates = [
'鏃�','鏆傚仠','鏀剧數娴嬭瘯','鏀剧數绛夊緟','闄愭祦鍏呯數','鐩存祦鍏呯數','鍏呯數绛夊緟','娴嬭瘯鏃堕棿鍒�',
'娴嬭瘯瀹归噺鍒�','鍗曚綋涓嬮檺鍒�','缁勭涓嬮檺鍒�','甯傜數寮傚父','瀛樺偍鍗′笉瓒�','璐熻浇娓╁害楂�','鐢垫祦寮傚父','杩滅▼閫氫俊鍧�',
- '璐熻浇閫氫俊鍧�','閫夋嫨閫氫俊鍧�','璐熻浇鐢垫祦鍧�','鍐呭瓨鐢宠鍧�','鏈煡'
+ '璐熻浇閫氫俊鍧�','閫夋嫨閫氫俊鍧�','杞芥ā鍧楁斁鐢佃繃鍔熺巼鍋滄','鍐呴儴绋嬪簭寮傚父鍋滄','甯傜數鎭㈠鍋滄鍗囧帇鏀剧數','鍏呯數杩囩▼涓競鐢典腑鏂�','鍚堣矾鍣ㄦ斁鐢靛姛鑳界粍绔數鍘嬩笅闄�','娓╁害涓婇檺鍒�','鏈煡'
];
+ /*gl.BTS9100.alarmstates = [
+ '鏃�','鏆傚仠','鏀剧數娴嬭瘯','鏀剧數绛夊緟','闄愭祦鍏呯數','鐩存祦鍏呯數','鍏呯數绛夊緟','娴嬭瘯鏃堕棿鍒�',
+ '娴嬭瘯瀹归噺鍒�','鍗曚綋涓嬮檺鍒�','缁勭涓嬮檺鍒�','甯傜數寮傚父','瀛樺偍鍗′笉瓒�','璐熻浇娓╁害楂�','鐢垫祦寮傚父','杩滅▼閫氫俊鍧�',
+ '璐熻浇閫氫俊鍧�','閫夋嫨閫氫俊鍧�','璐熻浇鐢垫祦鍧�','鍐呭瓨鐢宠鍧�','鏈煡'
+ ];*/
// LD9璁惧
gl.namespace('LD9');
@@ -448,6 +453,12 @@
gl.CMD.e61850.stop = 83; //鍋滄娴嬭瘯
gl.CMD.e61850.setDischargeParm = 40; //璁剧疆鍙傛暟
gl.CMD.e61850.getDischargeParm = 41; //鑾峰彇鍙傛暟
+
+ //CMD涓媠ys
+ gl.namespace('CMD.sys');
+ gl.CMD.sys.restart = 0x10;
+ gl.CMD.sys.set = 0x81;
+ gl.CMD.sys.get = 0x80;
})(jQuery, window, document, GLOBAL);
// 鍦板浘淇℃伅
@@ -517,7 +528,7 @@
str += '&battid='+battid;
}
if(monnum){
- str += '&monnum'+monnum;
+ str += '&monnum='+monnum;
}
//var str = page+'?province='+province+'&city='+city+'&county='+county+'&home='+home;
return str;
--
Gitblit v1.9.1