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

hdw

2019-01-14 c4901764c4a7b6babf3110c9df7429ab55f870e0

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

 gx_tieta/WebRoot/mobil/ele-param2.html

@@ -172,7 +172,7 @@
                            <div class="layui-form-item">

                                <label class="layui-form-label"><i class="fa fa-search"></i></label>

                                <div class="layui-input-block">

                                    <input type="text" name="title" id="searchInput1" autocomplete="off" placeholder="机房搜索" class="layui-input">

                                    <input type="text" name="title" id="searchInput1" autocomplete="off" placeholder="请输入新建机房名" class="layui-input">

                                </div>

                            </div>

                        </div>

@@ -195,7 +195,7 @@
            <div data-role="navbar">

                <ul>

                  <li><a href="index.html" id="cancel"  class="ui-btn ui-btn-inline ui-corner-all  ui-btn-icon-delete" data-position-to="window" data-icon="home" data-role="button">首页</a></li>

                  <li><a href="#yourPopup" data-rel="popup" id="creatn" class="ui-btn ui-btn-inline ui-corner-all  ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">新建</a></li>

                   <li><a href="#yourPopup" data-rel="popup"  id="creatn" class="ui-btn ui-btn-inline ui-corner-all  ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">新建</a></li>

                </ul>

            </div>        

        </div>   

@@ -223,7 +223,7 @@
    <div id="homeLocation"></div>

    <!-- 存在机房信息 -->

    <div id="homeInfoIframe"></div>

    <input id="handle_status" value="" hidden="hidden">

    <input id="handle_status" value="" type="hidden">

    <script src="src/layui.all.js"></script>

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

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


 gx_tieta/WebRoot/mobil/iframe/searchBatt.html

@@ -99,6 +99,8 @@
                         layer.confirm('您输入的机房不存在！是否要该新建机房？',{btn:['新建','取消']},function(){

                        setV();

                        });

                        input = window.JSON.stringify(input);

                        setCookie("ele_parm2_newbatt",input);

                    }   

                }

            });