Browse Source

增加地图模块,水源地图联动

夜仔 3 years ago
parent
commit
4461e055c9

File diff suppressed because it is too large
+ 433 - 434
package-lock.json


+ 1 - 1
package.json

@@ -38,4 +38,4 @@
         "terser-webpack-plugin": "^5.1.3",
         "vue-cli-plugin-element-plus": "0.0.13"
     }
-}
+}

+ 2 - 2
public/index.html

@@ -9,6 +9,8 @@
     <title>
         <%= htmlWebpackPlugin.options.title %>
     </title>
+    <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=8e266e1ac2ad2383c7773ff504ac248f"></script>
+    <script type="text/javascript" src="//webapi.amap.com/ui/1.1/main.js"></script>
     <!-- <script src="@a/js/flexible.js"></script> -->
 </head>
 
@@ -19,7 +21,5 @@
     <div id="app"></div>
     <!-- built files will be auto injected -->
 </body>
-<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=8e266e1ac2ad2383c7773ff504ac248f"></script>
-<script type="text/javascript" src="//webapi.amap.com/ui/1.1/main.js"></script>
 
 </html>

BIN
src/assets/img/icon/tip1.png


BIN
src/assets/img/icon/tip2.png


BIN
src/assets/img/icon/tip3.png


BIN
src/assets/img/icon/tip4.png


BIN
src/assets/img/test/bg5.png


BIN
src/assets/img/test/bg7.png


BIN
src/assets/img/test/icon1.png


+ 2927 - 0
src/assets/js/map-data.js

