diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
diff --git a/src/views/maps/needTopic.vue b/src/views/maps/needTopic.vue
index d5dd71f..03e593d 100644
--- a/src/views/maps/needTopic.vue
+++ b/src/views/maps/needTopic.vue
@@ -130,7 +130,7 @@
         this.boardData.png = item.pngNeed.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
diff --git a/src/views/maps/needTopic.vue b/src/views/maps/needTopic.vue
index d5dd71f..03e593d 100644
--- a/src/views/maps/needTopic.vue
+++ b/src/views/maps/needTopic.vue
@@ -130,7 +130,7 @@
         this.boardData.png = item.pngNeed.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue
index 80e39ce..4d8180c 100644
--- a/src/views/maps/routeTopic.vue
+++ b/src/views/maps/routeTopic.vue
@@ -7,7 +7,7 @@
   <layout-map>
     <select-route @change="selectChange"/>
     <!--统计结果显示-->
-    <div v-show="boarData.value!=null" class="label-div">
+    <div v-show="boardData.value!=null" class="label-div">
       <div class="label">
         {{ boardData.name }}
       </div>
@@ -142,6 +142,7 @@
           '<br/>电话：' + route['phone'] +
           '<br/>岗位：' + route['duty'] +
           '<br/>站名：' + route['unitname'] +
+          '<br/>所属管理处：' + route['depname'] +
           '<br/>时间：' + route.locationdate + '</div>'
         return html
       })
@@ -159,6 +160,7 @@
               sex: item['WD60_09'],
               phone: item['WD60_10'],
               idcard: item['WD60_12'],
+              depname: item['WD60_13'],
               unitname: item['WD60_08']
             }
           })

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
diff --git a/src/views/maps/needTopic.vue b/src/views/maps/needTopic.vue
index d5dd71f..03e593d 100644
--- a/src/views/maps/needTopic.vue
+++ b/src/views/maps/needTopic.vue
@@ -130,7 +130,7 @@
         this.boardData.png = item.pngNeed.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue
index 80e39ce..4d8180c 100644
--- a/src/views/maps/routeTopic.vue
+++ b/src/views/maps/routeTopic.vue
@@ -7,7 +7,7 @@
   <layout-map>
     <select-route @change="selectChange"/>
     <!--统计结果显示-->
-    <div v-show="boarData.value!=null" class="label-div">
+    <div v-show="boardData.value!=null" class="label-div">
       <div class="label">
         {{ boardData.name }}
       </div>
@@ -142,6 +142,7 @@
           '<br/>电话：' + route['phone'] +
           '<br/>岗位：' + route['duty'] +
           '<br/>站名：' + route['unitname'] +
+          '<br/>所属管理处：' + route['depname'] +
           '<br/>时间：' + route.locationdate + '</div>'
         return html
       })
@@ -159,6 +160,7 @@
               sex: item['WD60_09'],
               phone: item['WD60_10'],
               idcard: item['WD60_12'],
+              depname: item['WD60_13'],
               unitname: item['WD60_08']
             }
           })
diff --git a/src/views/maps/supplyTopic.vue b/src/views/maps/supplyTopic.vue
index 9b3c833..72a0091 100644
--- a/src/views/maps/supplyTopic.vue
+++ b/src/views/maps/supplyTopic.vue
@@ -53,7 +53,6 @@
 import SelectButton from '@/components/SelectTool/components/selectButton'
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply, getUserSupply } from '@/api/needSupply'
-import { getHighConsequence } from '@/api/hca'
 
 import { getToday } from '@/utils/dateutils'
 import { getIndex } from '@/utils/mathUtils'
@@ -142,7 +141,7 @@
         this.boardData.png = item.pngSupply.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
diff --git a/src/views/maps/needTopic.vue b/src/views/maps/needTopic.vue
index d5dd71f..03e593d 100644
--- a/src/views/maps/needTopic.vue
+++ b/src/views/maps/needTopic.vue
@@ -130,7 +130,7 @@
         this.boardData.png = item.pngNeed.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue
index 80e39ce..4d8180c 100644
--- a/src/views/maps/routeTopic.vue
+++ b/src/views/maps/routeTopic.vue
@@ -7,7 +7,7 @@
   <layout-map>
     <select-route @change="selectChange"/>
     <!--统计结果显示-->
-    <div v-show="boarData.value!=null" class="label-div">
+    <div v-show="boardData.value!=null" class="label-div">
       <div class="label">
         {{ boardData.name }}
       </div>
@@ -142,6 +142,7 @@
           '<br/>电话：' + route['phone'] +
           '<br/>岗位：' + route['duty'] +
           '<br/>站名：' + route['unitname'] +
+          '<br/>所属管理处：' + route['depname'] +
           '<br/>时间：' + route.locationdate + '</div>'
         return html
       })
@@ -159,6 +160,7 @@
               sex: item['WD60_09'],
               phone: item['WD60_10'],
               idcard: item['WD60_12'],
+              depname: item['WD60_13'],
               unitname: item['WD60_08']
             }
           })
diff --git a/src/views/maps/supplyTopic.vue b/src/views/maps/supplyTopic.vue
index 9b3c833..72a0091 100644
--- a/src/views/maps/supplyTopic.vue
+++ b/src/views/maps/supplyTopic.vue
@@ -53,7 +53,6 @@
 import SelectButton from '@/components/SelectTool/components/selectButton'
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply, getUserSupply } from '@/api/needSupply'
-import { getHighConsequence } from '@/api/hca'
 
 import { getToday } from '@/utils/dateutils'
 import { getIndex } from '@/utils/mathUtils'
@@ -142,7 +141,7 @@
         this.boardData.png = item.pngSupply.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/waterThreat2.vue b/src/views/maps/waterThreat2.vue
new file mode 100644
index 0000000..5536cc3
--- /dev/null
+++ b/src/views/maps/waterThreat2.vue
@@ -0,0 +1,414 @@
+<!--
+ * @Description: 水保隐患专题
+ * @Author: 王晓颖
+ * @Date: 2021-04-07
+ -->
+<template>
+  <layout-map>
+    <!--选择区-->
+    <!--<select-all-construction @change="selectChange" />-->
+    <!--&lt;!&ndash;统计结果显示&ndash;&gt;-->
+    <!--<div class="label-div">-->
+    <!--<div class="label">-->
+    <!--{{ boardData.name | boardNameFilter }}-->
+    <!--</div>-->
+    <!--<div class="value">-->
+    <!--{{ boardData.value }}-->
+    <!--</div>-->
+    <!--</div>-->
+
+    <!--地图-->
+    <Map :url="configUrl" @onload="onMapload" />
+    <div class="map-btn-group">
+      <!--<select-button :select="heatShow" name="热力图" icon="icon-heat" @click="showHeat(heatShow)"/>-->
+      <select-button :select="positionShow" name="点位分布" icon="icon-position" @click="showPosition(positionShow)"/>
+      <select-button :select="stationShow" name="管理处" icon="icon-station" @click="showStation(stationShow)"/>
+    </div>
+  </layout-map>
+</template>
+
+<script>
+import Map from '@/components/Map/MarsMap.vue'
+import 'mars3d-heatmap'
+import axios from 'axios'
+import SelectAllConstruction from './components/selectAllConstruction'
+import SelectButton from '@/components/SelectTool/components/selectButton'
+import { getTimes } from '@/utils/dateutils'
+import LayoutMap from '@/layout/layoutMap'
+import { getWaterThreat } from '@/api/threat'
+export default {
+  name: 'WaterThreat',
+  components: {
+    LayoutMap,
+    SelectAllConstruction,
+    Map,
+    SelectButton
+  },
+  filters: {
+    boardNameFilter(val) {
+      if (val === '全部' || val === '') {
+        return '全省水保隐患'
+      } else {
+        return val + '区域水保隐患'
+      }
+    }
+  },
+  data() {
+    return {
+      map: null, // 地图
+      configUrl: 'static/config/config.json',
+      alpha: 100, // 透明度
+      underground: null, // ？
+      heatShow: false, // 显示热力图
+      stationShow: true, // 显示管理处
+      positionShow: true, // 显示位置
+      boardData: {
+        name: '全部',
+        value: 196
+      }, // 统计版展示数据
+      threatLevel: {
+        '1': 'A级',
+        '2': 'B级',
+        '3': 'C级',
+        '4': '问题'
+      }, // 隐患等级
+      manageStations: [
+        { 'x': 112.73874, 'y': 37.693689, 'z': 0, 'name': '晋中管理处' },
+        { 'x': 111.121552, 'y': 37.5245, 'z': 0, 'name': '吕梁管理处' },
+        { 'x': 112.929902, 'y': 39.622888, 'z': 0, 'name': '同朔管理处' },
+        { 'x': 112.72496, 'y': 38.415485, 'z': 0, 'name': '忻州管理处' },
+        { 'x': 113.58249, 'y': 37.851892, 'z': 0, 'name': '阳泉管理处' },
+        { 'x': 110.980927, 'y': 35.010828, 'z': 0, 'name': '运城管理处' },
+        { 'x': 113.038394, 'y': 35.850111, 'z': 0, 'name': '长晋管理处' },
+        { 'x': 111.491467, 'y': 36.064572, 'z': 0, 'name': '临汾管理处' }
+      ],
+      threatAreaStation: [
+        { x: 112.73874, y: 37.693689, id: 0, name: '晋中管理处', count: 158 },
+        { x: 111.121552, y: 37.5245, id: 0, name: '吕梁管理处', count: 10 },
+        { x: 112.929902, y: 39.622888, id: 0, name: '同朔管理处', count: 44 },
+        { x: 112.72496, y: 38.415485, id: 0, name: '忻州管理处', count: 9 },
+        { x: 113.58249, y: 37.851892, id: 0, name: '阳泉管理处', count: 21 },
+        { x: 110.980927, y: 35.010828, id: 0, name: '运城管理处', count: 21 },
+        { x: 113.038394, y: 35.850111, id: 0, name: '长晋管理处', count: 11 },
+        { x: 111.491467, y: 36.064572, id: 0, name: '临汾管理处', count: 30 }
+      ],
+      threatArea: [], // 第三方隐患列表
+      stationLayer: null, // 管理站图层
+      heatLayer: null, // 水保隐患热力图
+      threatLayer: null, // 水保隐患分布图层
+      pointColorArr: ['#f33349', '#f79a2c', '#f2fa19', '#95e40c', '#1ffee6'],
+      graphicLayer: null // 管理站标签图层
+    }
+  },
+  methods: {
+    // 地图构造完成回调
+    onMapload(map) {
+      // 以下为演示代码
+      this.map = map
+      // 背景透明
+      this.map._viewer.scene.backgroundColor = new this.Cesium.Color(0.0, 0.0, 0.0, 0.0)
+      this.map._viewer.scene.globe.baseColor.alpha = 0
+      // this.addWaterHeat()
+      // 添加管理处
+      this.addStation()
+      this.addStationDiv()
+      // 添加水保隐患隐患点
+      this.addThreatPosition()
+    },
+    // 高后果区热力图
+    addWaterHeat() {
+      const { mars3d } = this
+      getWaterThreat().then((res) => {
+        let data = res.data.filter(item => item['DES02'] !== '无')
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        // 过滤掉经度为null的
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        const heatLayer = new mars3d.layer.HeatLayer({
+          positions: this.threatArea.map(item => {
+            return { lng: item['经度'], lat: item['纬度'], value: 1 }
+          }),
+          heatStyle: {
+            radius: 30, // 半径
+            blur: 1 // 模糊因子
+          },
+          // 以下为矩形矢量对象的样式参数
+          style: {
+            opacity: 0.8,
+            clampToGround: false,
+            height: 10000
+          },
+          redrawZoom: true,
+          flyTo: false
+        })
+        this.heatLayer = heatLayer
+        this.map.addLayer(heatLayer)
+      })
+    },
+    // 水保隐患位置
+    addThreatPosition() {
+      getWaterThreat().then((res) => {
+        let data = res.data
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        debugger
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        this.addFeatures(this.threatArea)
+      })
+    },
+    // 添加隐患点
+    addFeatures(arr) {
+      const { mars3d, Cesium, threatLevel } = this
+      // 创建DIV数据图层
+      var graphicLayer = new mars3d.layer.DivLayer()
+      this.threatLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      // 在layer上绑定监听事件
+      graphicLayer.on(mars3d.EventType.click, function(event) {
+        console.log('监听layer，单击了矢量对象', event)
+      })
+      graphicLayer.bindPopup(function(event) {
+        const item = event.graphic.attr
+        var html =
+          '位置描述：' +
+          item['位置描述'] +
+          '<br />村庄地址：' +
+          item['村庄地址'] +
+          '<br />发现人：' +
+          item['发现人'] +
+          '<br />隐患描述：' +
+          item['隐患描述'] +
+          '<br />创建时间：' +
+          item['创建时间'] +
+          '<br />隐患等级：' +
+          threatLevel[item['隐患等级']]
+        return html
+      })
+
+      for (var i = 0, len = arr.length; i < len; i++) {
+        const item = arr[i]
+        var jd = item['经度']
+        var wd = item['纬度']
+        const level = parseInt(item['隐患等级']) - 1
+        var clr = this.pointColorArr[level]
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(jd, wd, 0),
+          style: {
+            html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 2000000) // 按视距距离显示
+          },
+          attr: item
+        })
+        graphicLayer.addGraphic(graphic)
+      }
+    },
+    // 管理处
+    addStation() {
+      const { mars3d } = this
+      const stationLayer = new mars3d.layer.ModelLayer({
+        name: '管理处',
+        url: './static/gltf/output/guanlizhan.gltf',
+        // url: './static/gltf/house02.gltf',
+        style: {
+          scale: 10,
+          heading: 0,
+          minimumPixelSize: 30,
+          clampToGround: true
+        },
+        positions: this.manageStations.map(item => {
+          return { lng: item.x, lat: item.y, alt: 0 }
+        })
+      })
+      this.stationLayer = stationLayer
+      this.map.addLayer(stationLayer)
+    },
+    // 选框发生变化
+    selectChange({ area, state, time, level }) {
+      area = area === '全部' ? '' : area
+      time = time === '全部' ? '' : time
+      level = level === '全部' ? '' : level
+      // 解析时间
+      let beginTime = ''
+      let endTime = ''
+      if (time) {
+        const result = getTimes(time)
+        beginTime = result.beginDate
+        endTime = result.endDate
+      }
+      this.boardData.name = area
+      // 查询数据
+      let count = 0
+      debugger
+      for (const hca of this.threatArea) {
+        let flag = true // 标记是否合格
+        // 比较区域
+        if (area && hca['所属管理处'] && hca['所属管理处'].indexOf(area) === -1) {
+          flag = false
+        }
+        // 比较时间
+        if (time) {
+          const real_date = new Date(hca['识别时间'])
+          if (real_date && (real_date < beginTime || real_date > endTime)) {
+            flag = false
+          }
+        }
+        // 比较级别
+        if (level && hca['隐患等级'] && hca['隐患等级'] === level) {
+          flag = false
+        }
+        if (flag) {
+          count++
+        }
+      }
+      this.boardData.value = count
+    },
+    // 自定义的弹窗
+    addStationDiv() {
+      const { Cesium, mars3d } = this
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      this.graphicLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      for (const station of this.threatAreaStation) {
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(station.x, station.y, 10100),
+          style: {
+            html: `<div class="divpoint divpoint-theme-29baf1">
+                    <div class="divpoint-wrap">
+                        <div class="area">
+                            <div class="arrow-lt"></div>
+                            <div class="b-t"></div>
+                            <div class="b-r"></div>
+                            <div class="b-b"></div>
+                            <div class="b-l"></div>
+                            <div class="arrow-rb"></div>
+                            <div class="label-wrap">
+                                <div class="title">${station.name}</div>
+                                <div class="label-content">
+                                    <div class="data-li">
+                                        <div class="data-label">水保隐患数量：</div>
+                                        <div class="data-value"><span class="label-num">${station.count}</span><span class="label-unit">个</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">经度：</div>
+                                        <div class="data-value"><span class="label-num">${station.x}</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">纬度：</div>
+                                        <div class="data-value"><span class="label-num">${station.y}</span>
+                                        </div>
+                                    </div>
+                                    `,
+            // anchor: [0, 0],
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(10000, 500000), // 按视距距离显示
+            scaleByDistance: new Cesium.NearFarScalar(10000, 1.0, 500000, 0.1),
+            clampToGround: true,
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
+          },
+          pointerEvents: false // false时不允许拾取和触发任意鼠标事件，但可以穿透div缩放地球
+        })
+        graphicLayer.addGraphic(graphic)
+        graphic.testPoint = false // 打开测试点，与DIV点进行对比位置调整css
+      }
+    },
+    // 是否显示热力图
+    showHeat(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.heatShow = false
+        this.map.removeLayer(this.heatLayer, true)
+      } else {
+        this.heatShow = true
+        this.addWaterHeat()
+      }
+    },
+    // 显示管理处
+    showStation(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.stationShow = false
+        this.map.removeLayer(this.stationLayer, true)
+        this.map.removeLayer(this.graphicLayer, true)
+      } else {
+        this.stationShow = true
+        this.addStation()
+        this.addStationDiv()
+      }
+    },
+    // 显示隐患分布
+    showPosition(show) {
+      if (show) { // 移除
+        this.positionShow = false
+        this.map.removeLayer(this.threatLayer, true)
+      } else {
+        this.positionShow = true
+        this.addThreatPosition()
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .label-div{
+    position: absolute;
+    top: 140px;
+    left:31rem;
+    z-index:100;
+    color: white;
+    padding:2rem 3rem 1.5rem 3rem;
+    background-image: url("../../assets/button_images/board-box1.png");
+    background-size: 100% 100%;
+    .label{
+      margin-bottom: 1rem;
+      font-size:1.2rem;
+    }
+    .value{
+      font-family: DS-DigitalBold;
+      font-size:2.5rem;
+    }
+  }
+  .map-btn-group{
+    position: absolute;
+    bottom:3rem;
+    left:50%;
+    transform: translateX(-50%);
+    display: flex;
+    justify-content: center;
+  }
+</style>

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
diff --git a/src/views/maps/needTopic.vue b/src/views/maps/needTopic.vue
index d5dd71f..03e593d 100644
--- a/src/views/maps/needTopic.vue
+++ b/src/views/maps/needTopic.vue
@@ -130,7 +130,7 @@
         this.boardData.png = item.pngNeed.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue
index 80e39ce..4d8180c 100644
--- a/src/views/maps/routeTopic.vue
+++ b/src/views/maps/routeTopic.vue
@@ -7,7 +7,7 @@
   <layout-map>
     <select-route @change="selectChange"/>
     <!--统计结果显示-->
-    <div v-show="boarData.value!=null" class="label-div">
+    <div v-show="boardData.value!=null" class="label-div">
       <div class="label">
         {{ boardData.name }}
       </div>
@@ -142,6 +142,7 @@
           '<br/>电话：' + route['phone'] +
           '<br/>岗位：' + route['duty'] +
           '<br/>站名：' + route['unitname'] +
+          '<br/>所属管理处：' + route['depname'] +
           '<br/>时间：' + route.locationdate + '</div>'
         return html
       })
