diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
Binary files differ

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
Binary files differ

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png" "b/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
deleted file mode 100644
index 8f94d81..0000000
--- "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
+++ /dev/null
Binary files differ

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png" "b/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
deleted file mode 100644
index 8f94d81..0000000
--- "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
+++ /dev/null
Binary files differ
diff --git "a/public/static/images/\347\256\241\347\233\257.png" "b/public/static/images/\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..c322117
--- /dev/null
+++ "b/public/static/images/\347\256\241\347\233\257.png"
Binary files differ

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png" "b/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
deleted file mode 100644
index 8f94d81..0000000
--- "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
+++ /dev/null
Binary files differ
diff --git "a/public/static/images/\347\256\241\347\233\257.png" "b/public/static/images/\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..c322117
--- /dev/null
+++ "b/public/static/images/\347\256\241\347\233\257.png"
Binary files differ
diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue
index b6ba864..d7238e6 100644
--- a/src/components/Mars3D/Mars3dMap.vue
+++ b/src/components/Mars3D/Mars3dMap.vue
@@ -2,14 +2,19 @@
   <div :id="`mars3d-container${mapKey}`" class="mars3d-container" />
 </template>
 <script>
+
 import Vue from 'vue'
-// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
-// import 'cesium/Source/Cesium'// 导入必须的样式表
-// var Cesium = require('../../../node_modules/cesium/Source/Cesium')
-var Cesium = require('../../../node_modules/mars3d-cesium/Build/Cesium/Cesium')
+import * as Cesium from 'mars3d-cesium'
+// 导入mars3d主库
 import 'mars3d/dist/mars3d.css'
-import 'mars3d/dist/mars3d.js'
+import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css'
 import * as mars3d from 'mars3d'
+// 导入插件(其他插件类似，插件清单访问：http://mars3d.cn/dev/guide/start/architecture.html)
+
+// 为了方便使用,绑定到原型链，在其他vue文件，直接 this.mars3d 来使用
+Vue.prototype.mars3d = mars3d
+Vue.prototype.Cesium = mars3d.Cesium
+
 import axios from 'axios'
 export default {
   name: 'Mars3dMap',
@@ -19,6 +24,7 @@
       type: String,
       default: ''
     },
+    // 底图
     basemap: {
       type: Number,
       default: 1113
@@ -29,6 +35,11 @@
     appendToBody: {
       type: Boolean,
       default: false
+    },
+    // 是否需要加光
+    needBloomEffect: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -99,11 +110,18 @@
         window.location.reload()
       })
       this[`map${this.mapKey}`] = map
-      // this.bloomEffect = new mars3d.effect.BloomEffect({
-      //   enabled: true
-      // })
-      // map.addEffect(this.bloomEffect)
-      // window.map.basemap.opacity = this.alpha / 100
+      if (this.needBloomEffect) {
+        const bloomEffect = new mars3d.effect.BloomEffect({
+          enabled: true
+        })
+        map.addEffect(bloomEffect)
+      }
+
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      map.addLayer(graphicLayer)
+      // 垂直飞线
+      // lat:36.290705 , lng:117.424668 ,
+      // flyLine(graphicLayer, 117.33, 117.58, 36.59, 36.80)
       // 挂载到全局对象下，所有组件通过 this.map 访问
       Vue.prototype[`map${this.mapKey}`] = map
       // 抛出事件
@@ -113,7 +131,6 @@
       window.map.basemap = basemap
     }
   }
-
 }
 </script>
 

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png" "b/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
deleted file mode 100644
index 8f94d81..0000000
--- "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
+++ /dev/null
Binary files differ
diff --git "a/public/static/images/\347\256\241\347\233\257.png" "b/public/static/images/\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..c322117
--- /dev/null
+++ "b/public/static/images/\347\256\241\347\233\257.png"
Binary files differ
diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue
index b6ba864..d7238e6 100644
--- a/src/components/Mars3D/Mars3dMap.vue
+++ b/src/components/Mars3D/Mars3dMap.vue
@@ -2,14 +2,19 @@
   <div :id="`mars3d-container${mapKey}`" class="mars3d-container" />
 </template>
 <script>
+
 import Vue from 'vue'
-// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
-// import 'cesium/Source/Cesium'// 导入必须的样式表
-// var Cesium = require('../../../node_modules/cesium/Source/Cesium')
-var Cesium = require('../../../node_modules/mars3d-cesium/Build/Cesium/Cesium')
+import * as Cesium from 'mars3d-cesium'
+// 导入mars3d主库
 import 'mars3d/dist/mars3d.css'
-import 'mars3d/dist/mars3d.js'
+import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css'
 import * as mars3d from 'mars3d'
+// 导入插件(其他插件类似，插件清单访问：http://mars3d.cn/dev/guide/start/architecture.html)
+
+// 为了方便使用,绑定到原型链，在其他vue文件，直接 this.mars3d 来使用
+Vue.prototype.mars3d = mars3d
+Vue.prototype.Cesium = mars3d.Cesium
+
 import axios from 'axios'
 export default {
   name: 'Mars3dMap',
@@ -19,6 +24,7 @@
       type: String,
       default: ''
     },
+    // 底图
     basemap: {
       type: Number,
       default: 1113
@@ -29,6 +35,11 @@
     appendToBody: {
       type: Boolean,
       default: false
+    },
+    // 是否需要加光
+    needBloomEffect: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -99,11 +110,18 @@
         window.location.reload()
       })
       this[`map${this.mapKey}`] = map
-      // this.bloomEffect = new mars3d.effect.BloomEffect({
-      //   enabled: true
-      // })
-      // map.addEffect(this.bloomEffect)
-      // window.map.basemap.opacity = this.alpha / 100
+      if (this.needBloomEffect) {
+        const bloomEffect = new mars3d.effect.BloomEffect({
+          enabled: true
+        })
+        map.addEffect(bloomEffect)
+      }
+
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      map.addLayer(graphicLayer)
+      // 垂直飞线
+      // lat:36.290705 , lng:117.424668 ,
+      // flyLine(graphicLayer, 117.33, 117.58, 36.59, 36.80)
       // 挂载到全局对象下，所有组件通过 this.map 访问
       Vue.prototype[`map${this.mapKey}`] = map
       // 抛出事件