@@ -0,0 +1,2927 @@
+export default [
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.34751319885252, 31.12011701681389],
+            [121.3654088973999, 31.124746044543095],
+            [121.37141704559326, 31.116048061937327],
+            [121.36974334716795, 31.115184649529887],
+            [121.3700008392334, 31.114826422928072],
+            [121.3580060005188, 31.111023626427265],
+            // [121.36437892913818,31.10393201450142],
+            [121.36377811431883, 31.10536507722709],
+            [121.3604736328125, 31.1038217780114],
+            [121.35691165924072, 31.110748055544246],
+            [121.35380029678343, 31.11150128072968],
+            [121.35064601898192, 31.115487763290925],
+            [121.35300636291504, 31.11761871756099],
+            [121.35242700576781, 31.118445367976012],
+            [121.34953022003175, 31.117747308098444],
+            [121.34751319885252, 31.120080277595413]
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.382651, 31.129008],
+            [121.384196, 31.129375],
+            [121.381222, 31.140412],
+            [121.376802, 31.139857],
+            // [121.376853,31.139912],
+            [121.378222, 31.137145],
+            [121.37225, 31.136124],
+            [121.370845, 31.135876],
+            [121.364295, 31.132693],
+            [121.363667, 31.133809],
+            [121.353765, 31.129484],
+            [121.353314, 31.129718],
+            [121.349205, 31.127661],
+            [121.341872, 31.125272],
+            [121.344339, 31.119908],
+            [121.347472, 31.120037],
+            [121.365379, 31.124767],
+            [121.365615, 31.124693],
+            [121.382651, 31.129008],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.35789871215819, 31.111041997791038],
+            [121.36997938156128, 31.11480805229664],
+            [121.36974334716795, 31.115138723118047],
+            [121.37163162231445, 31.116020506343503],
+            [121.37525796890259, 31.10979273695708],
+            [121.37058019638062, 31.107036956407075],
+            [121.3693141937256, 31.108396484807898],
+            [121.36826276779173, 31.107863698970295],
+            [121.36976480484009, 31.105383449685714],
+            [121.36431455612181, 31.10393201450142],
+            [121.36373519897461, 31.105273214880548],
+            [121.35789871215819, 31.111041997791038]
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.35682582855225, 31.11063782696709],
+            [121.35326385498045, 31.107698351033527],
+            [121.35317802429199, 31.10655927964506],
+            [121.35219097137453, 31.106485790699168],
+            [121.35171890258789, 31.107661607008467],
+            [121.34850025177002, 31.106632768534084],
+            [121.35124683380127, 31.099136608903038],
+            [121.35841369628906, 31.100679984254285],
+            [121.35897159576416, 31.098916124662743],
+            [121.3627052307129, 31.099724564374952],
+            [121.35682582855225, 31.11063782696709]
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.366612, 31.091676],
+            [121.372889, 31.093155],
+            [121.374289, 31.090573],
+            [121.384116, 31.09344],
+            [121.375147, 31.109571],
+            [121.370577, 31.106981],
+            [121.369305, 31.108363],
+            [121.368275, 31.107854],
+            [121.369767, 31.105378],
+            [121.364324, 31.103867],
+            [121.363686, 31.105295],
+            [121.360526, 31.103812],
+            [121.362747, 31.09969],
+            [121.366612, 31.091676]
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.37882, 31.103243],
+            [121.391904, 31.113302],
+            [121.382656, 31.128989],
+            [121.380939, 31.128603],
+            [121.365575, 31.124636],
+            [121.371455, 31.116029],
+            [121.371648, 31.116011],
+            [121.37882, 31.103243]
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.37882, 31.103243],
+            [121.391904, 31.113302],
+            [121.400292, 31.098363],
+            [121.384156, 31.093549],
+            [121.37882, 31.103243]
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.384196, 31.129375],
+            [121.393479, 31.128961],
+            [121.399468, 31.127217],
+            [121.393698, 31.119207],
+            [121.39314, 31.118885],
+            [121.392636, 31.118205],
+            [121.391724, 31.117636],
+            [121.392475, 31.117397],
+            [121.393688, 31.11793],
+            [121.393682, 31.117767],
+            [121.394262, 31.116224],
+            [121.394734, 31.115673],
+            [121.394476, 31.115415],
+            [121.394873, 31.114919],
+            [121.395254, 31.114963],
+            [121.395619, 31.114522],
+
+            [121.397711, 31.112786],
+            [121.397684, 31.112827],
+            [121.399041, 31.110738],
+            [121.399985, 31.109066],
+            [121.407195, 31.112446],
+            [121.408611, 31.108643],
+            [121.405243, 31.107321],
+            [121.408032, 31.100578],
+
+            [121.400393, 31.098355],
+            [121.392046, 31.113273],
+            [121.382741, 31.128951],
+            [121.384196, 31.129375],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.345748, 31.126565],
+            [121.349203, 31.127667],
+            [121.353322, 31.129798],
+            [121.353795, 31.129614],
+            [121.363676, 31.133811],
+            [121.360108, 31.140478],
+            [121.357491, 31.144335],
+            [121.350667, 31.141304],
+            [121.352384, 31.138568],
+            [121.342256, 31.134206],
+            [121.34327, 31.131804],
+            [121.344793, 31.130096],
+            [121.344042, 31.129434],
+            [121.344536, 31.128626],
+            [121.345136, 31.127671],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.357352, 31.144364],
+            [121.351494, 31.150737],
+            [121.348512, 31.154914],
+            [121.339918, 31.15014],
+            [121.335841, 31.15586],
+            // [121.328695,31.156099],
+            [121.330369, 31.153014],
+            [121.329983, 31.151067],
+            [121.329854, 31.150351],
+            [121.331249, 31.148129],
+            [121.333287, 31.148845],
+            [121.33333, 31.146807],
+            [121.334553, 31.146329],
+            [121.335626, 31.14374],
+            [121.336914, 31.143317],
+            [121.338223, 31.141977],
+            [121.338845, 31.140103],
+            [121.338137, 31.139057],
+            [121.33701, 31.13902],
+            [121.336903, 31.138983],
+            [121.337418, 31.137275],
+            [121.338448, 31.137477],
+            [121.340465, 31.136632],
+            [121.342224, 31.134263],
+            [121.352351, 31.138564],
+            [121.350652, 31.141268],
+            [121.357401, 31.144317],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.347266, 31.157132],
+            [121.352244, 31.159593],
+            [121.354218, 31.156673],
+            [121.357652, 31.157096],
+            [121.372232, 31.136124],
+            [121.370789, 31.135921],
+            [121.36433, 31.132716],
+            [121.357507, 31.144315],
+            [121.3574, 31.144315],
+            [121.351455, 31.150857],
+            [121.348538, 31.154892],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.330369, 31.153014],
+            [121.335841, 31.15586],
+            [121.339918, 31.15014],
+            [121.343912, 31.152363],
+            [121.338688, 31.160943],
+            [121.343569, 31.163656],
+            [121.339669, 31.16904],
+            [121.323941, 31.162999],
+            [121.326332, 31.158041],
+            [121.319638, 31.155452],
+            [121.320904, 31.15313],
+            [121.328221, 31.156472],
+            [121.330369, 31.153014],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.347266, 31.157132],
+            [121.352244, 31.159593],
+            [121.344459, 31.171057],
+            [121.339669, 31.16904],
+            [121.343569, 31.163656],
+            [121.338688, 31.160943],
+            [121.343912, 31.152363],
+            [121.348538, 31.154892],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.344459, 31.171057],
+            [121.350692, 31.175276],
+            [121.357178, 31.16404],
+            [121.357652, 31.157096],
+            [121.354218, 31.156673],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.36715, 31.157951],
+            [121.362751, 31.168968],
+            [121.357709, 31.181874],
+            [121.350692, 31.175276],
+            [121.357178, 31.16404],
+            [121.357652, 31.157096],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.364049, 31.16597],
+            [121.365348, 31.166365],
+            [121.366184, 31.164574],
+            [121.367515, 31.164877],
+            [121.373341, 31.166034],
+            [121.377128, 31.157882],
+            [121.370841, 31.158093],
+            [121.372396, 31.154181],
+            [121.368942, 31.15307],
+            [121.378136, 31.137226],
+            [121.372232, 31.136124],
+            [121.357652, 31.157096],
+            [121.36715, 31.157951],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.377128, 31.157882],
+            [121.370841, 31.158093],
+            [121.372396, 31.154181],
+            [121.368942, 31.15307],
+            [121.376795, 31.139876],
+            [121.381194, 31.140413],
+            [121.380926, 31.144168],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.373341, 31.166034],
+            [121.377128, 31.157882],
+            [121.386596, 31.157037],
+            [121.381945, 31.168513],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.381194, 31.140413],
+            [121.380926, 31.144168],
+            [121.389852, 31.14685],
+            [121.390711, 31.143618],
+            [121.394852, 31.144811],
+            [121.393951, 31.148007],
+            [121.398135, 31.149347],
+            [121.399894, 31.143948],
+            [121.390796, 31.140165],
+            [121.393479, 31.128961],
+            [121.384207, 31.129381],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.377128, 31.157882],
+            [121.380926, 31.144168],
+            [121.389852, 31.14685],
+            [121.390711, 31.143618],
+            [121.394852, 31.144811],
+            [121.393951, 31.148007],
+            [121.398135, 31.149347],
+            [121.397057, 31.152644],
+            [121.39593, 31.155871],
+            [121.387428, 31.153869],
+            [121.386596, 31.157037],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.39593, 31.155871],
+            [121.39468, 31.159589],
+            [121.402469, 31.162031],
+            [121.404744, 31.156637],
+            [121.400983, 31.155302],
+            [121.400259, 31.157087],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.397057, 31.152644],
+            [121.401541, 31.153823],
+            [121.401236, 31.154645],
+            [121.405141, 31.15577],
+            [121.409545, 31.144814],
+            [121.409845, 31.142445],
+            [121.409674, 31.141563],
+            [121.40667, 31.139764],
+            [121.403108, 31.136348],
+            [121.399894, 31.143948],
+            [121.398135, 31.149347],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.393232, 31.159272],
+            [121.392899, 31.160048],
+            [121.392674, 31.159979],
+            [121.392604, 31.16014],
+            [121.391955, 31.16003],
+            [121.391623, 31.161063],
+            [121.393833, 31.161627],
+            [121.39151, 31.1686270],
+            [121.395501, 31.170014],
+            [121.395431, 31.17022],
+            [121.395206, 31.170211],
+            [121.394766, 31.171496],
+            [121.393838, 31.171317],
+            [121.393377, 31.173006],
+            [121.395855, 31.173341],
+            [121.394552, 31.177734],
+            [121.391065, 31.176852],
+            [121.389842, 31.178142],
+            [121.391086, 31.178899],
+            [121.388055, 31.181492],
+            [121.386875, 31.181254],
+            [121.388779, 31.177637],
+            [121.378845, 31.17514],
+            [121.381945, 31.168513],
+            [121.386596, 31.157037],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.362751, 31.168968],
+            [121.364049, 31.16597],
+            [121.365348, 31.166365],
+            [121.366184, 31.164574],
+            [121.367515, 31.164877],
+            [121.373341, 31.166034],
+            [121.381945, 31.168513],
+            [121.378845, 31.17514],
+            [121.378281, 31.179698],
+            [121.370245, 31.178278],
+            [121.370444, 31.177002],
+            [121.370106, 31.176933],
+            [121.367805, 31.17103],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.362751, 31.168968],
+            [121.357709, 31.181874],
+            [121.358182, 31.186109],
+            [121.363503, 31.185403],
+            [121.369737, 31.187027],
+            [121.369554, 31.186174],
+            [121.372129, 31.184925],
+            [121.376614, 31.184118],
+            [121.37758, 31.182594],
+            [121.378845, 31.17514],
+            [121.378281, 31.179698],
+            [121.370245, 31.178278],
+            [121.370444, 31.177002],
+            [121.370106, 31.176933],
+            [121.367805, 31.17103],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.394552, 31.177734],
+            [121.391065, 31.176852],
+            [121.389842, 31.178142],
+            [121.391086, 31.178899],
+            [121.388055, 31.181492],
+            [121.386875, 31.181254],
+            [121.388779, 31.177637],
+            [121.378845, 31.17514],
+            [121.378281, 31.179698],
+            [121.37758, 31.182594],
+            [121.376614, 31.184118],
+            [121.372129, 31.184925],
+            [121.369554, 31.186174],
+            [121.388366, 31.194257],
+            [121.392406, 31.188336],
+            [121.395952, 31.177768],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.388366, 31.194257],
+            [121.392406, 31.188336],
+            [121.395952, 31.177768],
+            [121.397617, 31.178106],
+            [121.397494, 31.179391],
+            [121.397751, 31.179372],
+            [121.399296, 31.178615],
+            [121.412166, 31.182255],
+            [121.412133, 31.183921],
+            [121.413952, 31.184141],
+            [121.413898, 31.184728],
+            [121.416709, 31.184655],
+            [121.417305, 31.187918],
+            [121.413523, 31.186743],
+            [121.412568, 31.188647],
+            [121.412536, 31.189841],
+            [121.412675, 31.190373],
+            [121.412525, 31.191355],
+            [121.399575, 31.191869],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.350983, 31.180603],
+            [121.349975, 31.181925],
+            [121.348773, 31.181484],
+            [121.34813, 31.182292],
+            [121.344932, 31.180842],
+            [121.345276, 31.17728],
+            [121.342808, 31.175279],
+            [121.340855, 31.175169],
+            [121.341113, 31.174838],
+            [121.338216, 31.173002],
+            [121.329912, 31.16889],
+            [121.326157, 31.17258],
+            [121.321479, 31.175297],
+            [121.315771, 31.182898],
+            [121.314827, 31.185211],
+            [121.314119, 31.186294],
+            [121.312424, 31.189029],
+            [121.311244, 31.189726],
+            [121.307811, 31.195325],
+            [121.30854, 31.197215],
+            [121.308031, 31.198138],
+            [121.301963, 31.195605],
+            [121.303648, 31.19515],
+            [121.323941, 31.162999],
+            [121.339669, 31.16904],
+            [121.344459, 31.171057],
+            [121.350692, 31.175276],
+            [121.357709, 31.181874],
+            [121.358182, 31.186109],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.330183, 31.182865],
+            [121.329287, 31.182452],
+            [121.328038, 31.184889],
+            [121.320538, 31.184081],
+            [121.318913, 31.186706],
+            [121.318585, 31.187592],
+            [121.318703, 31.190529],
+            [121.318013, 31.200077],
+            [121.313845, 31.199926],
+            [121.314285, 31.191888],
+            [121.316977, 31.186728],
+            [121.314119, 31.186294],
+            [121.314827, 31.185211],
+            [121.315771, 31.182898],
+            [121.321479, 31.175297],
+            [121.326157, 31.17258],
+            [121.329912, 31.16889],
+            [121.338216, 31.173002],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.314119, 31.186294],
+            [121.312424, 31.189029],
+            [121.311244, 31.189726],
+            [121.307811, 31.195325],
+            [121.30854, 31.197215],
+            [121.308031, 31.198138],
+            [121.30754, 31.19876],
+            [121.305223, 31.199741],
+            [121.304482, 31.2021],
+            [121.309289, 31.202761],
+            [121.30974, 31.200223],
+            [121.313602, 31.200838],
+            [121.312068, 31.214295],
+            [121.314342, 31.215149],
+            [121.31563, 31.214681],
+            [121.315925, 31.209648],
+            [121.317191, 31.209813],
+            [121.31718, 31.209574],
+            [121.31593, 31.209409],
+            [121.316032, 31.206964],
+            [121.319245, 31.207143],
+            [121.317942, 31.215053],
+            // [121.315662,31.214901],
+            [121.330768, 31.214736],
+            [121.331197, 31.216176],
+            [121.331905, 31.216461],
+            [121.331144, 31.213699],
+            [121.330843, 31.211533],
+            [121.327571, 31.211097],
+            [121.32704, 31.206597],
+            [121.32668, 31.201095],
+            [121.324712, 31.201012],
+            [121.324733, 31.202986],
+            [121.323145, 31.202857],
+            [121.323574, 31.200912],
+            [121.318146, 31.200522],
+            [121.318013, 31.200077],
+            [121.313845, 31.199926],
+            [121.314285, 31.191888],
+            [121.316977, 31.186728],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.340388, 31.218863],
+            [121.340452, 31.219725],
+            [121.340796, 31.220001],
+            [121.338328, 31.220652],
+            [121.338435, 31.221496],
+            [121.337159, 31.221863],
+            [121.336375, 31.221836],
+            [121.335936, 31.223744],
+            [121.321173, 31.221519],
+            [121.321108, 31.221581],
+            [121.320819, 31.222379],
+            [121.319993, 31.223274],
+            [121.319757, 31.22359],
+            [121.318957, 31.223063],
+            [121.317616, 31.224476],
+            [121.315159, 31.22293],
+            [121.314932, 31.222418],
+            [121.313548, 31.22118],
+            [121.314483, 31.220613],
+            [121.315277, 31.219774],
+            [121.311136, 31.218076],
+            [121.312068, 31.214295],
+            [121.314342, 31.215149],
+            [121.31563, 31.214681],
+            [121.315925, 31.209648],
+            [121.317191, 31.209813],
+            [121.31718, 31.209574],
+            [121.31593, 31.209409],
+            [121.316032, 31.206964],
+            [121.319245, 31.207143],
+            [121.317942, 31.215053],
+            [121.330768, 31.214736],
+            [121.331197, 31.216176],
+            [121.331905, 31.216461],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.311136, 31.218076],
+            [121.305301, 31.217722],
+            [121.304507, 31.215093],
+            [121.30263, 31.213019],
+            [121.3016, 31.211762],
+            [121.301578, 31.210762],
+            [121.299304, 31.209604],
+            [121.30308, 31.205933],
+            [121.30367, 31.202446],
+            [121.303713, 31.201694],
+            [121.301203, 31.202832],
+            [121.300699, 31.203933],
+            [121.300033, 31.203657],
+            [121.297759, 31.205144],
+            [121.295935, 31.203511],
+            [121.295581, 31.2024],
+            [121.296053, 31.201703],
+            [121.297373, 31.201565],
+            [121.297716, 31.200868],
+            [121.298381, 31.200556],
+            [121.298295, 31.199849],
+            [121.299293, 31.199298],
+            [121.299379, 31.198417],
+            [121.300441, 31.19817],
+            [121.300345, 31.197178],
+            [121.301729, 31.196738],
+            [121.301439, 31.195985],
+            [121.301963, 31.195605],
+            [121.308031, 31.198138],
+            [121.30754, 31.19876],
+            [121.305223, 31.199741],
+            [121.304482, 31.2021],
+            [121.309289, 31.202761],
+            [121.30974, 31.200223],
+            [121.313602, 31.200838],
+            [121.312068, 31.214295],
+            [121.311136, 31.218076],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.340796, 31.220001],
+            [121.338328, 31.220652],
+            [121.338435, 31.221496],
+            [121.337159, 31.221863],
+            [121.336375, 31.221836],
+            [121.335936, 31.223744],
+            [121.321173, 31.221519],
+            [121.321108, 31.221581],
+            [121.320819, 31.222379],
+            [121.319993, 31.223274],
+            [121.319757, 31.22359],
+            [121.319917, 31.223721],
+            [121.317728, 31.227437],
+            [121.322749, 31.229483],
+            [121.326526, 31.22963],
+            [121.334551, 31.232639],
+            [121.334422, 31.235152],
+            [121.342426, 31.240179],
+            [121.346421, 31.239622],
+            [121.345993, 31.238106],
+            [121.339792, 31.237226],
+            [121.340532, 31.234418],
+            [121.343654, 31.234694],
+            [121.343686, 31.23473],
+            [121.343847, 31.233685],
+            [121.345199, 31.23373],
+            [121.345736, 31.233749],
+            [121.346229, 31.228153],
+            [121.344158, 31.227914],
+            [121.344244, 31.226813],
+            [121.342732, 31.226529],
+            [121.340543, 31.226322],
+            [121.341278, 31.224162],
+            [121.345553, 31.223831],
+            [121.345371, 31.223152],
+            [121.344196, 31.222084],
+            [121.340897, 31.221616],
+            [121.340972, 31.220166],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            // [121.338328,31.220652],
+            [121.313919, 31.227032],
+            [121.308834, 31.229197],
+            [121.300948, 31.23077],
+            [121.298534, 31.230619],
+            [121.295026, 31.231908],
+            [121.29215, 31.233142],
+            [121.291801, 31.232486],
+            [121.292144, 31.231899],
+            [121.291683, 31.22978],
+            [121.292326, 31.228523],
+            [121.292498, 31.227706],
+            [121.29267, 31.227385],
+            [121.293925, 31.22766],
+            [121.294301, 31.226706],
+            [121.292799, 31.225945],
+            [121.293346, 31.225449],
+            [121.290653, 31.224413],
+            [121.29076, 31.223211],
+            [121.291919, 31.221688],
+            [121.288196, 31.220275],
+            [121.289102, 31.217926],
+            [121.294622, 31.220894],
+            [121.296039, 31.221188],
+            [121.29709, 31.221747],
+            [121.297884, 31.221032],
+            [121.297283, 31.220197],
+            [121.297337, 31.219334],
+            [121.29783, 31.218426],
+            [121.299429, 31.218545],
+            [121.299815, 31.219591],
+            [121.300588, 31.220142],
+            [121.301564, 31.218894],
+            [121.30327, 31.218848],
+            [121.305169, 31.218169],
+            [121.305301, 31.217722],
+            [121.311136, 31.218076],
+            [121.315277, 31.219774],
+            [121.314483, 31.220613],
+            [121.313548, 31.22118],
+            [121.314932, 31.222418],
+            [121.315159, 31.22293],
+            [121.317616, 31.224476],
+            [121.318957, 31.223063],
+            [121.319757, 31.22359],
+            [121.319917, 31.223721],
+            [121.317728, 31.227437],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.294718, 31.203143],
+            [121.293694, 31.202097],
+            [121.292927, 31.202428],
+            [121.292535, 31.202382],
+            [121.292315, 31.200734],
+            [121.286141, 31.195513],
+            [121.280583, 31.193916],
+            [121.277343, 31.193549],
+            [121.276485, 31.194365],
+            [121.276485, 31.194521],
+            [121.278421, 31.19526],
+            [121.277407, 31.196829],
+            [121.278341, 31.197421],
+            [121.272359, 31.206883],
+            [121.287235, 31.211907],
+            [121.29202, 31.208924],
+            [121.294042, 31.210975],
+            [121.2968, 31.208938],
+
+            // [121.304507,31.215093],
+            // [121.30263,31.213019],
+            // [121.3016,31.211762],
+            // [121.301578,31.210762],
+            [121.299304, 31.209604],
+            [121.30308, 31.205933],
+            [121.30367, 31.202446],
+            [121.303713, 31.201694],
+            [121.301203, 31.202832],
+            [121.300699, 31.203933],
+            [121.300033, 31.203657],
+            [121.297759, 31.205144],
+            [121.295935, 31.203511],
+            [121.295581, 31.2024],
+            [121.296053, 31.201703],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.276226, 31.194972],
+            [121.275459, 31.195256],
+            [121.274949, 31.195504],
+            [121.274563, 31.195931],
+            [121.274075, 31.196151],
+            [121.273329, 31.197064],
+            [121.270507, 31.199634],
+            [121.269692, 31.199781],
+            [121.268168, 31.201368],
+            [121.266055, 31.200643],
+            [121.265197, 31.201488],
+            [121.264102, 31.200864],
+            [121.260293, 31.207847],
+            [121.263941, 31.209104],
+            [121.26304, 31.210609],
+            [121.260886, 31.208525],
+            [121.258419, 31.213205],
+            [121.262152, 31.214435],
+            [121.263418, 31.216527],
+            [121.262624, 31.21849],
+            [121.268049, 31.219334],
+            [121.276536, 31.223041],
+            [121.292498, 31.227706],
+            [121.29267, 31.227385],
+            [121.293925, 31.22766],
+            [121.294301, 31.226706],
+            [121.292799, 31.225945],
+            [121.293346, 31.225449],
+            [121.290653, 31.224413],
+            [121.29076, 31.223211],
+            [121.291919, 31.221688],
+            [121.288196, 31.220275],
+            [121.289102, 31.217926],
+            [121.294622, 31.220894],
+            [121.296039, 31.221188],
+            [121.29709, 31.221747],
+            [121.297884, 31.221032],
+            [121.297283, 31.220197],
+            [121.297337, 31.219334],
+            [121.29783, 31.218426],
+            [121.299429, 31.218545],
+            [121.299815, 31.219591],
+            [121.300588, 31.220142],
+            [121.301564, 31.218894],
+            [121.30327, 31.218848],
+            [121.305169, 31.218169],
+
+            [121.305301, 31.217722],
+            [121.304507, 31.215093],
+            [121.30263, 31.213019],
+            [121.3016, 31.211762],
+            [121.301578, 31.210762],
+            [121.299304, 31.209604],
+            [121.2968, 31.208938],
+            [121.294042, 31.210975],
+            [121.29202, 31.208924],
+            [121.287235, 31.211907],
+            [121.272359, 31.206883],
+            [121.278341, 31.197421],
+            [121.277407, 31.196829],
+            [121.278421, 31.19526],
+            [121.276485, 31.194521],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.276536, 31.223041],
+            [121.273772, 31.227776],
+            [121.27404, 31.227914],
+            [121.27301, 31.229763],
+            [121.276797, 31.229799],
+            [121.275322, 31.232455],
+            [121.274131, 31.231845],
+            [121.273911, 31.232318],
+            [121.273562, 31.232345],
+            [121.2736, 31.232813],
+            [121.273064, 31.232969],
+            [121.272817, 31.23363],
+            [121.274378, 31.234102],
+            [121.273552, 31.235551],
+            [121.272119, 31.234795],
+            [121.270242, 31.237978],
+            [121.26793, 31.237019],
+            [121.267157, 31.238216],
+            [121.265773, 31.237556],
+            [121.264663, 31.239794],
+            [121.265403, 31.24001],
+            [121.265092, 31.242312],
+            [121.263279, 31.24189],
+            [121.26219, 31.243931],
+            [121.263268, 31.244133],
+            [121.263043, 31.24472],
+            [121.266304, 31.24544],
+            [121.266428, 31.245041],
+            [121.267367, 31.245619],
+            [121.266884, 31.246454],
+            [121.269244, 31.246798],
+            [121.269255, 31.247967],
+            [121.264856, 31.249192],
+            [121.2644, 31.251058],
+            [121.264802, 31.251838],
+            [121.270575, 31.251966],
+            [121.270549, 31.251791],
+            [121.270919, 31.251832],
+            [121.271054, 31.250773],
+            [121.27174, 31.250557],
+            [121.272513, 31.250167],
+            [121.273988, 31.250993],
+            [121.275367, 31.25047],
+            [121.278253, 31.254634],
+            [121.281364, 31.254973],
+            [121.283617, 31.254772],
+            [121.284035, 31.254405],
+            [121.285216, 31.254561],
+            [121.284529, 31.252258],
+            [121.283445, 31.250351],
+            [121.281267, 31.24803],
+            [121.283461, 31.245308],
+            [121.287259, 31.243602],
+            [121.289352, 31.236942],
+            [121.288064, 31.236318],
+            [121.289352, 31.234337],
+            [121.291004, 31.234832],
+            [121.29215, 31.233142],
+            [121.291801, 31.232486],
+            [121.292144, 31.231899],
+            [121.291683, 31.22978],
+            [121.292326, 31.228523],
+            [121.292498, 31.227706],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.270818, 31.252593],
+            [121.264788, 31.256445],
+            [121.264337, 31.254684],
+            [121.261483, 31.2545],
+            [121.261483, 31.257307],
+            [121.254688, 31.259525],
+            [121.242704, 31.259195],
+            [121.241331, 31.252041],
+            [121.236911, 31.250574],
+            [121.236181, 31.246391],
+            [121.239335, 31.243859],
+            [121.239829, 31.24019],
+            [121.241352, 31.235365],
+            [121.244914, 31.229971],
+            [121.248133, 31.231035],
+            [121.25045, 31.227659],
+            [121.253068, 31.225237],
+            [121.255107, 31.224246],
+            [121.25663, 31.223567],
+            [121.259463, 31.224338],
+            [121.261995, 31.218429],
+            [121.262624, 31.21849],
+            [121.268049, 31.219334],
+            [121.276536, 31.223041],
+            [121.273772, 31.227776],
+            [121.27404, 31.227914],
+            [121.27301, 31.229763],
+            [121.276797, 31.229799],
+            [121.275322, 31.232455],
+            [121.274131, 31.231845],
+            [121.273911, 31.232318],
+            [121.273562, 31.232345],
+            [121.2736, 31.232813],
+            [121.273064, 31.232969],
+            [121.272817, 31.23363],
+            [121.274378, 31.234102],
+            [121.273552, 31.235551],
+            [121.272119, 31.234795],
+            [121.270242, 31.237978],
+            [121.26793, 31.237019],
+            [121.267157, 31.238216],
+            [121.265773, 31.237556],
+            [121.264663, 31.239794],
+            [121.265403, 31.24001],
+            [121.265092, 31.242312],
+            [121.263279, 31.24189],
+            [121.26219, 31.243931],
+            [121.263268, 31.244133],
+            [121.263043, 31.24472],
+            [121.266304, 31.24544],
+            [121.266428, 31.245041],
+            [121.267367, 31.245619],
+            [121.266884, 31.246454],
+            [121.269244, 31.246798],
+            [121.269255, 31.247967],
+            [121.264856, 31.249192],
+            [121.2644, 31.251058],
+            [121.264802, 31.251838],
+            [121.270575, 31.251966],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.411683, 31.140621],
+            [121.40958, 31.144785],
+            [121.409545, 31.144814],
+            [121.409845, 31.142445],
+            [121.409674, 31.141563],
+            [121.40667, 31.139764],
+            [121.403108, 31.136348],
+            [121.399894, 31.143948],
+            [121.390796, 31.140165],
+            [121.393479, 31.128961],
+            [121.399468, 31.127217],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.411683, 31.140621],
+            [121.399468, 31.127217],
+            [121.393698, 31.119207],
+            [121.39314, 31.118885],
+            [121.392636, 31.118205],
+            [121.391724, 31.117636],
+            [121.392475, 31.117397],
+            [121.393688, 31.11793],
+            [121.393682, 31.117767],
+            [121.394262, 31.116224],
+            [121.394734, 31.115673],
+            [121.394476, 31.115415],
+            [121.394873, 31.114919],
+            [121.395254, 31.114963],
+            [121.395619, 31.114522],
+            [121.397711, 31.112786],
+
+            [121.406954, 31.116068],
+            [121.406965, 31.11892],
+            [121.42596, 31.120585],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.397711, 31.112786],
+            [121.397684, 31.112827],
+            [121.399041, 31.110738],
+            [121.399985, 31.109066],
+            [121.407195, 31.112446],
+            [121.408611, 31.108643],
+            [121.405243, 31.107321],
+            [121.408032, 31.100578],
+            [121.409075, 31.101085],
+            [121.415415, 31.102922],
+            [121.412089, 31.109867],
+            [121.413345, 31.110133],
+            [121.410555, 31.116283],
+            [121.406939, 31.115401],
+            [121.406954, 31.116068],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.426245, 31.120233],
+            [121.438399, 31.122102],
+            [121.438909, 31.119153],
+            [121.406954, 31.116068],
+            [121.406965, 31.11892],
+            [121.42596, 31.120585],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.42418, 31.10545],
+            [121.430467, 31.107398],
+            [121.430113, 31.108169],
+            [121.43345, 31.110714],
+            [121.433632, 31.110135],
+            [121.437473, 31.111081],
+            [121.43727, 31.111733],
+            [121.437656, 31.112009],
+            [121.437978, 31.112303],
+            [121.436937, 31.11335],
+            [121.436379, 31.113038],
+            [121.43566, 31.113515],
+            [121.438909, 31.119153],
+            [121.406954, 31.116068],
+            [121.406939, 31.115401],
+            [121.410555, 31.116283],
+            [121.413345, 31.110133],
+            [121.412089, 31.109867],
+            [121.415415, 31.102922],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.411821, 31.095876],
+            [121.413816, 31.089647],
+            [121.413183, 31.088149],
+            [121.414841, 31.088397],
+            [121.414911, 31.087258],
+            [121.419052, 31.08825],
+            [121.419803, 31.087097],
+            [121.4227, 31.087676],
+            [121.422936, 31.087226],
+            [121.42447, 31.087667],
+            [121.424695, 31.087345],
+            [121.425682, 31.087584],
+            [121.426348, 31.086105],
+            [121.4283, 31.086757],
+            [121.426675, 31.091131],
+            [121.434845, 31.093869],
+            [121.434652, 31.094401],
+            [121.433665, 31.094227],
+            [121.433096, 31.095963],
+            [121.43433, 31.096689],
+            [121.433836, 31.09781],
+
+            [121.431841, 31.103496],
+            [121.423719, 31.101094],
+            [121.424803, 31.102567],
+            [121.42418, 31.10545],
+            [121.415415, 31.102922],
+            [121.409075, 31.101085],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.436293, 31.096982],
+            [121.436615, 31.092149],
+            [121.436014, 31.0918],
+            [121.435231, 31.09383],
+            [121.431025, 31.092342],
+            [121.431342, 31.091662],
+            [121.433911, 31.092333],
+            [121.434367, 31.090978],
+            [121.433402, 31.090743],
+            [121.433756, 31.08999],
+            [121.4347, 31.089907],
+            [121.434625, 31.09022],
+            [121.43602, 31.090422],
+            [121.436417, 31.089714],
+            [121.437017, 31.089669],
+            [121.439152, 31.083715],
+            [121.443342, 31.084349],
+            [121.443278, 31.084946],
+            [121.445069, 31.08524],
+            [121.445338, 31.089604],
+            [121.456302, 31.091258],
+            [121.456485, 31.090679],
+            [121.457783, 31.090766],
+            [121.456056, 31.096463],
+            [121.455637, 31.096362],
+            [121.455466, 31.096945],
+            [121.4559, 31.097032],
+            [121.455069, 31.09983],
+            [121.454554, 31.101433],
+            [121.453211, 31.101929],
+            [121.452562, 31.103761],
+            [121.451473, 31.103748],
+            [121.45047, 31.10372],
+            [121.450577, 31.104735],
+            [121.449408, 31.104616],
+            [121.449332, 31.106008],
+            [121.446216, 31.105704],
+            [121.446017, 31.106752],
+            [121.446779, 31.106885],
+            [121.446795, 31.108423],
+            [121.448565, 31.108965],
+            [121.448351, 31.109792],
+            [121.447149, 31.109645],
+            [121.446581, 31.112667],
+            [121.44808, 31.113523],
+            [121.449603, 31.113661],
+            [121.449931, 31.113684],
+            [121.449941, 31.11519],
+            [121.450129, 31.115397],
+            [121.44823, 31.114855],
+            [121.448069, 31.115181],
+            [121.446835, 31.1148],
+            [121.4475, 31.11621],
+            [121.446009, 31.115494],
+            [121.443021, 31.113505],
+            [121.441439, 31.112467],
+            [121.439524, 31.112067],
+            [121.438241, 31.111966],
+            [121.437769, 31.111829],
+
+            [121.437978, 31.112303],
+            [121.437656, 31.112009],
+            [121.43727, 31.111733],
+            [121.437473, 31.111081],
+            [121.433632, 31.110135],
+            [121.43345, 31.110714],
+            [121.430113, 31.108169],
+            [121.430467, 31.107398],
+            [121.42418, 31.10545],
+
+            [121.42418, 31.10545],
+            [121.424803, 31.102567],
+            [121.423719, 31.101094],
+            [121.431841, 31.103496],
+            [121.433836, 31.09781],
+            [121.43433, 31.096689],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.424659, 31.07798],
+            [121.424466, 31.068672],
+            [121.425431, 31.065317],
+            [121.434283, 31.06841],
+            [121.435516, 31.066452],
+            [121.440945, 31.0683],
+            [121.442082, 31.068649],
+            [121.441964, 31.0692],
+            [121.442286, 31.070523],
+            [121.443627, 31.071029],
+            [121.442297, 31.074971],
+            [121.445097, 31.075513],
+            [121.445376, 31.074484],
+            [121.446159, 31.074594],
+            [121.447136, 31.071157],
+            [121.449357, 31.07124],
+            [121.451384, 31.072453],
+            [121.452629, 31.070726],
+            [121.455767, 31.070689],
+            [121.455762, 31.072481],
+            [121.455896, 31.072499],
+            [121.455874, 31.070712],
+            [121.45743, 31.070657],
+            [121.460026, 31.070992],
+            [121.460032, 31.074199],
+            [121.45853, 31.074176],
+            [121.458492, 31.074718],
+            [121.457044, 31.074833],
+            [121.457044, 31.075798],
+            [121.460069, 31.075775],
+            [121.460198, 31.076983],
+            [121.459045, 31.077016],
+            [121.45912, 31.078803],
+            [121.460525, 31.080043],
+            [121.459426, 31.079896],
+            [121.459463, 31.079556],
+            [121.45611, 31.078431],
+            [121.456078, 31.078996],
+            [121.455611, 31.078918],
+            [121.455569, 31.078206],
+            [121.449416, 31.078173],
+            [121.44919, 31.079524],
+            [121.450569, 31.078904],
+            [121.451561, 31.079634],
+            [121.45081, 31.082782],
+            [121.449673, 31.08257],
+            [121.449453, 31.085281],
+            [121.453653, 31.085685],
+            [121.454565, 31.079795],
+            [121.4561, 31.079189],
+            [121.456668, 31.080273],
+            [121.455982, 31.080246],
+            [121.455016, 31.081927],
+            [121.455241, 31.082193],
+            [121.454764, 31.083402],
+            [121.454898, 31.083411],
+            [121.455327, 31.08223],
+            [121.457704, 31.08286],
+            [121.458042, 31.082216],
+            [121.459222, 31.082639],
+            [121.458884, 31.083723],
+            [121.459629, 31.084008],
+            [121.458009, 31.090068],
+            [121.456668, 31.089856],
+
+            [121.456485, 31.090679],
+            [121.456302, 31.091258],
+            [121.445338, 31.089604],
+            [121.445069, 31.08524],
+            [121.443278, 31.084946],
+            [121.443342, 31.084349],
+            [121.439152, 31.083715],
+            [121.437017, 31.089669],
+            [121.436417, 31.089714],
+            [121.43602, 31.090422],
+            [121.434625, 31.09022],
+            [121.4347, 31.089907],
+            [121.433756, 31.08999],
+            [121.433402, 31.090743],
+            [121.434367, 31.090978],
+            [121.433911, 31.092333],
+            [121.431342, 31.091662],
+            [121.431025, 31.092342],
+            [121.435231, 31.09383],
+            [121.436014, 31.0918],
+            [121.436615, 31.092149],
+            [121.436293, 31.096982],
+
+            [121.43433, 31.096689],
+            [121.433836, 31.09781],
+            [121.43433, 31.096689],
+            [121.433096, 31.095963],
+            [121.433665, 31.094227],
+            [121.434652, 31.094401],
+            [121.434845, 31.093869],
+            [121.426675, 31.091131],
+            [121.4283, 31.086757],
+            [121.426348, 31.086105],
+            [121.425682, 31.087584],
+            [121.424695, 31.087345],
+            [121.42447, 31.087667],
+            [121.422936, 31.087226],
+            [121.4227, 31.087676],
+            [121.419803, 31.087097],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.42144, 31.067698],
+            [121.423994, 31.058673],
+            [121.431311, 31.046945],
+            [121.434143, 31.048747],
+            [121.437276, 31.049446],
+            [121.441374, 31.052497],
+            [121.442705, 31.050935],
+            [121.444743, 31.052111],
+            [121.445988, 31.050696],
+            [121.446905, 31.04689],
+            [121.442528, 31.046182],
+            [121.443193, 31.043627],
+            [121.445768, 31.03995],
+            [121.448828, 31.040557],
+            [121.44791, 31.046784],
+            [121.452701, 31.047538],
+            [121.453908, 31.044422],
+            [121.460935, 31.044514],
+            [121.463467, 31.045452],
+            [121.464556, 31.045911],
+            [121.465275, 31.04593],
+            [121.46491, 31.046881],
+            [121.466273, 31.047387],
+            [121.466123, 31.047855],
+
+            [121.464848, 31.047568],
+
+            [121.464406, 31.049041],
+            [121.466262, 31.049335],
+            [121.467104, 31.046118],
+            [121.468655, 31.046146],
+            [121.470693, 31.046748],
+            [121.472367, 31.046518],
+            [121.478761, 31.048122],
+            [121.477774, 31.050553],
+            [121.486995, 31.050999],
+            [121.486958, 31.05116],
+            [121.477189, 31.050783],
+            [121.474802, 31.05064],
+            [121.474818, 31.050829],
+            [121.477774, 31.050967],
+            [121.4775, 31.051886],
+            [121.476851, 31.053173],
+            [121.471787, 31.051831],
+            [121.471959, 31.051141],
+            [121.470521, 31.050829],
+            [121.469899, 31.052097],
+            [121.465768, 31.051261],
+            [121.465307, 31.052667],
+            [121.46292, 31.052065],
+            [121.462791, 31.052364],
+            [121.462228, 31.052336],
+            [121.461928, 31.054308],
+            [121.460163, 31.054372],
+            [121.459465, 31.055562],
+            [121.45733, 31.055098],
+            [121.456595, 31.05815],
+            [121.459165, 31.058347],
+            [121.462496, 31.059225],
+            [121.462378, 31.059827],
+            [121.463177, 31.06008],
+            [121.462625, 31.061628],
+            [121.460533, 31.06127],
+            [121.459943, 31.062648],
+            [121.462019, 31.063209],
+            [121.460586, 31.067455],
+            [121.459787, 31.067211],
+            [121.459481, 31.067326],
+            [121.459481, 31.067326],
+            [121.458532, 31.067556],
+            [121.456601, 31.06688],
+            [121.455871, 31.066743],
+            [121.455859, 31.061596],
+            [121.453139, 31.06149],
+            [121.453096, 31.063071],
+            [121.451879, 31.063103],
+            [121.452619, 31.066706],
+            [121.447137, 31.066641],
+            [121.447973, 31.068075],
+            [121.445248, 31.068222],
+            [121.444648, 31.07006],
+            [121.44718, 31.070005],
+
+            [121.447136, 31.071157],
+            [121.446159, 31.074594],
+            [121.445376, 31.074484],
+            [121.445097, 31.075513],
+            [121.442297, 31.074971],
+            [121.443627, 31.071029],
+            [121.442286, 31.070523],
+            [121.441964, 31.0692],
+            [121.442082, 31.068649],
+            [121.440945, 31.0683],
+            [121.435516, 31.066452],
+            [121.434283, 31.06841],
+            [121.425431, 31.065317],
+            [121.424466, 31.068672],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.465275, 31.04593],
+            [121.46491, 31.046881],
+            [121.466273, 31.047387],
+            [121.466123, 31.047855],
+            [121.464848, 31.047568],
+            [121.464406, 31.049041],
+            [121.466262, 31.049335],
+            [121.467104, 31.046118],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.449745, 31.036355],
+            [121.456123, 31.03828],
+            [121.45732, 31.035403],
+            [121.461954, 31.035973],
+            [121.461869, 31.036741],
+            [121.465618, 31.037462],
+
+
+            [121.463467, 31.045452],
+            [121.460935, 31.044514],
+            [121.453908, 31.044422],
+            [121.452701, 31.047538],
+            [121.44791, 31.046784],
+            [121.448828, 31.040557],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.463467, 31.045452],
+            [121.464556, 31.045911],
+            [121.465275, 31.04593],
+
+            [121.467104, 31.046118],
+            [121.468655, 31.046146],
+            [121.470693, 31.046748],
+            [121.472367, 31.046518],
+            [121.478761, 31.048122],
+
+            [121.481338, 31.02982],
+            [121.481735, 31.028404],
+            [121.478237, 31.027609],
+            [121.477395, 31.029659],
+            [121.474675, 31.043513],
+            [121.472315, 31.04303],
+            [121.47254, 31.042428],
+            [121.472964, 31.042474],
+            [121.471913, 31.038347],
+            [121.470411, 31.03706],
+            [121.465803, 31.036407],
+            [121.465618, 31.037462],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            // [121.4775,31.051886],
+            [121.476851, 31.053173],
+            [121.471787, 31.051831],
+            [121.471959, 31.051141],
+            [121.470521, 31.050829],
+            [121.469899, 31.052097],
+            [121.465768, 31.051261],
+            [121.465307, 31.052667],
+            [121.46292, 31.052065],
+            [121.462791, 31.052364],
+            [121.462228, 31.052336],
+            [121.461928, 31.054308],
+            [121.460163, 31.054372],
+            [121.459465, 31.055562],
+            [121.45733, 31.055098],
+            [121.456595, 31.05815],
+            [121.459165, 31.058347],
+            [121.462496, 31.059225],
+            [121.462378, 31.059827],
+            [121.463177, 31.06008],
+            [121.462625, 31.061628],
+            [121.460533, 31.06127],
+            [121.459943, 31.062648],
+            [121.462019, 31.063209],
+            [121.460586, 31.067455],
+            [121.459787, 31.067211],
+            [121.459481, 31.067326],
+            [121.459481, 31.067326],
+            [121.458532, 31.067556],
+            [121.456601, 31.06688],
+            [121.455871, 31.066743],
+            [121.455859, 31.061596],
+            [121.453139, 31.06149],
+            [121.453096, 31.063071],
+            [121.451879, 31.063103],
+            [121.452619, 31.066706],
+            [121.447137, 31.066641],
+            [121.447973, 31.068075],
+            [121.445248, 31.068222],
+            [121.444648, 31.07006],
+            [121.44718, 31.070005],
+
+            [121.447136, 31.071157],
+            [121.449357, 31.07124],
+            [121.451384, 31.072453],
+            [121.452629, 31.070726],
+            [121.455767, 31.070689],
+            [121.455762, 31.072481],
+            [121.455896, 31.072499],
+            [121.455874, 31.070712],
+            [121.45743, 31.070657],
+            [121.460026, 31.070992],
+            [121.460032, 31.074199],
+            [121.45853, 31.074176],
+            [121.458492, 31.074718],
+            [121.457044, 31.074833],
+            [121.457044, 31.075798],
+            [121.460069, 31.075775],
+            [121.460198, 31.076983],
+            [121.459045, 31.077016],
+            [121.45912, 31.078803],
+            [121.460525, 31.080043],
+            [121.459426, 31.079896],
+            [121.459463, 31.079556],
+            [121.45611, 31.078431],
+            [121.456078, 31.078996],
+            [121.455611, 31.078918],
+            [121.455569, 31.078206],
+            [121.449416, 31.078173],
+            [121.44919, 31.079524],
+            [121.450569, 31.078904],
+            [121.451561, 31.079634],
+            [121.45081, 31.082782],
+            [121.449673, 31.08257],
+            [121.449453, 31.085281],
+            [121.453653, 31.085685],
+            [121.454565, 31.079795],
+            [121.4561, 31.079189],
+            [121.456668, 31.080273],
+            [121.455982, 31.080246],
+            [121.455016, 31.081927],
+            [121.455241, 31.082193],
+            [121.454764, 31.083402],
+            [121.454898, 31.083411],
+            [121.455327, 31.08223],
+            [121.457704, 31.08286],
+            [121.458042, 31.082216],
+            [121.459222, 31.082639],
+            [121.458884, 31.083723],
+            [121.459629, 31.084008],
+            [121.458009, 31.090068],
+            [121.456668, 31.089856],
+
+            [121.456485, 31.090679],
+            [121.457783, 31.090766],
+            [121.456056, 31.096463],
+            [121.455637, 31.096362],
+            [121.455466, 31.096945],
+            [121.4559, 31.097032],
+            [121.455069, 31.09983],
+
+            [121.460593, 31.100949],
+            [121.465389, 31.092289],
+            [121.467695, 31.088018],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.487952, 31.01804],
+            [121.486922, 31.015796],
+            [121.476537, 31.014729],
+            [121.462589, 31.00958],
+            [121.448985, 31.009369],
+            [121.448824, 31.0097],
+            [121.447934, 31.009654],
+            [121.447365, 31.011217],
+            [121.446432, 31.011153],
+            [121.445123, 31.013975],
+            [121.439522, 31.012504],
+            [121.436518, 31.019014],
+            [121.450874, 31.023788],
+            [121.445981, 31.035068],
+            [121.436567, 31.032117],
+            [121.435859, 31.033046],
+            [121.435376, 31.034609],
+            [121.434764, 31.034388],
+            [121.432393, 31.038672],
+            [121.430762, 31.038175],
+            [121.429024, 31.042009],
+            [121.43073, 31.042597],
+            [121.429539, 31.045244],
+            [121.430301, 31.046871],
+
+            [121.431311, 31.046945],
+            [121.434143, 31.048747],
+            [121.437276, 31.049446],
+            [121.441374, 31.052497],
+            [121.442705, 31.050935],
+            [121.444743, 31.052111],
+            [121.445988, 31.050696],
+            [121.446905, 31.04689],
+            [121.442528, 31.046182],
+            [121.443193, 31.043627],
+            [121.445768, 31.03995],
+            [121.448828, 31.040557],
+
+            [121.449745, 31.036355],
+            [121.456123, 31.03828],
+            [121.45732, 31.035403],
+            [121.461954, 31.035973],
+            [121.461869, 31.036741],
+            [121.465618, 31.037462],
+
+
+            [121.465803, 31.036407],
+            [121.470411, 31.03706],
+            [121.471913, 31.038347],
+            [121.472964, 31.042474],
+            [121.47254, 31.042428],
+            [121.472315, 31.04303],
+            [121.474675, 31.043513],
+            [121.477395, 31.029659],
+            [121.478237, 31.027609],
+            [121.481735, 31.028404],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.40039, 31.09835],
+            [121.399384, 31.098076],
+            [121.409503, 31.073954],
+            [121.424659, 31.07798],
+
+            [121.419803, 31.087097],
+            [121.419052, 31.08825],
+            [121.414911, 31.087258],
+            [121.414841, 31.088397],
+            [121.413183, 31.088149],
+            [121.413816, 31.089647],
+            [121.411821, 31.095876],
+            [121.409075, 31.101085],
+            [121.408032, 31.100578],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.424659, 31.07798],
+            [121.424466, 31.068672],
+            [121.42144, 31.067698],
+            [121.423994, 31.058673],
+            [121.431311, 31.046945],
+            [121.430301, 31.046871],
+            [121.429539, 31.045244],
+            [121.410148, 31.044195],
+            [121.407787, 31.051319],
+
+            [121.405665, 31.05625],
+            [121.399065, 31.071662],
+            [121.400932, 31.072213],
+            [121.402595, 31.071396],
+            [121.409503, 31.073954],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.388116, 31.094725],
+            [121.397844, 31.076055],
+            [121.396975, 31.075687],
+            [121.399065, 31.071662],
+            [121.400932, 31.072213],
+            [121.402595, 31.071396],
+            [121.409503, 31.073954],
+            [121.399384, 31.098076],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.396975, 31.075687],
+            [121.387753, 31.075412],
+            [121.387565, 31.075697],
+            [121.386288, 31.07526],
+            [121.3861, 31.075664],
+            [121.383874, 31.074948],
+            [121.383338, 31.076083],
+            [121.38101, 31.075384],
+            [121.38446, 31.066885],
+            [121.387234, 31.06734],
+            [121.389717, 31.061932],
+            [121.392845, 31.062924],
+            [121.393306, 31.061899],
+            [121.392228, 31.061546],
+            [121.392802, 31.059882],
+            [121.394985, 31.060663],
+            [121.3952, 31.060236],
+            [121.397313, 31.061008],
+            [121.398247, 31.058416],
+            [121.397474, 31.058012],
+            [121.397989, 31.056923],
+            [121.401315, 31.058499],
+            [121.401546, 31.057975],
+            [121.402136, 31.058278],
+            [121.402796, 31.056743],
+            [121.403107, 31.056863],
+            [121.403724, 31.0557],
+            [121.405665, 31.05625],
+
+            [121.399065, 31.071662],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.394462, 31.046573],
+            [121.397606, 31.039633],
+            [121.392295, 31.037519],
+            [121.394044, 31.034696],
+            [121.39988, 31.023577],
+            [121.401039, 31.021044],
+            [121.406945, 31.022713],
+            [121.417218, 31.025848],
+            [121.419643, 31.026629],
+            [121.418795, 31.028468],
+
+            [121.435859, 31.033046],
+            [121.435376, 31.034609],
+            [121.434764, 31.034388],
+            [121.432393, 31.038672],
+            [121.430762, 31.038175],
+            [121.429024, 31.042009],
+            [121.43073, 31.042597],
+            [121.429539, 31.045244],
+            [121.410148, 31.044195],
+            [121.407787, 31.051319],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.421447, 31.014287],
+            [121.424281, 31.015131],
+            [121.429656, 31.003618],
+            [121.429302, 31.001568],
+            [121.430096, 31.000464],
+            [121.430986, 31.001071],
+            [121.431608, 31.002395],
+            [121.43369, 31.003793],
+            [121.434376, 31.004694],
+            [121.439054, 31.007435],
+            [121.44444, 31.008924],
+            [121.444998, 31.008538],
+            [121.446972, 31.008924],
+            [121.447079, 31.009384],
+            [121.44768, 31.009329],
+
+            [121.448985, 31.009369],
+            [121.448824, 31.0097],
+            [121.447934, 31.009654],
+            [121.447365, 31.011217],
+            [121.446432, 31.011153],
+            [121.445123, 31.013975],
+            [121.439522, 31.012504],
+            [121.436518, 31.019014],
+            [121.450874, 31.023788],
+            [121.445981, 31.035068],
+            [121.436567, 31.032117],
+            [121.435859, 31.033046],
+
+            [121.418795, 31.028468],
+            [121.419643, 31.026629],
+            [121.417218, 31.025848],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.421447, 31.014287],
+            [121.422915, 31.01054],
+            [121.417079, 31.008576],
+            [121.412905, 31.007721],
+            [121.411467, 31.011556],
+            [121.406945, 31.022713],
+            [121.417218, 31.025848],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.421447, 31.014287],
+            [121.424281, 31.015131],
+            [121.429656, 31.003618],
+            [121.429302, 31.001568],
+            [121.430096, 31.000464],
+            [121.429736, 30.999956],
+            [121.428754, 30.999037],
+            [121.427322, 30.998379],
+            [121.426094, 30.997685],
+            [121.423271, 30.996459],
+            [121.417079, 31.008576],
+            [121.422915, 31.01054],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.405084, 31.010031],
+            [121.406178, 31.007787],
+            [121.405996, 31.006794],
+            [121.40488, 31.00593],
+            [121.408512, 31.006794],
+            [121.410802, 30.996237],
+            [121.410051, 30.995942],
+            [121.41033, 30.995395],
+            [121.411054, 30.995561],
+            [121.41209, 30.992866],
+            [121.414665, 30.993427],
+            [121.423271, 30.996459],
+            [121.417079, 31.008576],
+            [121.412905, 31.007721],
+            [121.411467, 31.011556],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.396216, 31.007647],
+            [121.395315, 31.009624],
+            [121.394564, 31.011334],
+            [121.392451, 31.010691],
+            [121.391313, 31.013316],
+            [121.388213, 31.012318],
+            [121.388052, 31.012861],
+            [121.385262, 31.012088],
+            [121.384232, 31.010121],
+            [121.381765, 31.015367],
+
+            [121.401039, 31.021044],
+            [121.406945, 31.022713],
+            [121.411467, 31.011556],
+            [121.405084, 31.010031],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.396216, 31.007647],
+            [121.395315, 31.009624],
+            [121.394564, 31.011334],
+            [121.392451, 31.010691],
+            [121.391313, 31.013316],
+            [121.388213, 31.012318],
+            [121.388052, 31.012861],
+            [121.385262, 31.012088],
+            [121.384232, 31.010121],
+            [121.381765, 31.015367],
+            // [121.362995,31.0267],
+
+
+            [121.401039, 31.021044],
+            [121.39988, 31.023577],
+            // [121.394044,31.034696],
+
+            // [121.362995,31.0267],
+            [121.367884, 31.015015],
+            [121.371744, 31.01426],
+            [121.37272, 31.013846],
+            [121.374211, 31.013295],
+            [121.375992, 31.013681],
+            [121.375681, 31.014518],
+            [121.376217, 31.014637],
+            [121.37611, 31.014922],
+            [121.37787, 31.015161],
+            [121.379146, 31.015042],
+            [121.380219, 31.015033],
+            [121.380831, 31.013754],
+            [121.381882, 31.012706],
+            [121.382397, 31.009782],
+            [121.383985, 31.008991],
+            [121.384007, 31.00695],
+            [121.387182, 31.00134],
+            [121.387311, 31.000936],
+            [121.38729, 30.999538],
+            [121.39098, 30.993082],
+            [121.390723, 30.989918],
+
+            [121.392021, 30.989706],
+            [121.401098, 30.990975],
+            [121.410367, 30.992649],
+            [121.410882, 30.992539],
+            [121.41144, 30.992613],
+
+            [121.41209, 30.992866],
+            [121.411054, 30.995561],
+            [121.41033, 30.995395],
+            [121.410051, 30.995942],
+            [121.410802, 30.996237],
+            [121.408512, 31.006794],
+            [121.40488, 31.00593],
+            [121.405996, 31.006794],
+            [121.406178, 31.007787],
+            [121.405084, 31.010031],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.371744, 31.01426],
+            [121.37272, 31.013846],
+            [121.374211, 31.013295],
+            [121.375992, 31.013681],
+            [121.375681, 31.014518],
+            [121.376217, 31.014637],
+            [121.37611, 31.014922],
+            [121.37787, 31.015161],
+            [121.379146, 31.015042],
+            [121.380219, 31.015033],
+            [121.380831, 31.013754],
+            [121.381882, 31.012706],
+            [121.382397, 31.009782],
+            [121.383985, 31.008991],
+            [121.384007, 31.00695],
+            [121.387182, 31.00134],
+            [121.387311, 31.000936],
+            [121.38729, 30.999538],
+            [121.39098, 30.993082],
+            [121.390723, 30.989918],
+            [121.387321, 30.988716],
+            [121.385347, 30.993475],
+            [121.38186, 30.992491],
+            [121.380213, 30.996423],
+            [121.375465, 30.995108],
+            [121.372043, 31.003858],
+            [121.369414, 31.003031],
+            [121.370584, 31.000226],
+            [121.369436, 30.999936],
+            [121.369945, 30.998161],
+            [121.352822, 30.992703],
+            [121.352683, 30.993282],
+            [121.355531, 30.994133],
+            [121.354126, 30.997996],
+            [121.362569, 31.000764],
+            [121.360885, 31.00527],
+            [121.367827, 31.007201],
+            [121.367118, 31.009031],
+            [121.369897, 31.009675],
+            [121.369012, 31.011702],
+            [121.372188, 31.012691],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.375465, 30.995108],
+            [121.372043, 31.003858],
+            [121.369414, 31.003031],
+            [121.370584, 31.000226],
+            [121.369436, 30.999936],
+            [121.369945, 30.998161],
+            [121.352822, 30.992703],
+
+            [121.352378, 30.992596],
+            [121.352056, 30.993047],
+            [121.351423, 30.992798],
+            [121.351713, 30.992375],
+            [121.350758, 30.992145],
+            [121.350383, 30.991566],
+            [121.351198, 30.991594],
+            [121.351584, 30.988126],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.368694, 31.01158],
+            [121.369219, 31.010601],
+            [121.367846, 31.010137],
+            [121.36739, 31.01118],
+            [121.352643, 31.006923],
+            [121.353984, 31.00335],
+
+            [121.360885, 31.00527],
+            [121.367827, 31.007201],
+            [121.367118, 31.009031],
+            [121.369897, 31.009675],
+            [121.369012, 31.011702],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.387029, 31.094393],
+            [121.3743, 31.090561],
+            [121.372883, 31.093148],
+            [121.366612, 31.091655],
+            [121.372197, 31.080004],
+            [121.370367, 31.079003],
+            [121.370566, 31.078653],
+            [121.370485, 31.078658],
+            [121.370185, 31.079099],
+            [121.363233, 31.076724],
+            [121.364209, 31.075061],
+            [121.363651, 31.074711],
+            [121.363844, 31.07416],
+            [121.361977, 31.072947],
+            [121.364456, 31.069997],
+            [121.363469, 31.069905],
+            [121.362568, 31.069464],
+            [121.362675, 31.068913],
+            [121.361645, 31.068499],
+            [121.361752, 31.068214],
+            [121.361935, 31.068012],
+            [121.356924, 31.066193],
+            [121.360368, 31.059364],
+            [121.365947, 31.061276],
+            [121.368887, 31.061864],
+            [121.371054, 31.063187],
+
+            [121.38446, 31.066885],
+            [121.38101, 31.075384],
+            [121.383338, 31.076083],
+            [121.383874, 31.074948],
+            [121.3861, 31.075664],
+            [121.386288, 31.07526],
+            [121.387565, 31.075697],
+            [121.387753, 31.075412],
+            [121.396975, 31.075687],
+            [121.397844, 31.076055],
+            [121.388116, 31.094725],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.371054, 31.063187],
+            [121.368887, 31.061864],
+            [121.365947, 31.061276],
+            [121.360368, 31.059364],
+
+            [121.368545, 31.041198],
+            [121.373684, 31.042503],
+            [121.373545, 31.042917],
+            [121.374183, 31.04322],
+            [121.373979, 31.043804],
+            [121.379092, 31.045449],
+            [121.380079, 31.046685],
+            [121.381001, 31.043923],
+            [121.384483, 31.04458],
+            [121.383104, 31.046805],
+            [121.380926, 31.046129],
+            [121.380411, 31.047513],
+            [121.382423, 31.049204],
+            [121.381801, 31.050702],
+            [121.384998, 31.051824],
+            [121.388613, 31.045279],
+            [121.389364, 31.045169],
+
+            [121.392295, 31.037519],
+            [121.397606, 31.039633],
+            [121.394462, 31.046573],
+
+            [121.407787, 31.051319],
+
+            [121.405665, 31.05625],
+            [121.403724, 31.0557],
+            [121.403107, 31.056863],
+            [121.402796, 31.056743],
+            [121.402136, 31.058278],
+            [121.401546, 31.057975],
+            [121.401315, 31.058499],
+            [121.397989, 31.056923],
+            [121.397474, 31.058012],
+            [121.398247, 31.058416],
+            [121.397313, 31.061008],
+            [121.3952, 31.060236],
+            [121.394985, 31.060663],
+            [121.392802, 31.059882],
+            [121.392228, 31.061546],
+            [121.393306, 31.061899],
+            [121.392845, 31.062924],
+            [121.389717, 31.061932],
+            [121.387234, 31.06734],
+            [121.38446, 31.066885],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.373501, 31.028166],
+            [121.373955, 31.026869],
+            [121.366461, 31.024359],
+            [121.36585, 31.026189],
+            [121.366134, 31.026286],
+            [121.365925, 31.026511],
+            [121.363441, 31.025922],
+            [121.36409, 31.024093],
+            [121.359343, 31.022732],
+            [121.35871, 31.024957],
+            [121.365812, 31.026598],
+            [121.362541, 31.038889],
+            [121.342001, 31.033571],
+            [121.3336, 31.033433],
+            [121.333355, 31.03423],
+            [121.333366, 31.034377],
+            [121.333817, 31.035628],
+            [121.333452, 31.036648],
+            [121.333945, 31.037935],
+            [121.333656, 31.040674],
+            [121.334385, 31.041263],
+            [121.334246, 31.042752],
+            [121.335201, 31.045804],
+            [121.335061, 31.046934],
+            [121.335115, 31.047044],
+            [121.335383, 31.048322],
+            [121.335083, 31.05107],
+            [121.335211, 31.057633],
+            [121.335823, 31.058975],
+            [121.335265, 31.060721],
+            [121.33578, 31.061879],
+            [121.341751, 31.062963],
+            [121.342426, 31.058947],
+            [121.353509, 31.061888],
+
+            [121.356924, 31.066193],
+            [121.360368, 31.059364],
+
+            [121.368545, 31.041198],
+            [121.373684, 31.042503],
+            [121.373545, 31.042917],
+            [121.374183, 31.04322],
+            [121.373979, 31.043804],
+            [121.379092, 31.045449],
+            [121.380079, 31.046685],
+            [121.381001, 31.043923],
+            [121.384483, 31.04458],
+            [121.383104, 31.046805],
+            [121.380926, 31.046129],
+            [121.380411, 31.047513],
+            [121.382423, 31.049204],
+            [121.381801, 31.050702],
+            [121.384998, 31.051824],
+            [121.388613, 31.045279],
+            [121.389364, 31.045169],
+
+            [121.392295, 31.037519],
+            [121.394044, 31.034696],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.373501, 31.028166],
+            [121.373955, 31.026869],
+            [121.366461, 31.024359],
+            [121.364373, 31.023555],
+
+            [121.367884, 31.015015],
+            [121.39988, 31.023577],
+            [121.394044, 31.034696],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.334021, 31.031523],
+            [121.333184, 31.030052],
+            [121.333871, 31.028783],
+            [121.333978, 31.027312],
+            [121.33327, 31.025841],
+            [121.333506, 31.025087],
+            [121.333163, 31.024425],
+            [121.333828, 31.023469],
+            [121.333378, 31.022844],
+            [121.333142, 31.021152],
+            [121.333764, 31.020306],
+            [121.333399, 31.019239],
+            [121.333356, 31.017143],
+            [121.333742, 31.016058],
+            [121.332906, 31.014771],
+            [121.333313, 31.014054],
+            [121.343355, 31.014477],
+            [121.339987, 31.010247],
+            [121.338914, 31.007911],
+            [121.335159, 31.001989],
+            [121.33488, 31.001805],
+            [121.334772, 31.001695],
+            [121.330781, 30.997133],
+            [121.326983, 30.994981],
+            [121.327112, 30.990695],
+            [121.326812, 30.987513],
+            [121.326125, 30.982049],
+            [121.331071, 30.982526],
+            [121.336479, 30.981496],
+            [121.347207, 30.977559],
+            [121.352572, 30.978056],
+            [121.371412, 30.983428],
+            [121.384029, 30.986923],
+
+            [121.387321, 30.988716],
+            [121.385347, 30.993475],
+            [121.38186, 30.992491],
+            [121.380213, 30.996423],
+            [121.375465, 30.995108],
+
+            [121.351584, 30.988126],
+            [121.351198, 30.991594],
+            [121.350383, 30.991566],
+            [121.350758, 30.992145],
+            [121.351713, 30.992375],
+            [121.351423, 30.992798],
+            [121.352056, 30.993047],
+            [121.352378, 30.992596],
+
+            [121.352822, 30.992703],
+            [121.352683, 30.993282],
+            [121.355531, 30.994133],
+            [121.354126, 30.997996],
+            [121.362569, 31.000764],
+            [121.360885, 31.00527],
+
+            [121.353984, 31.00335],
+            [121.352643, 31.006923],
+            [121.36739, 31.01118],
+            [121.367846, 31.010137],
+            [121.369219, 31.010601],
+            [121.368694, 31.01158],
+
+            [121.369012, 31.011702],
+            [121.372188, 31.012691],
+
+            [121.371744, 31.01426],
+            [121.367884, 31.015015],
+
+            [121.364373, 31.023555],
+
+            [121.366461, 31.024359],
+            [121.36585, 31.026189],
+            [121.366134, 31.026286],
+            [121.365925, 31.026511],
+            [121.363441, 31.025922],
+            [121.36409, 31.024093],
+            [121.359343, 31.022732],
+            [121.35871, 31.024957],
+            [121.365812, 31.026598],
+            [121.362541, 31.038889],
+            [121.342001, 31.033571],
+            [121.3336, 31.033433],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.460214, 31.102994],
+            [121.460257, 31.106706],
+            [121.463948, 31.114275],
+            [121.46766, 31.119198],
+            [121.477123, 31.117508],
+            [121.477874, 31.117214],
+            [121.479376, 31.117838],
+            [121.478024, 31.11962],
+            [121.484497, 31.117308],
+            [121.47605, 31.129466],
+            [121.483685, 31.130605],
+            [121.486185, 31.124075],
+
+            // [121.493373,31.126379]
+
+            [121.488717, 31.124699],
+            [121.494935, 31.126933],
+
+            [121.498706, 31.116369],
+            [121.486482, 31.112194],
+            [121.488187, 31.107165],
+            [121.494345, 31.108929],
+            [121.495246, 31.106421],
+            [121.501496, 31.108194],
+            [121.506269, 31.09502],
+            [121.505084, 31.094574],
+            [121.504601, 31.095966],
+            [121.502836, 31.095484],
+            [121.503303, 31.094106],
+            [121.493212, 31.091565],
+            [121.493802, 31.089475],
+            [121.487692, 31.087918],
+            [121.487011, 31.089944],
+            [121.486501, 31.089843],
+            [121.484104, 31.098451],
+            [121.471551, 31.093462],
+
+            [121.466118, 31.090793],
+            [121.460593, 31.100949],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.506269, 31.09502],
+            [121.505084, 31.094574],
+            [121.504601, 31.095966],
+            [121.502836, 31.095484],
+            [121.503303, 31.094106],
+            [121.493212, 31.091565],
+            [121.493802, 31.089475],
+            [121.487692, 31.087918],
+            [121.487011, 31.089944],
+            [121.486501, 31.089843],
+
+            [121.490432, 31.078641],
+            [121.487042, 31.077703],
+            [121.487697, 31.075709],
+            [121.498554, 31.078071],
+            [121.500786, 31.0706],
+            [121.508832, 31.07264],
+            [121.508543, 31.074303],
+            [121.509766, 31.074648],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.471551, 31.093462],
+            [121.484104, 31.098451],
+            [121.486501, 31.089843],
+            [121.490432, 31.078641],
+            [121.487042, 31.077703],
+            [121.487697, 31.075709],
+            [121.498554, 31.078071],
+            [121.500786, 31.0706],
+            [121.508832, 31.07264],
+            [121.508543, 31.074303],
+            [121.509766, 31.074648],
+            [121.510374, 31.071053],
+            [121.511667, 31.064308],
+            [121.512005, 31.059915],
+            [121.502284, 31.057396],
+            [121.502043, 31.058996],
+            [121.499269, 31.058458],
+            [121.499634, 31.056735],
+
+            // [121.477774,31.050967],
+            [121.4775, 31.051886],
+            [121.476851, 31.053173],
+
+            [121.467695, 31.088018],
+            [121.466118, 31.090793],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.498706, 31.116369],
+            [121.486482, 31.112194],
+            [121.488187, 31.107165],
+            [121.494345, 31.108929],
+            [121.495246, 31.106421],
+            [121.501496, 31.108194],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.487819, 31.031166],
+            [121.498998, 31.034714],
+            [121.49902, 31.032876],
+            [121.527354, 31.03266],
+            [121.526721, 31.03744],
+            [121.526464, 31.042174],
+
+            [121.530492, 31.043207],
+
+            [121.540091, 31.045795],
+            [121.540863, 31.045133],
+            [121.543567, 31.045584],
+            [121.543513, 31.047018],
+            [121.546217, 31.047652],
+            [121.545981, 31.054592],
+            [121.530402, 31.048884],
+            [121.529287, 31.054936],
+            [121.527479, 31.062183],
+            [121.519448, 31.060391],
+            [121.519062, 31.064775],
+            [121.511667, 31.064308],
+            [121.512005, 31.059915],
+            [121.502284, 31.057396],
+            [121.502043, 31.058996],
+            [121.499269, 31.058458],
+            [121.499634, 31.056735],
+
+            [121.4775, 31.051886],
+            [121.477774, 31.050967],
+            [121.474818, 31.050829],
+            [121.474802, 31.05064],
+            [121.477189, 31.050783],
+            [121.486958, 31.05116],
+            [121.486995, 31.050999],
+            [121.477774, 31.050553],
+            [121.478761, 31.048122],
+
+            [121.481338, 31.02982],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.538816, 31.057737],
+            [121.534889, 31.069336],
+            [121.532732, 31.073875],
+            [121.525244, 31.074528],
+            [121.51872, 31.073296],
+            [121.517004, 31.071642],
+            [121.515952, 31.070925],
+            [121.510374, 31.071053],
+            [121.511667, 31.064308],
+
+            [121.519062, 31.064775],
+            [121.519448, 31.060391],
+            [121.527479, 31.062183],
+            [121.529287, 31.054936],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.545981, 31.054592],
+            [121.530402, 31.048884],
+            [121.529287, 31.054936],
+
+            [121.538816, 31.057737],
+            [121.534889, 31.069336],
+
+            [121.53945, 31.071081],
+            [121.54033, 31.068655],
+            [121.54195, 31.067111],
+            [121.545802, 31.069069],
+            [121.545965, 31.066882],
+            [121.5492, 31.067774],
+            [121.551393, 31.064506],
+
+            [121.552171, 31.063316],
+            [121.551018, 31.059718],
+            [121.550127, 31.059387],
+            [121.547338, 31.057944],
+            [121.54693, 31.056767],
+            [121.546104, 31.056565],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.487952, 31.01804],
+            [121.486922, 31.015796],
+            [121.490864, 31.011563],
+            [121.495091, 30.997604],
+            [121.498568, 30.997848],
+            [121.498557, 30.999117],
+            [121.502484, 31.001112],
+            [121.506625, 31.002657],
+            [121.508406, 31.002887],
+            [121.509844, 31.003062],
+            [121.512027, 31.005632],
+            [121.513443, 31.005591],
+            [121.513738, 31.005568],
+            [121.513406, 31.007825],
+            [121.517686, 31.007986],
+            [121.520031, 31.008069],
+            [121.520068, 31.007021],
+            [121.521667, 31.00646],
+            [121.521999, 31.005338],
+            [121.521978, 31.005163],
+            [121.521935, 31.004207],
+            [121.521731, 31.003113],
+            [121.521774, 31.002561],
+            [121.521742, 31.00257],
+            [121.521366, 31.002625],
+            [121.520733, 31.002358],
+            [121.523791, 30.999259],
+            [121.52451, 31.000841],
+            [121.526334, 31.000354],
+            [121.529316, 30.997411],
+            [121.529756, 30.997402],
+            [121.532095, 30.997153],
+            [121.533522, 30.996583],
+            [121.536097, 30.996546],
+            [121.535561, 30.998239],
+            [121.534059, 31.003683],
+            [121.533919, 31.00749],
+            [121.532278, 31.00783],
+            [121.532219, 31.012776],
+            [121.533785, 31.012831],
+            [121.533662, 31.017401],
+            [121.535733, 31.017341],
+            [121.535663, 31.022283],
+            [121.539193, 31.022205],
+            [121.539359, 31.024752],
+            [121.53746, 31.025147],
+            [121.536532, 31.026402],
+            [121.537991, 31.027161],
+            [121.537422, 31.028099],
+            [121.538173, 31.028687],
+            [121.537927, 31.029101],
+            [121.540072, 31.030213],
+            [121.537937, 31.033468],
+            [121.53768, 31.033412],
+            [121.537583, 31.03606],
+            [121.531221, 31.035941],
+            [121.530695, 31.040574],
+            [121.530492, 31.043207],
+
+            [121.526464, 31.042174],
+            [121.526721, 31.03744],
+            [121.527354, 31.03266],
+            [121.49902, 31.032876],
+            [121.498998, 31.034714],
+            [121.487819, 31.031166],
+
+            [121.481338, 31.02982],
+            [121.481735, 31.028404],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.536097, 30.996546],
+            [121.535561, 30.998239],
+            [121.534059, 31.003683],
+            [121.533919, 31.00749],
+            [121.532278, 31.00783],
+            [121.532219, 31.012776],
+            [121.533785, 31.012831],
+            [121.533662, 31.017401],
+            [121.535733, 31.017341],
+            [121.535663, 31.022283],
+            [121.539193, 31.022205],
+            [121.539359, 31.024752],
+            [121.53746, 31.025147],
+            [121.536532, 31.026402],
+            [121.537991, 31.027161],
+            [121.537422, 31.028099],
+            [121.538173, 31.028687],
+            [121.537927, 31.029101],
+            [121.540072, 31.030213],
+            [121.537937, 31.033468],
+            [121.53768, 31.033412],
+            [121.537583, 31.03606],
+            [121.531221, 31.035941],
+            [121.530695, 31.040574],
+            [121.530492, 31.043207],
+            [121.546772, 31.048273],
+            [121.547909, 31.048567],
+            [121.548939, 31.047869],
+            [121.549798, 31.047924],
+            [121.550205, 31.049156],
+            [121.551493, 31.049762],
+            [121.552845, 31.049284],
+            [121.554046, 31.050295],
+            [121.554604, 31.048788],
+            [121.555484, 31.047152],
+            [121.555634, 31.046453],
+            [121.557308, 31.04592],
+            [121.562211, 31.045534],
+            [121.562554, 31.045488],
+            [121.563037, 31.044955],
+            [121.559765, 31.041499],
+            [121.564078, 31.035643],
+            [121.56219, 31.035018],
+            [121.561396, 31.034687],
+            [121.561589, 31.034218],
+            [121.560548, 31.033869],
+            [121.560087, 31.034071],
+            [121.557158, 31.029005],
+            [121.555044, 31.028371],
+            [121.550849, 31.028169],
+            [121.551246, 31.022836],
+            [121.554057, 31.022349],
+            [121.554712, 31.022303],
+            [121.554712, 31.022303],
+            [121.56087, 31.023176],
+            [121.562381, 31.020281],
+            [121.564441, 31.017312],
+            [121.567553, 31.017826],
+            [121.569409, 31.021881],
+            [121.569849, 31.021045],
+            [121.570997, 31.018213],
+            [121.571898, 31.015592],
+            [121.565723, 31.011211],
+            [121.568765, 31.009827],
+            [121.570138, 31.003721],
+            [121.573611, 30.99194],
+            [121.565078, 30.991002],
+            [121.556677, 30.988123],
+            [121.552342, 30.9948],
+            [121.545948, 30.994837],
+            [121.543781, 30.996069],
+            [121.539918, 30.996566],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.551393, 31.064506],
+            [121.5492, 31.067774],
+            [121.545965, 31.066882],
+            [121.545802, 31.069069],
+            [121.54195, 31.067111],
+            [121.54033, 31.068655],
+            [121.53945, 31.071081],
+
+            [121.534889, 31.069336],
+            [121.532732, 31.073875],
+            [121.525244, 31.074528],
+            [121.51872, 31.073296],
+            [121.517004, 31.071642],
+            [121.515952, 31.070925],
+
+            [121.510374, 31.071053],
+            [121.509766, 31.074648],
+
+            [121.543846, 31.08477],
+            [121.533171, 31.107053],
+            [121.545498, 31.110636],
+
+            [121.545949, 31.109474],
+            [121.546587, 31.109309],
+            [121.547601, 31.109162],
+            [121.548717, 31.109754],
+            [121.548776, 31.109887],
+            [121.548341, 31.111123],
+            [121.548754, 31.111302],
+            [121.549108, 31.112064],
+            [121.551962, 31.112799],
+            [121.552305, 31.112018],
+            [121.553132, 31.112156],
+            [121.553164, 31.113157],
+            [121.555588, 31.114287],
+            [121.5565, 31.112781],
+            [121.559558, 31.11301],
+            [121.562476, 31.110585],
+            [121.562004, 31.110503],
+            [121.563731, 31.110305],
+            [121.566177, 31.099355],
+            [121.567571, 31.092915],
+            [121.566016, 31.092217],
+            [121.564267, 31.091978],
+            [121.56166, 31.091656],
+            [121.560619, 31.09241],
+            [121.559911, 31.092244],
+            [121.559214, 31.091748],
+            [121.557315, 31.091684],
+            [121.555974, 31.091261],
+            [121.555888, 31.091077],
+            [121.554225, 31.090287],
+            [121.55313, 31.089957],
+            [121.552959, 31.090251],
+            [121.55195, 31.089323],
+            [121.551746, 31.087917],
+            [121.552122, 31.08698],
+            [121.547455, 31.085363],
+            [121.550306, 31.078857],
+            [121.553771, 31.080355],
+            [121.553846, 31.080869],
+            [121.555166, 31.0812],
+            [121.555981, 31.080888],
+            [121.556485, 31.081274],
+            [121.556271, 31.082257],
+            [121.557816, 31.08279],
+            [121.558621, 31.082661],
+            [121.559457, 31.083461],
+            [121.56068, 31.083497],
+            [121.561668, 31.083773],
+            [121.564189, 31.082404],
+            [121.565208, 31.082753],
+            [121.568909, 31.081108],
+            [121.570412, 31.079261],
+            [121.573458, 31.079362],
+            [121.569864, 31.076927],
+            [121.561378, 31.074483],
+            [121.560954, 31.074483],
+            [121.5609, 31.075044],
+            [121.560021, 31.074805],
+            [121.559656, 31.074603],
+            [121.559463, 31.074869],
+            [121.557671, 31.074658],
+            [121.556544, 31.072188],
+            [121.552704, 31.069229],
+            [121.555293, 31.066526],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.494935, 31.126933],
+            [121.498706, 31.116369],
+            [121.501496, 31.108194],
+            [121.506269, 31.09502],
+            [121.509766, 31.074648],
+            [121.543846, 31.08477],
+            [121.533171, 31.107053],
+            [121.545498, 31.110636],
+            // [121.559526,31.121651],
+            // [121.558196,31.12323],
+            // [121.542961,31.120512],
+            // [121.542798,31.119064],
+            [121.542818, 31.119185],
+            [121.53752, 31.118586],
+            [121.533571, 31.117263],
+            [121.525975, 31.128891],
+            [121.525214, 31.128101],
+            [121.524194, 31.127908],
+            [121.523004, 31.126567],
+            [121.522628, 31.126117],
+            [121.521437, 31.126062],
+            [121.521212, 31.124988],
+            [121.520268, 31.124666],
+            [121.504257, 31.118419],
+            [121.499879, 31.130074],
+            [121.497079, 31.12821],
+        ]
+    ],
+    [
+        ['id'],
+        ['name'],
+        ['bz'],
+        [
+            [121.483685, 31.130605],
+            [121.486247, 31.131881],
+            [121.488221, 31.132092],
+            [121.489144, 31.129603],
+            [121.493313, 31.126691],
+            [121.493373, 31.126379],
+            [121.488717, 31.124699],
+            [121.486185, 31.124075],
+        ]
+    ]
+]