@@ -159,6 +160,7 @@
               sex: item['WD60_09'],
               phone: item['WD60_10'],
               idcard: item['WD60_12'],
+              depname: item['WD60_13'],
               unitname: item['WD60_08']
             }
           })
diff --git a/src/views/maps/supplyTopic.vue b/src/views/maps/supplyTopic.vue
index 9b3c833..72a0091 100644
--- a/src/views/maps/supplyTopic.vue
+++ b/src/views/maps/supplyTopic.vue
@@ -53,7 +53,6 @@
 import SelectButton from '@/components/SelectTool/components/selectButton'
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply, getUserSupply } from '@/api/needSupply'
-import { getHighConsequence } from '@/api/hca'
 
 import { getToday } from '@/utils/dateutils'
 import { getIndex } from '@/utils/mathUtils'
@@ -142,7 +141,7 @@
         this.boardData.png = item.pngSupply.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/waterThreat2.vue b/src/views/maps/waterThreat2.vue
new file mode 100644
index 0000000..5536cc3
--- /dev/null
+++ b/src/views/maps/waterThreat2.vue
@@ -0,0 +1,414 @@
+<!--
+ * @Description: 水保隐患专题
+ * @Author: 王晓颖
+ * @Date: 2021-04-07
+ -->
+<template>
+  <layout-map>
+    <!--选择区-->
+    <!--<select-all-construction @change="selectChange" />-->
+    <!--&lt;!&ndash;统计结果显示&ndash;&gt;-->
+    <!--<div class="label-div">-->
+    <!--<div class="label">-->
+    <!--{{ boardData.name | boardNameFilter }}-->
+    <!--</div>-->
+    <!--<div class="value">-->
+    <!--{{ boardData.value }}-->
+    <!--</div>-->
+    <!--</div>-->
+
+    <!--地图-->
+    <Map :url="configUrl" @onload="onMapload" />
+    <div class="map-btn-group">
+      <!--<select-button :select="heatShow" name="热力图" icon="icon-heat" @click="showHeat(heatShow)"/>-->
+      <select-button :select="positionShow" name="点位分布" icon="icon-position" @click="showPosition(positionShow)"/>
+      <select-button :select="stationShow" name="管理处" icon="icon-station" @click="showStation(stationShow)"/>
+    </div>
+  </layout-map>
+</template>
+
+<script>
+import Map from '@/components/Map/MarsMap.vue'
+import 'mars3d-heatmap'
+import axios from 'axios'
+import SelectAllConstruction from './components/selectAllConstruction'
+import SelectButton from '@/components/SelectTool/components/selectButton'
+import { getTimes } from '@/utils/dateutils'
+import LayoutMap from '@/layout/layoutMap'
+import { getWaterThreat } from '@/api/threat'
+export default {
+  name: 'WaterThreat',
+  components: {
+    LayoutMap,
+    SelectAllConstruction,
+    Map,
+    SelectButton
+  },
+  filters: {
+    boardNameFilter(val) {
+      if (val === '全部' || val === '') {
+        return '全省水保隐患'
+      } else {
+        return val + '区域水保隐患'
+      }
+    }
+  },
+  data() {
+    return {
+      map: null, // 地图
+      configUrl: 'static/config/config.json',
+      alpha: 100, // 透明度
+      underground: null, // ？
+      heatShow: false, // 显示热力图
+      stationShow: true, // 显示管理处
+      positionShow: true, // 显示位置
+      boardData: {
+        name: '全部',
+        value: 196
+      }, // 统计版展示数据
+      threatLevel: {
+        '1': 'A级',
+        '2': 'B级',
+        '3': 'C级',
+        '4': '问题'
+      }, // 隐患等级
+      manageStations: [
+        { 'x': 112.73874, 'y': 37.693689, 'z': 0, 'name': '晋中管理处' },
+        { 'x': 111.121552, 'y': 37.5245, 'z': 0, 'name': '吕梁管理处' },
+        { 'x': 112.929902, 'y': 39.622888, 'z': 0, 'name': '同朔管理处' },
+        { 'x': 112.72496, 'y': 38.415485, 'z': 0, 'name': '忻州管理处' },
+        { 'x': 113.58249, 'y': 37.851892, 'z': 0, 'name': '阳泉管理处' },
+        { 'x': 110.980927, 'y': 35.010828, 'z': 0, 'name': '运城管理处' },
+        { 'x': 113.038394, 'y': 35.850111, 'z': 0, 'name': '长晋管理处' },
+        { 'x': 111.491467, 'y': 36.064572, 'z': 0, 'name': '临汾管理处' }
+      ],
+      threatAreaStation: [
+        { x: 112.73874, y: 37.693689, id: 0, name: '晋中管理处', count: 158 },
+        { x: 111.121552, y: 37.5245, id: 0, name: '吕梁管理处', count: 10 },
+        { x: 112.929902, y: 39.622888, id: 0, name: '同朔管理处', count: 44 },
+        { x: 112.72496, y: 38.415485, id: 0, name: '忻州管理处', count: 9 },
+        { x: 113.58249, y: 37.851892, id: 0, name: '阳泉管理处', count: 21 },
+        { x: 110.980927, y: 35.010828, id: 0, name: '运城管理处', count: 21 },
+        { x: 113.038394, y: 35.850111, id: 0, name: '长晋管理处', count: 11 },
+        { x: 111.491467, y: 36.064572, id: 0, name: '临汾管理处', count: 30 }
+      ],
+      threatArea: [], // 第三方隐患列表
+      stationLayer: null, // 管理站图层
+      heatLayer: null, // 水保隐患热力图
+      threatLayer: null, // 水保隐患分布图层
+      pointColorArr: ['#f33349', '#f79a2c', '#f2fa19', '#95e40c', '#1ffee6'],
+      graphicLayer: null // 管理站标签图层
+    }
+  },
+  methods: {
+    // 地图构造完成回调
+    onMapload(map) {
+      // 以下为演示代码
+      this.map = map
+      // 背景透明
+      this.map._viewer.scene.backgroundColor = new this.Cesium.Color(0.0, 0.0, 0.0, 0.0)
+      this.map._viewer.scene.globe.baseColor.alpha = 0
+      // this.addWaterHeat()
+      // 添加管理处
+      this.addStation()
+      this.addStationDiv()
+      // 添加水保隐患隐患点
+      this.addThreatPosition()
+    },
+    // 高后果区热力图
+    addWaterHeat() {
+      const { mars3d } = this
+      getWaterThreat().then((res) => {
+        let data = res.data.filter(item => item['DES02'] !== '无')
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        // 过滤掉经度为null的
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        const heatLayer = new mars3d.layer.HeatLayer({
+          positions: this.threatArea.map(item => {
+            return { lng: item['经度'], lat: item['纬度'], value: 1 }
+          }),
+          heatStyle: {
+            radius: 30, // 半径
+            blur: 1 // 模糊因子
+          },
+          // 以下为矩形矢量对象的样式参数
+          style: {
+            opacity: 0.8,
+            clampToGround: false,
+            height: 10000
+          },
+          redrawZoom: true,
+          flyTo: false
+        })
+        this.heatLayer = heatLayer
+        this.map.addLayer(heatLayer)
+      })
+    },
+    // 水保隐患位置
+    addThreatPosition() {
+      getWaterThreat().then((res) => {
+        let data = res.data
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        debugger
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        this.addFeatures(this.threatArea)
+      })
+    },
+    // 添加隐患点
+    addFeatures(arr) {
+      const { mars3d, Cesium, threatLevel } = this
+      // 创建DIV数据图层
+      var graphicLayer = new mars3d.layer.DivLayer()
+      this.threatLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      // 在layer上绑定监听事件
+      graphicLayer.on(mars3d.EventType.click, function(event) {
+        console.log('监听layer，单击了矢量对象', event)
+      })
+      graphicLayer.bindPopup(function(event) {
+        const item = event.graphic.attr
+        var html =
+          '位置描述：' +
+          item['位置描述'] +
+          '<br />村庄地址：' +
+          item['村庄地址'] +
+          '<br />发现人：' +
+          item['发现人'] +
+          '<br />隐患描述：' +
+          item['隐患描述'] +
+          '<br />创建时间：' +
+          item['创建时间'] +
+          '<br />隐患等级：' +
+          threatLevel[item['隐患等级']]
+        return html
+      })
+
+      for (var i = 0, len = arr.length; i < len; i++) {
+        const item = arr[i]
+        var jd = item['经度']
+        var wd = item['纬度']
+        const level = parseInt(item['隐患等级']) - 1
+        var clr = this.pointColorArr[level]
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(jd, wd, 0),
+          style: {
+            html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 2000000) // 按视距距离显示
+          },
+          attr: item
+        })
+        graphicLayer.addGraphic(graphic)
+      }
+    },
+    // 管理处
+    addStation() {
+      const { mars3d } = this
+      const stationLayer = new mars3d.layer.ModelLayer({
+        name: '管理处',
+        url: './static/gltf/output/guanlizhan.gltf',
+        // url: './static/gltf/house02.gltf',
+        style: {
+          scale: 10,
+          heading: 0,
+          minimumPixelSize: 30,
+          clampToGround: true
+        },
+        positions: this.manageStations.map(item => {
+          return { lng: item.x, lat: item.y, alt: 0 }
+        })
+      })
+      this.stationLayer = stationLayer
+      this.map.addLayer(stationLayer)
+    },
+    // 选框发生变化
+    selectChange({ area, state, time, level }) {
+      area = area === '全部' ? '' : area
+      time = time === '全部' ? '' : time
+      level = level === '全部' ? '' : level
+      // 解析时间
+      let beginTime = ''
+      let endTime = ''
+      if (time) {
+        const result = getTimes(time)
+        beginTime = result.beginDate
+        endTime = result.endDate
+      }
+      this.boardData.name = area
+      // 查询数据
+      let count = 0
+      debugger
+      for (const hca of this.threatArea) {
+        let flag = true // 标记是否合格
+        // 比较区域
+        if (area && hca['所属管理处'] && hca['所属管理处'].indexOf(area) === -1) {
+          flag = false
+        }
+        // 比较时间
+        if (time) {
+          const real_date = new Date(hca['识别时间'])
+          if (real_date && (real_date < beginTime || real_date > endTime)) {
+            flag = false
+          }
+        }
+        // 比较级别
+        if (level && hca['隐患等级'] && hca['隐患等级'] === level) {
+          flag = false
+        }
+        if (flag) {
+          count++
+        }
+      }
+      this.boardData.value = count
+    },
+    // 自定义的弹窗
+    addStationDiv() {
+      const { Cesium, mars3d } = this
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      this.graphicLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      for (const station of this.threatAreaStation) {
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(station.x, station.y, 10100),
+          style: {
+            html: `<div class="divpoint divpoint-theme-29baf1">
+                    <div class="divpoint-wrap">
+                        <div class="area">
+                            <div class="arrow-lt"></div>
+                            <div class="b-t"></div>
+                            <div class="b-r"></div>
+                            <div class="b-b"></div>
+                            <div class="b-l"></div>
+                            <div class="arrow-rb"></div>
+                            <div class="label-wrap">
+                                <div class="title">${station.name}</div>
+                                <div class="label-content">
+                                    <div class="data-li">
+                                        <div class="data-label">水保隐患数量：</div>
+                                        <div class="data-value"><span class="label-num">${station.count}</span><span class="label-unit">个</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">经度：</div>
+                                        <div class="data-value"><span class="label-num">${station.x}</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">纬度：</div>
+                                        <div class="data-value"><span class="label-num">${station.y}</span>
+                                        </div>
+                                    </div>
+                                    `,
+            // anchor: [0, 0],
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(10000, 500000), // 按视距距离显示
+            scaleByDistance: new Cesium.NearFarScalar(10000, 1.0, 500000, 0.1),
+            clampToGround: true,
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
+          },
+          pointerEvents: false // false时不允许拾取和触发任意鼠标事件，但可以穿透div缩放地球
+        })
+        graphicLayer.addGraphic(graphic)
+        graphic.testPoint = false // 打开测试点，与DIV点进行对比位置调整css
+      }
+    },
+    // 是否显示热力图
+    showHeat(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.heatShow = false
+        this.map.removeLayer(this.heatLayer, true)
+      } else {
+        this.heatShow = true
+        this.addWaterHeat()
+      }
+    },
+    // 显示管理处
+    showStation(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.stationShow = false
+        this.map.removeLayer(this.stationLayer, true)
+        this.map.removeLayer(this.graphicLayer, true)
+      } else {
+        this.stationShow = true
+        this.addStation()
+        this.addStationDiv()
+      }
+    },
+    // 显示隐患分布
+    showPosition(show) {
+      if (show) { // 移除
+        this.positionShow = false
+        this.map.removeLayer(this.threatLayer, true)
+      } else {
+        this.positionShow = true
+        this.addThreatPosition()
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .label-div{
+    position: absolute;
+    top: 140px;
+    left:31rem;
+    z-index:100;
+    color: white;
+    padding:2rem 3rem 1.5rem 3rem;
+    background-image: url("../../assets/button_images/board-box1.png");
+    background-size: 100% 100%;
+    .label{
+      margin-bottom: 1rem;
+      font-size:1.2rem;
+    }
+    .value{
+      font-family: DS-DigitalBold;
+      font-size:2.5rem;
+    }
+  }
+  .map-btn-group{
+    position: absolute;
+    bottom:3rem;
+    left:50%;
+    transform: translateX(-50%);
+    display: flex;
+    justify-content: center;
+  }
+</style>
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index ae36f07..9471a8b 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -194,7 +194,7 @@
                 image: img,
                 pixelOffsetX: 0,
                 pixelOffsetY: -20,
-                scale: 0.5,
+                scale: 0.6,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM
               }

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
diff --git a/src/views/maps/needTopic.vue b/src/views/maps/needTopic.vue
index d5dd71f..03e593d 100644
--- a/src/views/maps/needTopic.vue
+++ b/src/views/maps/needTopic.vue
@@ -130,7 +130,7 @@
         this.boardData.png = item.pngNeed.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue
index 80e39ce..4d8180c 100644
--- a/src/views/maps/routeTopic.vue
+++ b/src/views/maps/routeTopic.vue
@@ -7,7 +7,7 @@
   <layout-map>
     <select-route @change="selectChange"/>
     <!--统计结果显示-->
-    <div v-show="boarData.value!=null" class="label-div">
+    <div v-show="boardData.value!=null" class="label-div">
       <div class="label">
         {{ boardData.name }}
       </div>
@@ -142,6 +142,7 @@
           '<br/>电话：' + route['phone'] +
           '<br/>岗位：' + route['duty'] +
           '<br/>站名：' + route['unitname'] +
+          '<br/>所属管理处：' + route['depname'] +
           '<br/>时间：' + route.locationdate + '</div>'
         return html
       })
