未审批可更改

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

2019-01-18 2fe250ece8de95b3f70172fe5b45793ab6a3084a

 gx_tieta/WebRoot/elegroup.jsp

@@ -23,7 +23,7 @@
         position: absolute;

         top: 0;

         right: 0;

         z-index: 999;

         z-index: 99;

      }

      .toolbar-fixed-top-right.right10 {

         right: 10px;

@@ -70,6 +70,7 @@
               <tr class="fWeight">

                  <td>省</td>               <!-- 省 -->

                  <td>市</td>               <!-- 市 -->

                  <td>区/县</td>            <!-- 区/县 -->

                  <td><s:text name="Computer_site"/></td>                  <!-- 机房站点（或机房设备） -->

                  <td><s:text name="Battery"/></td>                     <!-- 蓄电池组 -->

               </tr>

@@ -79,6 +80,9 @@
                  </td>

                  <td>

                     <select id="city" name=""></select>

                  </td>

                  <td>

                     <select id="county" name=""></select>

                  </td>

                  <td>

                     <select id="station_name" name=""></select>

@@ -103,8 +107,9 @@
            <select name="addType" id="addType">

               <option value="0">全省机房</option>

               <option value="1">全市机房</option>

               <option value="2">单个机房</option>

               <option value="3">电池组</option>

               <option value="2">全市区/县房</option>

               <option value="3">单个机房</option>

               <option value="4">电池组</option>

            </select>

            <a href="javasscript:;" class="tool-btn" id="toolBtnAdd" title="添加"><i class="fa fa-plus"></i></a>

            <a href="javasscript:;" class="tool-btn" id="toolBtnApply" title="应用"><i class="fa fa-sticky-note-o"></i></a>

@@ -153,7 +158,8 @@
   <div id="tb-right-menu">

      <a href="javascript:;" class="apply"><s:text name="Apply"/></a>                              <!-- 应用 -->

      <a href="javascript:;" class="add-province">添加全省机房</a>                                 <!-- 添加全省机房 -->

      <a href="javascript:;" class="add-city">添加全市机房</a>                                     <!-- 添加全市机房 -->

      <a href="javascript:;" class="add-city">添加全市机房</a>

      <a href="javascript:;" class="add-county">添加全区/县机房</a>                                     <!-- 添加全市机房 -->

      <a href="javascript:;" class="add-station"><s:text name="Add_all_Chartere_room_batt_group"/></a>   <!-- 添加整个机房电池组 -->

      <a href="javascript:;" class="add-batt"><s:text name="Add_single_batt_group"/></a>               <!-- 添加单个电池组 -->

      <!--<a href="javascript:;" class="add-weihuqu"><s:text name="Add_maintenance_area_batt_group"/></a>       添加整个维护区电池组 -->

@@ -301,7 +307,7 @@
         }

      });

      

      setUserName();

      //setUserName();

      //页面加载完生成包机组列表

      searchAllbaojiGroup();

      

@@ -418,8 +424,9 @@
               createBattTable(allbattstation);

               addTdIdx($('#tbroom table tbody td'),battstationIdList);                           

            }

            $('#station_num').text(totalstationNum);

            $('#batt_num').text(totalbattNum);

            getbattStationlength();

            /* $('#station_num').text(totalstationNum);

            $('#batt_num').text(totalbattNum); */

         });         

      }

   }

@@ -566,9 +573,9 @@
                  //console.info(data);

                  var model=eval("("+data.result+")");

                  if(model.code==1){

                     alert(model.msg);							
                     layer.msg(model.msg);							
                  }else{

                     alert(model.msg);

                     layer.msg(model.msg);

                  }

                  $('#lbottom .li-con ul').remove();

                  searchAllbaojiGroup();

@@ -577,10 +584,10 @@
                  $('#allShade').hide();

               });                           

            }else{

               alert('<s:text name="The_baoji_group_name_already_exists,Please_enter_a_different_set_of_names"/>!');      /* 该包机组名已经存在,请输入其他组名 */

               layer.msg('<s:text name="The_baoji_group_name_already_exists,Please_enter_a_different_set_of_names"/>!');      /* 该包机组名已经存在,请输入其他组名 */

            }

         }else{

            alert('<s:text name="Can_not_be_empty"/>！！！');         /* 不能为空 */

            layer.msg('<s:text name="Can_not_be_empty"/>！！！');         /* 不能为空 */

         }

      });

      //点击编辑按钮给当前行添加class