+ 45 - 37
src/assets/scss/common.scss

@@ -107,25 +107,30 @@ body {
     background: transparent;
     border-radius: 3%;
     box-shadow: inset 0 0 0.2rem 0.0125rem #30cfff;
-    background: rgba(0, 44, 110, 0.8);
+    background: rgba(0, 44, 110, 0.5);
     // box-shadow: inset 0 0 0.2rem 0.0125rem #30cfff;
     // background: rgba(0, 44, 110, 0.8);
     font-size: 0.2rem;
     padding: 0.1875rem;
-    width: 2.5rem;
+    width: 5rem;
     font-size: .1875rem;
     font-family: Microsoft YaHei Regular, Microsoft YaHei Regular-Regular;
     .tableContent {
         display: flex;
         flex-wrap: wrap;
         div {
-            width: 100%;
+            width: 50%;
+            padding-right: .25rem;
             line-height: .375rem;
+            box-sizing: border-box;
             a {
                 color: #0497FE;
                 cursor: pointer;
             }
         }
+        .max {
+            width: 100%;
+        }
         .divTitle {
             color: #04F2F4;
         }
@@ -150,28 +155,56 @@ body {
         padding: 0.2rem 0;
         box-sizing: border-box;
         position: relative;
+        .mapTips {
+            position: absolute;
+            right: 0;
+            bottom: 0.2rem;
+            z-index: 9;
+            width: 1.6875rem;
+            .el-col {
+                height: .6875rem;
+                margin-bottom: .0625rem;
+                line-height: .6875rem;
+                text-indent: .6875rem;
+                font-size: .175rem;
+                background-size: 100% 100%;
+            }
+            &>.greenImage {
+                background: url('~@a/img/icon/tip1.png') no-repeat;
+            }
+            &>.blueImage {
+                background: url('~@a/img/icon/tip2.png') no-repeat;
+            }
+            &>.yellowImage {
+                background: url('~@a/img/icon/tip3.png') no-repeat;
+            }
+            &>.redImage {
+                background: url('~@a/img/icon/tip4.png') no-repeat;
+            }
+        }
         .btnW {
             position: absolute;
             top: 50%;
             bottom: 50%;
             border-radius: 50%;
-            width: 40px;
-            height: 40px;
+            width: .45rem;
+            height: .45rem;
             border: 1px solid #30cfff;
             z-index: 1;
-            display: table;
+            display: inline;
+            transform: translateY(-0.225rem);
             i {
-                line-height: 40px;
-                font-size: 25px;
+                line-height: .45rem;
+                font-size: .3rem;
                 color: #30cfff;
             }
         }
         .leftBtn {
-            left: -20px;
+            left: -0.225rem;
             text-align: left;
         }
         .rightBtn {
-            right: -20px;
+            right: -0.225rem;
             text-align: right;
         }
         .centerContent {
@@ -182,31 +215,6 @@ body {
     }
 }
 
-// 两侧按钮
-.centerBox {
-    position: relative;
-    .btnW {
-        position: absolute;
-        top: 50%;
-        bottom: 50%;
-        border-radius: 50%;
-        width: 40px;
-        height: 40px;
-        border: 1px solid #30cfff;
-        z-index: 1;
-        display: table;
-        i {
-            line-height: 40px;
-            font-size: 25px;
-            color: #30cfff;
-        }
-    }
-    .leftBtn {
-        left: -20px;
-        text-align: left;
-    }
-    .rightBtn {
-        right: -20px;
-        text-align: right;
-    }
+.amap-logo {
+    display: none !important;
 }

+ 1 - 1
src/assets/scss/element-ui.scss

@@ -73,7 +73,7 @@
     // padding: 0;
     border-radius: 3%;
     box-shadow: inset 0 0 0.2rem 0.0125rem #30cfff;
-    background: rgba(0, 44, 110, 0.8);
+    background: rgba(0, 44, 110, 0.5);
     font-size: 0.2rem;
     padding: 0.1875rem;
     .el-popper__arrow::before {

+ 7 - 1
src/components/category/index.vue

@@ -75,7 +75,13 @@ export default {
               borderRadius: [15, 15, 12, 15],
             },
             data: val,
-          },
+          },{
+            data: val.map(val=>val+40),
+            itemStyle: {
+              color: "#fccf2a",
+            },
+            type: 'line'
+          }
         ],
       });
     },