@@ -159,6 +160,7 @@
               sex: item['WD60_09'],
               phone: item['WD60_10'],
               idcard: item['WD60_12'],
+              depname: item['WD60_13'],
               unitname: item['WD60_08']
             }
           })
diff --git a/src/views/maps/supplyTopic.vue b/src/views/maps/supplyTopic.vue
index 9b3c833..72a0091 100644
--- a/src/views/maps/supplyTopic.vue
+++ b/src/views/maps/supplyTopic.vue
@@ -53,7 +53,6 @@
 import SelectButton from '@/components/SelectTool/components/selectButton'
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply, getUserSupply } from '@/api/needSupply'
-import { getHighConsequence } from '@/api/hca'
 
 import { getToday } from '@/utils/dateutils'
 import { getIndex } from '@/utils/mathUtils'
@@ -142,7 +141,7 @@
         this.boardData.png = item.pngSupply.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/waterThreat2.vue b/src/views/maps/waterThreat2.vue
new file mode 100644
index 0000000..5536cc3
--- /dev/null
+++ b/src/views/maps/waterThreat2.vue
@@ -0,0 +1,414 @@
+<!--
+ * @Description: 水保隐患专题
+ * @Author: 王晓颖
+ * @Date: 2021-04-07
+ -->
+<template>
+  <layout-map>
+    <!--选择区-->
+    <!--<select-all-construction @change="selectChange" />-->
+    <!--&lt;!&ndash;统计结果显示&ndash;&gt;-->
+    <!--<div class="label-div">-->
+    <!--<div class="label">-->
+    <!--{{ boardData.name | boardNameFilter }}-->
+    <!--</div>-->
+    <!--<div class="value">-->
+    <!--{{ boardData.value }}-->
+    <!--</div>-->
+    <!--</div>-->
+
+    <!--地图-->
+    <Map :url="configUrl" @onload="onMapload" />
+    <div class="map-btn-group">
+      <!--<select-button :select="heatShow" name="热力图" icon="icon-heat" @click="showHeat(heatShow)"/>-->
+      <select-button :select="positionShow" name="点位分布" icon="icon-position" @click="showPosition(positionShow)"/>
+      <select-button :select="stationShow" name="管理处" icon="icon-station" @click="showStation(stationShow)"/>
+    </div>
+  </layout-map>
+</template>
+
+<script>
+import Map from '@/components/Map/MarsMap.vue'
+import 'mars3d-heatmap'
+import axios from 'axios'
+import SelectAllConstruction from './components/selectAllConstruction'
+import SelectButton from '@/components/SelectTool/components/selectButton'
+import { getTimes } from '@/utils/dateutils'
+import LayoutMap from '@/layout/layoutMap'
+import { getWaterThreat } from '@/api/threat'
+export default {
+  name: 'WaterThreat',
+  components: {
+    LayoutMap,
+    SelectAllConstruction,
+    Map,
+    SelectButton
+  },
+  filters: {
+    boardNameFilter(val) {
+      if (val === '全部' || val === '') {
+        return '全省水保隐患'
+      } else {
+        return val + '区域水保隐患'
+      }
+    }
+  },
+  data() {
+    return {
+      map: null, // 地图
+      configUrl: 'static/config/config.json',
+      alpha: 100, // 透明度
+      underground: null, // ？
+      heatShow: false, // 显示热力图
+      stationShow: true, // 显示管理处
+      positionShow: true, // 显示位置
+      boardData: {
+        name: '全部',
+        value: 196
+      }, // 统计版展示数据
+      threatLevel: {
+        '1': 'A级',
+        '2': 'B级',
+        '3': 'C级',
+        '4': '问题'
+      }, // 隐患等级
+      manageStations: [
+        { 'x': 112.73874, 'y': 37.693689, 'z': 0, 'name': '晋中管理处' },
+        { 'x': 111.121552, 'y': 37.5245, 'z': 0, 'name': '吕梁管理处' },
+        { 'x': 112.929902, 'y': 39.622888, 'z': 0, 'name': '同朔管理处' },
+        { 'x': 112.72496, 'y': 38.415485, 'z': 0, 'name': '忻州管理处' },
+        { 'x': 113.58249, 'y': 37.851892, 'z': 0, 'name': '阳泉管理处' },
+        { 'x': 110.980927, 'y': 35.010828, 'z': 0, 'name': '运城管理处' },
+        { 'x': 113.038394, 'y': 35.850111, 'z': 0, 'name': '长晋管理处' },
+        { 'x': 111.491467, 'y': 36.064572, 'z': 0, 'name': '临汾管理处' }
+      ],
+      threatAreaStation: [
+        { x: 112.73874, y: 37.693689, id: 0, name: '晋中管理处', count: 158 },
+        { x: 111.121552, y: 37.5245, id: 0, name: '吕梁管理处', count: 10 },
+        { x: 112.929902, y: 39.622888, id: 0, name: '同朔管理处', count: 44 },
+        { x: 112.72496, y: 38.415485, id: 0, name: '忻州管理处', count: 9 },
+        { x: 113.58249, y: 37.851892, id: 0, name: '阳泉管理处', count: 21 },
+        { x: 110.980927, y: 35.010828, id: 0, name: '运城管理处', count: 21 },
+        { x: 113.038394, y: 35.850111, id: 0, name: '长晋管理处', count: 11 },
+        { x: 111.491467, y: 36.064572, id: 0, name: '临汾管理处', count: 30 }
+      ],
+      threatArea: [], // 第三方隐患列表
+      stationLayer: null, // 管理站图层
+      heatLayer: null, // 水保隐患热力图
+      threatLayer: null, // 水保隐患分布图层
+      pointColorArr: ['#f33349', '#f79a2c', '#f2fa19', '#95e40c', '#1ffee6'],
+      graphicLayer: null // 管理站标签图层
+    }
+  },
+  methods: {
+    // 地图构造完成回调
+    onMapload(map) {
+      // 以下为演示代码
+      this.map = map
+      // 背景透明
+      this.map._viewer.scene.backgroundColor = new this.Cesium.Color(0.0, 0.0, 0.0, 0.0)
+      this.map._viewer.scene.globe.baseColor.alpha = 0
+      // this.addWaterHeat()
+      // 添加管理处
+      this.addStation()
+      this.addStationDiv()
+      // 添加水保隐患隐患点
+      this.addThreatPosition()
+    },
+    // 高后果区热力图
+    addWaterHeat() {
+      const { mars3d } = this
+      getWaterThreat().then((res) => {
+        let data = res.data.filter(item => item['DES02'] !== '无')
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        // 过滤掉经度为null的
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        const heatLayer = new mars3d.layer.HeatLayer({
+          positions: this.threatArea.map(item => {
+            return { lng: item['经度'], lat: item['纬度'], value: 1 }
+          }),
+          heatStyle: {
+            radius: 30, // 半径
+            blur: 1 // 模糊因子
+          },
+          // 以下为矩形矢量对象的样式参数
+          style: {
+            opacity: 0.8,
+            clampToGround: false,
+            height: 10000
+          },
+          redrawZoom: true,
+          flyTo: false
+        })
+        this.heatLayer = heatLayer
+        this.map.addLayer(heatLayer)
+      })
+    },
+    // 水保隐患位置
+    addThreatPosition() {
+      getWaterThreat().then((res) => {
+        let data = res.data
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        debugger
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        this.addFeatures(this.threatArea)
+      })
+    },
+    // 添加隐患点
+    addFeatures(arr) {
+      const { mars3d, Cesium, threatLevel } = this
+      // 创建DIV数据图层
+      var graphicLayer = new mars3d.layer.DivLayer()
+      this.threatLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      // 在layer上绑定监听事件
+      graphicLayer.on(mars3d.EventType.click, function(event) {
+        console.log('监听layer，单击了矢量对象', event)
+      })
+      graphicLayer.bindPopup(function(event) {
+        const item = event.graphic.attr
+        var html =
+          '位置描述：' +
+          item['位置描述'] +
+          '<br />村庄地址：' +
+          item['村庄地址'] +
+          '<br />发现人：' +
+          item['发现人'] +
+          '<br />隐患描述：' +
+          item['隐患描述'] +
+          '<br />创建时间：' +
+          item['创建时间'] +
+          '<br />隐患等级：' +
+          threatLevel[item['隐患等级']]
+        return html
+      })
+
+      for (var i = 0, len = arr.length; i < len; i++) {
+        const item = arr[i]
+        var jd = item['经度']
+        var wd = item['纬度']
+        const level = parseInt(item['隐患等级']) - 1
+        var clr = this.pointColorArr[level]
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(jd, wd, 0),
+          style: {
+            html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 2000000) // 按视距距离显示
+          },
+          attr: item
+        })
+        graphicLayer.addGraphic(graphic)
+      }
+    },
+    // 管理处
+    addStation() {
+      const { mars3d } = this
+      const stationLayer = new mars3d.layer.ModelLayer({
+        name: '管理处',
+        url: './static/gltf/output/guanlizhan.gltf',
+        // url: './static/gltf/house02.gltf',
+        style: {
+          scale: 10,
+          heading: 0,
+          minimumPixelSize: 30,
+          clampToGround: true
+        },
+        positions: this.manageStations.map(item => {
+          return { lng: item.x, lat: item.y, alt: 0 }
+        })
+      })
+      this.stationLayer = stationLayer
+      this.map.addLayer(stationLayer)
+    },
+    // 选框发生变化
+    selectChange({ area, state, time, level }) {
+      area = area === '全部' ? '' : area
+      time = time === '全部' ? '' : time
+      level = level === '全部' ? '' : level
+      // 解析时间
+      let beginTime = ''
+      let endTime = ''
+      if (time) {
+        const result = getTimes(time)
+        beginTime = result.beginDate
+        endTime = result.endDate
+      }
+      this.boardData.name = area
+      // 查询数据
+      let count = 0
+      debugger
+      for (const hca of this.threatArea) {
+        let flag = true // 标记是否合格
+        // 比较区域
+        if (area && hca['所属管理处'] && hca['所属管理处'].indexOf(area) === -1) {
+          flag = false
+        }
+        // 比较时间
+        if (time) {
+          const real_date = new Date(hca['识别时间'])
+          if (real_date && (real_date < beginTime || real_date > endTime)) {
+            flag = false
+          }
+        }
+        // 比较级别
+        if (level && hca['隐患等级'] && hca['隐患等级'] === level) {
+          flag = false
+        }
+        if (flag) {
+          count++
+        }
+      }
+      this.boardData.value = count
+    },
+    // 自定义的弹窗
+    addStationDiv() {
+      const { Cesium, mars3d } = this
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      this.graphicLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      for (const station of this.threatAreaStation) {
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(station.x, station.y, 10100),
+          style: {
+            html: `<div class="divpoint divpoint-theme-29baf1">
+                    <div class="divpoint-wrap">
+                        <div class="area">
+                            <div class="arrow-lt"></div>
+                            <div class="b-t"></div>
+                            <div class="b-r"></div>
+                            <div class="b-b"></div>
+                            <div class="b-l"></div>
+                            <div class="arrow-rb"></div>
+                            <div class="label-wrap">
+                                <div class="title">${station.name}</div>
+                                <div class="label-content">
+                                    <div class="data-li">
+                                        <div class="data-label">水保隐患数量：</div>
+                                        <div class="data-value"><span class="label-num">${station.count}</span><span class="label-unit">个</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">经度：</div>
+                                        <div class="data-value"><span class="label-num">${station.x}</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">纬度：</div>
+                                        <div class="data-value"><span class="label-num">${station.y}</span>
+                                        </div>
+                                    </div>
+                                    `,
+            // anchor: [0, 0],
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(10000, 500000), // 按视距距离显示
+            scaleByDistance: new Cesium.NearFarScalar(10000, 1.0, 500000, 0.1),
+            clampToGround: true,
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
+          },
+          pointerEvents: false // false时不允许拾取和触发任意鼠标事件，但可以穿透div缩放地球
+        })
+        graphicLayer.addGraphic(graphic)
+        graphic.testPoint = false // 打开测试点，与DIV点进行对比位置调整css
+      }
+    },
+    // 是否显示热力图
+    showHeat(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.heatShow = false
+        this.map.removeLayer(this.heatLayer, true)
+      } else {
+        this.heatShow = true
+        this.addWaterHeat()
+      }
+    },
+    // 显示管理处
+    showStation(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.stationShow = false
+        this.map.removeLayer(this.stationLayer, true)
+        this.map.removeLayer(this.graphicLayer, true)
+      } else {
+        this.stationShow = true
+        this.addStation()
+        this.addStationDiv()
+      }
+    },
+    // 显示隐患分布
+    showPosition(show) {
+      if (show) { // 移除
+        this.positionShow = false
+        this.map.removeLayer(this.threatLayer, true)
+      } else {
+        this.positionShow = true
+        this.addThreatPosition()
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .label-div{
+    position: absolute;
+    top: 140px;
+    left:31rem;
+    z-index:100;
+    color: white;
+    padding:2rem 3rem 1.5rem 3rem;
+    background-image: url("../../assets/button_images/board-box1.png");
+    background-size: 100% 100%;
+    .label{
+      margin-bottom: 1rem;
+      font-size:1.2rem;
+    }
+    .value{
+      font-family: DS-DigitalBold;
+      font-size:2.5rem;
+    }
+  }
+  .map-btn-group{
+    position: absolute;
+    bottom:3rem;
+    left:50%;
+    transform: translateX(-50%);
+    display: flex;
+    justify-content: center;
+  }
+</style>
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index ae36f07..9471a8b 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -194,7 +194,7 @@
                 image: img,
                 pixelOffsetX: 0,
                 pixelOffsetY: -20,
-                scale: 0.5,
+                scale: 0.6,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM
               }
diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png
index 182631b..9b74331 100644
--- a/static/images/map/weather/weather-dayu.png
+++ b/static/images/map/weather/weather-dayu.png
Binary files differ

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
diff --git a/src/views/maps/needTopic.vue b/src/views/maps/needTopic.vue
index d5dd71f..03e593d 100644
--- a/src/views/maps/needTopic.vue
+++ b/src/views/maps/needTopic.vue
@@ -130,7 +130,7 @@
         this.boardData.png = item.pngNeed.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue
index 80e39ce..4d8180c 100644
--- a/src/views/maps/routeTopic.vue
+++ b/src/views/maps/routeTopic.vue
@@ -7,7 +7,7 @@
   <layout-map>
     <select-route @change="selectChange"/>
     <!--统计结果显示-->
-    <div v-show="boarData.value!=null" class="label-div">
+    <div v-show="boardData.value!=null" class="label-div">
       <div class="label">
         {{ boardData.name }}
       </div>
@@ -142,6 +142,7 @@
           '<br/>电话：' + route['phone'] +
           '<br/>岗位：' + route['duty'] +
           '<br/>站名：' + route['unitname'] +
+          '<br/>所属管理处：' + route['depname'] +
           '<br/>时间：' + route.locationdate + '</div>'
         return html
       })
