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

hdw

2018-12-21 f5d074139f55ca0d507430fd074508b056e588c9

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

 gx_tieta/WebRoot/mobil/batt-edit.html

@@ -105,25 +105,25 @@
                                        <tr>

                                            <td>省</td>

                                            <td>

                                                <input type="text" id="station_name1" data-mini="true" />

                                                <input type="text" id="station_name1"class="unable" data-mini="true" />

                                            </td>

                                        </tr>

                                        <tr>

                                            <td>城市</td>

                                            <td>

                                                <input type="text" id="city" data-mini="true" />

                                                <input type="text" id="city" class="unable"data-mini="true" />

                                            </td>

                                        </tr>

                                        <tr>

                                            <td>区县</td>

                                            <td>

                                                <input type="text" id="county" data-mini="true" />

                                                <input type="text" id="county" class="unable"data-mini="true" />

                                            </td>

                                        </tr>

                                        <tr>

                                            <td>机房名称</td>

                                            <td>

                                                <input type="text" id="StationName3" data-mini="true" />

                                                <input type="text" id="StationName3"class="unable" data-mini="true" />

                                            </td>

                                        </tr>

                                        <tr>


 gx_tieta/WebRoot/mobil/ele-param2.html

@@ -69,7 +69,7 @@
        .abs{

          position: fixed;

          width:100%;

          height:4.5em;

          height:8em;

          overflow: hidden;

          z-index:999;

        }

@@ -78,7 +78,7 @@
          

        }

         .mt7{

          margin-top:7em;

          margin-top:8em;

        } 

    </style>

</head>

@@ -241,8 +241,8 @@
        

        

        

        // 机房定位面板

        $('#homeLocation').on('click', function() {

        //

        $('#homeLocation').off('click').on('click.cjj', function() {

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

             console.warn(homeInfo);

                searchBattLife();