Merge branch 'master' of http://git.trustie.net/qiubing/geo_info_platform

machine.html

@@ -140,17 +140,15 @@
         if( array[i].input.indexOf(value) > -1 ){
           flag = true;
           answer = '<div class="rotWord"><span></span><p id="member">'+array[i].output+'</p></div>';
-          continue;
+          setTimeout(function(){
+            $(".b_body").append(answer);
+            $(".b_body").scrollTop(10000000);
+            text.val('');
+          },500);
+          return;
         }
       }
-      if(flag){
+      ajax(args);
-        setTimeout(function(){
-          $(".b_body").append(answer);
-          $(".b_body").scrollTop(10000000);
-        },500);
-      }else{
-        ajax(args);
-      }
       $(".b_body").scrollTop(10000000);
       text.val('');
     }

map.html

@@ -127,7 +127,18 @@
   <script type="text/javascript" src="./js/jquery.easy_slides.js"></script> 
   <script type="text/javascript" src="./js/demo.js"></script>
   <script>
+    
     $(document).ready(function () {
+        //回车
+        $(document).keydown(function(event)
+        {
+        if(event.keyCode==13 && $(".search-input-item.prov").is(":focus"))
+        {
+            var name = $(".search-input-item.prov").val();
+            $(".fixed-left").addClass("collpased").css({left:"0px"});
+            init(name);
+        }
+        });
       var graphContainer = document.getElementById('mainGraph');
       var myChartGraph = echarts.init(graphContainer);
 
@@ -476,8 +487,9 @@
     
   </script>
   <script type="text/javascript">
-    // window.init = init;
+    
     $(document).ready(function () {
+        
         $('.slider_one_big_picture').EasySlides({
             'autoplay': true,
             'stepbystep': false,