@@ -617,7 +624,7 @@
            if(flag){

               $.post('User_battgroup_baojigroupAction!update','us.baoji_group_id='+id+'&us.baoji_group_name='+txtVal,function(data){

                  var model=eval("("+data.result+")");

                  alert(model.msg);

                  layer.msg(model.msg);

                  $('#lbottom .li-con ul').remove();

                  searchAllbaojiGroup();

                  //隐藏重命名窗口

@@ -625,31 +632,33 @@
                  $('#allShade').hide();

               });

            }else{

               alert('<s:text name="The_baoji_group_name_already_exists,Please_enter_a_different_set_of_names"/>!');      /* 该包机组名已经存在,请输入其他组名 */

               layer.msg('<s:text name="The_baoji_group_name_already_exists,Please_enter_a_different_set_of_names"/>!');      /* 该包机组名已经存在,请输入其他组名 */

            }

         }else{

            alert('<s:text name="Can_not_be_empty"/>！！！');         /* 不能为空 */

            layer.msg('<s:text name="Can_not_be_empty"/>！！！');         /* 不能为空 */

         }

         

      });

      //点击删除按钮

      $('#right-menu .del-group').live('click',function(){

         var oLi=$('#lbottom .li-con li').eq(LiIndex);

         if(confirm("<s:text name='Confirm_del'/>'"+oLi.text()+"'？")){         /* 确认删除包机组 */

         // 取人删除包机组

         layer.confirm("<s:text name='Confirm_del'/>'"+oLi.text()+"'？", {icon:3, title: '系统提示'}, function(index) {

            layer.close(index);

            var baojigroupid=oLi.attr('value');

            loading.showLoading();

            $.post('User_battgroup_baojigroupAction!delete','us.baoji_group_id='+baojigroupid+"&us.baoji_group_name="+oLi.text(),function(data){

               loading.hideLoading();

               var model=eval("("+data.result+")");

               if(model.code==1){

                  alert(model.msg);					
                  layer.msg(model.msg);					
               }else{

                  alert(model.msg);

                  layer.msg(model.msg);

               }

               $('#lbottom .li-con ul').remove();

               searchAllbaojiGroup();

            });

         }

         });

      });

   });

   

@@ -770,19 +779,24 @@
      $('#right-menu').on('click','.del-user',function(){

         var ouserLi=$('#rbottom .li-con li').eq(LiIndex); 

         var obaoLi=$('#lbottom .li-con li.b8cfe5');

         if(confirm('<s:text name="Determine"/><s:text name="From"/>:'+obaoLi.text()+'<s:text name="Delete"/>:'+ouserLi.text()+"?")){   //确定从包机组  吗?

            var num=ouserLi.attr('num');

            var temp = {num:num,uname:ouserLi.text(),baoji_group_name:obaoLi.text()};

            loading.showLoading();

            $.post('User_battgroup_baojigroup_usrAction!delete',"json="+JSON.stringify(temp),function(data){

               loading.hideLoading();

               var model=eval("("+data.result+")");

               alert(model.msg);

               searchBaojiZuUser(obaoLi.attr('value'));

         // 提示是否删除包机用户

         layer.confirm(

            '<s:text name="Determine"/><s:text name="From"/>'+obaoLi.text()+'<s:text name="Delete"/>'+ouserLi.text()+"?", 
            {icon:3,title:'系统提示'}, 
            function(index) {

               layer.close(index);

               var num=ouserLi.attr('num');

               var temp = {num:num,uname:ouserLi.text(),baoji_group_name:obaoLi.text()};

               loading.showLoading();

               $.post('User_battgroup_baojigroup_usrAction!delete',"json="+JSON.stringify(temp),function(data){

                  loading.hideLoading();

                  var model=eval("("+data.result+")");

                  layer.msg(model.msg);

                  searchBaojiZuUser(obaoLi.attr('value'));

               });

               //删除选中的行

               $('#rbottom .li-con li').eq(LiIndex).remove();

            });

            //删除选中的行

            $('#rbottom .li-con li').eq(LiIndex).remove();			
         }

      });

      

      $('#right-menu').on('click','.apply',function(data){

@@ -806,14 +820,14 @@
            //console.info(json);

            $.post('User_battgroup_baojigroup_usrAction!add',"json="+json,function(data){

               var model=eval("("+data.result+")");

               alert(model.msg);

               layer.msg(model.msg);

               var baojizuid=$('#lbottom .li-con li.b8cfe5').attr('value');

               searchBaojiZuUser(baojizuid);

               // 隐藏等待框

               loading.hideLoading();

            });

         }else{

            alert('<s:text name="There_is_nothing_to_be_done"/>');      /* 没有什么可以做的 */

            layer.msg('<s:text name="There_is_nothing_to_be_done"/>');      /* 没有什么可以做的 */

         }

      });      

      //点击查看包机组效果

@@ -989,9 +1003,48 @@
              }else {

                 $select.text('').html('<option>暂无可测市</option>');

              }

              findStationNamebyStationname1();

              findCounty();

           }

       });

   }

	
   // 查询区/县

   function findCounty() {

      var tmp = {

         StationName1:$("#station_name1").val(),

         StationName2:$("#city").val(),

      };

		
      // 查询区县

      $.ajax({

         type: 'post',

         async: true,

         url: "BattInfAction!serchStationName5_all",

         data: "json="+JSON.stringify(tmp),

         success:function(data) {

            var rs = JSON.parse(data.result);

            var $select = $("#county");

            if(rs.code==1){

               var _data = rs.data;

               // 根据数据构造生成下拉列表的数据

               var optsList = [];

               for(var i=0;i<_data.length;i++){

                  var __data = _data[i];

                  var _attr = {

                     StationId: __data.StationId

                  };

                  var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);

                  optsList.push(tmp);

               }

					
               // 根据数据生成下拉列表

               createOptions($select, optsList, true);

            }else{

               $select.text('').html('<option>暂无可测机房站点</option>');

            }

            findStationNamebyStationname1();

         }

      });

   }

   

   //当维护区的值变换时更新市

