From 81c7c8e734d57a2f92a31010f801d9107ee545c5 Mon Sep 17 00:00:00 2001 From: LiJun <LiJun@192.168.10.24> Date: 星期一, 12 十一月 2018 15:08:21 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/js/elecircle.content.js | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js index 265753a..d8bd338 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 = { @@ -980,11 +988,11 @@ name: 'workstatus', type: 'list', notShow: false, - imgCallback: gl.statusImg.getImg, + //imgCallback: gl.statusImg.getImg, status: 0, content: { list:gl.BTS9100.workstates, - text: '璁惧鐘舵��:' + text: '璁惧鐘舵�侊細' } }, { -- Gitblit v1.9.1