@@ -113,7 +131,6 @@
       window.map.basemap = basemap
     }
   }
-
 }
 </script>
 
diff --git a/src/components/Mars3D/utils/ArcGisWfsLayer.js b/src/components/Mars3D/utils/ArcGisWfsLayer.js
index 3b6d51a..7ca8399 100644
--- a/src/components/Mars3D/utils/ArcGisWfsLayer.js
+++ b/src/components/Mars3D/utils/ArcGisWfsLayer.js
@@ -62,3 +62,30 @@
   window.map.addLayer(wfsLayer)
   return wfsLayer
 }
+
+/**
+ * 添加楼宇
+ */
+export function building() {
+  const wfsLayer = new mars3d.layer.ArcGisWfsLayer({
+    name: '建筑物面矢量图层',
+    url: Vue.prototype.baseConfig.buildingUrl,
+    // minimumLevel: changeLevel,
+    symbol: {
+      type: 'polygonC',
+      styleOptions: {
+        color: 'rgb(52,125,246)',
+        outline: false,
+        opacity: 0.8
+      },
+      callback: function(attr, styleOpt) {
+        var val = { attr }.attr
+        console.log(attr)
+      }
+    },
+    buildings: {
+      height: 100
+    }
+  })
+  window.map.addLayer(wfsLayer)
+}

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png" "b/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
deleted file mode 100644
index 8f94d81..0000000
--- "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
+++ /dev/null
Binary files differ
diff --git "a/public/static/images/\347\256\241\347\233\257.png" "b/public/static/images/\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..c322117
--- /dev/null
+++ "b/public/static/images/\347\256\241\347\233\257.png"
Binary files differ
diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue
index b6ba864..d7238e6 100644
--- a/src/components/Mars3D/Mars3dMap.vue
+++ b/src/components/Mars3D/Mars3dMap.vue
@@ -2,14 +2,19 @@
   <div :id="`mars3d-container${mapKey}`" class="mars3d-container" />
 </template>
 <script>
+
 import Vue from 'vue'
-// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
-// import 'cesium/Source/Cesium'// 导入必须的样式表
-// var Cesium = require('../../../node_modules/cesium/Source/Cesium')
-var Cesium = require('../../../node_modules/mars3d-cesium/Build/Cesium/Cesium')
+import * as Cesium from 'mars3d-cesium'
+// 导入mars3d主库
 import 'mars3d/dist/mars3d.css'
-import 'mars3d/dist/mars3d.js'
+import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css'
 import * as mars3d from 'mars3d'
+// 导入插件(其他插件类似，插件清单访问：http://mars3d.cn/dev/guide/start/architecture.html)
+
+// 为了方便使用,绑定到原型链，在其他vue文件，直接 this.mars3d 来使用
+Vue.prototype.mars3d = mars3d
+Vue.prototype.Cesium = mars3d.Cesium
+
 import axios from 'axios'
 export default {
   name: 'Mars3dMap',
@@ -19,6 +24,7 @@
       type: String,
       default: ''
     },
+    // 底图
     basemap: {
       type: Number,
       default: 1113
@@ -29,6 +35,11 @@
     appendToBody: {
       type: Boolean,
       default: false
+    },
+    // 是否需要加光
+    needBloomEffect: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -99,11 +110,18 @@
         window.location.reload()
       })
       this[`map${this.mapKey}`] = map
-      // this.bloomEffect = new mars3d.effect.BloomEffect({
-      //   enabled: true
-      // })
-      // map.addEffect(this.bloomEffect)
-      // window.map.basemap.opacity = this.alpha / 100
+      if (this.needBloomEffect) {
+        const bloomEffect = new mars3d.effect.BloomEffect({
+          enabled: true
+        })
+        map.addEffect(bloomEffect)
+      }
+
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      map.addLayer(graphicLayer)
+      // 垂直飞线
+      // lat:36.290705 , lng:117.424668 ,
+      // flyLine(graphicLayer, 117.33, 117.58, 36.59, 36.80)
       // 挂载到全局对象下，所有组件通过 this.map 访问
       Vue.prototype[`map${this.mapKey}`] = map
       // 抛出事件
@@ -113,7 +131,6 @@
       window.map.basemap = basemap
     }
   }
-
 }
 </script>
 
diff --git a/src/components/Mars3D/utils/ArcGisWfsLayer.js b/src/components/Mars3D/utils/ArcGisWfsLayer.js
index 3b6d51a..7ca8399 100644
--- a/src/components/Mars3D/utils/ArcGisWfsLayer.js
+++ b/src/components/Mars3D/utils/ArcGisWfsLayer.js
@@ -62,3 +62,30 @@
   window.map.addLayer(wfsLayer)
   return wfsLayer
 }
+
+/**
+ * 添加楼宇
+ */
+export function building() {
+  const wfsLayer = new mars3d.layer.ArcGisWfsLayer({
+    name: '建筑物面矢量图层',
+    url: Vue.prototype.baseConfig.buildingUrl,
+    // minimumLevel: changeLevel,
+    symbol: {
+      type: 'polygonC',
+      styleOptions: {
+        color: 'rgb(52,125,246)',
+        outline: false,
+        opacity: 0.8
+      },
+      callback: function(attr, styleOpt) {
+        var val = { attr }.attr
+        console.log(attr)
+      }
+    },
+    buildings: {
+      height: 100
+    }
+  })
+  window.map.addLayer(wfsLayer)
+}
diff --git a/src/components/Mars3D/utils/GeoJsonLayer.js b/src/components/Mars3D/utils/GeoJsonLayer.js
index 65a7e26..51ab972 100644
--- a/src/components/Mars3D/utils/GeoJsonLayer.js
+++ b/src/components/Mars3D/utils/GeoJsonLayer.js
@@ -149,13 +149,14 @@
         duration: 1
       })
     }
-  }).on(mars3d.EventType.show, function(event) {
-    console.log(index, ' show时间(s):', new Date().getSeconds())
-  }).on(mars3d.EventType.load, function(event) {
-    console.log(index, ' load时间(s):', new Date().getSeconds())
-  }).on(mars3d.EventType.postRender, function(event) {
-    console.log(index, ' postRender时间(s):', new Date().getSeconds())
   })