@@ -1001,6 +1054,11 @@
   

   //当维护区的值变换时更新机房站点

   $('#city').change(function(){

      findCounty();

   });

	
   //当区/县的值变换时更新机房站点

   $('#county').change(function(){

      findStationNamebyStationname1();

   });

   

@@ -1008,7 +1066,8 @@
   function findStationNamebyStationname1(){

      var tmp = {

         StationName1:$("#station_name1").val(),

         StationName2:$("#city").val()

         StationName2:$("#city").val(),

         StationName5:$("#county").val()

      };

      //var selectvalue=$("#station_name1 option:selected").val();

      //alert(selectvalue);

@@ -1024,7 +1083,7 @@
               var _attr = {

                  StationId: __data.StationId

               };

               var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

               var tmp = getOptionsData(__data.StationName, __data.StationName, __data, _attr);

               optsList.push(tmp);

            }

            

@@ -1049,6 +1108,7 @@
      var tmp = {

         StationName1:$("#station_name1").val(),

         StationName2:$("#city").val(),

         StationName5:$("#county").val(),

         StationName: $("#station_name").val(),

         StationId: stationid

      };

@@ -1388,6 +1448,7 @@
            binf={

               BattGroupId: 0,            // 电池组id

               StationName: '',         // 机房名称

               StationName5: '',         // 区/县

               StationName2: '',         // 市 

               StationName1: province,      // 省

            };

@@ -1412,7 +1473,7 @@
               }

            });

         }else{

            alert('请选择省!');      //请先选择省

            layer.msg('请选择省!');      //请先选择省

         }

      });

      

@@ -1429,7 +1490,51 @@
            binf={

               BattGroupId: 0,            // 电池组id

               StationName: '',         // 机房名称

               StationName5: '',         // 区/县

               StationName2: city,         // 市 

               StationName1: '',         // 省

            };

            //console.log(binf);

            var json=window.JSON.stringify(binf);

            $.post('BattInfAction!serchBatt','result='+json,function(data){

               var model=eval("("+data.result+")");

               //console.info(model);

               if(model.code==1 && model.data.length>0){

                  //var stationid=0;

                  for(var i=0;i<model.data.length;i++){

                     var batt=model.data[i];

                     //console.info(batt);

                     myRoom.push(batt.StationName);

                     myRoomVal.push(batt.StationId);								
                     singleELeGroup.push(batt.StationName);

                     singleELeGroup.push(batt.BattGroupName);

                     singleEleVal.push(batt.StationId);

                     singleEleVal.push(batt.BattGroupId);						
                  }

                  //console.info(singleELeGroup);

                  addRedLi(myRoom,myRoomVal,singleELeGroup,singleEleVal);						
               }

            });

         }else{

            layer.msg('请选择市!');      //请先选择市

         }

      });

		
      // 添加整个区/县的机房

      $('#tb-right-menu .add-county').click(function() {

         //获取包机房名称和新增电池组名称

         var myRoom=new Array();

         var myRoomVal=new Array();

         var singleELeGroup=new Array();

         var singleEleVal=new Array();

         var county = $('#county').attr('value');	
         if(county.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){

            var binf=new Object();

            binf={

               BattGroupId: 0,            // 电池组id

               StationName: '',         // 机房名称

               StationName5: county,         // 区/县

               StationName2: '',         // 市 
               StationName1: '',         // 省

            };

            //console.log(binf);

@@ -1454,7 +1559,7 @@
               }

            });

         }else{

            alert('请选择市!');      //请先选择市

            layer.msg('请选择区/县!');      //请先选择区/县

         }

      });

      

@@ -1466,6 +1571,7 @@
            binf={

               BattGroupId: battgrouid,   // 电池组id

               StationName: '',         // 机房名称

               StationName5: '',         // 区/县

               StationName2: '',         // 市 

               StationName1: '',         // 省

            };