@@ -159,6 +160,7 @@
               sex: item['WD60_09'],
               phone: item['WD60_10'],
               idcard: item['WD60_12'],
+              depname: item['WD60_13'],
               unitname: item['WD60_08']
             }
           })
diff --git a/src/views/maps/supplyTopic.vue b/src/views/maps/supplyTopic.vue
index 9b3c833..72a0091 100644
--- a/src/views/maps/supplyTopic.vue
+++ b/src/views/maps/supplyTopic.vue
@@ -53,7 +53,6 @@
 import SelectButton from '@/components/SelectTool/components/selectButton'
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply, getUserSupply } from '@/api/needSupply'
-import { getHighConsequence } from '@/api/hca'
 
 import { getToday } from '@/utils/dateutils'
 import { getIndex } from '@/utils/mathUtils'
@@ -142,7 +141,7 @@
         this.boardData.png = item.pngSupply.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/waterThreat2.vue b/src/views/maps/waterThreat2.vue
new file mode 100644
index 0000000..5536cc3
--- /dev/null
+++ b/src/views/maps/waterThreat2.vue
@@ -0,0 +1,414 @@
+<!--
+ * @Description: 水保隐患专题
+ * @Author: 王晓颖
+ * @Date: 2021-04-07
+ -->
+<template>
+  <layout-map>
+    <!--选择区-->
+    <!--<select-all-construction @change="selectChange" />-->
+    <!--&lt;!&ndash;统计结果显示&ndash;&gt;-->
+    <!--<div class="label-div">-->
+    <!--<div class="label">-->
+    <!--{{ boardData.name | boardNameFilter }}-->
+    <!--</div>-->
+    <!--<div class="value">-->
+    <!--{{ boardData.value }}-->
+    <!--</div>-->
+    <!--</div>-->
+
+    <!--地图-->
+    <Map :url="configUrl" @onload="onMapload" />
+    <div class="map-btn-group">
+      <!--<select-button :select="heatShow" name="热力图" icon="icon-heat" @click="showHeat(heatShow)"/>-->
+      <select-button :select="positionShow" name="点位分布" icon="icon-position" @click="showPosition(positionShow)"/>
+      <select-button :select="stationShow" name="管理处" icon="icon-station" @click="showStation(stationShow)"/>
+    </div>
+  </layout-map>
+</template>
+
+<script>
+import Map from '@/components/Map/MarsMap.vue'
+import 'mars3d-heatmap'
+import axios from 'axios'
+import SelectAllConstruction from './components/selectAllConstruction'
+import SelectButton from '@/components/SelectTool/components/selectButton'
+import { getTimes } from '@/utils/dateutils'
+import LayoutMap from '@/layout/layoutMap'
+import { getWaterThreat } from '@/api/threat'
+export default {
+  name: 'WaterThreat',
+  components: {
+    LayoutMap,
+    SelectAllConstruction,
+    Map,
+    SelectButton
+  },
+  filters: {
+    boardNameFilter(val) {
+      if (val === '全部' || val === '') {
+        return '全省水保隐患'
+      } else {
+        return val + '区域水保隐患'
+      }
+    }
+  },
+  data() {
+    return {
+      map: null, // 地图
+      configUrl: 'static/config/config.json',
+      alpha: 100, // 透明度
+      underground: null, // ？
+      heatShow: false, // 显示热力图
+      stationShow: true, // 显示管理处
+      positionShow: true, // 显示位置
+      boardData: {
+        name: '全部',
+        value: 196
+      }, // 统计版展示数据
+      threatLevel: {
+        '1': 'A级',
+        '2': 'B级',
+        '3': 'C级',
+        '4': '问题'
+      }, // 隐患等级
+      manageStations: [
+        { 'x': 112.73874, 'y': 37.693689, 'z': 0, 'name': '晋中管理处' },
+        { 'x': 111.121552, 'y': 37.5245, 'z': 0, 'name': '吕梁管理处' },
+        { 'x': 112.929902, 'y': 39.622888, 'z': 0, 'name': '同朔管理处' },
+        { 'x': 112.72496, 'y': 38.415485, 'z': 0, 'name': '忻州管理处' },
+        { 'x': 113.58249, 'y': 37.851892, 'z': 0, 'name': '阳泉管理处' },
+        { 'x': 110.980927, 'y': 35.010828, 'z': 0, 'name': '运城管理处' },
+        { 'x': 113.038394, 'y': 35.850111, 'z': 0, 'name': '长晋管理处' },
+        { 'x': 111.491467, 'y': 36.064572, 'z': 0, 'name': '临汾管理处' }
+      ],
+      threatAreaStation: [
+        { x: 112.73874, y: 37.693689, id: 0, name: '晋中管理处', count: 158 },
+        { x: 111.121552, y: 37.5245, id: 0, name: '吕梁管理处', count: 10 },
+        { x: 112.929902, y: 39.622888, id: 0, name: '同朔管理处', count: 44 },
+        { x: 112.72496, y: 38.415485, id: 0, name: '忻州管理处', count: 9 },
+        { x: 113.58249, y: 37.851892, id: 0, name: '阳泉管理处', count: 21 },
+        { x: 110.980927, y: 35.010828, id: 0, name: '运城管理处', count: 21 },
+        { x: 113.038394, y: 35.850111, id: 0, name: '长晋管理处', count: 11 },
+        { x: 111.491467, y: 36.064572, id: 0, name: '临汾管理处', count: 30 }
+      ],
+      threatArea: [], // 第三方隐患列表
+      stationLayer: null, // 管理站图层
+      heatLayer: null, // 水保隐患热力图
+      threatLayer: null, // 水保隐患分布图层
+      pointColorArr: ['#f33349', '#f79a2c', '#f2fa19', '#95e40c', '#1ffee6'],
+      graphicLayer: null // 管理站标签图层
+    }
+  },
+  methods: {
+    // 地图构造完成回调
+    onMapload(map) {
+      // 以下为演示代码
+      this.map = map
+      // 背景透明
+      this.map._viewer.scene.backgroundColor = new this.Cesium.Color(0.0, 0.0, 0.0, 0.0)
+      this.map._viewer.scene.globe.baseColor.alpha = 0
+      // this.addWaterHeat()
+      // 添加管理处
+      this.addStation()
+      this.addStationDiv()
+      // 添加水保隐患隐患点
+      this.addThreatPosition()
+    },
+    // 高后果区热力图
+    addWaterHeat() {
+      const { mars3d } = this
+      getWaterThreat().then((res) => {
+        let data = res.data.filter(item => item['DES02'] !== '无')
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        // 过滤掉经度为null的
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        const heatLayer = new mars3d.layer.HeatLayer({
+          positions: this.threatArea.map(item => {
+            return { lng: item['经度'], lat: item['纬度'], value: 1 }
+          }),
+          heatStyle: {
+            radius: 30, // 半径
+            blur: 1 // 模糊因子
+          },
+          // 以下为矩形矢量对象的样式参数
+          style: {
+            opacity: 0.8,
+            clampToGround: false,
+            height: 10000
+          },
+          redrawZoom: true,
+          flyTo: false
+        })
+        this.heatLayer = heatLayer
+        this.map.addLayer(heatLayer)
+      })
+    },
+    // 水保隐患位置
+    addThreatPosition() {
+      getWaterThreat().then((res) => {
+        let data = res.data
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        debugger
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        this.addFeatures(this.threatArea)
+      })
+    },
+    // 添加隐患点
+    addFeatures(arr) {
+      const { mars3d, Cesium, threatLevel } = this
+      // 创建DIV数据图层
+      var graphicLayer = new mars3d.layer.DivLayer()
+      this.threatLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      // 在layer上绑定监听事件
+      graphicLayer.on(mars3d.EventType.click, function(event) {
+        console.log('监听layer，单击了矢量对象', event)
+      })
+      graphicLayer.bindPopup(function(event) {
+        const item = event.graphic.attr
+        var html =
+          '位置描述：' +
+          item['位置描述'] +
+          '<br />村庄地址：' +
+          item['村庄地址'] +
+          '<br />发现人：' +
+          item['发现人'] +
+          '<br />隐患描述：' +
+          item['隐患描述'] +
+          '<br />创建时间：' +
+          item['创建时间'] +
+          '<br />隐患等级：' +
+          threatLevel[item['隐患等级']]
+        return html
+      })
+
+      for (var i = 0, len = arr.length; i < len; i++) {
+        const item = arr[i]
+        var jd = item['经度']
+        var wd = item['纬度']
+        const level = parseInt(item['隐患等级']) - 1
+        var clr = this.pointColorArr[level]
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(jd, wd, 0),
+          style: {
+            html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 2000000) // 按视距距离显示
+          },
+          attr: item
+        })
+        graphicLayer.addGraphic(graphic)
+      }
+    },
+    // 管理处
+    addStation() {
+      const { mars3d } = this
+      const stationLayer = new mars3d.layer.ModelLayer({
+        name: '管理处',
+        url: './static/gltf/output/guanlizhan.gltf',
+        // url: './static/gltf/house02.gltf',
+        style: {
+          scale: 10,
+          heading: 0,
+          minimumPixelSize: 30,
+          clampToGround: true
+        },
+        positions: this.manageStations.map(item => {
+          return { lng: item.x, lat: item.y, alt: 0 }
+        })
+      })
+      this.stationLayer = stationLayer
+      this.map.addLayer(stationLayer)
+    },
+    // 选框发生变化
+    selectChange({ area, state, time, level }) {
+      area = area === '全部' ? '' : area
+      time = time === '全部' ? '' : time
+      level = level === '全部' ? '' : level
+      // 解析时间
+      let beginTime = ''
+      let endTime = ''
+      if (time) {
+        const result = getTimes(time)
+        beginTime = result.beginDate
+        endTime = result.endDate
+      }
+      this.boardData.name = area
+      // 查询数据
+      let count = 0
+      debugger
+      for (const hca of this.threatArea) {
+        let flag = true // 标记是否合格
+        // 比较区域
+        if (area && hca['所属管理处'] && hca['所属管理处'].indexOf(area) === -1) {
+          flag = false
+        }
+        // 比较时间
+        if (time) {
+          const real_date = new Date(hca['识别时间'])
+          if (real_date && (real_date < beginTime || real_date > endTime)) {
+            flag = false
+          }
+        }
+        // 比较级别
+        if (level && hca['隐患等级'] && hca['隐患等级'] === level) {
+          flag = false
+        }
+        if (flag) {
+          count++
+        }
+      }
+      this.boardData.value = count
+    },
+    // 自定义的弹窗
+    addStationDiv() {
+      const { Cesium, mars3d } = this
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      this.graphicLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      for (const station of this.threatAreaStation) {
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(station.x, station.y, 10100),
+          style: {
+            html: `<div class="divpoint divpoint-theme-29baf1">
+                    <div class="divpoint-wrap">
+                        <div class="area">
+                            <div class="arrow-lt"></div>
+                            <div class="b-t"></div>
+                            <div class="b-r"></div>
+                            <div class="b-b"></div>
+                            <div class="b-l"></div>
+                            <div class="arrow-rb"></div>
+                            <div class="label-wrap">
+                                <div class="title">${station.name}</div>
+                                <div class="label-content">
+                                    <div class="data-li">
+                                        <div class="data-label">水保隐患数量：</div>
+                                        <div class="data-value"><span class="label-num">${station.count}</span><span class="label-unit">个</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">经度：</div>
+                                        <div class="data-value"><span class="label-num">${station.x}</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">纬度：</div>
+                                        <div class="data-value"><span class="label-num">${station.y}</span>
+                                        </div>
+                                    </div>
+                                    `,
+            // anchor: [0, 0],
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(10000, 500000), // 按视距距离显示
+            scaleByDistance: new Cesium.NearFarScalar(10000, 1.0, 500000, 0.1),
+            clampToGround: true,
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
+          },
+          pointerEvents: false // false时不允许拾取和触发任意鼠标事件，但可以穿透div缩放地球
+        })
+        graphicLayer.addGraphic(graphic)
+        graphic.testPoint = false // 打开测试点，与DIV点进行对比位置调整css
+      }
+    },
+    // 是否显示热力图
+    showHeat(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.heatShow = false
+        this.map.removeLayer(this.heatLayer, true)
+      } else {
+        this.heatShow = true
+        this.addWaterHeat()
+      }
+    },
+    // 显示管理处
+    showStation(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.stationShow = false
+        this.map.removeLayer(this.stationLayer, true)
+        this.map.removeLayer(this.graphicLayer, true)
+      } else {
+        this.stationShow = true
+        this.addStation()
+        this.addStationDiv()
+      }
+    },
+    // 显示隐患分布
+    showPosition(show) {
+      if (show) { // 移除
+        this.positionShow = false
+        this.map.removeLayer(this.threatLayer, true)
+      } else {
+        this.positionShow = true
+        this.addThreatPosition()
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .label-div{
+    position: absolute;
+    top: 140px;
+    left:31rem;
+    z-index:100;
+    color: white;
+    padding:2rem 3rem 1.5rem 3rem;
+    background-image: url("../../assets/button_images/board-box1.png");
+    background-size: 100% 100%;
+    .label{
+      margin-bottom: 1rem;
+      font-size:1.2rem;
+    }
+    .value{
+      font-family: DS-DigitalBold;
+      font-size:2.5rem;
+    }
+  }
+  .map-btn-group{
+    position: absolute;
+    bottom:3rem;
+    left:50%;
+    transform: translateX(-50%);
+    display: flex;
+    justify-content: center;
+  }
+</style>
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index ae36f07..9471a8b 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -194,7 +194,7 @@
                 image: img,
                 pixelOffsetX: 0,
                 pixelOffsetY: -20,
-                scale: 0.5,
+                scale: 0.6,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM
               }
diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png
index 182631b..9b74331 100644
--- a/static/images/map/weather/weather-dayu.png
+++ b/static/images/map/weather/weather-dayu.png
Binary files differ
diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png
index 03dfd4c..0546306 100644
--- a/static/images/map/weather/weather-duoyun.png
+++ b/static/images/map/weather/weather-duoyun.png
Binary files differ

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
diff --git a/src/views/maps/needTopic.vue b/src/views/maps/needTopic.vue
index d5dd71f..03e593d 100644
--- a/src/views/maps/needTopic.vue
+++ b/src/views/maps/needTopic.vue
@@ -130,7 +130,7 @@
         this.boardData.png = item.pngNeed.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue
index 80e39ce..4d8180c 100644
--- a/src/views/maps/routeTopic.vue
+++ b/src/views/maps/routeTopic.vue
@@ -7,7 +7,7 @@
   <layout-map>
     <select-route @change="selectChange"/>
     <!--统计结果显示-->
-    <div v-show="boarData.value!=null" class="label-div">
+    <div v-show="boardData.value!=null" class="label-div">
       <div class="label">
         {{ boardData.name }}
       </div>
@@ -142,6 +142,7 @@
           '<br/>电话：' + route['phone'] +
           '<br/>岗位：' + route['duty'] +
           '<br/>站名：' + route['unitname'] +
+          '<br/>所属管理处：' + route['depname'] +
           '<br/>时间：' + route.locationdate + '</div>'
         return html
       })
