From e24744ff8b8aaa16ec75f33dd67a31e8fb94979d Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期一, 19 十一月 2018 14:48:22 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/js/elecircle.content.js | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index 265753a..afcc6b0 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -476,12 +476,12 @@
});
// 鎷撴墤鍥惧悕绉�
- eleCircle.drawText({
+ /*eleCircle.drawText({
id: 'title',
startX: 400,
startY: 40,
name: '璁惧娴厖鐘舵�佺數娴佹柟鍚�',
- });
+ });*/
// 璁惧鍐呴儴娓╁害
eleCircle.drawText({
@@ -489,6 +489,14 @@
startX: 270,
startY: 100,
name: '璁惧娓╁害锛�0鈩�',
+ });
+
+ // dcdc妯″潡鍛婅
+ eleCircle.drawText({
+ id: 'dcdcWarn',
+ startX: 250,
+ startY: 390,
+ name: 'DCDC妯″潡鍛婅锛�0x8000/0x8000',
});
var currentObj = {
@@ -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',
@@ -980,11 +1000,11 @@
name: 'workstatus',
type: 'list',
notShow: false,
- imgCallback: gl.statusImg.getImg,
+ //imgCallback: gl.statusImg.getImg,
status: 0,
content: {
list:gl.BTS9100.workstates,
- text: '璁惧鐘舵��:'
+ text: '璁惧鐘舵�侊細'
}
},
{
@@ -1003,7 +1023,7 @@
status: 0,
notShow: false,
content: {
- text: '閫氫俊璁℃暟:'
+ text: '閫氫俊璁℃暟锛�'
}
},
{
@@ -1012,16 +1032,30 @@
status: 0,
notShow: false,
content: {
- text:'閫氫俊涓㈠寘鐜�:'
+ 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 = {
LD9: /^40190/,
--
Gitblit v1.9.1