From 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 10:12:26 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/elecircle.content.js | 100 ++++++++++++++++++++++++++++++++------------------
1 files changed, 64 insertions(+), 36 deletions(-)
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index ea321c3..6ae94b9 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -1,5 +1,18 @@
var eleCircle = new EleCircle('eleCircle', {});
+var signalGood = new Image();
+signalGood.src="image/eleCircle/signalGood.gif";
+var signalBad = new Image();
+signalBad.src="image/eleCircle/signalBad.gif";
$(function() {
+ eleCircle.drawImg({
+ startX: 10,
+ startY: 30,
+ width: 30,
+ height: 30,
+ isShow:false,
+ id: 'signal'
+ });
+
// 鏈�涓婃柟鐨勬í绾�
eleCircle.drawLine({
startX: 120,
@@ -314,42 +327,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 +431,11 @@
});
// 缁樺埗浜屾瀬绠o
- eleCircle.drawDiode({
- startX: 430,
- startY: 160,
- id: 'diode'
- });
+// eleCircle.drawDiode({
+// startX: 430,
+// startY: 160,
+// id: 'diode'
+// });
// 缁樺埗ko寮�鍏�
eleCircle.drawSwitchBtn({
@@ -467,7 +480,7 @@
id: 'title',
startX: 400,
startY: 40,
- name: '鐢垫睜缁勬诞鍏呯姸鎬佺數娴佹柟鍚�',
+ name: '璁惧娴厖鐘舵�佺數娴佹柟鍚�',
});
// 璁惧鍐呴儴娓╁害
@@ -487,7 +500,7 @@
[430, 520], [430, 360],[320,360]
],
clockwise: 0,
- name: '鐢垫睜缁勬诞鍏呯姸鎬佺數娴佹柟鍚�'
+ name: '璁惧娴厖鐘舵�佺數娴佹柟鍚�'
}
currentObj = $.extend({}, currentObj, floatCharge);
@@ -526,6 +539,22 @@
lineWidth: 20,
fontWeight: 'bold',
id: 'eleCurrent'
+ });
+
+ // 璐熻浇鐢垫祦
+ eleCircle.drawText({
+ id: 'loaderCurr',
+ startX: 600,
+ startY: 50,
+ name: '鏈�澶ц礋杞界數娴侊細0A',
+ });
+
+ // 鏈�澶ф牳瀹圭數娴�
+ eleCircle.drawText({
+ id: 'disCurrMax',
+ startX: 600,
+ startY: 70,
+ name: '鏈�澶ф牳瀹圭數娴侊細0A',
});
// 娴厖鐢垫祦鏂瑰悜
@@ -929,7 +958,6 @@
if(typeof callback == 'function') {
callback.call({}, data);
}
-
// 鍒ゆ柇workstatus
switch(workstatus) {
case 0: { // 娴厖鐘舵��
--
Gitblit v1.9.1