+ 4 - 4
src/components/line-smooth/index.vue

@@ -56,7 +56,7 @@ export default {
           position: "bottom",
         },
         legend: {
-          // show:true,
+          show:true,
           data: ["社会救助", "火灾", "抢险救援"],
           bottom: 10,
           itemGap: 20,
@@ -64,12 +64,12 @@ export default {
             color: "#FFF",
           },
         },
-        toolbox: {},
+        // toolbox: {},
         grid: {
-          top: 40,
+          top: 30,
           left: 0,
           right: 15,
-          bottom: 50,
+          bottom: 40,
           containLabel: true,
         },
         xAxis: {

+ 134 - 0
src/components/mixins/map.js

@@ -0,0 +1,134 @@
+import AMap from 'AMap'
+import mapData from '@a/js/map-data.js'
+// import AMapUI from 'AMapUI'
+export default {
+    data() {
+        return {
+            map: null,
+            mapPolList: [],
+            colorList: [
+                ['#99e', "#F33"],
+                ['#ee6', "#c38"],
+                ['#c38', "#F33"],
+                ['#6E7', '#F33'],
+                ['#6A7', "#F33"],
+                ['#EF7', "#F33"],
+                ['#AF7', "#F33"],
+                ['#BAC', "#F33"],
+                ['#BEF', "#F33"],
+                ['#BBB', "#F33"],
+                ['#EFA', "#F33"],
+                ['#FE6', "#F33"],
+                ['#7F6', "#F33"],
+                ['#7dc', "#F33"],
+            ],
+            colorIndList: [-1, 7, 21, 26, 31, 37, 46, 52, 57, 66, 68, 71, 74, 100]
+        }
+    },
+    mounted() {
+
+    },
+    methods: {
+        async initMap() {
+            this.map = await new AMap.Map('mapF', {
+                mapStyle: 'amap://styles/darkblue', //设置地图的显示样式
+                resizeEnable: true,
+                zoom: 13,
+                zooms: [3, 15],
+                // features: [] //清空背景道路等
+            })
+            AMap.plugin(["AMap.Geolocation"], () => {
+                var geolocation = new AMap.Geolocation({
+                    showButton: true, //是否显示定位按钮
+                    buttonPosition: "RT", //定位按钮的位置
+                    /* LT LB RT RB */
+                    buttonOffset: new AMap.Pixel(10, 20), //定位按钮距离对应角落的距离
+                    zoomToAccuracy: false, //定位成功后调整地图视野范围使定位位置及精度范围视野内可见,默认:false
+                    showMarker: true, //是否显示定位点
+                    markerOptions: {
+                        //自定义定位点样式,同Marker的Options
+                        offset: new AMap.Pixel(-18, -36),
+                        content: '<img src="https://a.amap.com/jsapi_demos/static/resource/img/user.png" style="width:36px;height:36px"/>',
+                    },
+                    showCircle: true, //是否显示定位精度圈
+                    circleOptions: {
+                        //定位精度圈的样式
+                        strokeColor: "#0093FF",
+                        noSelect: true,
+                        strokeOpacity: 0.5,
+                        strokeWeight: 1,
+                        fillColor: "#02B0FF",
+                        fillOpacity: 0.25,
+                    },
+                });
+                this.map.addControl(geolocation);
+                // geolocation.getCurrentPosition();
+            });
+            this.mapPolList = mapData.map((val, ind) => {
+                let color = this.colorList[this.colorIndList.findIndex((value, index) => value <= ind && ind < this.colorIndList[index + 1])]
+                return [new AMap.Polygon({
+                    map: this.map,
+                    fillOpacity: 0.5,
+                    path: val[3],
+                    fillColor: color[0],
+                    strokeColor: color[1],
+                }), new AMap.Polygon({
+                    map: this.map,
+                    fillOpacity: 0.5,
+                    path: val[3],
+                    fillColor: color[1],
+                    strokeColor: color[0],
+                })]
+            })
+            this.map.on('mousemove', (e) => {
+                var point = [e.lnglat.getLng(), e.lnglat.getLat()]
+                var pointList = mapData.map(val => {
+                    return AMap.GeometryUtil.isPointInRing(point, val[3])
+                })
+                this.mapPolList.forEach((element, ind) => {
+                    if (pointList[ind]) {
+                        this.map.remove(element[0]);
+                        this.map.add(element[1]);
+                    } else {
+                        this.map.remove(element[1]);
+                        this.map.add(element[0]);
+                    }
+                });
+            })
+            this.map.setFitView();
+        },
+        randomColor() {
+            var color = "#";
+            //for循环中,如果后面仅有一条语句,{}可省略不写
+            //随机生成6位0-15之间的数字,再用toString(16)将数字转成16进制
+            for (var i = 0; i < 6; i++) color += parseInt(Math.random() * 16).toString(16);
+            return color;
+        },
+        deleteMarker(lnglats) {
+            this.map.remove(lnglats);
+        },
+        addMarker(lnglats, type) {
+            // 创建标点和点击事件
+            let icon = ''
+            let markers = lnglats.map((val, ind) => {
+                if (type === 'water') {
+                    icon = val.waterAdministrative === '单位' ? 'http://120.55.70.156/image/unitWater.png' : val.waterAdministrative === '市政' ? 'http://120.55.70.156/image/szWater.png' : val.waterAdministrative === '社区' || val.waterAdministrative === '居民' ? 'http://120.55.70.156/image/sqWater.png' : ''
+                }
+                let marker = new AMap.Marker({
+                    position: new AMap.LngLat(val.gisX, val.gisY),
+                    icon: icon,
+                    zIndex: 9,
+                    extData: {
+                        id: ind + 1
+                    }
+                });
+                marker.on('click', async() => {
+                    await this.addMarkerInfo([val.gisX, val.gisY], val)
+                })
+                return marker
+            })
+            this.map.add(new AMap.OverlayGroup(markers));
+            // this.map.setFitView(); // 根据所有点自适应
+        },
+    }
+}

+ 112 - 26
src/views/comprehensive-disposal.vue

@@ -4,11 +4,35 @@
       <el-col class="leftBox" v-show="leftBtn">
         <el-col class="leftTop">
           <h4>警情时段分布</h4>
-          <line-smooth ref="lineSmooth" :dataMap="houseList"></line-smooth>
+          <el-row class="leftTopContent">
+            <el-row class="selectBar">
+              <el-form :inline="true" size="mini" :model="barForm">
+                <el-form-item label="场所分类">
+                  <el-select v-model="barForm.fireType" @change="getHouse()" filterable clearable placeholder="场所" >
+                    <el-option :label="item" :value="item" v-for="(item,ind) in fireTypeList" :key="ind"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-form>
+            </el-row>
+            <el-row class="fireBar">
+              <line-smooth ref="lineSmooth" :dataMap="houseList"></line-smooth>
+            </el-row>
+          </el-row>
         </el-col>
         <el-col class="leftBot">
           <h4>历史警情趋势图</h4>
-          <bar-chart ref="barChart" :dataMap="monthList"></bar-chart>
+          <el-row class="leftBotContent">
+            <el-row class="selectBar">
+               <el-row>
+                <el-button size="mini" @click="searchTime('one')" :class="{ btnClick: timeArea === 'one' }">近一年</el-button>
+                <el-button size="mini" @click="searchTime('three')" :class="{ btnClick: timeArea === 'three' }">近三年</el-button>
+                <el-button size="mini" @click="searchTime('five')" :class="{ btnClick: timeArea === 'five' }">近五年</el-button>
+              </el-row>
+            </el-row>
+            <el-row class="fireBar">
+              <bar-chart ref="barChart" :dataMap="monthList"></bar-chart>
+            </el-row>
+          </el-row>
         </el-col>
       </el-col>
     </transition>
@@ -130,6 +154,7 @@ import barChart from "@c/bar";
 import lineSmooth from "@c/line-smooth";
 import gauge from "@c/gauge";
 import linstener from "@c/mixins/linstener";
+import map from "@c/mixins/map";
 export default {
   data() {
     return {
@@ -146,7 +171,7 @@ export default {
           callingUp: "1号",
           equipName: "一七",
           carNumber: "沪X5477应急",
-          carStatus: "动",
+          carStatus: "动",
           disposeTime: "1:00:00",
           correspondent: "张三",
           commander: "李四",
@@ -165,7 +190,7 @@ export default {
           callingUp: "1号",
           equipName: "一七",
           carNumber: "沪X5477应急",
-          carStatus: "动",
+          carStatus: "动",
           disposeTime: "1:00:00",
           correspondent: "张三",
           commander: "李四",
@@ -184,7 +209,7 @@ export default {
           callingUp: "1号",
           equipName: "一七",
           carNumber: "沪X5477应急",
-          carStatus: "动",
+          carStatus: "动",
           disposeTime: "1:00:00",
           correspondent: "张三",
           commander: "李四",
@@ -203,7 +228,7 @@ export default {
           callingUp: "1号",
           equipName: "一七",
           carNumber: "沪X5477应急",
-          carStatus: "动",
+          carStatus: "动",
           disposeTime: "1:00:00",
           correspondent: "张三",
           commander: "李四",
@@ -221,12 +246,17 @@ export default {
         { prop: "department", name: "所属中队" },
         { prop: "status", name: "状况" },
       ],
+      barForm: {
+        fireType: "",
+        address: "",
+      },
       monthList:[],
       houseList:[],
       proptionList:[],
+      timeArea: 'one',
     };
   },
-  mixins: [linstener],
+  mixins: [linstener,map],
   components: { barChart, lineSmooth, gauge },
   created() {
     this.getData();
@@ -244,26 +274,31 @@ export default {
         ]),
       true
     );
+    this.initMap()
   },
   methods: {
     async getData() {
-      this.getPage();
+      let res = await this.$axios.all([
+        this.$axios.get(this.$api.fire.fireType),
+      ]);
+      if (res[0]) this.fireTypeList = res[0].data;
+      // this.getPage();
       this.getHouse();
       this.getProption();
       this.getMonth();
     },
     // 实时警情处理
     async getPage() {
-      // let res = await this.$axios.get(this.$api.house.page +
-      //     "?" +
-      //     this.$qs.stringify({
-      //       current: 1,
-      //       size: 100,
-      //       startTime: "2020-03-03 00:00:00",
-      //       endTime: "2020-03-03 23:59:59",
-      //     })
-      // );
-      // if (res) this.tableData = res.data;
+      let res = await this.$axios.get(this.$api.house.page +
+          "?" +
+          this.$qs.stringify({
+            current: 1,
+            size: 100,
+            startTime: "2020-03-03 00:00:00",
+            endTime: "2020-03-03 23:59:59",
+          })
+      );
+      if (res) this.tableData = res.data;
     },
     // 警情时段分布
     async getHouse() {
@@ -280,6 +315,9 @@ export default {
       let res = await this.$axios.get(this.$api.house.alertStatisticsByMonth);
       if (res) this.monthList = res.data;
     },
+    searchTime(val){
+      this.timeArea = val
+    }
   },
 };
 </script>
@@ -305,6 +343,7 @@ export default {
     box-sizing: border-box;
     & > .el-col {
       flex: 1;
+      max-height: 50%;
       background: url('~@a/img/enforce/bg1.png') no-repeat;
       background-size: 100% 100%;
       position: relative;
@@ -322,18 +361,65 @@ export default {
     .leftTop {
       padding: 0.375rem 0.475rem 0.1875rem;
       margin-bottom: 0.125rem;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .leftTopContent {
+        width: 100%;
+        height: 100%;
+        display: block;
+        .selectBar {
+          width: 100%;
+          display: flex;
+          justify-content: flex-end;
+          height: 0.875rem;
+          padding: 0.25rem 0;
+        }
+        .fireBar {
+          height: calc(100% - 0.875rem);
+        }
+      }
     }
     .leftBot {
       padding: 0.375rem 0.45rem 0.1875rem;
       box-sizing: border-box;
-    }
-  }
-  .centerBox {
-    .centerContent {
-      width: 100%;
-      height: 100%;
-      background: url(~@a/img/enforce/center.png) no-repeat;
-      background-size: 100% 100%;
+      .leftBotContent {
+        width: 100%;
+        height: 100%;
+        display: block;
+        .selectBar {
+          width: 100%;
+          display: flex;
+          justify-content: flex-start;
+          height: 0.875rem;
+          padding: 0.25rem 0;
+          .el-row{
+            display: flex;
+            .el-button {
+              // width: 0.375rem;
+              height: 0.325rem;
+              min-height: auto;
+              padding: 0 .0625rem;
+              margin-right: 0.075rem;
+              margin-left: 0;
+              background: #000707;
+              color: #fff;
+              border: 1px solid;
+              box-sizing: border-box;
+              border-radius: .0375rem;
+              font-size: 0.15rem;
+              border-image: linear-gradient(0deg, #0461c2 0%, #0ecdf1 100%) 1 1;
+            }
+            .btnClick {
+              color: #fccf2a;
+              border-image: linear-gradient(0deg, #ff6800 0%, #fccf2a 100%) 1 1;
+            }
+          }
+        }
+        .fireBar {
+          height: calc(100% - 0.875rem);
+        }
+      }
     }
   }
   .rightBox {

+ 3 - 9
src/views/enforcement-dynamic.vue

@@ -138,6 +138,7 @@ import treeMap from "@c/treemap";
 import graphChart from "@c/graph";
 import radarChart from "@c/radar";
 import linstener from "@c/mixins/linstener";
+import map from "@c/mixins/map";
 export default {
   data() {
     return {
@@ -158,7 +159,7 @@ export default {
     };
   },
   components: { treeMap, graphChart, radarChart },
-  mixins: [linstener],
+  mixins: [linstener,map],
   created() {
     this.getData();
   },
@@ -173,6 +174,7 @@ export default {
         ]),
       true
     );
+    this.initMap()
   },
   methods: {
     async getData() {
@@ -384,14 +386,6 @@ export default {
       }
     }
   }
-  .centerBox {
-    .centerContent {
-      width: 100%;
-      height: 100%;
-      background: url(~@a/img/enforce/center.png) no-repeat;
-      background-size: 100% 100%;
-    }
-  }
   .rightBox {
     display: flex;
     box-sizing: border-box;

+ 318 - 209
src/views/fire-data-analysis.vue

@@ -6,14 +6,19 @@
           <h4>火灾趋势图</h4>
           <el-row class="leftTopContent">
             <el-row class="selectBar">
+              <el-row>
+                <el-button size="mini" @click="searchTime('one')" :class="{ btnClick: timeArea === 'one' }">近一年</el-button>
+                <el-button size="mini" @click="searchTime('three')" :class="{ btnClick: timeArea === 'three' }">近三年</el-button>
+                <el-button size="mini" @click="searchTime('five')" :class="{ btnClick: timeArea === 'five' }">近五年</el-button>
+              </el-row>
               <el-form :inline="true" size="mini" :model="barForm">
-                <el-form-item label="街道:">
-                  <el-select v-model="barForm.address" @change="getTrend()" filterable clearable placeholder="选择街道" >
+                <el-form-item label="">
+                  <el-select v-model="barForm.address" @change="getTrend()" filterable clearable placeholder="街道" >
                     <el-option :label="item" :value="item" v-for="(item,ind) in fireAddressList" :key="ind"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="火灾类型:">
-                  <el-select @change="getTrend()" v-model="barForm.fireType" placeholder="选择火灾类型" filterable clearable >
+                <el-form-item label="">
+                  <el-select @change="getTrend()" v-model="barForm.fireType" placeholder="火灾类型" filterable clearable >
                     <el-option :value="item"  v-for="(item,ind) in fireTypeList" :key="ind" ></el-option>
                   </el-select>
                 </el-form-item>
@@ -69,9 +74,89 @@
     </transition>
     <transition name="el-fade-in-linear">
       <el-col class="rightBox" v-show="rightBtn">
-      <div class="rightContent">
-        <h4>详细火灾情况</h4>
-        <div class="VS"  @click="vsClick('isVsTab')" :style="{ 'font-size': isVsTab ? '.2rem' : '.225rem' }">
+        <div class="rightContent">
+          <el-col class="rightTop">
+            <h4>详细火灾情况</h4>
+            <se-table
+              ref="seTable"
+              :dataMap="tableData"
+              :headerData="headerData"
+              :key="windowWidth"
+            ></se-table>
+          </el-col>
+          <el-col class="rightBot">
+            <h4>实时警情处理</h4>
+            <el-table
+              :data="tableData2"
+              :key="windowWidth"
+              class="transparentTableRow"
+              height="100%"
+              row-style="height:.425rem;"
+              cell-style="height:.425rem;box-sizing: border-box;"
+              style="width: 100%; margin: 0 auto"
+            >
+              <el-table-column
+                show-overflow-tooltip
+                v-for="item in headerData2"
+                :key="item.prop"
+                :prop="item.prop"
+                align="center"
+                min-width="20"
+                :label="item.name"
+              >
+                <template v-if="item.prop === 'type'" #default="scope">
+                  <el-tooltip placement="left">
+                    <template #content>
+                      <div class="tableTooltip">
+                        <div class="tableTitle">
+                          <div>执勤力量</div>
+                        </div>
+                        <el-row class="tableContent">
+                          <el-col :span="12">电车呼台:{{scope.row.callingUp}}</el-col>
+                          <el-col :span="12">装备名称:{{scope.row.equipName}}</el-col>
+                          <el-col :span="12">车牌号:{{scope.row.carNumber}}</el-col>
+                          <el-col :span="12">车辆状态:{{scope.row.carStatus}}</el-col>
+                          <el-col :span="24">警情处置时长:{{scope.row.disposeTime}}</el-col>
+                        </el-row>
+                        <el-row class="tablePersonnel">
+                          <el-col :span="7">
+                            <img src="~@a/img/test/bg1.png" alt="" />
+                            <div>{{scope.row.commander}}</div>
+                            <div>指挥员</div>
+                          </el-col>
+                          <el-col :span="7">
+                            <img src="~@a/img/test/bg1.png" alt="" />
+                            <div>{{scope.row.correspondent}}</div>
+                            <div>通讯员</div>
+                          </el-col>
+                          <el-col :span="7">
+                            <img src="~@a/img/test/bg1.png" alt="" />
+                            <div>{{scope.row.firemen}}</div>
+                            <div>消防员</div>
+                          </el-col>
+                          <el-col :span="7">
+                            <img src="~@a/img/test/bg1.png" alt="" />
+                            <div>{{scope.row.driver}}</div>
+                            <div>驾驶员</div>
+                          </el-col>
+                        </el-row>
+                      </div>
+                    </template>
+                    <template>
+                      <i class="iconfont icon-icon-test" v-if="item.prop === 'type'"></i>
+                      <div class="name-wrapper" v-else>{{ scope.row[item.prop] }}</div>
+                    </template>
+                  </el-tooltip>
+                </template>
+                <template v-else #default="scope">
+                    {{ item.prop === 'type' ? '' : (item.prop === 'status' ? (scope.row[item.prop] == 1 ? '可用' : '不可用') : scope.row[item.prop])}}
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </div>
+      <!-- <div class="rightContent"> -->
+        <!-- <div class="VS"  @click="vsClick('isVsTab')" :style="{ 'font-size': isVsTab ? '.2rem' : '.225rem' }">
           {{ isVsTab ? "返回" : "VS" }}
         </div>
         <div class="flexBoxE" :style="isVsTab ? '' : 'height:100%;padding-top:49px'">
@@ -97,8 +182,8 @@
           <div>
             <se-table ref="seTable" :dataMap="tableData2" :headerData="headerData" :key="windowWidth"></se-table>
           </div>
-        </div>
-      </div>
+        </div> -->
+      <!-- </div> -->
       </el-col>
     </transition>
   </el-row>
@@ -110,12 +195,101 @@ import category from "@c/category";
 import pieThreeD from "@c/pie-3D";
 import seTable from "@c/se-table";
 import AMap from 'AMap'
-import AMapUI from 'AMapUI'
+import map from "@c/mixins/map";
 export default {
+  components: { category, pieThreeD, seTable },
+  mixins: [linstener,map],
   data() {
     return {
       tableData: [],
-      tableData2: [],
+      tableData2: [
+        {
+          type: "火灾",
+          policeTime: "23:00:00",
+          alertLevel: "二级",
+          address: "闵行区",
+          car: "2辆",
+          policeCause: "电器火灾",
+          department: "吴泾支队",
+          status: "1",
+          callingUp: "1号",
+          equipName: "一七",
+          carNumber: "沪X5477应急",
+          carStatus: "出动",
+          disposeTime: "1:00:00",
+          correspondent: "张三",
+          commander: "李四",
+          firemen: "王五",
+          driver: "赵六",
+        },
+        {
+          type: "火灾",
+          policeTime: "23:00:00",
+          alertLevel: "二级",
+          address: "闵行区",
+          car: "2辆",
+          policeCause: "电器火灾",
+          department: "吴泾支队",
+          status: "1",
+          callingUp: "1号",
+          equipName: "一七",
+          carNumber: "沪X5477应急",
+          carStatus: "出动",
+          disposeTime: "1:00:00",
+          correspondent: "张三",
+          commander: "李四",
+          firemen: "王五",
+          driver: "赵六",
+        },
+        {
+          type: "火灾",
+          policeTime: "23:00:00",
+          alertLevel: "二级",
+          address: "闵行区",
+          car: "2辆",
+          policeCause: "电器火灾",
+          department: "吴泾支队",
+          status: "1",
+          callingUp: "1号",
+          equipName: "一七",
+          carNumber: "沪X5477应急",
+          carStatus: "出动",
+          disposeTime: "1:00:00",
+          correspondent: "张三",
+          commander: "李四",
+          firemen: "王五",
+          driver: "赵六",
+        },
+        {
+          type: "火灾",
+          policeTime: "23:00:00",
+          alertLevel: "二级",
+          address: "闵行区",
+          car: "2辆",
+          policeCause: "电器火灾",
+          department: "吴泾支队",
+          status: "1",
+          callingUp: "1号",
+          equipName: "一七",
+          carNumber: "沪X5477应急",
+          carStatus: "出动",
+          disposeTime: "1:00:00",
+          correspondent: "张三",
+          commander: "李四",
+          firemen: "王五",
+          driver: "赵六",
+        },
+      ],
+      headerData2: [
+        { prop: "type", name: "类型" },
+        { prop: "policeTime", name: "立案时间" },
+        { prop: "alertLevel", name: "警情等级" },
+        { prop: "address", name: "案发地址" },
+        { prop: "car", name: "调动车辆" },
+        { prop: "policeCause", name: "原因" },
+        { prop: "department", name: "所属中队" },
+        { prop: "status", name: "状况" },
+      ],
       headerData: [
         { prop: "address", name: "火灾地址" },
         { prop: "burnedArea", name: "过火面积" },
@@ -142,12 +316,9 @@ export default {
         fireType: "",
         address: "",
       },
-      map: null,
-      lnglats: [[120.38162, 31.11246], [121.38162, 30.11246], [121.35152, 31.11946], [121.38162, 41.11286]],
+      timeArea: 'one',
     };
   },
-  components: { category, pieThreeD, seTable },
-  mixins: [linstener],
   created() {
     this.getData();
   },
@@ -174,153 +345,20 @@ export default {
     this.initMap()
   },
   methods: {
-    initMap(){
-      let that = this
-      this.map = new AMap.Map('mapF',{
-        zoom: [2,13],
-        mapStyle: 'amap://styles/darkblue', //设置地图的显示样式
-        resizeEnable: true
-      })
-      // 构建闵行区地图和点位、点位弹窗
-      AMapUI.loadUI(["overlay/SimpleInfoWindow","geo/DistrictExplorer"],  (SimpleInfoWindow,DistrictExplorer)=> {
-        // 构建地图边界
-        let colors = [
-        "#3366cc",
-        "#dc3912",
-        "#ff9900",
-        "#109618",
-        "#990099",
-        "#0099c6",
-        "#dd4477",
-        "#66aa00",
-        "#b82e2e",
-        "#316395",
-        "#994499",
-        "#22aa99",
-        "#aaaa11",
-        "#6633cc",
-        "#e67300",
-        "#8b0707",
-        "#651067",
-        "#329262",
-        "#5574a6",
-        "#3b3eac",
-        ];
-        //创建一个实例
-        var districtExplorer = new DistrictExplorer({
-          map: this.map,
-        });
-
-        let adcode = 310112;
-        // 绘制图形边界
-        districtExplorer.loadAreaNode(adcode,  (error, areaNode) => {
-          //更新地图视野
-          this.map.setBounds(areaNode.getBounds(), null, null, true);
-
-          //清除已有的绘制内容
-          districtExplorer.clearFeaturePolygons();
-
-          //绘制子区域
-          districtExplorer.renderSubFeatures(areaNode,  (feature, i) => {
-            var fillColor = colors[i % colors.length];
-            var strokeColor = colors[colors.length - 1 - (i % colors.length)];
-
-            return {
-              cursor: "default",
-              bubble: true,
-              strokeColor: strokeColor, //线颜色
-              strokeOpacity: 1, //线透明度
-              strokeWeight: 1, //线宽
-              fillColor: fillColor, //填充色
-              fillOpacity: 0.35, //填充透明度
-            };
-          });
-
-          //绘制父区域
-          districtExplorer.renderParentFeature(areaNode, {
-            cursor: "default",
-            bubble: true,
-            strokeColor: "black", //线颜色
-            strokeOpacity: 1, //线透明度
-            strokeWeight: 1, //线宽
-            fillColor: 'red', //填充色
-            fillOpacity: 0.35, //填充透明度
-          });
-        });
-        // 创建标点和点击事件
-        let markers =[]
-        for (let i = 0; i < that.lnglats.length; i++) {
-          let lnglat = that.lnglats[i];
-          // 创建点实例
-          let marker = new AMap.Marker({
-              position: new AMap.LngLat(lnglat[0], lnglat[1]),
-              icon: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_b' + (i + 1) + '.png',
-              zIndex: 9,
-              extData: {
-                  id: i + 1
-              }
-          });
-          marker.on('click',()=>{
-            this.addMarker([lnglat[0], lnglat[1]],)
-          })
-          markers.push(marker);
-        }
-         that.map.add(new AMap.OverlayGroup(markers));
-        // let marker = new AMap.Marker({
-        //     map: that.map,
-        //     // icon: "//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png",
-        //     zIndex: 9,
-        //     position: [121.38162, 31.11246],
-        // });
-        // marker.on('click',()=>{
-        //   this.addMarker([121.38162, 31.11246],)
-        // })
-        // marker.setMap(this.map);
-      });
-    
-      AMap.plugin(["AMap.Geolocation"], function() {
-        var geolocation = new AMap.Geolocation({
-          showButton: true, //是否显示定位按钮
-          buttonPosition: "RB", //定位按钮的位置
-          /* LT LB RT RB */
-          buttonOffset: new AMap.Pixel(10, 20), //定位按钮距离对应角落的距离
-          zoomToAccuracy: false, //定位成功后调整地图视野范围使定位位置及精度范围视野内可见,默认:false
-          showMarker: true, //是否显示定位点
-          markerOptions: {
-            //自定义定位点样式,同Marker的Options
-            offset: new AMap.Pixel(-18, -36),
-            content:
-              '<img src="https://a.amap.com/jsapi_demos/static/resource/img/user.png" style="width:36px;height:36px"/>',
-          },
-          showCircle: true, //是否显示定位精度圈
-          circleOptions: {
-            //定位精度圈的样式
-            strokeColor: "#0093FF",
-            noSelect: true,
-            strokeOpacity: 0.5,
-            strokeWeight: 1,
-            fillColor: "#02B0FF",
-            fillOpacity: 0.25,
-          },
-        });
-        that.map.addControl(geolocation);
-        geolocation.getCurrentPosition();
-      });
-    },
     // 添加标点
-    addMarker(position) {
-      // this.map.getIsOpen();
-       this.map.clearInfoWindow();
-      var infoWindow =new AMap.InfoWindow({
-        isCustom: true,  //使用自定义窗体
-        closeWhenClickMap:true,
-        content: `
+    addMarkerInfo(position, content, value) {
+        // this.map.getIsOpen();
+        this.map.clearInfoWindow();
+        var infoWindow = new AMap.InfoWindow({
+            isCustom: true, //使用自定义窗体
+            closeWhenClickMap: true,
+            content: content || `
                 <div class="tableTooltip mapTab">
                   <div class="tableTitle">
                     <div>${'单位及执法情况'}</div>
                   </div>
                   <el-row class="tableContent">
-                    <div>单位名称:${'XX居民楼'}</div>
+                    <div>单位名称:${value.callingUp}</div>
                     <div>单位地址:${'XX路135弄'}</div>
                     <div>法人:${'张三'}</div>
                     <div>管理人:${'李四'}</div>
@@ -335,11 +373,10 @@ export default {
                     <div>单位自主管理情况:<a>点击查看</a></div>
                   </el-row>
                 </div>`,
-        offset: new AMap.Pixel(16, -30)
-      });
-      infoWindow.open(this.map, position);
+            offset: new AMap.Pixel(16, -30)
+        });
+        infoWindow.open(this.map, position);
     },
-    // 定位
     async getData() {
       let res = await this.$axios.all([
         this.$axios.get(this.$api.fire.fireType),
@@ -350,6 +387,7 @@ export default {
       this.getTrend();
       this.getFireCause();
       this.getFireStatis();
+      // this.getPage();
     },
     // 火灾趋势图 柱状图
     async getTrend() {
@@ -397,8 +435,8 @@ export default {
         }
       }
     },
-    // 详细火灾情况,表格
-    async getFireStatis(val) {
+    // 详细火灾情况,表格val
+    async getFireStatis() {
       let res = await this.$axios.get(
         this.$api.fire.fireStatistics +
           "?" +
@@ -407,20 +445,36 @@ export default {
             size: 1000,
             startTime: this.$store.state.timeList[0] || "",
             endTime: this.$store.state.timeList[1] || "",
-            address:val === 1 ? this.tabObj.address :val === 2 ? this.tabObj.address2 : ''
+            // address:val === 1 ? this.tabObj.address :val === 2 ? this.tabObj.address2 : ''
           })
       );
       if (res){ 
-        if(val ===1){
-          this.tableData = res.data.records;
-        } else if(val ===2){
-          this.tableData2 = res.data.records;
-        } else {
+        // if(val ===1){
+        //   this.tableData = res.data.records;
+        // } else if(val ===2){
+        //   this.tableData2 = res.data.records;
+        // } else {
+        //   this.tableData = res.data.records;
           this.tableData = res.data.records;
-          this.tableData2 = res.data.records;
-        }
+        // }
       }
     },
+    // 实时警情处理
+    async getPage() {
+      let res = await this.$axios.get(this.$api.house.page +
+          "?" +
+          this.$qs.stringify({
+            current: 1,
+            size: 100,
+            startTime: "2020-03-03 00:00:00",
+            endTime: "2020-03-03 23:59:59",
+          })
+      );
+      if (res) this.tableData2 = res.data;
+    },
+    searchTime(val){
+      this.timeArea = val
+    }
   },
 };
 </script>
@@ -467,17 +521,38 @@ export default {
       .leftTopContent {
         width: 100%;
         height: 100%;
-        display: flex;
-        flex-direction: column;
+        display: block;
         .selectBar {
           width: 100%;
           display: flex;
-          justify-content: flex-end;
+          justify-content: space-between;
           height: 0.875rem;
           padding: 0.25rem 0;
+          .el-row{
+            display: flex;
+            .el-button {
+              // width: 0.375rem;
+              height: 0.325rem;
+              min-height: auto;
+              padding: 0 .0625rem;
+              margin-right: 0.075rem;
+              margin-left: 0;
+              background: #000707;
+              color: #fff;
+              border: 1px solid;
+              box-sizing: border-box;
+              border-radius: .0375rem;
+              font-size: 0.15rem;
+              border-image: linear-gradient(0deg, #0461c2 0%, #0ecdf1 100%) 1 1;
+            }
+            .btnClick {
+              color: #fccf2a;
+              border-image: linear-gradient(0deg, #ff6800 0%, #fccf2a 100%) 1 1;
+            }
+          }
         }
         .fireBar {
-          flex: 1;
+          height: calc(100% - 0.875rem);
         }
       }
     }
@@ -527,49 +602,83 @@ export default {
       }
     }
   }
+  
   .rightBox {
-    .rightContent {
+    box-sizing: border-box;
+    .rightContent{
+      display: flex;
+      justify-content: space-between;
+      flex-direction: column;
       width: 100%;
       height: 100%;
-      background: url(~@a/img/enforce/bg2.png) no-repeat;
-      background-size: 100% 100%;
-      box-sizing: border-box;
-      padding: 0.4375rem 0.4375rem;
-      position: relative;
-      h4 {
-        font-size: 0.2125rem;
-        position: absolute;
-        left: 0;
-        right: 0;
-        top: 0;
-        margin: 0 auto;
-        text-align: center;
-        color: #00ffff;
-      }
-      & > .flexBoxE {
+      & > .el-col {
+        flex: 1;
+        max-height: 50%;
+        background: url(~@a/img/enforce/bg1.png) no-repeat;
+        background-size: 100% 100%;
+        position: relative;
+        padding: 0.5rem 0.35rem 0.25rem;
+        box-sizing: border-box;
         width: 100%;
-        height: 50%;
-        .el-form {
-          text-align: right;
-          padding: 0.125rem 0;
-          .el-form-item {
-            margin: 0;
-          }
-        }
-        & > div {
-          height: calc(100% - 0.625rem);
-        }
-        .formVs {
-          padding-right: 0.875rem;
-          box-sizing: border-box;
+        h4 {
+          font-size: 0.2125rem;
+          position: absolute;
+          left: 0;
+          right: 0;
+          top: 0;
+          margin: 0 auto;
+          text-align: center;
+          color: #00ffff;
         }
       }
-      .VS {
-        top: 0.55rem;
-        right: 0.625rem;
-        padding: 0;
+      .rightTop{
+        margin-bottom: 0.125rem;
       }
     }
   }
+  // .rightBox {
+  //   .rightContent {
+  //     width: 100%;
+  //     height: 100%;
+  //     background: url(~@a/img/enforce/bg2.png) no-repeat;
+  //     background-size: 100% 100%;
+  //     box-sizing: border-box;
+  //     padding: 0.4375rem 0.4375rem;
+  //     position: relative;
+  //     h4 {
+  //       font-size: 0.2125rem;
+  //       position: absolute;
+  //       left: 0;
+  //       right: 0;
+  //       top: 0;
+  //       margin: 0 auto;
+  //       text-align: center;
+  //       color: #00ffff;
+  //     }
+  //     & > .flexBoxE {
+  //       width: 100%;
+  //       height: 50%;
+  //       .el-form {
+  //         text-align: right;
+  //         padding: 0.125rem 0;
+  //         .el-form-item {
+  //           margin: 0;
+  //         }
+  //       }
+  //       & > div {
+  //         height: calc(100% - 0.625rem);
+  //       }
+  //       .formVs {
+  //         padding-right: 0.875rem;
+  //         box-sizing: border-box;
+  //       }
+  //     }
+  //     .VS {
+  //       top: 0.55rem;
+  //       right: 0.625rem;
+  //       padding: 0;
+  //     }
+  //   }
+  // }
 }
 </style>

+ 18 - 24
src/views/rescue-station.vue

@@ -123,22 +123,22 @@
                         <div>车牌号</div>
                       </el-col>
                       <el-col>
-                        <img src="~@a/img/test/bg3.png" alt="" />
+                        <img src="~@a/img/test/bg7.png" alt="" />
                         <div>{{ item.correspondent }}</div>
                         <div>指挥员</div>
                       </el-col>
                       <el-col>
-                        <img src="~@a/img/test/bg3.png" alt="" />
+                        <img src="~@a/img/test/bg7.png" alt="" />
                         <div>{{ item.commander }}</div>
                         <div>通讯员</div>
                       </el-col>
                       <el-col>
-                        <img src="~@a/img/test/bg3.png" alt="" />
+                        <img src="~@a/img/test/bg7.png" alt="" />
                         <div>{{ item.firemen }}</div>
                         <div>消防员</div>
                       </el-col>
                       <el-col>
-                        <img src="~@a/img/test/bg3.png" alt="" />
+                        <img src="~@a/img/test/bg7.png" alt="" />
                         <div>{{ item.driver }}</div>
                         <div>驾驶员</div>
                       </el-col>
@@ -166,6 +166,7 @@
 
 <script>
 import linstener from "@c/mixins/linstener";
+import map from "@c/mixins/map";
 export default {
   data() {
     return {
@@ -183,7 +184,7 @@ export default {
           callingUp: "1号",
           equipName: "一七",
           carNumber: "沪X5477应急",
-          carStatus: "动",
+          carStatus: "动",
           disposeTime: "1:00:00",
           correspondent: "张三",
           commander: "李四",
@@ -202,7 +203,7 @@ export default {
           callingUp: "1号",
           equipName: "一七",
           carNumber: "沪X5477应急",
-          carStatus: "动",
+          carStatus: "动",
           disposeTime: "1:00:00",
           correspondent: "张三",
           commander: "李四",
@@ -221,7 +222,7 @@ export default {
           callingUp: "1号",
           equipName: "一七",
           carNumber: "沪X5477应急",
-          carStatus: "动",
+          carStatus: "动",
           disposeTime: "1:00:00",
           correspondent: "张三",
           commander: "李四",
@@ -240,7 +241,7 @@ export default {
           callingUp: "1号",
           equipName: "一七",
           carNumber: "沪X5477应急",
-          carStatus: "动",
+          carStatus: "动",
           disposeTime: "1:00:00",
           correspondent: "张三",
           commander: "李四",
@@ -259,7 +260,7 @@ export default {
           callingUp: "1号",
           equipName: "一七",
           carNumber: "沪X5477应急",
-          carStatus: "动",
+          carStatus: "动",
           disposeTime: "1:00:00",
           correspondent: "张三",
           commander: "李四",
@@ -270,7 +271,7 @@ export default {
       tableData2: [
         {
           id:'222',
-          address: "闵行区",
+          address: "XX消防站",
           car: "3辆",
           lochus: "12人",
           children:[
@@ -281,7 +282,7 @@ export default {
         },
         {
           id:'222',
-          address: "闵行区",
+          address: "XX消防站",
           car: "3辆",
           lochus: "12人",
           children:[
@@ -292,7 +293,7 @@ export default {
         },
         {
           id:'222',
-          address: "闵行区",
+          address: "XX消防站",
           car: "3辆",
           lochus: "12人",
           children:[
@@ -303,7 +304,7 @@ export default {
         },
         {
           id:'222',
-          address: "闵行区",
+          address: "XX消防站",
           car: "3辆",
           lochus: "12人",
           children:[
@@ -314,7 +315,7 @@ export default {
         },
         {
           id:'222',
-          address: "闵行区",
+          address: "XX消防站",
           car: "3辆",
           lochus: "12人",
           children:[
@@ -325,7 +326,7 @@ export default {
         },
         {
           id:'222',
-          address: "闵行区",
+          address: "XX消防站",
           car: "3辆",
           lochus: "12人",
           children:[
@@ -353,7 +354,7 @@ export default {
       unitBeOnDutyList: [],
     };
   },
-  mixins: [linstener],
+  mixins: [linstener,map],
   components: {},
   created() {
     this.getData();
@@ -371,6 +372,7 @@ export default {
         ]),
       true
     );
+    this.initMap()
   },
   methods: {
     async getData() {
@@ -608,13 +610,5 @@ export default {
       }
     }
   }
-  .centerBox {
-    .centerContent {
-      width: 100%;
-      height: 100%;
-      background: url(~@a/img/enforce/center.png) no-repeat;
-      background-size: 100% 100%;
-    }
-  }
 }
 </style>

+ 42 - 16
src/views/water-sources.vue

@@ -43,6 +43,11 @@
         <el-row class="rightBtn btnW" @click="rightBtnClick()">
           <i :class="rightBtn ? 'el-icon-arrow-right' : 'el-icon-arrow-left'"></i>
         </el-row>
+        <el-row class="mapTips">
+          <el-col class="greenImage">市政取水点</el-col>
+          <el-col class="yellowImage">社区取水点</el-col>
+          <el-col class="redImage">单位取水点</el-col>
+        </el-row>
       </el-col>
     </transition>
     <transition name="el-fade-in-linear">
@@ -158,10 +163,14 @@
 
 <script>
 import linstener from "@c/mixins/linstener";
+import map from "@c/mixins/map";
 import waterGauge from "@c/water-gauge";
 import gauge from "@c/gauge";
 import funnel from "@c/funnel";
+import AMap from 'AMap'
 export default {
+  mixins: [linstener,map],
+  components: { waterGauge, funnel, gauge },
   data() {
     return {
       timeArea: "month",
@@ -184,8 +193,6 @@ export default {
       },
     };
   },
-  mixins: [linstener],
-  components: { waterGauge, funnel, gauge },
   created() {
     this.getData();
   },
@@ -201,6 +208,7 @@ export default {
         ]),
       true
     );
+    this.initMap()
   },
   methods: {
     async getData() {
@@ -230,7 +238,38 @@ export default {
             // endTime: "2020-03-03 23:59:59",
           })
       );
-      if (res) this.tableData = res.data.records;
+      if (res){
+         this.tableData = res.data.records
+         this.addMarker(res.data.records,'water')
+      }
+    },
+    // 添加标点
+    addMarkerInfo(position, value) {
+        // this.map.getIsOpen();
+        this.map.clearInfoWindow();
+        var infoWindow = new AMap.InfoWindow({
+            isCustom: true, //使用自定义窗体
+            closeWhenClickMap: true,
+            content: `
+                <div class="tableTooltip mapTab">
+                  <div class="tableTitle">
+                    <div>${value.type}</div>
+                  </div>
+                  <el-row class="tableContent">
+                    <div class="max">水源位置:${value.address}</div>
+                    <div>电话:${value.phone}</div>
+                    <div class="max">支队名称:${value.detachmentName}</div>
+                    <div>管辖机构:${value.jurisdictionalAgency}</div>
+                    <div>水源类型:${value.type}</div>
+                    <div>取水形式:${value.getWaterType}</div>
+                    <div>水源性质:${value.waterAdministrative}</div>
+                    <div>状态:${value.status == 1 ?'可用':'不可用'}</div>
+                    <div>供水单位:${value.waterUnit}</div>
+                  </el-row>
+                </div>`,
+            offset: new AMap.Pixel(16, -30)
+        });
+        infoWindow.open(this.map, position);
     },
     // 消防水源信息
     async getFireWaterStatistics() {
@@ -284,7 +323,6 @@ export default {
     display: flex;
     justify-content: space-between;
     flex-direction: column;
-    padding: 0 0.3rem;
     box-sizing: border-box;
     & > .el-col {
       flex: 1;
@@ -462,7 +500,6 @@ export default {
     display: flex;
     justify-content: space-between;
     flex-direction: column;
-    padding: 0 0.3rem;
     box-sizing: border-box;
     & > .el-col {
       flex: 1;
@@ -601,16 +638,5 @@ export default {
       box-sizing: border-box;
     }
   }
-  .centerBox {
-    display: flex;
-    // padding: 0 0.2rem;
-    box-sizing: border-box;
-    .centerContent {
-      width: 100%;
-      height: 100%;
-      background: url(~@a/img/enforce/center.png) no-repeat;
-      background-size: 100% 100%;
-    }
-  }
 }
 </style>

Some files were not shown because too many files changed in this diff