From bb65f33c9fdff40844f17e95e3e75aed2b42bda2 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 14:47:33 +0800
Subject: [PATCH] 修改内容

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

diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index ea321c3..47e27b4 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -314,42 +314,42 @@
 	});
 	
 	// 浜屾瀬绠′笂鏂圭殑妯嚎
-	eleCircle.drawLine({
-		startX: 380,
-		startY: 135,
-		endX: 430,
-		endY: 135,
-		strokeStyle: '#FF0000',
-	});
+//	eleCircle.drawLine({
+//		startX: 380,
+//		startY: 135,
+//		endX: 430,
+//		endY: 135,
+//		strokeStyle: '#FF0000',
+//	});
 	// 浜屾瀬绠′笂鏂圭殑绔栫嚎
-	eleCircle.drawLine({
-		startX: 430,
-		startY: 135,
-		endX: 430,
-		endY: 160,
-		strokeStyle: '#FF0000',
-	});
+//	eleCircle.drawLine({
+//		startX: 430,
+//		startY: 135,
+//		endX: 430,
+//		endY: 160,
+//		strokeStyle: '#FF0000',
+//	});
 	
 	
 	
 	
 	// 浜屾瀬绠′笅鏂圭殑绔栫嚎
-	eleCircle.drawLine({
-		startX: 430,
-		startY: 220,
-		endX: 430,
-		endY: 250,
-		strokeStyle: '#FF0000',
-	});
+//	eleCircle.drawLine({
+//		startX: 430,
+//		startY: 220,
+//		endX: 430,
+//		endY: 250,
+//		strokeStyle: '#FF0000',
+//	});
 	
 	// 浜屾瀬绠′笅鏂圭殑妯嚎
-	eleCircle.drawLine({
-		startX: 430,
-		startY: 250,
-		endX: 380,
-		endY: 250,
-		strokeStyle: '#FF0000',
-	});
+//	eleCircle.drawLine({
+//		startX: 430,
+//		startY: 250,
+//		endX: 380,
+//		endY: 250,
+//		strokeStyle: '#FF0000',
+//	});
 	
 	
 	// BATC+绔笂鏂圭殑铏氱嚎
@@ -418,11 +418,11 @@
 	});
 	
 	// 缁樺埗浜屾瀬绠o
-	eleCircle.drawDiode({
-		startX: 430,
-		startY: 160,
-		id: 'diode'
-	});
+//	eleCircle.drawDiode({
+//		startX: 430,
+//		startY: 160,
+//		id: 'diode'
+//	});
 	
 	// 缁樺埗ko寮�鍏�
 	eleCircle.drawSwitchBtn({
@@ -528,6 +528,22 @@
 		id: 'eleCurrent'
 	});
 	
+	// 璐熻浇鐢垫祦
+	eleCircle.drawText({
+		id: 'loaderCurr',
+		startX: 600,
+		startY: 50,
+		name: '鏈�澶ц礋杞界數娴侊細0A',
+	});
+	
+	// 鏈�澶ф牳瀹圭數娴�
+	eleCircle.drawText({
+		id: 'disCurrMax',
+		startX: 600,
+		startY: 70,
+		name: '鏈�澶ф牳瀹圭數娴侊細0A',
+	});
+	
 	// 娴厖鐢垫祦鏂瑰悜
 	var floatCurr = [
          {

--
Gitblit v1.9.1