@@ -159,6 +160,7 @@
               sex: item['WD60_09'],
               phone: item['WD60_10'],
               idcard: item['WD60_12'],
+              depname: item['WD60_13'],
               unitname: item['WD60_08']
             }
           })
diff --git a/src/views/maps/supplyTopic.vue b/src/views/maps/supplyTopic.vue
index 9b3c833..72a0091 100644
--- a/src/views/maps/supplyTopic.vue
+++ b/src/views/maps/supplyTopic.vue
@@ -53,7 +53,6 @@
 import SelectButton from '@/components/SelectTool/components/selectButton'
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply, getUserSupply } from '@/api/needSupply'
-import { getHighConsequence } from '@/api/hca'
 
 import { getToday } from '@/utils/dateutils'
 import { getIndex } from '@/utils/mathUtils'
@@ -142,7 +141,7 @@
         this.boardData.png = item.pngSupply.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/waterThreat2.vue b/src/views/maps/waterThreat2.vue
new file mode 100644
index 0000000..5536cc3
--- /dev/null
+++ b/src/views/maps/waterThreat2.vue
@@ -0,0 +1,414 @@
+<!--
+ * @Description: 水保隐患专题
+ * @Author: 王晓颖
+ * @Date: 2021-04-07
+ -->
+<template>
+  <layout-map>
+    <!--选择区-->
+    <!--<select-all-construction @change="selectChange" />-->
+    <!--&lt;!&ndash;统计结果显示&ndash;&gt;-->
+    <!--<div class="label-div">-->
+    <!--<div class="label">-->
+    <!--{{ boardData.name | boardNameFilter }}-->
+    <!--</div>-->
+    <!--<div class="value">-->
+    <!--{{ boardData.value }}-->
+    <!--</div>-->
+    <!--</div>-->
+
+    <!--地图-->
+    <Map :url="configUrl" @onload="onMapload" />
+    <div class="map-btn-group">
+      <!--<select-button :select="heatShow" name="热力图" icon="icon-heat" @click="showHeat(heatShow)"/>-->
+      <select-button :select="positionShow" name="点位分布" icon="icon-position" @click="showPosition(positionShow)"/>
+      <select-button :select="stationShow" name="管理处" icon="icon-station" @click="showStation(stationShow)"/>
+    </div>
+  </layout-map>
+</template>
+
+<script>
+import Map from '@/components/Map/MarsMap.vue'
+import 'mars3d-heatmap'
+import axios from 'axios'
+import SelectAllConstruction from './components/selectAllConstruction'
+import SelectButton from '@/components/SelectTool/components/selectButton'
+import { getTimes } from '@/utils/dateutils'
+import LayoutMap from '@/layout/layoutMap'
+import { getWaterThreat } from '@/api/threat'
+export default {
+  name: 'WaterThreat',
+  components: {
+    LayoutMap,
+    SelectAllConstruction,
+    Map,
+    SelectButton
+  },
+  filters: {
+    boardNameFilter(val) {
+      if (val === '全部' || val === '') {
+        return '全省水保隐患'
+      } else {
+        return val + '区域水保隐患'
+      }
+    }
+  },
+  data() {
+    return {
+      map: null, // 地图
+      configUrl: 'static/config/config.json',
+      alpha: 100, // 透明度
+      underground: null, // ？
+      heatShow: false, // 显示热力图
+      stationShow: true, // 显示管理处
+      positionShow: true, // 显示位置
+      boardData: {
+        name: '全部',
+        value: 196
+      }, // 统计版展示数据
+      threatLevel: {
+        '1': 'A级',
+        '2': 'B级',
+        '3': 'C级',
+        '4': '问题'
+      }, // 隐患等级
+      manageStations: [
+        { 'x': 112.73874, 'y': 37.693689, 'z': 0, 'name': '晋中管理处' },
+        { 'x': 111.121552, 'y': 37.5245, 'z': 0, 'name': '吕梁管理处' },
+        { 'x': 112.929902, 'y': 39.622888, 'z': 0, 'name': '同朔管理处' },
+        { 'x': 112.72496, 'y': 38.415485, 'z': 0, 'name': '忻州管理处' },
+        { 'x': 113.58249, 'y': 37.851892, 'z': 0, 'name': '阳泉管理处' },
+        { 'x': 110.980927, 'y': 35.010828, 'z': 0, 'name': '运城管理处' },
+        { 'x': 113.038394, 'y': 35.850111, 'z': 0, 'name': '长晋管理处' },
+        { 'x': 111.491467, 'y': 36.064572, 'z': 0, 'name': '临汾管理处' }
+      ],
+      threatAreaStation: [
+        { x: 112.73874, y: 37.693689, id: 0, name: '晋中管理处', count: 158 },
+        { x: 111.121552, y: 37.5245, id: 0, name: '吕梁管理处', count: 10 },
+        { x: 112.929902, y: 39.622888, id: 0, name: '同朔管理处', count: 44 },
+        { x: 112.72496, y: 38.415485, id: 0, name: '忻州管理处', count: 9 },
+        { x: 113.58249, y: 37.851892, id: 0, name: '阳泉管理处', count: 21 },
+        { x: 110.980927, y: 35.010828, id: 0, name: '运城管理处', count: 21 },
+        { x: 113.038394, y: 35.850111, id: 0, name: '长晋管理处', count: 11 },
+        { x: 111.491467, y: 36.064572, id: 0, name: '临汾管理处', count: 30 }
+      ],
+      threatArea: [], // 第三方隐患列表
+      stationLayer: null, // 管理站图层
+      heatLayer: null, // 水保隐患热力图
+      threatLayer: null, // 水保隐患分布图层
+      pointColorArr: ['#f33349', '#f79a2c', '#f2fa19', '#95e40c', '#1ffee6'],
+      graphicLayer: null // 管理站标签图层
+    }
+  },
+  methods: {
+    // 地图构造完成回调
+    onMapload(map) {
+      // 以下为演示代码
+      this.map = map
+      // 背景透明
+      this.map._viewer.scene.backgroundColor = new this.Cesium.Color(0.0, 0.0, 0.0, 0.0)
+      this.map._viewer.scene.globe.baseColor.alpha = 0
+      // this.addWaterHeat()
+      // 添加管理处
+      this.addStation()
+      this.addStationDiv()
+      // 添加水保隐患隐患点
+      this.addThreatPosition()
+    },
+    // 高后果区热力图
+    addWaterHeat() {
+      const { mars3d } = this
+      getWaterThreat().then((res) => {
+        let data = res.data.filter(item => item['DES02'] !== '无')
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        // 过滤掉经度为null的
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        const heatLayer = new mars3d.layer.HeatLayer({
+          positions: this.threatArea.map(item => {
+            return { lng: item['经度'], lat: item['纬度'], value: 1 }
+          }),
+          heatStyle: {
+            radius: 30, // 半径
+            blur: 1 // 模糊因子
+          },
+          // 以下为矩形矢量对象的样式参数
+          style: {
+            opacity: 0.8,
+            clampToGround: false,
+            height: 10000
+          },
+          redrawZoom: true,
+          flyTo: false
+        })
+        this.heatLayer = heatLayer
+        this.map.addLayer(heatLayer)
+      })
+    },
+    // 水保隐患位置
+    addThreatPosition() {
+      getWaterThreat().then((res) => {
+        let data = res.data
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        debugger
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        this.addFeatures(this.threatArea)
+      })
+    },
+    // 添加隐患点
+    addFeatures(arr) {
+      const { mars3d, Cesium, threatLevel } = this
+      // 创建DIV数据图层
+      var graphicLayer = new mars3d.layer.DivLayer()
+      this.threatLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      // 在layer上绑定监听事件
+      graphicLayer.on(mars3d.EventType.click, function(event) {
+        console.log('监听layer，单击了矢量对象', event)
+      })
+      graphicLayer.bindPopup(function(event) {
+        const item = event.graphic.attr
+        var html =
+          '位置描述：' +
+          item['位置描述'] +
+          '<br />村庄地址：' +
+          item['村庄地址'] +
+          '<br />发现人：' +
+          item['发现人'] +
+          '<br />隐患描述：' +
+          item['隐患描述'] +
+          '<br />创建时间：' +
+          item['创建时间'] +
+          '<br />隐患等级：' +
+          threatLevel[item['隐患等级']]
+        return html
+      })
+
+      for (var i = 0, len = arr.length; i < len; i++) {
+        const item = arr[i]
+        var jd = item['经度']
+        var wd = item['纬度']
+        const level = parseInt(item['隐患等级']) - 1
+        var clr = this.pointColorArr[level]
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(jd, wd, 0),
+          style: {
+            html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 2000000) // 按视距距离显示
+          },
+          attr: item
+        })
+        graphicLayer.addGraphic(graphic)
+      }
+    },
+    // 管理处
+    addStation() {
+      const { mars3d } = this
+      const stationLayer = new mars3d.layer.ModelLayer({
+        name: '管理处',
+        url: './static/gltf/output/guanlizhan.gltf',
+        // url: './static/gltf/house02.gltf',
+        style: {
+          scale: 10,
+          heading: 0,
+          minimumPixelSize: 30,
+          clampToGround: true
+        },
+        positions: this.manageStations.map(item => {
+          return { lng: item.x, lat: item.y, alt: 0 }
+        })
+      })
+      this.stationLayer = stationLayer
+      this.map.addLayer(stationLayer)
+    },
+    // 选框发生变化
+    selectChange({ area, state, time, level }) {
+      area = area === '全部' ? '' : area
+      time = time === '全部' ? '' : time
+      level = level === '全部' ? '' : level
+      // 解析时间
+      let beginTime = ''
+      let endTime = ''
+      if (time) {
+        const result = getTimes(time)
+        beginTime = result.beginDate
+        endTime = result.endDate
+      }
+      this.boardData.name = area
+      // 查询数据
+      let count = 0
+      debugger
+      for (const hca of this.threatArea) {
+        let flag = true // 标记是否合格
+        // 比较区域
+        if (area && hca['所属管理处'] && hca['所属管理处'].indexOf(area) === -1) {
+          flag = false
+        }
+        // 比较时间
+        if (time) {
+          const real_date = new Date(hca['识别时间'])
+          if (real_date && (real_date < beginTime || real_date > endTime)) {
+            flag = false
+          }
+        }
+        // 比较级别
+        if (level && hca['隐患等级'] && hca['隐患等级'] === level) {
+          flag = false
+        }
+        if (flag) {
+          count++
+        }
+      }
+      this.boardData.value = count
+    },
+    // 自定义的弹窗
+    addStationDiv() {
+      const { Cesium, mars3d } = this
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      this.graphicLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      for (const station of this.threatAreaStation) {
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(station.x, station.y, 10100),
+          style: {
+            html: `<div class="divpoint divpoint-theme-29baf1">
+                    <div class="divpoint-wrap">
+                        <div class="area">
+                            <div class="arrow-lt"></div>
+                            <div class="b-t"></div>
+                            <div class="b-r"></div>
+                            <div class="b-b"></div>
+                            <div class="b-l"></div>
+                            <div class="arrow-rb"></div>
+                            <div class="label-wrap">
+                                <div class="title">${station.name}</div>
+                                <div class="label-content">
+                                    <div class="data-li">
+                                        <div class="data-label">水保隐患数量：</div>
+                                        <div class="data-value"><span class="label-num">${station.count}</span><span class="label-unit">个</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">经度：</div>
+                                        <div class="data-value"><span class="label-num">${station.x}</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">纬度：</div>
+                                        <div class="data-value"><span class="label-num">${station.y}</span>
+                                        </div>
+                                    </div>
+                                    `,
+            // anchor: [0, 0],
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(10000, 500000), // 按视距距离显示
+            scaleByDistance: new Cesium.NearFarScalar(10000, 1.0, 500000, 0.1),
+            clampToGround: true,
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
+          },
+          pointerEvents: false // false时不允许拾取和触发任意鼠标事件，但可以穿透div缩放地球
+        })
+        graphicLayer.addGraphic(graphic)
+        graphic.testPoint = false // 打开测试点，与DIV点进行对比位置调整css
+      }
+    },
+    // 是否显示热力图
+    showHeat(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.heatShow = false
+        this.map.removeLayer(this.heatLayer, true)
+      } else {
+        this.heatShow = true
+        this.addWaterHeat()
+      }
+    },
+    // 显示管理处
+    showStation(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.stationShow = false
+        this.map.removeLayer(this.stationLayer, true)
+        this.map.removeLayer(this.graphicLayer, true)
+      } else {
+        this.stationShow = true
+        this.addStation()
+        this.addStationDiv()
+      }
+    },
+    // 显示隐患分布
+    showPosition(show) {
+      if (show) { // 移除
+        this.positionShow = false
+        this.map.removeLayer(this.threatLayer, true)
+      } else {
+        this.positionShow = true
+        this.addThreatPosition()
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .label-div{
+    position: absolute;
+    top: 140px;
+    left:31rem;
+    z-index:100;
+    color: white;
+    padding:2rem 3rem 1.5rem 3rem;
+    background-image: url("../../assets/button_images/board-box1.png");
+    background-size: 100% 100%;
+    .label{
+      margin-bottom: 1rem;
+      font-size:1.2rem;
+    }
+    .value{
+      font-family: DS-DigitalBold;
+      font-size:2.5rem;
+    }
+  }
+  .map-btn-group{
+    position: absolute;
+    bottom:3rem;
+    left:50%;
+    transform: translateX(-50%);
+    display: flex;
+    justify-content: center;
+  }
+</style>
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index ae36f07..9471a8b 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -194,7 +194,7 @@
                 image: img,
                 pixelOffsetX: 0,
                 pixelOffsetY: -20,
-                scale: 0.5,
+                scale: 0.6,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM
               }
diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png
index 182631b..9b74331 100644
--- a/static/images/map/weather/weather-dayu.png
+++ b/static/images/map/weather/weather-dayu.png
Binary files differ
diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png
index 03dfd4c..0546306 100644
--- a/static/images/map/weather/weather-duoyun.png
+++ b/static/images/map/weather/weather-duoyun.png
Binary files differ
diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png
index d8ee803..9776429 100644
--- a/static/images/map/weather/weather-qing.png
+++ b/static/images/map/weather/weather-qing.png
Binary files differ

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
diff --git a/src/views/maps/needTopic.vue b/src/views/maps/needTopic.vue
index d5dd71f..03e593d 100644
--- a/src/views/maps/needTopic.vue
+++ b/src/views/maps/needTopic.vue
@@ -130,7 +130,7 @@
         this.boardData.png = item.pngNeed.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue
index 80e39ce..4d8180c 100644
--- a/src/views/maps/routeTopic.vue
+++ b/src/views/maps/routeTopic.vue
@@ -7,7 +7,7 @@
   <layout-map>
     <select-route @change="selectChange"/>
     <!--统计结果显示-->
-    <div v-show="boarData.value!=null" class="label-div">
+    <div v-show="boardData.value!=null" class="label-div">
       <div class="label">
         {{ boardData.name }}
       </div>
@@ -142,6 +142,7 @@
           '<br/>电话：' + route['phone'] +
           '<br/>岗位：' + route['duty'] +
           '<br/>站名：' + route['unitname'] +
+          '<br/>所属管理处：' + route['depname'] +
           '<br/>时间：' + route.locationdate + '</div>'
         return html
       })
