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

81041

2018-11-30 b8b791df46b97c724e5f2dd0319bb6f527aecd62

 gx_tieta/WebRoot/index.jsp

@@ -2543,7 +2543,7 @@
               // 显示区域的图标

               bmap.setDots(allStation);

               bmap.queryInRect(map, createMapDot);

               updateStation(setRect);

               updateStation();

               

               // 更新小工具搜索机房功能

               updateSearchSource(allStation);

@@ -3007,6 +3007,8 @@
                  //console.info(allStation);

                  console.info(allStation);

                  var temp = getStationMap(allStation, mk.point);

                  console.info(temp);

                  temp.StationName = temp.title;

                  if(confirm("确认从地图上删除'"+temp.title+"'的位置信息吗？")){

                     if(temp != undefined){

                        var json = JSON.stringify(temp);

@@ -3723,6 +3725,11 @@
               type: 1

            });

            $(this).prop('checked', false);

         }else if(num == 0) {

            layerMsg = layer.msg("至少选择一个！", {

               type: 1

            });

            $(this).prop('checked', true);

         }

         

      });