diff --git a/Index.html b/Index.html
index edf2abd..404b677 100755
--- a/Index.html
+++ b/Index.html
@@ -128,6 +128,9 @@
 
   <script type="text/javascript" src="./js/jQuery-1.8.3.min.js"></script>
   <script type="text/javascript">
+  function cancelVoice(){
+      $(".voicePanel").removeClass("active");
+  }
   $(function(){
     $(".show_detail").hover(function(){
         $(this).find(".detail_info").show();
@@ -170,8 +173,25 @@
             if(event.keyCode==13 && $(".search-input-item.prov").is(":focus"))
             {
                 var name = $(".search-input-item.prov").val();
+                if(name == ""){$(".search-input-item.prov").addClass("empty");return;}
+                $(".search-input-item.prov").removeClass("empty");
                 $(".fixed-left").addClass("collpased").css({left:"0px"});
                 init(name);
+                InitMap(name);
+            }
+            if(event.keyCode==13 && $(".search-input-item.lon").is(":focus"))
+            {
+                var jing = $(".search-input-item.lon").eq(0).val();
+                var wei = $(".search-input-item.lon").eq(1).val();
+                if(jing && wei){
+                    $(".search-input-item.lon").removeClass("empty");
+                    $(".fixed-left").addClass("collpased").css({left:"0px"});
+                    // 78.744718,33.670094
+                    InitMap("班公湖");
+                    init("班公湖");
+                }else{
+                    $(".search-input-item.lon").addClass("empty");
+                }
             }
         });
       var graphContainer = document.getElementById('mainGraph');
diff --git a/css/demo.css b/css/demo.css
index 0614be9..04ccad7 100644
--- a/css/demo.css
+++ b/css/demo.css
@@ -140,6 +140,9 @@ body{
   padding: 0 10px;
   margin-right: 10px;
 }
+.search-input-item.empty{
+  border:1px solid red;
+}
 .ml10{margin-left: 10px;}
 .more_icon{
   display: inline-block;
diff --git a/js/map.js b/js/map.js
index e2e588b..2bdd024 100644
--- a/js/map.js
+++ b/js/map.js
@@ -404,207 +404,25 @@ var convertData = function (data) {
   return res;
 };
 
-var convertedData = [
-  convertData(data),
-  convertData(data.sort(function (a, b) {
-      return b.value - a.value;
-  }).slice(0, 6))
-];
 
 
-option = {
-  backgroundColor: '#044161',
-  animation: true,
-  animationDuration: 1000,
-  animationEasing: 'cubicInOut',
-  animationDurationUpdate: 1000,
-  animationEasingUpdate: 'cubicInOut',
-  title: [
-      {
-          text: '全国主要城市 知识兵要信息',
-          subtext: 'data from yunqicl',
-          left: 'center',
-          top: 10,
-          textStyle: {
-              color: '#fff'
-          }
-      },
-      {
-          id: 'statistic',
-          right: 120,
-          top: 40,
-          width: 100,
-          textStyle: {
-              color: '#fff',
-              fontSize: 16
-          }
-      }
-  ],
-  toolbox: {
-      iconStyle: {
-          normal: {
-              borderColor: '#fff'
-          },
-          emphasis: {
-              borderColor: '#b1e4ff'
-          }
-      },
-      feature: {
-          dataZoom: {},
-          brush: {
-              type: ['rect', 'polygon', 'clear']
-          },
-          saveAsImage : {show: true}
-      }
-  },
-  brush: {
-      outOfBrush: {
-          color: '#abc'
-      },
-      brushStyle: {
-          borderWidth: 1,
-          color: 'rgba(255,140,0,0.5)',
-          borderColor: 'rgba(0,0,0,0.5)',
-      },
-      seriesIndex: [0, 1],
-      throttleType: 'debounce',
-      throttleDelay: 300,
-      geoIndex: 0
-  },
-  geo: {
-      map: 'china',
-      left: '140',
-      right: '10%',
-      center: [99.98561551896913, 33.205000490896193],
-      zoom: 0.6,
-      label: {
-          emphasis: {
-              show: false
-          }
-      },
-      roam: true,
-      itemStyle: {
-          normal: {
-              areaColor: '#1a5787',
-              borderColor: '#00BFFF'
-          },
-          emphasis: {
-              areaColor: '#206AA5'
-          }
-      }
-  },
-  tooltip : {
-      trigger: 'item'
-  },
-  grid: {
-      right: 20,
-      top: 100,
-      bottom: 40,
-      width: '15%'
-  },
-  xAxis: {
-      type: 'value',
-      scale: true,
-      position: 'top',
-      boundaryGap: false,
-      splitLine: {show: false},
-      axisLine: {show: false},
-      axisTick: {show: false},
-      axisLabel: {margin: 2, textStyle: {color: '#aaa'}},
-  },
-  yAxis: {
-      type: 'category',
-      name: 'TOP 20',
-      nameGap: 16,
-      axisLine: {show: false, lineStyle: {color: '#ddd'}},
-      axisTick: {show: false, lineStyle: {color: '#ddd'}},
-      axisLabel: {interval: 0, textStyle: {color: '#ddd'}},
-      data: []
-  },
-  series : [
-      {
-          name: 'pm2.5',
-          type: 'scatter',
-          coordinateSystem: 'geo',
-          data: convertedData[0],
-          symbolSize: function (val) {
-              return Math.max(val[2] / 10, 8);
-          },
-          label: {
-              normal: {
-                  formatter: '{b}',
-                  position: 'right',
-                  show: false
-              },
-              emphasis: {
-                  show: true
-              }
-          },
-          itemStyle: {
-              normal: {
-                  color: '#ddb926'
-              }
-          }
-      },
-      {
-          name: 'Top 5',
-          type: 'effectScatter',
-          coordinateSystem: 'geo',
-          data: convertedData[1],
-          symbolSize: function (val) {
-              return Math.max(val[2] / 10, 8);
-          },
-          showEffectOn: 'emphasis',
-          rippleEffect: {
-              brushType: 'stroke'
-          },
-          hoverAnimation: true,
-          label: {
-              normal: {
-                  formatter: '{b}',
-                  position: 'right',
-                  show: true
-              }
-          },
-          itemStyle: {
-              normal: {
-                  color: '#f4e925',
-                  shadowBlur: 10,
-                  shadowColor: '#333'
-              }
-          },
-          zlevel: 1
-      },
-      {
-          id: 'bar',
-          zlevel: 2,
-          type: 'bar',
-          symbol: 'none',
-          itemStyle: {
-              normal: {
-                  color: '#ddb926'
-              }
-          },
-          data: []
-      }
-  ]
-};
+
 
 
 // myChart.setOption(option);
 
-setTimeout(function () {
-  myChart.dispatchAction({
-      type: 'brush',
-      areas: [
-          {
-              geoIndex: 0,
-              brushType: 'polygon',
-              coordRange: [[119.72,34.85],[119.68,34.85],[119.5,34.84],[119.19,34.77],[118.76,34.63],[118.6,34.6],[118.46,34.6],[118.33,34.57],[118.05,34.56],[117.6,34.56],[117.41,34.56],[117.25,34.56],[117.11,34.56],[117.02,34.56],[117,34.56],[116.94,34.56],[116.94,34.55],[116.9,34.5],[116.88,34.44],[116.88,34.37],[116.88,34.33],[116.88,34.24],[116.92,34.15],[116.98,34.09],[117.05,34.06],[117.19,33.96],[117.29,33.9],[117.43,33.8],[117.49,33.75],[117.54,33.68],[117.6,33.65],[117.62,33.61],[117.64,33.59],[117.68,33.58],[117.7,33.52],[117.74,33.5],[117.74,33.46],[117.8,33.44],[117.82,33.41],[117.86,33.37],[117.9,33.3],[117.9,33.28],[117.9,33.27],[118.09,32.97],[118.21,32.7],[118.29,32.56],[118.31,32.5],[118.35,32.46],[118.35,32.42],[118.35,32.36],[118.35,32.34],[118.37,32.24],[118.37,32.14],[118.37,32.09],[118.44,32.05],[118.46,32.01],[118.54,31.98],[118.6,31.93],[118.68,31.86],[118.72,31.8],[118.74,31.78],[118.76,31.74],[118.78,31.7],[118.82,31.64],[118.82,31.62],[118.86,31.58],[118.86,31.55],[118.88,31.54],[118.88,31.52],[118.9,31.51],[118.91,31.48],[118.93,31.43],[118.95,31.4],[118.97,31.39],[118.97,31.37],[118.97,31.34],[118.97,31.27],[118.97,31.21],[118.97,31.17],[118.97,31.12],[118.97,31.02],[118.97,30.93],[118.97,30.87],[118.97,30.85],[118.95,30.8],[118.95,30.77],[118.95,30.76],[118.93,30.7],[118.91,30.63],[118.91,30.61],[118.91,30.6],[118.9,30.6],[118.88,30.54],[118.88,30.51],[118.86,30.51],[118.86,30.46],[118.72,30.18],[118.68,30.1],[118.66,30.07],[118.62,29.91],[118.56,29.73],[118.52,29.63],[118.48,29.51],[118.44,29.42],[118.44,29.32],[118.43,29.19],[118.43,29.14],[118.43,29.08],[118.44,29.05],[118.46,29.05],[118.6,28.95],[118.64,28.94],[119.07,28.51],[119.25,28.41],[119.36,28.28],[119.46,28.19],[119.54,28.13],[119.66,28.03],[119.78,28],[119.87,27.94],[120.03,27.86],[120.17,27.79],[120.23,27.76],[120.3,27.72],[120.42,27.66],[120.52,27.64],[120.58,27.63],[120.64,27.63],[120.77,27.63],[120.89,27.61],[120.97,27.6],[121.07,27.59],[121.15,27.59],[121.28,27.59],[121.38,27.61],[121.56,27.73],[121.73,27.89],[122.03,28.2],[122.3,28.5],[122.46,28.72],[122.5,28.77],[122.54,28.82],[122.56,28.82],[122.58,28.85],[122.6,28.86],[122.61,28.91],[122.71,29.02],[122.73,29.08],[122.93,29.44],[122.99,29.54],[123.03,29.66],[123.05,29.73],[123.16,29.92],[123.24,30.02],[123.28,30.13],[123.32,30.29],[123.36,30.36],[123.36,30.55],[123.36,30.74],[123.36,31.05],[123.36,31.14],[123.36,31.26],[123.38,31.42],[123.46,31.74],[123.48,31.83],[123.48,31.95],[123.46,32.09],[123.34,32.25],[123.22,32.39],[123.12,32.46],[123.07,32.48],[123.05,32.49],[122.97,32.53],[122.91,32.59],[122.83,32.81],[122.77,32.87],[122.71,32.9],[122.56,32.97],[122.38,33.05],[122.3,33.12],[122.26,33.15],[122.22,33.21],[122.22,33.3],[122.22,33.39],[122.18,33.44],[122.07,33.56],[121.99,33.69],[121.89,33.78],[121.69,34.02],[121.66,34.05],[121.64,34.08]]
-          }
-      ]
-  });
-}, 0);
+// setTimeout(function () {
+//   myChart.dispatchAction({
+//       type: 'brush',
+//       areas: [
+//           {
+//               geoIndex: 0,
+//               brushType: 'polygon',
+//               coordRange: [[119.72,34.85],[119.68,34.85],[119.5,34.84],[119.19,34.77],[118.76,34.63],[118.6,34.6],[118.46,34.6],[118.33,34.57],[118.05,34.56],[117.6,34.56],[117.41,34.56],[117.25,34.56],[117.11,34.56],[117.02,34.56],[117,34.56],[116.94,34.56],[116.94,34.55],[116.9,34.5],[116.88,34.44],[116.88,34.37],[116.88,34.33],[116.88,34.24],[116.92,34.15],[116.98,34.09],[117.05,34.06],[117.19,33.96],[117.29,33.9],[117.43,33.8],[117.49,33.75],[117.54,33.68],[117.6,33.65],[117.62,33.61],[117.64,33.59],[117.68,33.58],[117.7,33.52],[117.74,33.5],[117.74,33.46],[117.8,33.44],[117.82,33.41],[117.86,33.37],[117.9,33.3],[117.9,33.28],[117.9,33.27],[118.09,32.97],[118.21,32.7],[118.29,32.56],[118.31,32.5],[118.35,32.46],[118.35,32.42],[118.35,32.36],[118.35,32.34],[118.37,32.24],[118.37,32.14],[118.37,32.09],[118.44,32.05],[118.46,32.01],[118.54,31.98],[118.6,31.93],[118.68,31.86],[118.72,31.8],[118.74,31.78],[118.76,31.74],[118.78,31.7],[118.82,31.64],[118.82,31.62],[118.86,31.58],[118.86,31.55],[118.88,31.54],[118.88,31.52],[118.9,31.51],[118.91,31.48],[118.93,31.43],[118.95,31.4],[118.97,31.39],[118.97,31.37],[118.97,31.34],[118.97,31.27],[118.97,31.21],[118.97,31.17],[118.97,31.12],[118.97,31.02],[118.97,30.93],[118.97,30.87],[118.97,30.85],[118.95,30.8],[118.95,30.77],[118.95,30.76],[118.93,30.7],[118.91,30.63],[118.91,30.61],[118.91,30.6],[118.9,30.6],[118.88,30.54],[118.88,30.51],[118.86,30.51],[118.86,30.46],[118.72,30.18],[118.68,30.1],[118.66,30.07],[118.62,29.91],[118.56,29.73],[118.52,29.63],[118.48,29.51],[118.44,29.42],[118.44,29.32],[118.43,29.19],[118.43,29.14],[118.43,29.08],[118.44,29.05],[118.46,29.05],[118.6,28.95],[118.64,28.94],[119.07,28.51],[119.25,28.41],[119.36,28.28],[119.46,28.19],[119.54,28.13],[119.66,28.03],[119.78,28],[119.87,27.94],[120.03,27.86],[120.17,27.79],[120.23,27.76],[120.3,27.72],[120.42,27.66],[120.52,27.64],[120.58,27.63],[120.64,27.63],[120.77,27.63],[120.89,27.61],[120.97,27.6],[121.07,27.59],[121.15,27.59],[121.28,27.59],[121.38,27.61],[121.56,27.73],[121.73,27.89],[122.03,28.2],[122.3,28.5],[122.46,28.72],[122.5,28.77],[122.54,28.82],[122.56,28.82],[122.58,28.85],[122.6,28.86],[122.61,28.91],[122.71,29.02],[122.73,29.08],[122.93,29.44],[122.99,29.54],[123.03,29.66],[123.05,29.73],[123.16,29.92],[123.24,30.02],[123.28,30.13],[123.32,30.29],[123.36,30.36],[123.36,30.55],[123.36,30.74],[123.36,31.05],[123.36,31.14],[123.36,31.26],[123.38,31.42],[123.46,31.74],[123.48,31.83],[123.48,31.95],[123.46,32.09],[123.34,32.25],[123.22,32.39],[123.12,32.46],[123.07,32.48],[123.05,32.49],[122.97,32.53],[122.91,32.59],[122.83,32.81],[122.77,32.87],[122.71,32.9],[122.56,32.97],[122.38,33.05],[122.3,33.12],[122.26,33.15],[122.22,33.21],[122.22,33.3],[122.22,33.39],[122.18,33.44],[122.07,33.56],[121.99,33.69],[121.89,33.78],[121.69,34.02],[121.66,34.05],[121.64,34.08]]
+//           }
+//       ]
+//   });
+// }, 0);
 
 
 function renderBrushed(params) {
@@ -658,51 +476,276 @@ function renderBrushed(params) {
 // const renderFocusNodeJacency = function (params) {
 //   console.log('高量: ', params);
 // }
-
-const container = document.querySelector('#maps');
-var myChart = echarts.init(container);
-
-myChart.setOption(option);
-myChart.on('brushselected', renderBrushed);
-// myChart.on('focusnodeadjacency', renderFocusNodeJacency);
-myChart.on('click', function (params) {
-    console.log('init方法===》》》', window.initial);
-    var name = params.name;
-    console.log(name);
-    // window.loadData &&  window.loadData(name);
-    console.log(window.myChartGraph)
-    // window.myChartGraph && window.myChartGraph.restore && window.myChartGraph.restore();
-    window.initial && window.initial(name);
-    $('.fixed-left').css({left: 0}).addClass('collpased');
-    // $('.screen-btn').css({left: '360px'});
-    if (!$('.fixed-left').hasClass('active')) {
-        $('.screen-btn').css({left: '360px'});
-    }
-    $('.collpase-icon').addClass('icon-shouqi').removeClass('icon-zhankai');
-    const {seriesId, seriesIndex, seriesName, dataIndex, data, value } = params;
-    myChart.dispatchAction({
-        type: 'focusNodeAdjacency',
-        seriesId,
-        seriesIndex,
-        seriesName,
-        // 使用 dataIndex 来定位节点。
-        dataIndex,
-    });
-    const count = (params.data && params.data[params.data.length - 1]) || 0;
-    this.setOption({
-        yAxis: {
-            data: data
+$(function(){
+    InitMap("");
+})
+var convertedData = [];
+function setCurrent(currentOption){
+    convertedData = [
+        convertData(data),
+        convertData(data.sort(function (a, b) {
+            return b.value - a.value;
+        }).slice(0, 6)),
+        convertData(data.filter(function(item){
+            if(item.name == currentOption){
+                return item
+            }
+        }))
+    ];
+}
+function InitMap(currentOption){
+    setCurrent(currentOption);
+    var option = {
+        backgroundColor: '#044161',
+        animation: true,
+        animationDuration: 1000,
+        animationEasing: 'cubicInOut',
+        animationDurationUpdate: 1000,
+        animationEasingUpdate: 'cubicInOut',
+        title: [
+            {
+                text: '全国主要城市 知识兵要信息',
+                subtext: 'data from yunqicl',
+                left: 'center',
+                top: 10,
+                textStyle: {
+                    color: '#fff'
+                }
+            },
+            {
+                id: 'statistic',
+                right: 120,
+                top: 40,
+                width: 100,
+                textStyle: {
+                    color: '#fff',
+                    fontSize: 16
+                }
+            }
+        ],
+        toolbox: {
+            iconStyle: {
+                normal: {
+                    borderColor: '#fff'
+                },
+                emphasis: {
+                    borderColor: '#b1e4ff'
+                }
+            },
+            feature: {
+                dataZoom: {},
+                brush: {
+                    type: ['rect', 'polygon', 'clear']
+                },
+                saveAsImage : {show: true}
+            }
+        },
+        brush: {
+            outOfBrush: {
+                color: '#abc'
+            },
+            brushStyle: {
+                borderWidth: 1,
+                color: 'rgba(255,140,0,0.5)',
+                borderColor: 'rgba(0,0,0,0.5)',
+            },
+            seriesIndex: [0, 1],
+            throttleType: 'debounce',
+            throttleDelay: 300,
+            geoIndex: 0
+        },
+        geo: {
+            map: 'china',
+            left: '140',
+            right: '10%',
+            center: [99.98561551896913, 33.205000490896193],
+            zoom: 0.6,
+            label: {
+                emphasis: {
+                    show: false
+                }
+            },
+            roam: true,
+            itemStyle: {
+                normal: {
+                    areaColor: '#1a5787',
+                    borderColor: '#00BFFF'
+                },
+                emphasis: {
+                    areaColor: '#206AA5'
+                }
+            }
+        },
+        tooltip : {
+            trigger: 'item'
+        },
+        grid: {
+            right: 20,
+            top: 100,
+            bottom: 40,
+            width: '15%'
         },
         xAxis: {
-            axisLabel: {show: !!count}
+            type: 'value',
+            scale: true,
+            position: 'top',
+            boundaryGap: false,
+            splitLine: {show: false},
+            axisLine: {show: false},
+            axisTick: {show: false},
+            axisLabel: {margin: 2, textStyle: {color: '#aaa'}},
         },
-        title: {
-            id: 'statistic',
-            text: count ? '平均: ' + (1000 / count).toFixed(4) : ''
+        yAxis: {
+            type: 'category',
+            name: 'TOP 20',
+            nameGap: 16,
+            axisLine: {show: false, lineStyle: {color: '#ddd'}},
+            axisTick: {show: false, lineStyle: {color: '#ddd'}},
+            axisLabel: {interval: 0, textStyle: {color: '#ddd'}},
+            data: []
         },
-        series: {
-            id: 'bar',
-            data: name
+        series : [
+            {
+                name: 'pm2.5',
+                type: 'scatter',
+                coordinateSystem: 'geo',
+                data: convertedData[0],
+                symbolSize: function (val) {
+                    return Math.max(val[2] / 10, 8);
+                },
+                label: {
+                    normal: {
+                        formatter: '{b}',
+                        position: 'right',
+                        show: false
+                    },
+                    emphasis: {
+                        show: true
+                    }
+                },
+                itemStyle: {
+                    normal: {
+                        color: '#ddb926'
+                    }
+                }
+            },
+            {
+                name: 'Top 6',
+                type: 'effectScatter',
+                coordinateSystem: 'geo',
+                data: convertedData[1],
+                symbolSize: function (val) {
+                    return Math.max(val[2] / 10, 8);
+                },
+                showEffectOn: 'emphasis',
+                rippleEffect: {
+                    brushType: 'stroke'
+                },
+                hoverAnimation: true,
+                label: {
+                    normal: {
+                        formatter: '{b}',
+                        position: 'right',
+                        show: true
+                    }
+                },
+                itemStyle: {
+                    normal: {
+                        color: '#f4e925',
+                        shadowBlur: 10,
+                        shadowColor: '#333'
+                    }
+                },
+                zlevel: 1
+            },
+            {
+                name: '当前选中',
+                type: 'effectScatter',
+                coordinateSystem: 'geo',
+                data: convertedData[2],
+                symbolSize: function (val) {
+                    return Math.max(val[2] / 10, 8);
+                },
+                showEffectOn: 'emphasis',
+                rippleEffect: {
+                    brushType: 'stroke'
+                },
+                hoverAnimation: true,
+                label: {
+                    normal: {
+                        formatter: '{b}',
+                        position: 'right',
+                        show: true
+                    }
+                },
+                itemStyle: {
+                    normal: {
+                        color: '#ff0000',
+                        shadowBlur: 10,
+                        shadowColor: '#333'
+                    }
+                },
+                zlevel: 1
+            },
+            {
+                id: 'bar',
+                zlevel: 2,
+                type: 'bar',
+                symbol: 'none',
+                itemStyle: {
+                    normal: {
+                        color: '#ddb926'
+                    }
+                },
+                data: []
+            }
+        ]
+      };
+    const container = document.querySelector('#maps');
+    var myChart = echarts.init(container);
+    
+    myChart.setOption(option,true);
+    myChart.on('brushselected', renderBrushed);
+    // myChart.on('focusnodeadjacency', renderFocusNodeJacency);
+    myChart.on('click', function (params) {
+        console.log('init方法===》》》', window.initial);
+        var name = params.name;
+        console.log(name);
+        // window.loadData &&  window.loadData(name);
+        console.log(window.myChartGraph)
+        // window.myChartGraph && window.myChartGraph.restore && window.myChartGraph.restore();
+        window.initial && window.initial(name);
+        $('.fixed-left').css({left: 0}).addClass('collpased');
+        // $('.screen-btn').css({left: '360px'});
+        if (!$('.fixed-left').hasClass('active')) {
+            $('.screen-btn').css({left: '360px'});
         }
+        $('.collpase-icon').addClass('icon-shouqi').removeClass('icon-zhankai');
+        const {seriesId, seriesIndex, seriesName, dataIndex, data, value } = params;
+        myChart.dispatchAction({
+            type: 'focusNodeAdjacency',
+            seriesId,
+            seriesIndex,
+            seriesName,
+            // 使用 dataIndex 来定位节点。
+            dataIndex,
+        });
+        const count = (params.data && params.data[params.data.length - 1]) || 0;
+        this.setOption({
+            yAxis: {
+                data: data
+            },
+            xAxis: {
+                axisLabel: {show: !!count}
+            },
+            title: {
+                id: 'statistic',
+                text: count ? '平均: ' + (1000 / count).toFixed(4) : ''
+            },
+            series: {
+                id: 'bar',
+                data: name
+            }
+        });
     });
-});
\ No newline at end of file
+}