From 0cce8cd45143eb6aa19423554ec5bb1f59f3ebfc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 14:11:57 +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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index 265753a..0bb0133 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({
@@ -980,7 +980,7 @@
name: 'workstatus',
type: 'list',
notShow: false,
- imgCallback: gl.statusImg.getImg,
+ //imgCallback: gl.statusImg.getImg,
status: 0,
content: {
list:gl.BTS9100.workstates,
--
Gitblit v1.9.1