Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

LiJun

2018-11-12 81c7c8e734d57a2f92a31010f801d9107ee545c5

 gx_tieta/WebRoot/js/elecircle.content.js

@@ -491,6 +491,14 @@
      name: '设备温度：0℃',

   });

   

   // dcdc模块告警

   eleCircle.drawText({

      id: 'dcdcWarn',

      startX: 250,

      startY: 390,

      name: 'DCDC模块告警：0x8000/0x8000',

   });

	
   var currentObj = {

      id: 'current'

   };

@@ -984,7 +992,7 @@
         status: 0,

         content: {

            list:gl.BTS9100.workstates,

            text: '设备状态:'

            text: '设备状态：'

         }

      },

      {