@@ -1490,7 +1596,7 @@
               }

            });

         }else{

            alert('<s:text name="Please_choose_a_group_of_battery_pack!"/>');

            layer.msg('<s:text name="Please_choose_a_group_of_battery_pack!"/>');

         }         

      });

      //添加整个机房的电池组

@@ -1506,6 +1612,7 @@
            binf={

               BattGroupId: 0,            // 电池组id

               StationName: stationname,   // 机房名称

               StationName5: '',         // 区/县

               StationName2: '',         // 市 

               StationName1: '',         // 省

            };

@@ -1530,13 +1637,15 @@
               }

            });

         }else{

            alert('<s:text name="Please_select_a_set_of_Computer_room"/>!');      //请先选择一组机房

            layer.msg('<s:text name="Please_select_a_set_of_Computer_room"/>!');      //请先选择一组机房

         }         

      });

      //删除当前的行电池组

      $('#tb-right-menu .del').click(function(){

         var baojiLi=$('#lbottom .li-con li.b8cfe5');

         if(confirm('<s:text name="Confirm_that_the_selected_battery_pack_is_removed_from_the_package"/>？')){

         // 是否确认删除电池组

         layer.confirm('<s:text name="Confirm_that_the_selected_battery_pack_is_removed_from_the_package"/>？',{icon:3, title: '系统提示'},function(index) {

            layer.close(index);

            var removeArray=new Array();

            var redTr=$('#tbroom table .red');

            //需要判断是否含有新添加的电池组

@@ -1555,7 +1664,7 @@
               $.post('User_battgroup_baojigroup_battgroupAction!delete','result='+json,function(data){

                  loading.hideLoading();

                  var model=eval("("+data.result+")");

                  alert(model.msg);

                  layer.msg(model.msg);

                  searchAllBattstation(baojiLi.attr('value'));

               });

               bigEleGroupTxt=new Array();

@@ -1592,8 +1701,8 @@
                  removeLeftli(removeLi[i]);

               }

               getbattStationlength();            

            }			
         }

            }

         });

      });

      

      //移除左边列表中value='stationid'的li

@@ -1633,13 +1742,13 @@
            $.post('User_battgroup_baojigroup_battgroupAction!add','result='+json,function(data){

               loading.hideLoading();

               var model=eval("("+data.result+")");

               alert(model.msg);

               layer.msg(model.msg);

               searchAllBattstation(baojiLi.attr('value'));

               bigEleGroupTxt=new Array();

               bigEleGroupVal=new Array();            

            });

         }else{

            alert('<s:text name="There_is_nothing_to_be_done"/>');      /* 没有什么可以做的 */

            layer.msg('<s:text name="There_is_nothing_to_be_done"/>');      /* 没有什么可以做的 */

         }

      });

      

@@ -1714,7 +1823,7 @@
         // 机房列表滚动到顶部

         scrollBottom($('#ltop .li-con'), $('#ltop .li-con ul'));

      }else {

         alert('添加的内容已存在！');

         layer.msg('添加的内容已存在！');

      }

      

   }

@@ -1837,7 +1946,7 @@
      $('#toolBtnAdd').click(function() {

         var baoji = $('#lbottom .li-con li.b8cfe5').text();

         if(baoji.length == 0) {

            alert('请选择左下方的包机组！！！');

            layer.msg('请选择左下方的包机组！！！');

         }else {

            var addType = $('#addType').val();

            addBattGroup(addType);

@@ -1848,7 +1957,7 @@
      $('#toolBtnApply').click(function() {

         var baoji = $('#lbottom .li-con li.b8cfe5').text();

         if(baoji.length == 0) {

            alert('请选择左下方的包机组！！！');

            layer.msg('请选择左下方的包机组！！！');

         }else {

            $('#tb-right-menu .apply').click();

         }

@@ -1858,7 +1967,7 @@
      $('#toolBtnAll').click(function() {

         var baoji = $('#lbottom .li-con li.b8cfe5').text();

         if(baoji.length == 0) {

            alert('请选择左下方的包机组！！！');

            layer.msg('请选择左下方的包机组！！！');

         }else {

            $('#tb-right-menu .all-pitch').click();

         }

@@ -1868,7 +1977,7 @@
      $('#toolBtnDel').click(function() {

         var baoji = $('#lbottom .li-con li.b8cfe5').text();

         if(baoji.length == 0) {

            alert('请选择左下方的包机组！！！');

            layer.msg('请选择左下方的包机组！！！');

         }else {

            $('#tb-right-menu .del').click();

         }

@@ -1884,9 +1993,12 @@
               $('#tb-right-menu .add-city').click();

            break;

            case '2':

               $('#tb-right-menu .add-station').click();

               $('#tb-right-menu .add-county').click();

            break;

            case '3':

               $('#tb-right-menu .add-station').click();

            break;

            case '4':

               $('#tb-right-menu .add-batt').click();

            break;