From d66b241f5c0ea1e57fe5ab370668cd29ee445860 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Fri, 28 Sep 2018 10:50:32 +0800
Subject: [PATCH] banner和百度地图

---
 contact.html      | 2 +-
 css/contact.css   | 2 +-
 css/portfollo.css | 2 +-
 css/services.css  | 2 +-
 js/contact.js     | 8 +++++++-
 style.css         | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/contact.html b/contact.html
index 5a2ed52..6a361fb 100644
--- a/contact.html
+++ b/contact.html
@@ -157,6 +157,6 @@
 <script type="text/javascript" src="js/echarts.min.js?a=1"></script>
 <script type="text/javascript" src="js/main.js?a=2"></script>
 <script type="text/javascript" src="js/china.js?a=4"></script>
-<script type="text/javascript" src="js/contact.js"></script>
+<script type="text/javascript" src="js/contact.js?a=1"></script>
 </body>
 </html>
diff --git a/css/contact.css b/css/contact.css
index f1a5125..68ce3c8 100644
--- a/css/contact.css
+++ b/css/contact.css
@@ -3,7 +3,7 @@
 }
 .contactside-bg{
     width: 100%;
-    height:600px;
+    height:540px;
     background: url("../images/contactside-bg.png") no-repeat;
     background-size: 100% 100%;
 }