+    .on(mars3d.EventType.show, function(event) {
+      console.log(index, ' show时间(s):', new Date().getSeconds())
+    }).on(mars3d.EventType.load, function(event) {
+      console.log(index, ' load时间(s):', new Date().getSeconds())
+    }).on(mars3d.EventType.postRender, function(event) {
+      console.log(index, ' postRender时间(s):', new Date().getSeconds())
+    })
   window.map.addLayer(layer)
   queryServer.query({
     where: condition,

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png" "b/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
deleted file mode 100644
index 8f94d81..0000000
--- "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
+++ /dev/null
Binary files differ
diff --git "a/public/static/images/\347\256\241\347\233\257.png" "b/public/static/images/\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..c322117
--- /dev/null
+++ "b/public/static/images/\347\256\241\347\233\257.png"
Binary files differ
diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue
index b6ba864..d7238e6 100644
--- a/src/components/Mars3D/Mars3dMap.vue
+++ b/src/components/Mars3D/Mars3dMap.vue
@@ -2,14 +2,19 @@
   <div :id="`mars3d-container${mapKey}`" class="mars3d-container" />
 </template>
 <script>
+
 import Vue from 'vue'
-// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
-// import 'cesium/Source/Cesium'// 导入必须的样式表
-// var Cesium = require('../../../node_modules/cesium/Source/Cesium')
-var Cesium = require('../../../node_modules/mars3d-cesium/Build/Cesium/Cesium')
+import * as Cesium from 'mars3d-cesium'
+// 导入mars3d主库
 import 'mars3d/dist/mars3d.css'
-import 'mars3d/dist/mars3d.js'
+import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css'
 import * as mars3d from 'mars3d'
+// 导入插件(其他插件类似，插件清单访问：http://mars3d.cn/dev/guide/start/architecture.html)
+
+// 为了方便使用,绑定到原型链，在其他vue文件，直接 this.mars3d 来使用
+Vue.prototype.mars3d = mars3d
+Vue.prototype.Cesium = mars3d.Cesium
+
 import axios from 'axios'
 export default {
   name: 'Mars3dMap',
@@ -19,6 +24,7 @@
       type: String,
       default: ''
     },
+    // 底图
     basemap: {
       type: Number,
       default: 1113
@@ -29,6 +35,11 @@
     appendToBody: {
       type: Boolean,
       default: false
+    },
+    // 是否需要加光
+    needBloomEffect: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -99,11 +110,18 @@
         window.location.reload()
       })
       this[`map${this.mapKey}`] = map
-      // this.bloomEffect = new mars3d.effect.BloomEffect({
-      //   enabled: true
-      // })
-      // map.addEffect(this.bloomEffect)
-      // window.map.basemap.opacity = this.alpha / 100
+      if (this.needBloomEffect) {
+        const bloomEffect = new mars3d.effect.BloomEffect({
+          enabled: true
+        })
+        map.addEffect(bloomEffect)
+      }
+
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      map.addLayer(graphicLayer)
+      // 垂直飞线
+      // lat:36.290705 , lng:117.424668 ,
+      // flyLine(graphicLayer, 117.33, 117.58, 36.59, 36.80)
       // 挂载到全局对象下，所有组件通过 this.map 访问
       Vue.prototype[`map${this.mapKey}`] = map
       // 抛出事件
@@ -113,7 +131,6 @@
       window.map.basemap = basemap
     }
   }
-
 }
 </script>
 
diff --git a/src/components/Mars3D/utils/ArcGisWfsLayer.js b/src/components/Mars3D/utils/ArcGisWfsLayer.js
index 3b6d51a..7ca8399 100644
--- a/src/components/Mars3D/utils/ArcGisWfsLayer.js
+++ b/src/components/Mars3D/utils/ArcGisWfsLayer.js
@@ -62,3 +62,30 @@
   window.map.addLayer(wfsLayer)
   return wfsLayer
 }
+
+/**
+ * 添加楼宇
+ */
+export function building() {
+  const wfsLayer = new mars3d.layer.ArcGisWfsLayer({
+    name: '建筑物面矢量图层',
+    url: Vue.prototype.baseConfig.buildingUrl,
+    // minimumLevel: changeLevel,
+    symbol: {
+      type: 'polygonC',
+      styleOptions: {
+        color: 'rgb(52,125,246)',
+        outline: false,
+        opacity: 0.8
+      },
+      callback: function(attr, styleOpt) {
+        var val = { attr }.attr
+        console.log(attr)
+      }
+    },
+    buildings: {
+      height: 100
+    }
+  })
+  window.map.addLayer(wfsLayer)
+}
diff --git a/src/components/Mars3D/utils/GeoJsonLayer.js b/src/components/Mars3D/utils/GeoJsonLayer.js
index 65a7e26..51ab972 100644
--- a/src/components/Mars3D/utils/GeoJsonLayer.js
+++ b/src/components/Mars3D/utils/GeoJsonLayer.js
@@ -149,13 +149,14 @@
         duration: 1
       })
     }
-  }).on(mars3d.EventType.show, function(event) {
-    console.log(index, ' show时间(s):', new Date().getSeconds())
-  }).on(mars3d.EventType.load, function(event) {
-    console.log(index, ' load时间(s):', new Date().getSeconds())
-  }).on(mars3d.EventType.postRender, function(event) {
-    console.log(index, ' postRender时间(s):', new Date().getSeconds())
   })