@@ -159,6 +160,7 @@
               sex: item['WD60_09'],
               phone: item['WD60_10'],
               idcard: item['WD60_12'],
+              depname: item['WD60_13'],
               unitname: item['WD60_08']
             }
           })
diff --git a/src/views/maps/supplyTopic.vue b/src/views/maps/supplyTopic.vue
index 9b3c833..72a0091 100644
--- a/src/views/maps/supplyTopic.vue
+++ b/src/views/maps/supplyTopic.vue
@@ -53,7 +53,6 @@
 import SelectButton from '@/components/SelectTool/components/selectButton'
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply, getUserSupply } from '@/api/needSupply'
-import { getHighConsequence } from '@/api/hca'
 
 import { getToday } from '@/utils/dateutils'
 import { getIndex } from '@/utils/mathUtils'
@@ -142,7 +141,7 @@
         this.boardData.png = item.pngSupply.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/waterThreat2.vue b/src/views/maps/waterThreat2.vue
new file mode 100644
index 0000000..5536cc3
--- /dev/null
+++ b/src/views/maps/waterThreat2.vue
@@ -0,0 +1,414 @@
+<!--
+ * @Description: 水保隐患专题
+ * @Author: 王晓颖
+ * @Date: 2021-04-07
+ -->
+<template>
+  <layout-map>
+    <!--选择区-->
+    <!--<select-all-construction @change="selectChange" />-->
+    <!--&lt;!&ndash;统计结果显示&ndash;&gt;-->
+    <!--<div class="label-div">-->
+    <!--<div class="label">-->
+    <!--{{ boardData.name | boardNameFilter }}-->
+    <!--</div>-->
+    <!--<div class="value">-->
+    <!--{{ boardData.value }}-->
+    <!--</div>-->
+    <!--</div>-->
+
+    <!--地图-->
+    <Map :url="configUrl" @onload="onMapload" />
+    <div class="map-btn-group">
+      <!--<select-button :select="heatShow" name="热力图" icon="icon-heat" @click="showHeat(heatShow)"/>-->
+      <select-button :select="positionShow" name="点位分布" icon="icon-position" @click="showPosition(positionShow)"/>
+      <select-button :select="stationShow" name="管理处" icon="icon-station" @click="showStation(stationShow)"/>
+    </div>
+  </layout-map>
+</template>
+
+<script>
+import Map from '@/components/Map/MarsMap.vue'
+import 'mars3d-heatmap'
+import axios from 'axios'
+import SelectAllConstruction from './components/selectAllConstruction'
+import SelectButton from '@/components/SelectTool/components/selectButton'
+import { getTimes } from '@/utils/dateutils'
+import LayoutMap from '@/layout/layoutMap'
+import { getWaterThreat } from '@/api/threat'
+export default {
+  name: 'WaterThreat',
+  components: {
+    LayoutMap,
+    SelectAllConstruction,
+    Map,
+    SelectButton
+  },
+  filters: {
+    boardNameFilter(val) {
+      if (val === '全部' || val === '') {
+        return '全省水保隐患'
+      } else {
+        return val + '区域水保隐患'
+      }
+    }
+  },
+  data() {
+    return {
+      map: null, // 地图
+      configUrl: 'static/config/config.json',
+      alpha: 100, // 透明度
+      underground: null, // ？
+      heatShow: false, // 显示热力图
+      stationShow: true, // 显示管理处
+      positionShow: true, // 显示位置
+      boardData: {
+        name: '全部',
+        value: 196
+      }, // 统计版展示数据
+      threatLevel: {
+        '1': 'A级',
+        '2': 'B级',
+        '3': 'C级',
+        '4': '问题'
+      }, // 隐患等级
+      manageStations: [
+        { 'x': 112.73874, 'y': 37.693689, 'z': 0, 'name': '晋中管理处' },
+        { 'x': 111.121552, 'y': 37.5245, 'z': 0, 'name': '吕梁管理处' },
+        { 'x': 112.929902, 'y': 39.622888, 'z': 0, 'name': '同朔管理处' },
+        { 'x': 112.72496, 'y': 38.415485, 'z': 0, 'name': '忻州管理处' },
+        { 'x': 113.58249, 'y': 37.851892, 'z': 0, 'name': '阳泉管理处' },
+        { 'x': 110.980927, 'y': 35.010828, 'z': 0, 'name': '运城管理处' },
+        { 'x': 113.038394, 'y': 35.850111, 'z': 0, 'name': '长晋管理处' },
+        { 'x': 111.491467, 'y': 36.064572, 'z': 0, 'name': '临汾管理处' }
+      ],
+      threatAreaStation: [
+        { x: 112.73874, y: 37.693689, id: 0, name: '晋中管理处', count: 158 },
+        { x: 111.121552, y: 37.5245, id: 0, name: '吕梁管理处', count: 10 },
+        { x: 112.929902, y: 39.622888, id: 0, name: '同朔管理处', count: 44 },
+        { x: 112.72496, y: 38.415485, id: 0, name: '忻州管理处', count: 9 },
+        { x: 113.58249, y: 37.851892, id: 0, name: '阳泉管理处', count: 21 },
+        { x: 110.980927, y: 35.010828, id: 0, name: '运城管理处', count: 21 },
+        { x: 113.038394, y: 35.850111, id: 0, name: '长晋管理处', count: 11 },
+        { x: 111.491467, y: 36.064572, id: 0, name: '临汾管理处', count: 30 }
+      ],
+      threatArea: [], // 第三方隐患列表
+      stationLayer: null, // 管理站图层
+      heatLayer: null, // 水保隐患热力图
+      threatLayer: null, // 水保隐患分布图层
+      pointColorArr: ['#f33349', '#f79a2c', '#f2fa19', '#95e40c', '#1ffee6'],
+      graphicLayer: null // 管理站标签图层
+    }
+  },
+  methods: {
+    // 地图构造完成回调
+    onMapload(map) {
+      // 以下为演示代码
+      this.map = map
+      // 背景透明
+      this.map._viewer.scene.backgroundColor = new this.Cesium.Color(0.0, 0.0, 0.0, 0.0)
+      this.map._viewer.scene.globe.baseColor.alpha = 0
+      // this.addWaterHeat()
+      // 添加管理处
+      this.addStation()
+      this.addStationDiv()
+      // 添加水保隐患隐患点
+      this.addThreatPosition()
+    },
+    // 高后果区热力图
+    addWaterHeat() {
+      const { mars3d } = this
+      getWaterThreat().then((res) => {
+        let data = res.data.filter(item => item['DES02'] !== '无')
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        // 过滤掉经度为null的
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        const heatLayer = new mars3d.layer.HeatLayer({
+          positions: this.threatArea.map(item => {
+            return { lng: item['经度'], lat: item['纬度'], value: 1 }
+          }),
+          heatStyle: {
+            radius: 30, // 半径
+            blur: 1 // 模糊因子
+          },
+          // 以下为矩形矢量对象的样式参数
+          style: {
+            opacity: 0.8,
+            clampToGround: false,
+            height: 10000
+          },
+          redrawZoom: true,
+          flyTo: false
+        })
+        this.heatLayer = heatLayer
+        this.map.addLayer(heatLayer)
+      })
+    },
+    // 水保隐患位置
+    addThreatPosition() {
+      getWaterThreat().then((res) => {
+        let data = res.data
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        debugger
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        this.addFeatures(this.threatArea)
+      })
+    },
+    // 添加隐患点
+    addFeatures(arr) {
+      const { mars3d, Cesium, threatLevel } = this
+      // 创建DIV数据图层
+      var graphicLayer = new mars3d.layer.DivLayer()
+      this.threatLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      // 在layer上绑定监听事件
+      graphicLayer.on(mars3d.EventType.click, function(event) {
+        console.log('监听layer，单击了矢量对象', event)
+      })
+      graphicLayer.bindPopup(function(event) {
+        const item = event.graphic.attr
+        var html =
+          '位置描述：' +
+          item['位置描述'] +
+          '<br />村庄地址：' +
+          item['村庄地址'] +
+          '<br />发现人：' +
+          item['发现人'] +
+          '<br />隐患描述：' +
+          item['隐患描述'] +
+          '<br />创建时间：' +
+          item['创建时间'] +
+          '<br />隐患等级：' +
+          threatLevel[item['隐患等级']]
+        return html
+      })
+
+      for (var i = 0, len = arr.length; i < len; i++) {
+        const item = arr[i]
+        var jd = item['经度']
+        var wd = item['纬度']
+        const level = parseInt(item['隐患等级']) - 1
+        var clr = this.pointColorArr[level]
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(jd, wd, 0),
+          style: {
+            html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 2000000) // 按视距距离显示
+          },
+          attr: item
+        })
+        graphicLayer.addGraphic(graphic)
+      }
+    },
+    // 管理处
+    addStation() {
+      const { mars3d } = this
+      const stationLayer = new mars3d.layer.ModelLayer({
+        name: '管理处',
+        url: './static/gltf/output/guanlizhan.gltf',
+        // url: './static/gltf/house02.gltf',
+        style: {
+          scale: 10,
+          heading: 0,
+          minimumPixelSize: 30,
+          clampToGround: true
+        },
+        positions: this.manageStations.map(item => {
+          return { lng: item.x, lat: item.y, alt: 0 }
+        })
+      })
+      this.stationLayer = stationLayer
+      this.map.addLayer(stationLayer)
+    },
+    // 选框发生变化
+    selectChange({ area, state, time, level }) {
+      area = area === '全部' ? '' : area
+      time = time === '全部' ? '' : time
+      level = level === '全部' ? '' : level
+      // 解析时间
+      let beginTime = ''
+      let endTime = ''
+      if (time) {
+        const result = getTimes(time)
+        beginTime = result.beginDate
+        endTime = result.endDate
+      }
+      this.boardData.name = area
+      // 查询数据
+      let count = 0
+      debugger
+      for (const hca of this.threatArea) {
+        let flag = true // 标记是否合格
+        // 比较区域
+        if (area && hca['所属管理处'] && hca['所属管理处'].indexOf(area) === -1) {
+          flag = false
+        }
+        // 比较时间
+        if (time) {
+          const real_date = new Date(hca['识别时间'])
+          if (real_date && (real_date < beginTime || real_date > endTime)) {
+            flag = false
+          }
+        }
+        // 比较级别
+        if (level && hca['隐患等级'] && hca['隐患等级'] === level) {
+          flag = false
+        }
+        if (flag) {
+          count++
+        }
+      }
+      this.boardData.value = count
+    },
+    // 自定义的弹窗
+    addStationDiv() {
+      const { Cesium, mars3d } = this
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      this.graphicLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      for (const station of this.threatAreaStation) {
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(station.x, station.y, 10100),
+          style: {
+            html: `<div class="divpoint divpoint-theme-29baf1">
+                    <div class="divpoint-wrap">
+                        <div class="area">
+                            <div class="arrow-lt"></div>
+                            <div class="b-t"></div>
+                            <div class="b-r"></div>
+                            <div class="b-b"></div>
+                            <div class="b-l"></div>
+                            <div class="arrow-rb"></div>
+                            <div class="label-wrap">
+                                <div class="title">${station.name}</div>
+                                <div class="label-content">
+                                    <div class="data-li">
+                                        <div class="data-label">水保隐患数量：</div>
+                                        <div class="data-value"><span class="label-num">${station.count}</span><span class="label-unit">个</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">经度：</div>
+                                        <div class="data-value"><span class="label-num">${station.x}</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">纬度：</div>
+                                        <div class="data-value"><span class="label-num">${station.y}</span>
+                                        </div>
+                                    </div>
+                                    `,
+            // anchor: [0, 0],
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(10000, 500000), // 按视距距离显示
+            scaleByDistance: new Cesium.NearFarScalar(10000, 1.0, 500000, 0.1),
+            clampToGround: true,
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
+          },
+          pointerEvents: false // false时不允许拾取和触发任意鼠标事件，但可以穿透div缩放地球
+        })
+        graphicLayer.addGraphic(graphic)
+        graphic.testPoint = false // 打开测试点，与DIV点进行对比位置调整css
+      }
+    },
+    // 是否显示热力图
+    showHeat(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.heatShow = false
+        this.map.removeLayer(this.heatLayer, true)
+      } else {
+        this.heatShow = true
+        this.addWaterHeat()
+      }
+    },
+    // 显示管理处
+    showStation(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.stationShow = false
+        this.map.removeLayer(this.stationLayer, true)
+        this.map.removeLayer(this.graphicLayer, true)
+      } else {
+        this.stationShow = true
+        this.addStation()
+        this.addStationDiv()
+      }
+    },
+    // 显示隐患分布
+    showPosition(show) {
+      if (show) { // 移除
+        this.positionShow = false
+        this.map.removeLayer(this.threatLayer, true)
+      } else {
+        this.positionShow = true
+        this.addThreatPosition()
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .label-div{
+    position: absolute;
+    top: 140px;
+    left:31rem;
+    z-index:100;
+    color: white;
+    padding:2rem 3rem 1.5rem 3rem;
+    background-image: url("../../assets/button_images/board-box1.png");
+    background-size: 100% 100%;
+    .label{
+      margin-bottom: 1rem;
+      font-size:1.2rem;
+    }
+    .value{
+      font-family: DS-DigitalBold;
+      font-size:2.5rem;
+    }
+  }
+  .map-btn-group{
+    position: absolute;
+    bottom:3rem;
+    left:50%;
+    transform: translateX(-50%);
+    display: flex;
+    justify-content: center;
+  }
+</style>
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index ae36f07..9471a8b 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -194,7 +194,7 @@
                 image: img,
                 pixelOffsetX: 0,
                 pixelOffsetY: -20,
-                scale: 0.5,
+                scale: 0.6,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM
               }
diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png
index 182631b..9b74331 100644
--- a/static/images/map/weather/weather-dayu.png
+++ b/static/images/map/weather/weather-dayu.png
Binary files differ
diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png
index 03dfd4c..0546306 100644
--- a/static/images/map/weather/weather-duoyun.png
+++ b/static/images/map/weather/weather-duoyun.png
Binary files differ
diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png
index d8ee803..9776429 100644
--- a/static/images/map/weather/weather-qing.png
+++ b/static/images/map/weather/weather-qing.png
Binary files differ
diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png
index ebb1abe..5c983f9 100644
--- a/static/images/map/weather/weather-xiaoyu.png
+++ b/static/images/map/weather/weather-xiaoyu.png
Binary files differ

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 112ac9a..cca1e27 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -34,7 +34,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_01',
-            'value': ['20210419']
+            'value': [date]
           },
           {
             'leftSymbolList': [
@@ -68,7 +68,7 @@
 }
 
 // 各用户供需数据
-export function getUserSupply(params) {
+export function getUserSupply(date) {
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: 'http://172.26.2.128:9001/factdata/index/getData',
@@ -83,7 +83,7 @@
             'condition': '1',
             'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
             'key': 'WD01_03',
-            'value': ['2021-04-19']
+            'value': [date]
           }
         ]
       ],
