修改

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-21 35fefed0792c40cb99b8d15fa5811bbb5992bff9

 gx_tieta/WebRoot/js/groupmanage.js

@@ -15,6 +15,9 @@
   rs.behind = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_behind}";   // 落后图标

   rs.timeout = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_timeout}";   // 延时机房图标

   rs.warn = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_warn}";   // 告警机房图标

   rs.powercut = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_poff}";   // 停电机房图标

   rs.xuhang = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:Chart_xuhang}";      // 续航不足机房图标

   rs.installed = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_install}"; // 未安装图标

   // 61850设备状态

   rs.nuclear = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_nuclear_cap}";

   rs.devalarm = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_dev_alarm}";

@@ -39,6 +42,9 @@
   $('.popup .img-behind').attr('src', imgList.behind);

   $('.popup .img-warn').attr('src', imgList.warn);

   $('.popup .img-timeout').attr('src', imgList.timeout);

   $('.popup .img-powercut').attr('src', imgList.powercut);

   $('.popup .img-xuhang').attr('src', imgList.xuhang);

   $('.popup .img-installed').attr('src', imgList.installed);

   

   // 61850设备状态

   $('.popup .img-nuclear').attr('src', imgList.nuclear);

@@ -65,6 +71,10 @@
   $('.popup .img-behind').attr('src', 'images/none.jpg');

   $('.popup .img-warn').attr('src', 'images/none.jpg');

   $('.popup .img-timeout').attr('src', 'images/none.jpg');

   $('.popup .img-powercut').attr('src', 'images/none.jpg');

   $('.popup .img-xuhang').attr('src', 'images/none.jpg');

   $('.popup .img-installed').attr('src', 'images/none.jpg');

	
   // 61850设备状态图标

   $('.popup .img-nuclear').attr('src', 'images/none.jpg');

   $('.popup .img-devalarm').attr('src', 'images/none.jpg');

@@ -137,6 +147,7 @@
   var _behind = $('#file_add_behind').val().length;

   var _warn = $('#file_add_warn').val().length;

   var _timeout = $('#file_add_timeout').val().length;

	
   // 61850设备

   if(_chart_file&&_chart_name&&_logo&&_normal&&_behind&&_warn&&_timeout) {

      $('.popup .ensure-btn').addClass('add-btn').removeClass('disabled');

@@ -155,6 +166,9 @@
   var behind = $('.popup .img-behind').attr('src');

   var warn = $('.popup .img-warn').attr('src');

   var timeout = $('.popup .img-timeout').attr('src');

   var powercut = $('.popup .img-powercut').attr('src');

   var xuhang = $('.popup .img-xuhang').attr('src')

   var installed = $('.popup .img-installed').attr('src');

   

   // 61850设备

   var nuclear = $('.popup .img-nuclear').attr('src');

@@ -188,6 +202,24 @@
   // 地图延时图标

   if(pregImgSrc(timeout)) {   

      rs.timeout = timeout;

      rs.count ++;

   }

	
   // 地图停电图标

   if(pregImgSrc(powercut)) {	
      rs.powercut = powercut;

      rs.count ++;

   }

	
   // 续航不足图标

   if(pregImgSrc(xuhang)) {	
      rs.xuhang = xuhang;

      rs.count ++;

   }

	
   // 地图未安装图标

   if(pregImgSrc(installed)) {	
      rs.installed = installed;

      rs.count ++;

   }

   

@@ -253,6 +285,15 @@
      case 'warn':

         rs = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_warn}";

         break;

      case 'powercut':

         rs = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_poff}";

         break;

      case 'xuhang':

         rs = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:Chart_xuhang}";

         break;

      case 'installed':

         rs = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_install}";

         break;

      // 61850设备状态

      case 'nuclear':

         rs = "User_ChartAction!serchByInfo?json={Chart_file:'"+cfile+"',Chart_name:chart_nuclear_cap}";