+    .on(mars3d.EventType.show, function(event) {
+      console.log(index, ' show时间(s):', new Date().getSeconds())
+    }).on(mars3d.EventType.load, function(event) {
+      console.log(index, ' load时间(s):', new Date().getSeconds())
+    }).on(mars3d.EventType.postRender, function(event) {
+      console.log(index, ' postRender时间(s):', new Date().getSeconds())
+    })
   window.map.addLayer(layer)
   queryServer.query({
     where: condition,
diff --git a/src/components/Mars3D/utils/GraphicLayer.js b/src/components/Mars3D/utils/GraphicLayer.js
new file mode 100644
index 0000000..0e352bb
--- /dev/null
+++ b/src/components/Mars3D/utils/GraphicLayer.js
@@ -0,0 +1,67 @@
+import * as mars3d from 'mars3d'
+import Vue from 'vue'
+
+/**
+ *  四面体
+ * @param graphicLayer
+ * @param position
+ * @param attr
+ */
+export function Tetrahedron(graphicLayer, position, attr, style = {}) {
+  const tetrahedronPrimitive = new mars3d.graphic.Tetrahedron({
+    position: position,
+    style: {
+      width: 8,
+      height: 15,
+      color: 'rgba(255,0,0,0.7)',
+      moveHeight: 50
+    },
+    attr: attr
+  })
+  graphicLayer.addGraphic(tetrahedronPrimitive)
+}
+export function randomPoint(minJD, maxJD, minWD, maxWD) {
+  // 114.882505, 25.778006, 0]
+  // const jd = random(114.84 * 1000, 114.89 * 1000) / 1000
+  // const wd = random(25.76 * 1000, 25.81 * 1000) / 1000
+  const jd = random(minJD * 1000, maxJD * 1000) / 1000
+  const wd = random(minWD * 1000, maxWD * 1000) / 1000
+  return new mars3d.LngLatPoint(jd, wd, 100)
+}
+
+export function random(min, max) {
+  return Math.floor(Math.random() * (max - min + 1) + min)
+}
+
+/**
+ * 垂直飞线
+ * @constructor
+ */
+
+export function FlyLine(graphicLayer, minJD, maxJD, minWD, maxWD) {
+  const arrData = []
+  for (let j = 0; j < 100; ++j) {
+    const startPt = randomPoint(minJD, maxJD, minWD, maxWD)
+    const endPt = startPt.clone()
+    endPt.alt = random(1000, 2000)
+
+    arrData.push({
+      positions: [startPt, endPt],
+      style: {
+        width: 1,
+        materialType: mars3d.MaterialType.LineFlowColor,
+        materialOptions: {
+          color: 'rgb(141,172,172)',
+          speed: random(5, 10),
+          startTime: random(1000, 3000),
+          percent: 0.1,
+          alpha: 0.01
+        }
+      }
+    })
+  }
+  const upPoly = new mars3d.graphic.PolylineCombine({
+    instances: arrData
+  })
+  graphicLayer.addGraphic(upPoly)
+}

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png" "b/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
deleted file mode 100644
index 8f94d81..0000000
--- "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
+++ /dev/null
Binary files differ
diff --git "a/public/static/images/\347\256\241\347\233\257.png" "b/public/static/images/\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..c322117
--- /dev/null
+++ "b/public/static/images/\347\256\241\347\233\257.png"
Binary files differ
diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue
index b6ba864..d7238e6 100644
--- a/src/components/Mars3D/Mars3dMap.vue
+++ b/src/components/Mars3D/Mars3dMap.vue
@@ -2,14 +2,19 @@
   <div :id="`mars3d-container${mapKey}`" class="mars3d-container" />
 </template>
 <script>
+
 import Vue from 'vue'
-// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
-// import 'cesium/Source/Cesium'// 导入必须的样式表
-// var Cesium = require('../../../node_modules/cesium/Source/Cesium')
-var Cesium = require('../../../node_modules/mars3d-cesium/Build/Cesium/Cesium')
+import * as Cesium from 'mars3d-cesium'
+// 导入mars3d主库
 import 'mars3d/dist/mars3d.css'
-import 'mars3d/dist/mars3d.js'
+import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css'
 import * as mars3d from 'mars3d'
+// 导入插件(其他插件类似，插件清单访问：http://mars3d.cn/dev/guide/start/architecture.html)
+
+// 为了方便使用,绑定到原型链，在其他vue文件，直接 this.mars3d 来使用
+Vue.prototype.mars3d = mars3d
+Vue.prototype.Cesium = mars3d.Cesium
+
 import axios from 'axios'
 export default {
   name: 'Mars3dMap',
@@ -19,6 +24,7 @@
       type: String,
       default: ''
     },
+    // 底图
     basemap: {
       type: Number,
       default: 1113
@@ -29,6 +35,11 @@
     appendToBody: {
       type: Boolean,
       default: false
+    },
+    // 是否需要加光
+    needBloomEffect: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -99,11 +110,18 @@
         window.location.reload()
       })
       this[`map${this.mapKey}`] = map
-      // this.bloomEffect = new mars3d.effect.BloomEffect({
-      //   enabled: true
-      // })
-      // map.addEffect(this.bloomEffect)
-      // window.map.basemap.opacity = this.alpha / 100
+      if (this.needBloomEffect) {
+        const bloomEffect = new mars3d.effect.BloomEffect({
+          enabled: true
+        })
+        map.addEffect(bloomEffect)
+      }
+
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      map.addLayer(graphicLayer)
+      // 垂直飞线
+      // lat:36.290705 , lng:117.424668 ,
+      // flyLine(graphicLayer, 117.33, 117.58, 36.59, 36.80)
       // 挂载到全局对象下，所有组件通过 this.map 访问
       Vue.prototype[`map${this.mapKey}`] = map
       // 抛出事件
@@ -113,7 +131,6 @@
       window.map.basemap = basemap
     }
   }
-
 }
 </script>
 
diff --git a/src/components/Mars3D/utils/ArcGisWfsLayer.js b/src/components/Mars3D/utils/ArcGisWfsLayer.js
index 3b6d51a..7ca8399 100644
--- a/src/components/Mars3D/utils/ArcGisWfsLayer.js
+++ b/src/components/Mars3D/utils/ArcGisWfsLayer.js
@@ -62,3 +62,30 @@
   window.map.addLayer(wfsLayer)
   return wfsLayer
 }