diff --git a/src/api/pipe.js b/src/api/pipe.js
index e546790..5d0b3d2 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -38,7 +38,7 @@
     url: 'http://172.26.2.128:9001/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12',
+      'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
       'dimId': '459DEBAD30C14366AA65C957BBA76B09',
       'type': 1,
       'conditionList': [
diff --git a/src/api/threat.js b/src/api/threat.js
new file mode 100644
index 0000000..bebd145
--- /dev/null
+++ b/src/api/threat.js
@@ -0,0 +1,65 @@
+/**
+ * 隐患专题
+ */
+import request from '@/utils/request'
+import { getSignTimeStamp } from '@/utils/mathUtils'
+
+// 水保隐患
+export function getWaterThreat() {
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: 'http://172.26.2.128:9001/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
+      'indexId': '07D36AD4AE93444185EE571C032A8658',
+      'type': 0,
+      'distinct': true,
+      'conditionList': [
+        [
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '734AFA44DDC745009F4C27AABA1127F0',
+            'key': 'WD56_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22',
+              '23'
+            ],
+            'condition': '7',
+            'dimId': '5F356EF944164C548A835D5C6481AAE0',
+            'key': 'WD54_03'
+          },
+          {
+            'leftSymbolList': [
+              '21'
+            ],
+            'rightSymbolList': [
+              '22'
+            ],
+            'condition': '7',
+            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
+            'key': 'WD01_03'
+          }
+
+        ]
+      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
diff --git a/src/api/weather.js b/src/api/weather.js
index a4e8b65..0beebbb 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -52,7 +52,7 @@
         [
           {
             'condition': '3',
-            'key': 'WD52_07',
+            'key': 'WD52_08',
             'indexDimValues': date
           }
         ]
diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue
index 815e3c7..8549300 100644
--- a/src/components/Map/MarsMap.vue
+++ b/src/components/Map/MarsMap.vue
@@ -181,6 +181,10 @@
         symbol: {
           styleOptions: {
             materialType: 'PolylineGlow',
+            // materialType: 'LineFlowColor',
+            // alpha: 0.5,
+            // percent: 0.1,
+            // width: 5, // 线宽
             glowPower: 0.04, // 发光强度
             width: 10, // 线宽
             color: '#4ff8ff',
diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue
index 4a1a377..139fd37 100644
--- a/src/layout/layoutMap.vue
+++ b/src/layout/layoutMap.vue
@@ -39,8 +39,8 @@
     padding-right:10px;
     bottom:0px;
     left:0px;
-    background-color:#000000;
-    color:#ffffff;
+    background-color:#0F3F8D;
+    color:#0F3F8D;
     line-height:2
   }
 
diff --git a/src/permission.js b/src/permission.js
index 1bca28c..8be90f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false })// NProgress configuration
 
-const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index e681358..a744dcd 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -7,11 +7,11 @@
   return index
 }
 
-export function getSignTimeStamp(){
+export function getSignTimeStamp() {
   const username = 'admin'
-  const key= 'packingdata'
+  const key = 'packingdata'
   const timestamp = new Date().getTime().toString()
-  const str = username+key+timestamp
+  const str = username + key + timestamp
   const sign = md5.base64(str)
-  return {sign, username, timestamp}
+  return { sign, username, timestamp }
 }
diff --git a/src/views/maps/components/highConsequenceDialog.vue b/src/views/maps/components/highConsequenceDialog.vue
index 678f027..1fc624a 100644
--- a/src/views/maps/components/highConsequenceDialog.vue
+++ b/src/views/maps/components/highConsequenceDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="高后果区详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,6 +133,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/components/threatDialog.vue b/src/views/maps/components/threatDialog.vue
index 5770a1b..4de4377 100644
--- a/src/views/maps/components/threatDialog.vue
+++ b/src/views/maps/components/threatDialog.vue
@@ -4,7 +4,7 @@
  * @Date: 2021-04-13 14:07:44
  -->
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="70%">
+  <el-dialog :visible.sync="dialogFormVisible" custom-class="dark-dialog" title="隐患详情" width="45%" top="40vh">
     <el-form :model="form" class="dialog-form">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -123,6 +123,7 @@
   color: white;
   border: 2px solid #1157a0;
   border-radius: 10px;
+  margin-top: 40vh;
   .el-dialog__header{
 
   }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 9551eee..b9dd659 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -32,6 +32,7 @@
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply } from '@/api/needSupply'
 import { getIndex } from '@/utils/mathUtils'
+import { getToday } from '@/utils/dateutils'
 import Button1 from '@/components/Button/button1'
 
 export default {
@@ -138,7 +139,8 @@
       this.areaNeedSupplyLayer = graphicLayer
       this.map.addLayer(graphicLayer)
       // 获取数据
-      getAreaSupply().then(res => {
+      const date = getToday('yyyyMMdd')
+      getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
diff --git a/src/views/maps/needTopic.vue b/src/views/maps/needTopic.vue
index d5dd71f..03e593d 100644
--- a/src/views/maps/needTopic.vue
+++ b/src/views/maps/needTopic.vue
@@ -130,7 +130,7 @@
         this.boardData.png = item.pngNeed.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue
index 80e39ce..4d8180c 100644
--- a/src/views/maps/routeTopic.vue
+++ b/src/views/maps/routeTopic.vue
@@ -7,7 +7,7 @@
   <layout-map>
     <select-route @change="selectChange"/>
     <!--统计结果显示-->
-    <div v-show="boarData.value!=null" class="label-div">
+    <div v-show="boardData.value!=null" class="label-div">
       <div class="label">
         {{ boardData.name }}
       </div>
@@ -142,6 +142,7 @@
           '<br/>电话：' + route['phone'] +
           '<br/>岗位：' + route['duty'] +
           '<br/>站名：' + route['unitname'] +
+          '<br/>所属管理处：' + route['depname'] +
           '<br/>时间：' + route.locationdate + '</div>'
         return html
       })
@@ -159,6 +160,7 @@
               sex: item['WD60_09'],
               phone: item['WD60_10'],
               idcard: item['WD60_12'],
+              depname: item['WD60_13'],
               unitname: item['WD60_08']
             }
           })
diff --git a/src/views/maps/supplyTopic.vue b/src/views/maps/supplyTopic.vue
index 9b3c833..72a0091 100644
--- a/src/views/maps/supplyTopic.vue
+++ b/src/views/maps/supplyTopic.vue
@@ -53,7 +53,6 @@
 import SelectButton from '@/components/SelectTool/components/selectButton'
 import LayoutMap from '@/layout/layoutMap'
 import { getAreaSupply, getUserSupply } from '@/api/needSupply'
-import { getHighConsequence } from '@/api/hca'
 
 import { getToday } from '@/utils/dateutils'
 import { getIndex } from '@/utils/mathUtils'
@@ -142,7 +141,7 @@
         this.boardData.png = item.pngSupply.toFixed(2)
       })
       this.map.addLayer(graphicLayer)
