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

81041

2019-01-07 d4ebdb224370b399f156d8da142019fb44216c64

 gx_tieta/WebRoot/ele-param1.jsp

@@ -132,6 +132,8 @@
        <div id="iframeAddData"></div>

        <!-- 关闭页面中iframe弹出层 -->

        <div id="iframeClose"></div>

        <!-- 查询并显示编辑面板 -->

        <div id="iframeShowEidt"></div>

      <script type="text/html" id="battGrouptools">

         <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>

         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>

@@ -170,7 +172,7 @@
               //console.info(json);

         <%   }   %>

         

         console.log(permits);

         // console.log(permits);

         

           layui.use(['form', 'table', 'layer', 'element'], function() {

              var table = layui.table;      // 获取表格模块

@@ -513,6 +515,15 @@
               searchHomeInfoByName(obj.data.StationName);

            }

            

            // 点击显示编辑面板

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

               var sName = $(this).data('sName');

               if(sName) {

                  searchHomeInfoByName(sName);

               }

            });

				
				
            // 根据机房的名称查询机房的信息

            function searchHomeInfoByName(homename) {

               var temp = {

@@ -536,7 +547,6 @@
                    async:true,            

                    dataType:'json',

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

				        	
                    success: function(res){

                       var rs = JSON.parse(res.result)

                       if(rs.code == 1) {