+
+/**
+ * 添加楼宇
+ */
+export function building() {
+  const wfsLayer = new mars3d.layer.ArcGisWfsLayer({
+    name: '建筑物面矢量图层',
+    url: Vue.prototype.baseConfig.buildingUrl,
+    // minimumLevel: changeLevel,
+    symbol: {
+      type: 'polygonC',
+      styleOptions: {
+        color: 'rgb(52,125,246)',
+        outline: false,
+        opacity: 0.8
+      },
+      callback: function(attr, styleOpt) {
+        var val = { attr }.attr
+        console.log(attr)
+      }
+    },
+    buildings: {
+      height: 100
+    }
+  })
+  window.map.addLayer(wfsLayer)
+}
diff --git a/src/components/Mars3D/utils/GeoJsonLayer.js b/src/components/Mars3D/utils/GeoJsonLayer.js
index 65a7e26..51ab972 100644
--- a/src/components/Mars3D/utils/GeoJsonLayer.js
+++ b/src/components/Mars3D/utils/GeoJsonLayer.js
@@ -149,13 +149,14 @@
         duration: 1
       })
     }
-  }).on(mars3d.EventType.show, function(event) {
-    console.log(index, ' show时间(s):', new Date().getSeconds())
-  }).on(mars3d.EventType.load, function(event) {
-    console.log(index, ' load时间(s):', new Date().getSeconds())
-  }).on(mars3d.EventType.postRender, function(event) {
-    console.log(index, ' postRender时间(s):', new Date().getSeconds())
   })
+    .on(mars3d.EventType.show, function(event) {
+      console.log(index, ' show时间(s):', new Date().getSeconds())
+    }).on(mars3d.EventType.load, function(event) {
+      console.log(index, ' load时间(s):', new Date().getSeconds())
+    }).on(mars3d.EventType.postRender, function(event) {
+      console.log(index, ' postRender时间(s):', new Date().getSeconds())
+    })
   window.map.addLayer(layer)
   queryServer.query({
     where: condition,
diff --git a/src/components/Mars3D/utils/GraphicLayer.js b/src/components/Mars3D/utils/GraphicLayer.js
new file mode 100644
index 0000000..0e352bb
--- /dev/null
+++ b/src/components/Mars3D/utils/GraphicLayer.js
@@ -0,0 +1,67 @@
+import * as mars3d from 'mars3d'
+import Vue from 'vue'
+
+/**
+ *  四面体
+ * @param graphicLayer
+ * @param position
+ * @param attr
+ */
+export function Tetrahedron(graphicLayer, position, attr, style = {}) {
+  const tetrahedronPrimitive = new mars3d.graphic.Tetrahedron({
+    position: position,
+    style: {
+      width: 8,
+      height: 15,
+      color: 'rgba(255,0,0,0.7)',
+      moveHeight: 50
+    },
+    attr: attr
+  })
+  graphicLayer.addGraphic(tetrahedronPrimitive)
+}
+export function randomPoint(minJD, maxJD, minWD, maxWD) {
+  // 114.882505, 25.778006, 0]
+  // const jd = random(114.84 * 1000, 114.89 * 1000) / 1000
+  // const wd = random(25.76 * 1000, 25.81 * 1000) / 1000
+  const jd = random(minJD * 1000, maxJD * 1000) / 1000
+  const wd = random(minWD * 1000, maxWD * 1000) / 1000
+  return new mars3d.LngLatPoint(jd, wd, 100)
+}
+
+export function random(min, max) {
+  return Math.floor(Math.random() * (max - min + 1) + min)
+}
+
+/**
+ * 垂直飞线
+ * @constructor
+ */
+
+export function FlyLine(graphicLayer, minJD, maxJD, minWD, maxWD) {
+  const arrData = []
+  for (let j = 0; j < 100; ++j) {
+    const startPt = randomPoint(minJD, maxJD, minWD, maxWD)
+    const endPt = startPt.clone()
+    endPt.alt = random(1000, 2000)
+
+    arrData.push({
+      positions: [startPt, endPt],
+      style: {
+        width: 1,
+        materialType: mars3d.MaterialType.LineFlowColor,
+        materialOptions: {
+          color: 'rgb(141,172,172)',
+          speed: random(5, 10),
+          startTime: random(1000, 3000),
+          percent: 0.1,
+          alpha: 0.01
+        }
+      }
+    })
+  }
+  const upPoly = new mars3d.graphic.PolylineCombine({
+    instances: arrData
+  })
+  graphicLayer.addGraphic(upPoly)
+}
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index a0d6a3e..ed448eb 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -42,13 +42,13 @@
 import MapSearchComp from '@/views/overview/components/mapSearchComp'
 
 import axios from 'axios'
-// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
-// import 'cesium/Source/Cesium'// 导入必须的样式表
-// var Cesium = require('../../../node_modules/cesium/Source/Cesium')
-var Cesium = require('../../../node_modules/mars3d-cesium/Build/Cesium/Cesium')
+
+import * as Cesium from 'mars3d-cesium'
+// 导入mars3d主库
 import 'mars3d/dist/mars3d.css'
-import 'mars3d/dist/mars3d.js'
+import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css'
 import * as mars3d from 'mars3d'
+
 import store from '@/store'
 import { breadcrumb } from '@/settings'
 import { RSAencrypt } from '@/utils/security'

diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 6e24067..29a3c40 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -30,7 +30,7 @@
   "basemaps": [
     {
       "pid": 10,
-      "id": 1111,
+      "id": 1112,
       "name": "天地图",
       "type": "group",
       "layers": [
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": 1112,
+      "id": 1111,
       "pid": 10,
       "name": "天地图电子",
       "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
@@ -59,5 +59,25 @@
       "key": ["216ee92889e17ab1b083fae665d522b8"],
       "show": true
     }
+  ],
+  "layers": [
+    {
+      "type": "geojson",
+      "id": "building",
+      "url": "http://111.198.10.15:11404/3d/zqBuilding.json",
+      "symbol": {
+        "type": "polygonP",
+        "styleOptions": {
+          "color": "rgb(52,125,246)",
+          "outline": false,
+          "opacity": 0.8
+        }
+      },
+      "buildings": {
+        "height": 100
+      },
+      "popup": "{name}",
+      "show": true
+    }
   ]
 }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 54c91c6..69da0af 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,12 +3,13 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://60.208.121.150:5001/",
-  "wsUrl": "ws://60.208.121.150:5001/websocket",
+  "wsUrl": "ws://60.208.121.150:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
   "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
   "mapType": "gaode",
   "alarmSound": true,
+  "refreshTime": 60,
   "singleSys": true,
   "refreshType":"websocket",
   "showPointType":"massMarkers",
@@ -16,5 +17,6 @@
   "provinceCode":"360000",
   "cityCode":"361000",
   "areaCode":"361024",
-  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqRq/MapServer/"
+  "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/",
+  "buildingUrl": "http://111.198.10.15:13002/arcgis/rest/services/zqBuilding/MapServer/0"
 }
diff --git "a/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..0d95cba
--- /dev/null
+++ "b/public/static/images/dev-\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..d050e49
--- /dev/null
+++ "b/public/static/images/dev-\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/dev-\347\256\241\347\233\257.png" "b/public/static/images/dev-\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..96f8e94
--- /dev/null
+++ "b/public/static/images/dev-\347\256\241\347\233\257.png"
Binary files differ
diff --git a/public/static/images/dev.png b/public/static/images/dev.png
new file mode 100644
index 0000000..6dbf993
--- /dev/null
+++ b/public/static/images/dev.png
Binary files differ
diff --git "a/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
new file mode 100644
index 0000000..ffc5bb8
--- /dev/null
+++ "b/public/static/images/\344\272\225\347\233\226\347\212\266\346\200\201\347\233\221\346\265\213\344\273\252.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
new file mode 100644
index 0000000..420106b
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\347\273\210\347\253\257.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
new file mode 100644
index 0000000..8f94d81
--- /dev/null
+++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png"
Binary files differ
diff --git "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png" "b/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
deleted file mode 100644
index 8f94d81..0000000
--- "a/public/static/images/\347\207\203\346\260\224\351\231\204\345\261\236\347\211\251.png"
+++ /dev/null
Binary files differ
diff --git "a/public/static/images/\347\256\241\347\233\257.png" "b/public/static/images/\347\256\241\347\233\257.png"
new file mode 100644
index 0000000..c322117
--- /dev/null
+++ "b/public/static/images/\347\256\241\347\233\257.png"
Binary files differ
diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue
index b6ba864..d7238e6 100644
--- a/src/components/Mars3D/Mars3dMap.vue
+++ b/src/components/Mars3D/Mars3dMap.vue
@@ -2,14 +2,19 @@
   <div :id="`mars3d-container${mapKey}`" class="mars3d-container" />
 </template>
 <script>
+
 import Vue from 'vue'
-// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
-// import 'cesium/Source/Cesium'// 导入必须的样式表
-// var Cesium = require('../../../node_modules/cesium/Source/Cesium')
-var Cesium = require('../../../node_modules/mars3d-cesium/Build/Cesium/Cesium')
+import * as Cesium from 'mars3d-cesium'
+// 导入mars3d主库
 import 'mars3d/dist/mars3d.css'
-import 'mars3d/dist/mars3d.js'
+import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css'
 import * as mars3d from 'mars3d'
+// 导入插件(其他插件类似，插件清单访问：http://mars3d.cn/dev/guide/start/architecture.html)
+
+// 为了方便使用,绑定到原型链，在其他vue文件，直接 this.mars3d 来使用
+Vue.prototype.mars3d = mars3d
+Vue.prototype.Cesium = mars3d.Cesium
+
 import axios from 'axios'
 export default {
   name: 'Mars3dMap',
@@ -19,6 +24,7 @@
       type: String,
       default: ''
     },
+    // 底图
     basemap: {
       type: Number,
       default: 1113
@@ -29,6 +35,11 @@
     appendToBody: {
       type: Boolean,
       default: false
+    },
+    // 是否需要加光
+    needBloomEffect: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -99,11 +110,18 @@
         window.location.reload()
       })
       this[`map${this.mapKey}`] = map