diff --git a/css/portfollo.css b/css/portfollo.css
index a72dea9..8d48319 100644
--- a/css/portfollo.css
+++ b/css/portfollo.css
@@ -1,7 +1,7 @@
 /*breadcrumb*/
 .breadcrumb{
     width: 100%;
-    height: 682px;
+    height: 540px;
     background:url('../images/breadcrumb-bg.png');
     background-size:100% 100%;
     background-repeat:no-repeat;
diff --git a/css/services.css b/css/services.css
index 5edd010..b1a6490 100644
--- a/css/services.css
+++ b/css/services.css
@@ -1,6 +1,6 @@
 .services-banner{
     width: 100%;
-    height: 600px;
+    height: 540px;
     background: url(../images/services_bgIxo.png);
     background-size: 100% 100%;
     background-repeat: no-repeat;
diff --git a/js/contact.js b/js/contact.js
index e6bf631..0c98187 100644
--- a/js/contact.js
+++ b/js/contact.js
@@ -127,6 +127,8 @@ var geoCoordMap = {
 
 var data = [
   {name: '无锡', value: 179},
+  {name: '丹阳', value: 12},
+  {name: '西安', value: 12},
   {name: '青岛', value: 12},
   {name: '北京', value: 12},
   {name: '赤峰', value: 12},
@@ -325,6 +327,7 @@ var geoCoordMap = {
   '武汉':[114.31,30.52],
   '大庆':[125.03,46.58],
   '双流': [103.930965,30.579155],
+  '丹阳': [119.601582,32.018124],
 };
 
 var convertData = function (data) {
@@ -383,9 +386,12 @@ option = {
       name: 'pm2.5',
       type: 'scatter',
       coordinateSystem: 'geo',
-      data: convertData(data),
+      data: convertData(data.sort(function (a, b) {
+        return b.value - a.value;
+      }).slice(1, 10)),
       symbol:'image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAoCAYAAADpE0oSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpmNmMwMTFjNS03Y2MzLTRkMmMtYTkzYy0zZjE3MjcyMjgxYzciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QTYwNDc2RjY1OEMwMTFFOEFBNjVGRkY5OEREMTA1MjQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QTYwNDc2RjU1OEMwMTFFOEFBNjVGRkY5OEREMTA1MjQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpmNmMwMTFjNS03Y2MzLTRkMmMtYTkzYy0zZjE3MjcyMjgxYzciIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6ZjZjMDExYzUtN2NjMy00ZDJjLWE5M2MtM2YxNzI3MjI4MWM3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+XzWLIQAABOpJREFUeNq8l2tMHFUUx8+dnV2kCLsUEBCaVoKKtaG2TVPb0KJRIKZoMWqLNY1pqh/EGBujJjZWgq/ExCZo1BhjUj+pqE3qI20p9QHBKiqxD6u01pa1jUsF2V2gdhd2Zvzf3TvLMDv7gq0n+eXOzj33/O/j3Lt3GKVgTYf9dhQNoA6sBBXAJap94Az4EXSBzr1rnFPJYrJElXf1+njwx8GjoIhSsxHwBnjtsxqXL23hxl5fM4p2UEyzswtg+xc1rg9TEr6j12vjvRWjzIS9yWdtf02+Ele4oScsynt4L2XW9oBNneumxWVjrRKZWktRCdU3O0ld7WL2qhyi+Ui3kIYFRRqd+Zfoe79Gff7IOwu7RyzbYzEjvrXbu0mMNsaW59HYI+UsrzQr8bA8QaLdf2l0OG5KUfPXtfkdUeF133h59g5YJJKypZRNbC4lZzrz+jHS6j10QI0d/d/g+p5b8n1SOLrGtoNiQEY2ljBPuqLc7kP3HyydGUtwFdcKj3jVVz4HyvPmfVo5j355ZzEt0X9/Okx0ZDyx4E25RBsMUdr+IOr2xrghEpXLIcbqLA6HyRcqtYX6Dx8SaOAio9YKLaHwK4OMal0aueyR3y0LiHp8jEzHGNeqlxSNGgAZqcimo8UOytU9D45iqxVoSaeY+3DfqALmsnb+zNiCeimkseWAjDQWztzfP40xWpqbfG25D/c12loXkTk+WCGHiF1nDrDaqZbpzycwxQr68cNYaonFfX/Dvr5hXmSGqlCGSDK7XStDPc/8tshOBfrzS26JTkwwOuRNPas9kxq9f2PkkCp0REZsMqeEHqq8l0bQblL3OH1JIhtjtGORStVXEpl9dZagbid87DZGpwNSzCyYUKQQ0T+AjAxNshG90QQ6noOD9e5ClVY6NTL76izN1aipSCWnrIXbRPfOFLPyH5WhzvdwubGHfeNspDJbW8Sf+dYYQuM1Rxw0jhZqnOl912Ojj4Zt5A/xpZreAccnIqM02TlsJ9ZvPmE+uCBHW24pVsPvRiFegE6UZVlTiDruw315G906vZLVCdbPCrsCG1C/13yAfLcsGLzaoYU30cK+KyJBqoNUlW29nwcuMWo4FvkXca8KhEssGa09mkWTsdPUJOHdATDC6ww4tp20D+peuTYNCYa1TnBR4nXch/tGj0y3TAF1RlwSWgfCoZxdwTYUz5mDPVEWGnqyfKpkNv/8b3lkevFPu1XV8/66rNZw3msatYNhQEZ2nZeL3vbI/nRFdw/J9LLbTuZ4QqNdXCyIxuqz+PHwrEUMW5vb7nzgpGPsbIAlFeQ+D59y0I5BOynWLjuF1nSe5x0M8mvQr/w4s2qBy5jSWKAodxYojuoclUocWjSBjl2UaN+ojT4HU2rcfv0OFkM4FHPZg/hGFB10eawZoh1xr7cQP4TitgyLfgnR202XxxhrAcEMigZFTEoojJ6dstpac7BWEZOSjZjbLtCbAdFvwatpfTthra9B8TM/X2Ypyvf/Moz2bJwPBGsTDbbNYbQPxRNNKCzE94gPuHTtdbT9JJGDlEKQp0F3GqI94Kk5fZgb1pvfhfvBgiSu58AKjHY4WcxURkwi0HqRMImSaX0qoikLC/HjKDZHvmYtbrVE9wsfyqiwEN+HYiv/JzW85s9bUbefLrdhzVuAJmih/9Mg+Axntu3/E2AAT7AgrVD+QLcAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAHgAAACgIBgAAAOkTShIAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADeGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxMzggNzkuMTU5ODI0LCAyMDE2LzA5LzE0LTAxOjA5OjAxICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOmY2YzAxMWM1LTdjYzMtNGQyYy1hOTNjLTNmMTcyNzIyODFjNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpBNjA0NzZGNjU4QzAxMUU4QUE2NUZGRjk4REQxMDUyNCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpBNjA0NzZGNTU4QzAxMUU4QUE2NUZGRjk4REQxMDUyNCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxNyAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOmY2YzAxMWM1LTdjYzMtNGQyYy1hOTNjLTNmMTcyNzIyODFjNyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpmNmMwMTFjNS03Y2MzLTRkMmMtYTkzYy0zZjE3MjcyMjgxYzciLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5fNYshAAAE6klEQVR42ryXa0wcVRTHz52dXaQIuxQQEJpWgoq1obZNU9vQolEgpmgxaos1jWmqH8QYG6MmNlaCr8TEJmjUGGNSP6moTeojbSn1AcEqKrEPq7TWlrWNSwXZXaB2F3Zm/N/dO8swO/uCrSf55c7OPff87+Pcu3cYpWBNh/12FA2gDqwEFcAlqn3gDPgRdIHOvWucU8liskSVd/X6ePDHwaOgiFKzEfAGeO2zGpcvbeHGXl8zinZQTLOzC2D7FzWuD1MSvqPXa+O9FaPMhL3JZ21/Tb4SV7ihJyzKe3gvZdb2gE2d66bFZWOtEplaS1EJ1Tc7SV3tYvaqHKL5SLeQhgVFGp35l+h7v0Z9/sg7C7tHLNtjMSO+tdu7SYw2xpbn0dgj5SyvNCvxsDxBot1/aXQ4bkpR89e1+R1R4XXfeHn2DlgkkrKllE1sLiVnOvP6MdLqPXRAjR393+D6nlvyfVI4usa2g2JARjaWME+6otzuQ/cfLJ0ZS3AV1wqPeNVXPgfK8+Z9WjmPfnlnMS3Rf386THRkPLHgTblEGwxR2v4g6vbGuCESlcshxuosDofJFyq1hfoPHxJo4CKj1gotofArg4xqXRq57JHfLQuIenyMTMcY16qXFI0aABmpyKajxQ7K1T0PjmKrFWhJp5j7cN+oAuaydv7M2IJ6KaSx5YCMNBbO3N8/jTFampt8bbkP9zXaWheROT5YIYeIXWcOsNqplunPJzDFCvrxw1hqicV9f8O+vmFeZIaqUIZIMrtdK0M9z/y2yE4F+vNLbolOTDA65E09qz2TGr1/Y+SQKnRERmwyp4QeqryXRtBuUvc4fUkiG2O0Y5FK1VcSmX11lqBuJ3zsNkanA1LMLJhQpBDRP4CMDE2yEb3RBDqeg4P17kKVVjo1MvvqLM3VqKlIJaeshdtE984Us/IflaHO93C5sYd942ykMltbxJ/51hhC4zVHHDSOFmqc6X3XY6OPhm3kD/Glmt4BxyciozTZOWwn1m8+YT64IEdbbilWw+9GIV6ATpRlWVOIOu7DfXkb3Tq9ktUJ1s8KuwIbUL/XfIB8tywYvNqhhTfRwr4rIkGqg1SVbb2fBy4xajgW+RdxrwqESywZrT2aRZOx09Qk4d0BMMLrDDi2nbQP6l65Ng0JhrVOcFHiddyH+0aPTLdMAXVGXBJaB8KhnF3BNhTPmYM9URYaerJ8qmQ2//xveWR68U+7VdXz/rqs1nDeaxq1g2FARnadl4ve9sj+dEV3D8n0sttO5nhCo11cLIjG6rP48fCsRQxbm9vufOCkY+xsgCUV5D4Pn3LQjkE7KdYuO4XWdJ7nHQzya9Cv/DizaoHLmNJYoCh3FiiO6hyVShxaNIGOXZRo36iNPgdTatx+/Q4WQzgUc9mD+EYUHXR5rBmiHXGvtxA/hOK2DIt+CdHbTZfHGGsBwQyKBkVMSiiMnp2y2lpzsFYRk5KNmNsu0JsB0W/Bq2l9O2Gtr0HxMz9fZinK9/8yjPZsnA8EaxMNts1htA/FE00oLMT3iA+4dO11tP0kkYOUQpCnQXcaoj3gqTl9mBvWm9+F+8GCJK7nwAqMdjhZzFRGTCLQepEwiZJpfSqiKQsL8eMoNke+Zi1utUT3Cx/KqLAQ34diK/8nNbzmz1tRt58ut2HNW4AmaKH/0yD4DGe27f8TYABPsCCtUP5AtwAAAABJRU5ErkJggg==',
       symbolSize: [30,40],
+      symbolOffset:[-1,-22],
       label: {
         normal: {
           formatter: '{b}',
diff --git a/style.css b/style.css
index a9f8d5a..e3ab558 100755
--- a/style.css
+++ b/style.css
@@ -356,7 +356,7 @@ a:hover{
 =====================*/
 .swiper-container {
 	width: 100%;
-	height: 600px;
+	height: 540px;
 }
 .parkpoint{
 	position: absolute;
--
libgit2 0.21.4