From 94e5b0bddf2b83e1591de425d3e30030fcbb1d23 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:50:53 +0800
Subject: [PATCH] 新建修改到APPLY

---
 gx_tieta/WebRoot/js/elecircle.content.js |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index 0bb0133..4ea08fb 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -491,6 +491,14 @@
 		name: '璁惧娓╁害锛�0鈩�',
 	});
 	
+	// dcdc妯″潡鍛婅
+	eleCircle.drawText({
+		id: 'dcdcWarn',
+		startX: 250,
+		startY: 390,
+		name: 'DCDC妯″潡鍛婅锛�0x8000/0x8000',
+	});
+	
 	var currentObj = {
 		id: 'current'
 	};
@@ -922,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',
@@ -984,7 +1004,7 @@
 			status: 0,
 			content: {
 				list:gl.BTS9100.workstates,
-				text: '璁惧鐘舵��:'
+				text: '璁惧鐘舵�侊細'
 			}
 		},
 		{
@@ -1003,7 +1023,7 @@
 			status: 0,
 			notShow: false,
 			content: {
-				text: '閫氫俊璁℃暟:'
+				text: '閫氫俊璁℃暟锛�'
 			}
 		},
 		{
@@ -1012,16 +1032,39 @@
 			status: 0,
 			notShow: false,
 			content: {
-				text:'閫氫俊涓㈠寘鐜�:'
+				text:'閫氫俊涓㈠寘鐜囷細'
+			}
+		},
+		{
+			name: 'sdCard',
+			type: 'text',
+			status: 0,
+			notShow: false,
+			content: {
+				text: 'sd鍗＄姸鎬侊細锛燂紵锛�'
+			}
+		},
+		{
+			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 = {
 		LD9: /^40190/,

--
Gitblit v1.9.1