-      // this.bloomEffect = new mars3d.effect.BloomEffect({
-      //   enabled: true
-      // })
-      // map.addEffect(this.bloomEffect)
-      // window.map.basemap.opacity = this.alpha / 100
+      if (this.needBloomEffect) {
+        const bloomEffect = new mars3d.effect.BloomEffect({
+          enabled: true
+        })
+        map.addEffect(bloomEffect)
+      }
+
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      map.addLayer(graphicLayer)
+      // 垂直飞线
+      // lat:36.290705 , lng:117.424668 ,
+      // flyLine(graphicLayer, 117.33, 117.58, 36.59, 36.80)
       // 挂载到全局对象下，所有组件通过 this.map 访问
       Vue.prototype[`map${this.mapKey}`] = map
       // 抛出事件
@@ -113,7 +131,6 @@
       window.map.basemap = basemap
     }
   }
-
 }
 </script>
 
diff --git a/src/components/Mars3D/utils/ArcGisWfsLayer.js b/src/components/Mars3D/utils/ArcGisWfsLayer.js
index 3b6d51a..7ca8399 100644
--- a/src/components/Mars3D/utils/ArcGisWfsLayer.js
+++ b/src/components/Mars3D/utils/ArcGisWfsLayer.js
@@ -62,3 +62,30 @@
   window.map.addLayer(wfsLayer)
   return wfsLayer
 }
+
+/**
+ * 添加楼宇
+ */
+export function building() {
+  const wfsLayer = new mars3d.layer.ArcGisWfsLayer({
+    name: '建筑物面矢量图层',
+    url: Vue.prototype.baseConfig.buildingUrl,
+    // minimumLevel: changeLevel,
+    symbol: {
+      type: 'polygonC',
+      styleOptions: {
+        color: 'rgb(52,125,246)',
+        outline: false,
+        opacity: 0.8
+      },
+      callback: function(attr, styleOpt) {
+        var val = { attr }.attr
+        console.log(attr)
+      }
+    },
+    buildings: {
+      height: 100
+    }
+  })
+  window.map.addLayer(wfsLayer)
+}
diff --git a/src/components/Mars3D/utils/GeoJsonLayer.js b/src/components/Mars3D/utils/GeoJsonLayer.js
index 65a7e26..51ab972 100644
--- a/src/components/Mars3D/utils/GeoJsonLayer.js
+++ b/src/components/Mars3D/utils/GeoJsonLayer.js
@@ -149,13 +149,14 @@
         duration: 1
       })
     }
-  }).on(mars3d.EventType.show, function(event) {
-    console.log(index, ' show时间(s):', new Date().getSeconds())
-  }).on(mars3d.EventType.load, function(event) {
-    console.log(index, ' load时间(s):', new Date().getSeconds())
-  }).on(mars3d.EventType.postRender, function(event) {
-    console.log(index, ' postRender时间(s):', new Date().getSeconds())
   })
