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

81041

2018-11-03 be47638f60bc2efbbe98b3debb854a5fcd4fc9b0

 gx_tieta/WebRoot/control.jsp

@@ -24,6 +24,7 @@
   <link rel="stylesheet" href="font-awesome-4.7.0/css/font-awesome.css">

   <link rel="stylesheet" type="text/css" href="css/whyc-ui.css">

   <link rel="stylesheet" type="text/css" href="css/confirm.css">

   <link rel="stylesheet" type="text/css" href="src/css/layui.css">

   <script type="text/javascript" src="js/echarts.js"></script>

   <script type="text/javascript" src="js/jquery-1.8.3.js"></script>

   <script type="text/javascript" src="js/base.js"></script>

@@ -239,6 +240,11 @@
                        <a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

                           <span class="whyc-btn-icon fa fa-stop-circle"></span>

                           <span class="whyc-btn-txt" id="stopTestBtn">停止测试</span>

                        </a>

                        <br>

                        <a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

                           <span class="whyc-btn-icon fa fa-gear"></span>

                           <span class="whyc-btn-txt" id="sysSet">设置系统参数</span>

                        </a>

                       </div>

                  </div>

@@ -943,6 +949,33 @@
      </div>

   </div>

   

   <!-- 系统参数设置 -->

   <div class="popup" id="sysSet_popup">

      <div class="popup-title"><span>系统参数设置</span> <a href="javascript:;" class="close">X</a></div>

      <div class="popup-content">

         <div class="popup-tbl">

            <table>

               <tbody>

                  <tr>

                     <th>机房id</th>

                     <th>机房名称</th>

                  </tr>

                  <tr>

                     <td><input type="text" id="sysSet_dev_id" readonly="readonly" value=""></td>

                     <td><input type="text" id="sysSet_stationName" readonly="readonly" value=""></td>

                  </tr>

               </tbody>

            </table>

         </div>

      </div>

		
      <div class="popup-footer">

         <input type="button" name="" id="sysSet_restart" value="重启设备" >

         <input type="button" name="" id="sysSet_read" value="读取" >							
         <input type="button" name="" id="sysSet_en" class="status-change-set" value="设置" >

      </div>

   </div>

	
   <!-- 单体曲线 -->

   <div class="popup w960 mr480x" id="monLineGraphPopup">

      <div id="control_popupTools">

@@ -1045,6 +1078,8 @@
   <!-- 引入电路图 -->

   <script type="text/javascript" src="js/elecircle.js"></script>

   <script type="text/javascript" src="js/elecircle.content.js"></script>

   <!-- 引入layui框架 -->

   <script type="text/javascript" src="src/layui.all.js"></script>

   <script type="text/javascript">

   var permits;

   <%   Object obj=session.getAttribute("permits");

@@ -1053,7 +1088,6 @@
         permits=<%=permits%>;

         //console.info(json);

   <%   }   %>

   console.log(permits);

      //拓扑图状态对象

      var mygraph = {

         battstate:0,

@@ -1105,11 +1139,24 @@
      myChart=echarts.init(oConEcharts);

      myChart.showLoading();

      

      // 设置页面权限模块

      $(function() {

         var testOp = checkUserPermit(permits, 'batt_test_op_permit');

         console.log(testOp);

         if(!testOp) {

            $(".ele-circle .tools-btn").remove();

         }

			
      });

		
		
		
      // 设置面板

      var LD9_popup = new Popup($('#LD9_popup'));

      var equip61850_popup = new Popup($('#equip61850'));

      var BTS_popup = new Popup($('#bts'));

      var equip4016_popup = new Popup($('#equip4016'));

      var sysSet_popup = new Popup($('#sysSet_popup'));

      var localNav = new Popup($('#localNav'));

      // 充放电弹出框设置

      $(function() {

@@ -1138,6 +1185,12 @@
            localNav.hidePopup();   // 隐藏localNav弹出框和遮罩层

         });

         

         // 设置系统参数

         $('#sysSet_popup').find('.close').bind('click', function() {

            sysSet_popup.hidePopup();   // 隐藏sysSet_popup弹出框和遮罩层

         });

			
			
         // 窗口大小改变

         $(window).resize(function() {

            LD9_popup.hidePopup();   // 隐藏LD9弹出框和遮罩层

@@ -1145,6 +1198,7 @@
            BTS_popup.hidePopup();   // 隐藏bts弹出框和遮罩层

            equip4016_popup.hidePopup();   // 隐藏4016弹出框和遮罩层

            localNav.hidePopup();

            sysSet_popup.hidePopup();   // 隐藏sysSet_popup弹出框和遮罩层

         });

      });

      //初始化柱状图

@@ -4350,6 +4404,42 @@
         

      });

      

      // 系统参数设置

      $(function() {

         // 点击设置系统参数

         $('#sysSet').click(function() {

            var batt = getBatt();

            var temp = {

               dev_id:batt.FBSDeviceId

            };

            layer.msg('功能开发中...');

				
            return;

            sysSet_popup.showPopup();

            searchSysData(temp);

         });

				
         // 查询设备的系统参数

         function searchSysData(temp) {

            $.ajax({

                  type: "post",

                  url: "Fbs9100_sysparamAction_action_serchByCondition",

                  async: true,

                  dataType: 'json',

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

                  success: function(data) {

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

                      console.info(rs);

                      if(rs.code == 1){

		                	
                      }else{

		                
                      }

                  }

              });

         }

      });

		
      // 机历卡模块

      $(function() {

         // 获取选项卡列表