-      const date = getToday()
+      const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
           const data = res.data.map(item => {
diff --git a/src/views/maps/waterThreat2.vue b/src/views/maps/waterThreat2.vue
new file mode 100644
index 0000000..5536cc3
--- /dev/null
+++ b/src/views/maps/waterThreat2.vue
@@ -0,0 +1,414 @@
+<!--
+ * @Description: 水保隐患专题
+ * @Author: 王晓颖
+ * @Date: 2021-04-07
+ -->
+<template>
+  <layout-map>
+    <!--选择区-->
+    <!--<select-all-construction @change="selectChange" />-->
+    <!--&lt;!&ndash;统计结果显示&ndash;&gt;-->
+    <!--<div class="label-div">-->
+    <!--<div class="label">-->
+    <!--{{ boardData.name | boardNameFilter }}-->
+    <!--</div>-->
+    <!--<div class="value">-->
+    <!--{{ boardData.value }}-->
+    <!--</div>-->
+    <!--</div>-->
+
+    <!--地图-->
+    <Map :url="configUrl" @onload="onMapload" />
+    <div class="map-btn-group">
+      <!--<select-button :select="heatShow" name="热力图" icon="icon-heat" @click="showHeat(heatShow)"/>-->
+      <select-button :select="positionShow" name="点位分布" icon="icon-position" @click="showPosition(positionShow)"/>
+      <select-button :select="stationShow" name="管理处" icon="icon-station" @click="showStation(stationShow)"/>
+    </div>
+  </layout-map>
+</template>
+
+<script>
+import Map from '@/components/Map/MarsMap.vue'
+import 'mars3d-heatmap'
+import axios from 'axios'
+import SelectAllConstruction from './components/selectAllConstruction'
+import SelectButton from '@/components/SelectTool/components/selectButton'
+import { getTimes } from '@/utils/dateutils'
+import LayoutMap from '@/layout/layoutMap'
+import { getWaterThreat } from '@/api/threat'
+export default {
+  name: 'WaterThreat',
+  components: {
+    LayoutMap,
+    SelectAllConstruction,
+    Map,
+    SelectButton
+  },
+  filters: {
+    boardNameFilter(val) {
+      if (val === '全部' || val === '') {
+        return '全省水保隐患'
+      } else {
+        return val + '区域水保隐患'
+      }
+    }
+  },
+  data() {
+    return {
+      map: null, // 地图
+      configUrl: 'static/config/config.json',
+      alpha: 100, // 透明度
+      underground: null, // ？
+      heatShow: false, // 显示热力图
+      stationShow: true, // 显示管理处
+      positionShow: true, // 显示位置
+      boardData: {
+        name: '全部',
+        value: 196
+      }, // 统计版展示数据
+      threatLevel: {
+        '1': 'A级',
+        '2': 'B级',
+        '3': 'C级',
+        '4': '问题'
+      }, // 隐患等级
+      manageStations: [
+        { 'x': 112.73874, 'y': 37.693689, 'z': 0, 'name': '晋中管理处' },
+        { 'x': 111.121552, 'y': 37.5245, 'z': 0, 'name': '吕梁管理处' },
+        { 'x': 112.929902, 'y': 39.622888, 'z': 0, 'name': '同朔管理处' },
+        { 'x': 112.72496, 'y': 38.415485, 'z': 0, 'name': '忻州管理处' },
+        { 'x': 113.58249, 'y': 37.851892, 'z': 0, 'name': '阳泉管理处' },
+        { 'x': 110.980927, 'y': 35.010828, 'z': 0, 'name': '运城管理处' },
+        { 'x': 113.038394, 'y': 35.850111, 'z': 0, 'name': '长晋管理处' },
+        { 'x': 111.491467, 'y': 36.064572, 'z': 0, 'name': '临汾管理处' }
+      ],
+      threatAreaStation: [
+        { x: 112.73874, y: 37.693689, id: 0, name: '晋中管理处', count: 158 },
+        { x: 111.121552, y: 37.5245, id: 0, name: '吕梁管理处', count: 10 },
+        { x: 112.929902, y: 39.622888, id: 0, name: '同朔管理处', count: 44 },
+        { x: 112.72496, y: 38.415485, id: 0, name: '忻州管理处', count: 9 },
+        { x: 113.58249, y: 37.851892, id: 0, name: '阳泉管理处', count: 21 },
+        { x: 110.980927, y: 35.010828, id: 0, name: '运城管理处', count: 21 },
+        { x: 113.038394, y: 35.850111, id: 0, name: '长晋管理处', count: 11 },
+        { x: 111.491467, y: 36.064572, id: 0, name: '临汾管理处', count: 30 }
+      ],
+      threatArea: [], // 第三方隐患列表
+      stationLayer: null, // 管理站图层
+      heatLayer: null, // 水保隐患热力图
+      threatLayer: null, // 水保隐患分布图层
+      pointColorArr: ['#f33349', '#f79a2c', '#f2fa19', '#95e40c', '#1ffee6'],
+      graphicLayer: null // 管理站标签图层
+    }
+  },
+  methods: {
+    // 地图构造完成回调
+    onMapload(map) {
+      // 以下为演示代码
+      this.map = map
+      // 背景透明
+      this.map._viewer.scene.backgroundColor = new this.Cesium.Color(0.0, 0.0, 0.0, 0.0)
+      this.map._viewer.scene.globe.baseColor.alpha = 0
+      // this.addWaterHeat()
+      // 添加管理处
+      this.addStation()
+      this.addStationDiv()
+      // 添加水保隐患隐患点
+      this.addThreatPosition()
+    },
+    // 高后果区热力图
+    addWaterHeat() {
+      const { mars3d } = this
+      getWaterThreat().then((res) => {
+        let data = res.data.filter(item => item['DES02'] !== '无')
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        // 过滤掉经度为null的
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        const heatLayer = new mars3d.layer.HeatLayer({
+          positions: this.threatArea.map(item => {
+            return { lng: item['经度'], lat: item['纬度'], value: 1 }
+          }),
+          heatStyle: {
+            radius: 30, // 半径
+            blur: 1 // 模糊因子
+          },
+          // 以下为矩形矢量对象的样式参数
+          style: {
+            opacity: 0.8,
+            clampToGround: false,
+            height: 10000
+          },
+          redrawZoom: true,
+          flyTo: false
+        })
+        this.heatLayer = heatLayer
+        this.map.addLayer(heatLayer)
+      })
+    },
+    // 水保隐患位置
+    addThreatPosition() {
+      getWaterThreat().then((res) => {
+        let data = res.data
+        data = data.map(item => {
+          return {
+            '经度': parseFloat(item['DES08']),
+            '纬度': parseFloat(item['DES09']),
+            '位置描述': item['DES02'],
+            '村庄地址': item['DES03'],
+            '发现人': item['DES04'],
+            '隐患描述': item['DES05'],
+            '业主单位': item['DES06'],
+            '隐患类型': item['DES01'],
+            '隐患发现时间': item['WD01_03'],
+            '创建时间': item['DES07'],
+            '隐患级别': item['WD54_03'],
+            '所属管理处': item['DES10'],
+            '状态': item['WD56_03']
+          }
+        })
+        debugger
+        this.threatArea = data.filter(item => item['经度'] !== null)
+        this.boardData.value = this.threatArea.length
+        this.addFeatures(this.threatArea)
+      })
+    },
+    // 添加隐患点
+    addFeatures(arr) {
+      const { mars3d, Cesium, threatLevel } = this
+      // 创建DIV数据图层
+      var graphicLayer = new mars3d.layer.DivLayer()
+      this.threatLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      // 在layer上绑定监听事件
+      graphicLayer.on(mars3d.EventType.click, function(event) {
+        console.log('监听layer，单击了矢量对象', event)
+      })
+      graphicLayer.bindPopup(function(event) {
+        const item = event.graphic.attr
+        var html =
+          '位置描述：' +
+          item['位置描述'] +
+          '<br />村庄地址：' +
+          item['村庄地址'] +
+          '<br />发现人：' +
+          item['发现人'] +
+          '<br />隐患描述：' +
+          item['隐患描述'] +
+          '<br />创建时间：' +
+          item['创建时间'] +
+          '<br />隐患等级：' +
+          threatLevel[item['隐患等级']]
+        return html
+      })
+
+      for (var i = 0, len = arr.length; i < len; i++) {
+        const item = arr[i]
+        var jd = item['经度']
+        var wd = item['纬度']
+        const level = parseInt(item['隐患等级']) - 1
+        var clr = this.pointColorArr[level]
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(jd, wd, 0),
+          style: {
+            html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 2000000) // 按视距距离显示
+          },
+          attr: item
+        })
+        graphicLayer.addGraphic(graphic)
+      }
+    },
+    // 管理处
+    addStation() {
+      const { mars3d } = this
+      const stationLayer = new mars3d.layer.ModelLayer({
+        name: '管理处',
+        url: './static/gltf/output/guanlizhan.gltf',
+        // url: './static/gltf/house02.gltf',
+        style: {
+          scale: 10,
+          heading: 0,
+          minimumPixelSize: 30,
+          clampToGround: true
+        },
+        positions: this.manageStations.map(item => {
+          return { lng: item.x, lat: item.y, alt: 0 }
+        })
+      })
+      this.stationLayer = stationLayer
+      this.map.addLayer(stationLayer)
+    },
+    // 选框发生变化
+    selectChange({ area, state, time, level }) {
+      area = area === '全部' ? '' : area
+      time = time === '全部' ? '' : time
+      level = level === '全部' ? '' : level
+      // 解析时间
+      let beginTime = ''
+      let endTime = ''
+      if (time) {
+        const result = getTimes(time)
+        beginTime = result.beginDate
+        endTime = result.endDate
+      }
+      this.boardData.name = area
+      // 查询数据
+      let count = 0
+      debugger
+      for (const hca of this.threatArea) {
+        let flag = true // 标记是否合格
+        // 比较区域
+        if (area && hca['所属管理处'] && hca['所属管理处'].indexOf(area) === -1) {
+          flag = false
+        }
+        // 比较时间
+        if (time) {
+          const real_date = new Date(hca['识别时间'])
+          if (real_date && (real_date < beginTime || real_date > endTime)) {
+            flag = false
+          }
+        }
+        // 比较级别
+        if (level && hca['隐患等级'] && hca['隐患等级'] === level) {
+          flag = false
+        }
+        if (flag) {
+          count++
+        }
+      }
+      this.boardData.value = count
+    },
+    // 自定义的弹窗
+    addStationDiv() {
+      const { Cesium, mars3d } = this
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      this.graphicLayer = graphicLayer
+      this.map.addLayer(graphicLayer)
+      for (const station of this.threatAreaStation) {
+        var graphic = new mars3d.graphic.DivGraphic({
+          position: Cesium.Cartesian3.fromDegrees(station.x, station.y, 10100),
+          style: {
+            html: `<div class="divpoint divpoint-theme-29baf1">
+                    <div class="divpoint-wrap">
+                        <div class="area">
+                            <div class="arrow-lt"></div>
+                            <div class="b-t"></div>
+                            <div class="b-r"></div>
+                            <div class="b-b"></div>
+                            <div class="b-l"></div>
+                            <div class="arrow-rb"></div>
+                            <div class="label-wrap">
+                                <div class="title">${station.name}</div>
+                                <div class="label-content">
+                                    <div class="data-li">
+                                        <div class="data-label">水保隐患数量：</div>
+                                        <div class="data-value"><span class="label-num">${station.count}</span><span class="label-unit">个</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">经度：</div>
+                                        <div class="data-value"><span class="label-num">${station.x}</span>
+                                        </div>
+                                    </div>
+                                    <div class="data-li">
+                                        <div class="data-label">纬度：</div>
+                                        <div class="data-value"><span class="label-num">${station.y}</span>
+                                        </div>
+                                    </div>
+                                    `,
+            // anchor: [0, 0],
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(10000, 500000), // 按视距距离显示
+            scaleByDistance: new Cesium.NearFarScalar(10000, 1.0, 500000, 0.1),
+            clampToGround: true,
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
+          },
+          pointerEvents: false // false时不允许拾取和触发任意鼠标事件，但可以穿透div缩放地球
+        })
+        graphicLayer.addGraphic(graphic)
+        graphic.testPoint = false // 打开测试点，与DIV点进行对比位置调整css
+      }
+    },
+    // 是否显示热力图
+    showHeat(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.heatShow = false
+        this.map.removeLayer(this.heatLayer, true)
+      } else {
+        this.heatShow = true
+        this.addWaterHeat()
+      }
+    },
+    // 显示管理处
+    showStation(show) {
+      // 现在正在显示
+      if (show) { // 移除
+        this.stationShow = false
+        this.map.removeLayer(this.stationLayer, true)
+        this.map.removeLayer(this.graphicLayer, true)
+      } else {
+        this.stationShow = true
+        this.addStation()
+        this.addStationDiv()
+      }
+    },
+    // 显示隐患分布
+    showPosition(show) {
+      if (show) { // 移除
+        this.positionShow = false
+        this.map.removeLayer(this.threatLayer, true)
+      } else {
+        this.positionShow = true
+        this.addThreatPosition()
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .label-div{
+    position: absolute;
+    top: 140px;
+    left:31rem;
+    z-index:100;
+    color: white;
+    padding:2rem 3rem 1.5rem 3rem;
+    background-image: url("../../assets/button_images/board-box1.png");
+    background-size: 100% 100%;
+    .label{
+      margin-bottom: 1rem;
+      font-size:1.2rem;
+    }
+    .value{
+      font-family: DS-DigitalBold;
+      font-size:2.5rem;
+    }
+  }
+  .map-btn-group{
+    position: absolute;
+    bottom:3rem;
+    left:50%;
+    transform: translateX(-50%);
+    display: flex;
+    justify-content: center;
+  }
+</style>
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index ae36f07..9471a8b 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -194,7 +194,7 @@
                 image: img,
                 pixelOffsetX: 0,
                 pixelOffsetY: -20,
-                scale: 0.5,
+                scale: 0.6,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM
               }
diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png
index 182631b..9b74331 100644
--- a/static/images/map/weather/weather-dayu.png
+++ b/static/images/map/weather/weather-dayu.png
Binary files differ
diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png
index 03dfd4c..0546306 100644
--- a/static/images/map/weather/weather-duoyun.png
+++ b/static/images/map/weather/weather-duoyun.png
Binary files differ
diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png
index d8ee803..9776429 100644
--- a/static/images/map/weather/weather-qing.png
+++ b/static/images/map/weather/weather-qing.png
Binary files differ
diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png
index ebb1abe..5c983f9 100644
--- a/static/images/map/weather/weather-xiaoyu.png
+++ b/static/images/map/weather/weather-xiaoyu.png
Binary files differ
diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png
index 1b3e670..a43ea8c 100644
--- a/static/images/map/weather/weather-yin.png
+++ b/static/images/map/weather/weather-yin.png
Binary files differ