+    .on(mars3d.EventType.show, function(event) {
+      console.log(index, ' show时间(s):', new Date().getSeconds())
+    }).on(mars3d.EventType.load, function(event) {
+      console.log(index, ' load时间(s):', new Date().getSeconds())
+    }).on(mars3d.EventType.postRender, function(event) {
+      console.log(index, ' postRender时间(s):', new Date().getSeconds())
+    })
   window.map.addLayer(layer)
   queryServer.query({
     where: condition,
diff --git a/src/components/Mars3D/utils/GraphicLayer.js b/src/components/Mars3D/utils/GraphicLayer.js
new file mode 100644
index 0000000..0e352bb
--- /dev/null
+++ b/src/components/Mars3D/utils/GraphicLayer.js
@@ -0,0 +1,67 @@
+import * as mars3d from 'mars3d'
+import Vue from 'vue'
+
+/**
+ *  四面体
+ * @param graphicLayer
+ * @param position
+ * @param attr
+ */
+export function Tetrahedron(graphicLayer, position, attr, style = {}) {
+  const tetrahedronPrimitive = new mars3d.graphic.Tetrahedron({
+    position: position,
+    style: {
+      width: 8,
+      height: 15,
+      color: 'rgba(255,0,0,0.7)',
+      moveHeight: 50
+    },
+    attr: attr
+  })
+  graphicLayer.addGraphic(tetrahedronPrimitive)
+}
+export function randomPoint(minJD, maxJD, minWD, maxWD) {
+  // 114.882505, 25.778006, 0]
+  // const jd = random(114.84 * 1000, 114.89 * 1000) / 1000
+  // const wd = random(25.76 * 1000, 25.81 * 1000) / 1000
+  const jd = random(minJD * 1000, maxJD * 1000) / 1000
+  const wd = random(minWD * 1000, maxWD * 1000) / 1000
+  return new mars3d.LngLatPoint(jd, wd, 100)
+}
+
+export function random(min, max) {
+  return Math.floor(Math.random() * (max - min + 1) + min)
+}
+
+/**
+ * 垂直飞线
+ * @constructor
+ */
+
+export function FlyLine(graphicLayer, minJD, maxJD, minWD, maxWD) {
+  const arrData = []
+  for (let j = 0; j < 100; ++j) {
+    const startPt = randomPoint(minJD, maxJD, minWD, maxWD)
+    const endPt = startPt.clone()
+    endPt.alt = random(1000, 2000)
+
+    arrData.push({
+      positions: [startPt, endPt],
+      style: {
+        width: 1,
+        materialType: mars3d.MaterialType.LineFlowColor,
+        materialOptions: {
+          color: 'rgb(141,172,172)',
+          speed: random(5, 10),
+          startTime: random(1000, 3000),
+          percent: 0.1,
+          alpha: 0.01
+        }
+      }
+    })
+  }
+  const upPoly = new mars3d.graphic.PolylineCombine({
+    instances: arrData
+  })
+  graphicLayer.addGraphic(upPoly)
+}
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index a0d6a3e..ed448eb 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -42,13 +42,13 @@
 import MapSearchComp from '@/views/overview/components/mapSearchComp'
 
 import axios from 'axios'
-// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
-// import 'cesium/Source/Cesium'// 导入必须的样式表
-// var Cesium = require('../../../node_modules/cesium/Source/Cesium')
-var Cesium = require('../../../node_modules/mars3d-cesium/Build/Cesium/Cesium')
+
+import * as Cesium from 'mars3d-cesium'
+// 导入mars3d主库
 import 'mars3d/dist/mars3d.css'
-import 'mars3d/dist/mars3d.js'
+import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css'
 import * as mars3d from 'mars3d'
+
 import store from '@/store'
 import { breadcrumb } from '@/settings'
 import { RSAencrypt } from '@/utils/security'
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index d22ea8d..8d6e637 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -6,8 +6,8 @@
       <div v-for="(item,index) in labelName" :key="item" class="cover-item">
         <span v-if="index===0" style="color: #FF7FE9;font-weight: 900;width:17px">—</span>
         <span v-else-if="index===3"><img :src="'/../../../static/images/标识器.png'" style="width: 17px;height:17px"></span>
-        <span v-else-if="index>3&&index<=8"><img :src="'/../../../static/images/dev.png'" style="width: 17px;height:17px"></span>
-        <span v-else><img :src="'/../../../static/images/燃气附属物.png'" style="width: 17px;height:17px"></span>
+        <span v-else><img :src="'/../../../static/images/'+labelName[index]+'.png'" style="width: 17px;height:17px"></span>
+        <!--        <span v-else><img :src="'/../../../static/images/燃气附属物.png'" style="width: 17px;height:17px"></span>-->
         <span style="position: relative;left: 5px">{{ item }}</span>
       </div>
     </div>
@@ -41,24 +41,26 @@
 import PopupDataFilter from '@/views/overview/components/popupDataFilter'
 import PopupLocation from '@/views/overview/components/popupLocation'
 import MapSearchComp from '@/views/overview/components/mapSearchComp'
-import { RSAencrypt } from '@/utils/security'
 import axios from 'axios'
+
+import * as Cesium from 'mars3d-cesium'
+// 导入mars3d主库
 import 'mars3d/dist/mars3d.css'
-import 'mars3d/dist/mars3d.js'
+import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css'
 import * as mars3d from 'mars3d'
+
 import store from '@/store'
 import { breadcrumb } from '@/settings'
 import Mars3dMap from '@/components/Mars3D/Mars3dMap'
-import { polylineC, polylineVolumeP } from '@/components/Mars3D/utils/ArcGisWfsLayer'
+import { building, polylineC, polylineVolumeP } from '@/components/Mars3D/utils/ArcGisWfsLayer'
 import { createPointLayer, createPointModelLayer } from '@/components/Mars3D/utils/GeoJsonLayer'
-// import { Tetrahedron } from '@/components/Mars3D/utils/GraphicLayer'
+import { Tetrahedron } from '@/components/Mars3D/utils/GraphicLayer'
 
-const Cesium = require('../../../node_modules/mars3d-cesium/Build/Cesium/Cesium')
 let layer2021 = null
 let layer2020 = null
 // 设备
 const dev_layer = []
-const alarm_layer = null
+let alarm_layer = null
 const rqline_layer = []
 let rqwell_layer = null
 let rqbox_layer = null
@@ -71,9 +73,9 @@
       layerName: ['燃气阀门井', '燃气调压箱', '中燃燃气标识器', '圣井燃气标识器', '正和燃气标识器', '华润燃气标识器', '华气燃气标识器', '井盖状态监测仪', '管盯', '燃气智能监测终端', '燃气管线'],
       labelName: ['燃气管线', '燃气阀门井', '燃气调压箱', '中燃-圣井-正和-华润-华气标识器', '井盖状态监测仪', '管盯', '燃气智能监测终端'],
       index: ['8', '10', '7', '0', '9', '1', '5', '6'],
-      basemap: 1113,
+      basemap: 1112,
       baseLayer: 'gaode_vec', // 底图图层
-      layers: [{ id: 'well', name: '井图层', children: [] }, { id: 'line', name: '管线图层', children: [] }, { id: 'dev', name: '设备图层', children: [] }], //, { id: 'alarm', name: '报警图层' }], // 图层列表
+      layers: [{ id: 'well', name: '井图层', children: [] }, { id: 'line', name: '管线图层', children: [] }, { id: 'dev', name: '设备图层', children: [] }, { id: 'alarm', name: '报警图层' }], // 图层列表
       checkedLayer: [], // 选中的图层
       center: ['', ''], // 地图中心
       // center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
@@ -129,7 +131,7 @@
       //   layer.alpha = val / 100 // 我们可以设置为0
       // })
       window.map.basemap.opacity = val / 100
-      underground.alpha = val / 100
+      window.map.getLayer('building', 'name').show = val / 100 > 0.5
       if (window.map.level >= 19 && this.alpha < 90) {
         // 展示该展示的
         rqwell_layer['3D'].show = this.checkedLayer.indexOf('well-燃气阀门井') !== -1
@@ -236,9 +238,21 @@
     // 初始化放这里
     onMapload(map, center) {
       window.map = map
+
+      const handler = new Cesium.ScreenSpaceEventHandler(map.viewer.canvas)
+      handler.setInputAction(function(evt) {
+        var cartesian = map.viewer.camera.pickEllipsoid(evt.position, map.viewer.scene.globe.ellipsoid)
+        var cartographic = Cesium.Cartographic.fromCartesian(cartesian)
+        var lng = Cesium.Math.toDegrees(cartographic.longitude)// 经度值
+        var lat = Cesium.Math.toDegrees(cartographic.latitude)// 纬度值
+        console.log(' {point: [' + lng + ',' + lat + ',0]},')
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
+
       this.center = center
       underground = new mars3d.thing.Underground({ alpha: this.alpha / 100 })
       window.map.addThing(underground)
+      alarm_layer = new mars3d.layer.GraphicLayer({ name: '报警图层' })
+      window.map.addLayer(alarm_layer)
       // 崩溃后刷新
       const that = this
       window.map.on(mars3d.EventType.load, function(event) {
@@ -246,6 +260,7 @@
         that.initPoint()
         window.map.on(mars3d.EventType.cameraChanged, that.cameraChange, that)
       })
+      this.mapLoading = false
     },
     async initLine() {
       // 三维管线
@@ -270,10 +285,10 @@
       }
       const rq = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 附属物名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'"
       const bsq = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 对象名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'"
-      rqwell_layer = createPointModelLayer('3', '燃气阀门井', '../static/images/燃气附属物.png', '../static/model/ys.gltf', 1.5, rq)
-      rqbox_layer = createPointModelLayer('4', '燃气调压箱', '../static/images/燃气附属物.png', '../static/model/tyx.glb', 0.1, rq)
+      rqwell_layer = createPointModelLayer('3', '燃气阀门井', '../static/images/燃气阀门井.png', '../static/model/ys.gltf', 1.5, rq)
+      rqbox_layer = createPointModelLayer('4', '燃气调压箱', '../static/images/燃气调压箱.png', '../static/model/tyx.glb', 0.1, rq)
       for (let i = 2; i < 10; i++) {
-        dev_layer.push(createPointLayer(this.layerName[i], this.index[i - 2], i <= 6 ? '../static/images/标识器.png' : '../static/images/dev.png', bsq))
+        dev_layer.push(createPointLayer(this.layerName[i], this.index[i - 2], i <= 6 ? '../static/images/标识器.png' : '../static/images/' + this.layerName[i] + '.png', bsq))
       }
       const that = this
       rqwell_layer['2D'].on(mars3d.EventType.load, function(event) {
@@ -333,7 +348,7 @@
       dev_layer.forEach(layer => { layer.show = devTypes.indexOf(layer.options.name) > -1 })
 
       // // 3.选中or没选中报警图层
-      // checkedLayer.indexOf('alarm') !== -1 ? alarm_layer.show = true : alarm_layer.show = false
+      checkedLayer.indexOf('alarm') !== -1 ? alarm_layer.show = true : alarm_layer.show = false
     },
     // 切换底图
     // changeBaseMap(type) {
@@ -497,6 +512,7 @@
       if (this.showAlarm && this.checkedLayer.indexOf('alarm') == -1) {
         this.checkedLayer.push('alarm')
       }
+      alarm_layer.closePopup().clear()
       this.alarmWells.forEach(item => {
         const point = rqwell_layer['2D'].graphics.filter(rq => {
           return rq.options.id === item.wellCode
@@ -567,6 +583,7 @@
               attr['报警内容'] = item.alarmContent
               attr['报警数值'] = item.alarmValue
               attr['报警时间'] = item.alarmTime
+              Tetrahedron(alarm_layer, point.options.position, attr)
               point.setStyle({
                 image: '../static/images/alarm.png',
                 scale: 0.8,
@@ -590,7 +607,6 @@
               }
               str += `</div>`
               point.bindPopup(str)
-              // alarm_layer.addGraphic(point)
               // this.initAlarmPoint(point, item)
             }
           })