diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,
diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue
index 3bbeaeb..de58764 100644
--- a/src/components/Map/components/disasterLayer.vue
+++ b/src/components/Map/components/disasterLayer.vue
@@ -56,7 +56,7 @@
         '霜冻': '11',
         '大雾': '12',
         '霾': '13',
-        '道路结冰': '14'
+        '道路结冰': '14',
       }, // 灾害与数字对应表
       disasterLevel: {
         '蓝色': '01',
@@ -104,8 +104,8 @@
           let data = res.data.map(item => {
             return {
               name: item['WD52_03'].trim(),
-              lng: parseFloat(item['WD52_06'].trim()),
-              lat: parseFloat(item['WD52_05'].trim()),
+              lng: parseFloat(item['WD52_05'].trim()),
+              lat: parseFloat(item['WD52_06'].trim()),
               value: item['WD52_08'].trim(),
               zhlx: item['WD52_12'].trim(),
               zhdj: item['WD52_13'].trim()
@@ -114,7 +114,10 @@
           data = data.filter(item => item.lng != null)
           this.data = data
           for (const item of data) {
-            const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            let img='static/images/weather_disaster/0000.png'
+            if(this.disaster[item.zhlx]){
+              img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            }
             const graphic = new mars3d.graphic.BillboardEntity({
               name: '气象灾害',
               position: [item.lng, item.lat, height],

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,
diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue
index 3bbeaeb..de58764 100644
--- a/src/components/Map/components/disasterLayer.vue
+++ b/src/components/Map/components/disasterLayer.vue
@@ -56,7 +56,7 @@
         '霜冻': '11',
         '大雾': '12',
         '霾': '13',
-        '道路结冰': '14'
+        '道路结冰': '14',
       }, // 灾害与数字对应表
       disasterLevel: {
         '蓝色': '01',
@@ -104,8 +104,8 @@
           let data = res.data.map(item => {
             return {
               name: item['WD52_03'].trim(),
-              lng: parseFloat(item['WD52_06'].trim()),
-              lat: parseFloat(item['WD52_05'].trim()),
+              lng: parseFloat(item['WD52_05'].trim()),
+              lat: parseFloat(item['WD52_06'].trim()),
               value: item['WD52_08'].trim(),
               zhlx: item['WD52_12'].trim(),
               zhdj: item['WD52_13'].trim()
@@ -114,7 +114,10 @@
           data = data.filter(item => item.lng != null)
           this.data = data
           for (const item of data) {
-            const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            let img='static/images/weather_disaster/0000.png'
+            if(this.disaster[item.zhlx]){
+              img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            }
             const graphic = new mars3d.graphic.BillboardEntity({
               name: '气象灾害',
               position: [item.lng, item.lat, height],
diff --git a/src/components/Map/components/supplyLayer.vue b/src/components/Map/components/supplyLayer.vue
index 9c4e07b..e64f114 100644
--- a/src/components/Map/components/supplyLayer.vue
+++ b/src/components/Map/components/supplyLayer.vue
@@ -98,19 +98,20 @@
       const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
+          debugger
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
@@ -172,6 +173,10 @@
     removeLayer() {
       const { map, layer } = this
       if (this.layer) {
+        const graphics = layer.graphics
+        for (const graphic of graphics) {
+          graphic.closePopup()
+        }
         map.removeLayer(layer)
         this.layer = null
       }

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,
diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue
index 3bbeaeb..de58764 100644
--- a/src/components/Map/components/disasterLayer.vue
+++ b/src/components/Map/components/disasterLayer.vue
@@ -56,7 +56,7 @@
         '霜冻': '11',
         '大雾': '12',
         '霾': '13',
-        '道路结冰': '14'
+        '道路结冰': '14',
       }, // 灾害与数字对应表
       disasterLevel: {
         '蓝色': '01',
@@ -104,8 +104,8 @@
           let data = res.data.map(item => {
             return {
               name: item['WD52_03'].trim(),
-              lng: parseFloat(item['WD52_06'].trim()),
-              lat: parseFloat(item['WD52_05'].trim()),
+              lng: parseFloat(item['WD52_05'].trim()),
+              lat: parseFloat(item['WD52_06'].trim()),
               value: item['WD52_08'].trim(),
               zhlx: item['WD52_12'].trim(),
               zhdj: item['WD52_13'].trim()
@@ -114,7 +114,10 @@
           data = data.filter(item => item.lng != null)
           this.data = data
           for (const item of data) {
-            const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            let img='static/images/weather_disaster/0000.png'
+            if(this.disaster[item.zhlx]){
+              img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            }
             const graphic = new mars3d.graphic.BillboardEntity({
               name: '气象灾害',
               position: [item.lng, item.lat, height],
diff --git a/src/components/Map/components/supplyLayer.vue b/src/components/Map/components/supplyLayer.vue
index 9c4e07b..e64f114 100644
--- a/src/components/Map/components/supplyLayer.vue
+++ b/src/components/Map/components/supplyLayer.vue
@@ -98,19 +98,20 @@
       const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
+          debugger
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
@@ -172,6 +173,10 @@
     removeLayer() {
       const { map, layer } = this
       if (this.layer) {
+        const graphics = layer.graphics
+        for (const graphic of graphics) {
+          graphic.closePopup()
+        }
         map.removeLayer(layer)
         this.layer = null
       }
diff --git a/src/components/Map/components/supplyLayerCone.vue b/src/components/Map/components/supplyLayerCone.vue
index de46f58..fc7fc50 100644
--- a/src/components/Map/components/supplyLayerCone.vue
+++ b/src/components/Map/components/supplyLayerCone.vue
@@ -79,7 +79,7 @@
   methods: {
     load() {
       console.log('load')
-      if(this.show) this.initLayer()
+      if (this.show) this.initLayer()
     },
     initLayer() {
       const { mars3d, map } = this
@@ -105,17 +105,17 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,
diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue
index 3bbeaeb..de58764 100644
--- a/src/components/Map/components/disasterLayer.vue
+++ b/src/components/Map/components/disasterLayer.vue
@@ -56,7 +56,7 @@
         '霜冻': '11',
         '大雾': '12',
         '霾': '13',
-        '道路结冰': '14'
+        '道路结冰': '14',
       }, // 灾害与数字对应表
       disasterLevel: {
         '蓝色': '01',
@@ -104,8 +104,8 @@
           let data = res.data.map(item => {
             return {
               name: item['WD52_03'].trim(),
-              lng: parseFloat(item['WD52_06'].trim()),
-              lat: parseFloat(item['WD52_05'].trim()),
+              lng: parseFloat(item['WD52_05'].trim()),
+              lat: parseFloat(item['WD52_06'].trim()),
               value: item['WD52_08'].trim(),
               zhlx: item['WD52_12'].trim(),
               zhdj: item['WD52_13'].trim()
@@ -114,7 +114,10 @@
           data = data.filter(item => item.lng != null)
           this.data = data
           for (const item of data) {
-            const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            let img='static/images/weather_disaster/0000.png'
+            if(this.disaster[item.zhlx]){
+              img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            }
             const graphic = new mars3d.graphic.BillboardEntity({
               name: '气象灾害',
               position: [item.lng, item.lat, height],
diff --git a/src/components/Map/components/supplyLayer.vue b/src/components/Map/components/supplyLayer.vue
index 9c4e07b..e64f114 100644
--- a/src/components/Map/components/supplyLayer.vue
+++ b/src/components/Map/components/supplyLayer.vue
@@ -98,19 +98,20 @@
       const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
+          debugger
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
@@ -172,6 +173,10 @@
     removeLayer() {
       const { map, layer } = this
       if (this.layer) {
+        const graphics = layer.graphics
+        for (const graphic of graphics) {
+          graphic.closePopup()
+        }
         map.removeLayer(layer)
         this.layer = null
       }
diff --git a/src/components/Map/components/supplyLayerCone.vue b/src/components/Map/components/supplyLayerCone.vue
index de46f58..fc7fc50 100644
--- a/src/components/Map/components/supplyLayerCone.vue
+++ b/src/components/Map/components/supplyLayerCone.vue
@@ -79,7 +79,7 @@
   methods: {
     load() {
       console.log('load')
-      if(this.show) this.initLayer()
+      if (this.show) this.initLayer()
     },
     initLayer() {
       const { mars3d, map } = this
@@ -105,17 +105,17 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
diff --git a/src/components/Map/components/vipLayer.vue b/src/components/Map/components/vipLayer.vue
index 154d153..9e18725 100644
--- a/src/components/Map/components/vipLayer.vue
+++ b/src/components/Map/components/vipLayer.vue
@@ -77,12 +77,12 @@
             name: item['WD02_03'],
             x: parseFloat(item['WD02_04']),
             y: parseFloat(item['WD02_05']),
-            pngNeed: item['DL03'],
-            lngNeed: item['DL02'],
-            pngSupply: item['DL03'],
-            lngSupply: item['DL02'],
-            supply: item['DL03'] + item['DL02'],
-            need: item['DL03'] + item['DL02']
+            pngNeed: item['DL01'],
+            lngNeed: 0,
+            pngSupply: item['DL01'],
+            lngSupply: 0,
+            supply: item['DL01'],
+            need: item['DL01']
           }
         })
         this.data = data
@@ -104,10 +104,10 @@
         this.layer.bindPopup(event => {
           const item = event.graphic.attr
           var html = `<div class='popup-win'><span class='title'>${item.name}</span><br/>`
-          if (showValue === 'need' || showValue==='all') {
+          if (showValue === 'need' || showValue === 'all') {
             html += `<span style="color:#63AEFF">需求：${item.need} m³</span><br/>`
           }
-          if (showValue === 'supply' || showValue==='all') {
+          if (showValue === 'supply' || showValue === 'all') {
             html += `<span style="color:#FFB861">供应：${item.supply}m³</span><br/>
             <span style="color:#FFB861">png供应：${item.pngSupply}m³</span><br/>
             <span style="color:#FFB861">lng供应：${item.lngSupply}m³</span></div>`

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,
diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue
index 3bbeaeb..de58764 100644
--- a/src/components/Map/components/disasterLayer.vue
+++ b/src/components/Map/components/disasterLayer.vue
@@ -56,7 +56,7 @@
         '霜冻': '11',
         '大雾': '12',
         '霾': '13',
-        '道路结冰': '14'
+        '道路结冰': '14',
       }, // 灾害与数字对应表
       disasterLevel: {
         '蓝色': '01',
@@ -104,8 +104,8 @@
           let data = res.data.map(item => {
             return {
               name: item['WD52_03'].trim(),
-              lng: parseFloat(item['WD52_06'].trim()),
-              lat: parseFloat(item['WD52_05'].trim()),
+              lng: parseFloat(item['WD52_05'].trim()),
+              lat: parseFloat(item['WD52_06'].trim()),
               value: item['WD52_08'].trim(),
               zhlx: item['WD52_12'].trim(),
               zhdj: item['WD52_13'].trim()
@@ -114,7 +114,10 @@
           data = data.filter(item => item.lng != null)
           this.data = data
           for (const item of data) {
-            const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            let img='static/images/weather_disaster/0000.png'
+            if(this.disaster[item.zhlx]){
+              img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            }
             const graphic = new mars3d.graphic.BillboardEntity({
               name: '气象灾害',
               position: [item.lng, item.lat, height],
diff --git a/src/components/Map/components/supplyLayer.vue b/src/components/Map/components/supplyLayer.vue
index 9c4e07b..e64f114 100644
--- a/src/components/Map/components/supplyLayer.vue
+++ b/src/components/Map/components/supplyLayer.vue
@@ -98,19 +98,20 @@
       const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
+          debugger
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
@@ -172,6 +173,10 @@
     removeLayer() {
       const { map, layer } = this
       if (this.layer) {
+        const graphics = layer.graphics
+        for (const graphic of graphics) {
+          graphic.closePopup()
+        }
         map.removeLayer(layer)
         this.layer = null
       }
diff --git a/src/components/Map/components/supplyLayerCone.vue b/src/components/Map/components/supplyLayerCone.vue
index de46f58..fc7fc50 100644
--- a/src/components/Map/components/supplyLayerCone.vue
+++ b/src/components/Map/components/supplyLayerCone.vue
@@ -79,7 +79,7 @@
   methods: {
     load() {
       console.log('load')
-      if(this.show) this.initLayer()
+      if (this.show) this.initLayer()
     },
     initLayer() {
       const { mars3d, map } = this
@@ -105,17 +105,17 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
diff --git a/src/components/Map/components/vipLayer.vue b/src/components/Map/components/vipLayer.vue
index 154d153..9e18725 100644
--- a/src/components/Map/components/vipLayer.vue
+++ b/src/components/Map/components/vipLayer.vue
@@ -77,12 +77,12 @@
             name: item['WD02_03'],
             x: parseFloat(item['WD02_04']),
             y: parseFloat(item['WD02_05']),
-            pngNeed: item['DL03'],
-            lngNeed: item['DL02'],
-            pngSupply: item['DL03'],
-            lngSupply: item['DL02'],
-            supply: item['DL03'] + item['DL02'],
-            need: item['DL03'] + item['DL02']
+            pngNeed: item['DL01'],
+            lngNeed: 0,
+            pngSupply: item['DL01'],
+            lngSupply: 0,
+            supply: item['DL01'],
+            need: item['DL01']
           }
         })
         this.data = data
@@ -104,10 +104,10 @@
         this.layer.bindPopup(event => {
           const item = event.graphic.attr
           var html = `<div class='popup-win'><span class='title'>${item.name}</span><br/>`
-          if (showValue === 'need' || showValue==='all') {
+          if (showValue === 'need' || showValue === 'all') {
             html += `<span style="color:#63AEFF">需求：${item.need} m³</span><br/>`
           }
-          if (showValue === 'supply' || showValue==='all') {
+          if (showValue === 'supply' || showValue === 'all') {
             html += `<span style="color:#FFB861">供应：${item.supply}m³</span><br/>
             <span style="color:#FFB861">png供应：${item.pngSupply}m³</span><br/>
             <span style="color:#FFB861">lng供应：${item.lngSupply}m³</span></div>`
diff --git a/src/components/Map/components/weatherLayer.vue b/src/components/Map/components/weatherLayer.vue
index b9f2096..ff93fa0 100644
--- a/src/components/Map/components/weatherLayer.vue
+++ b/src/components/Map/components/weatherLayer.vue
@@ -92,8 +92,8 @@
             name: item['WD51_20'],
             lng: parseFloat(item['WD51_21']),
             lat: parseFloat(item['WD51_22']),
-            wd: item['WD51_15'].trim(),
-            wg: item['WD51_14'].trim(),
+            wd: item['WD51_14'].trim(),
+            wg: item['WD51_15'].trim(),
             tqxx12: item['WD51_10'],
             tqxx24: item['WD51_12']
           }

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,
diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue
index 3bbeaeb..de58764 100644
--- a/src/components/Map/components/disasterLayer.vue
+++ b/src/components/Map/components/disasterLayer.vue
@@ -56,7 +56,7 @@
         '霜冻': '11',
         '大雾': '12',
         '霾': '13',
-        '道路结冰': '14'
+        '道路结冰': '14',
       }, // 灾害与数字对应表
       disasterLevel: {
         '蓝色': '01',
@@ -104,8 +104,8 @@
           let data = res.data.map(item => {
             return {
               name: item['WD52_03'].trim(),
-              lng: parseFloat(item['WD52_06'].trim()),
-              lat: parseFloat(item['WD52_05'].trim()),
+              lng: parseFloat(item['WD52_05'].trim()),
+              lat: parseFloat(item['WD52_06'].trim()),
               value: item['WD52_08'].trim(),
               zhlx: item['WD52_12'].trim(),
               zhdj: item['WD52_13'].trim()
@@ -114,7 +114,10 @@
           data = data.filter(item => item.lng != null)
           this.data = data
           for (const item of data) {
-            const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            let img='static/images/weather_disaster/0000.png'
+            if(this.disaster[item.zhlx]){
+              img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            }
             const graphic = new mars3d.graphic.BillboardEntity({
               name: '气象灾害',
               position: [item.lng, item.lat, height],
diff --git a/src/components/Map/components/supplyLayer.vue b/src/components/Map/components/supplyLayer.vue
index 9c4e07b..e64f114 100644
--- a/src/components/Map/components/supplyLayer.vue
+++ b/src/components/Map/components/supplyLayer.vue
@@ -98,19 +98,20 @@
       const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
+          debugger
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
@@ -172,6 +173,10 @@
     removeLayer() {
       const { map, layer } = this
       if (this.layer) {
+        const graphics = layer.graphics
+        for (const graphic of graphics) {
+          graphic.closePopup()
+        }
         map.removeLayer(layer)
         this.layer = null
       }
diff --git a/src/components/Map/components/supplyLayerCone.vue b/src/components/Map/components/supplyLayerCone.vue
index de46f58..fc7fc50 100644
--- a/src/components/Map/components/supplyLayerCone.vue
+++ b/src/components/Map/components/supplyLayerCone.vue
@@ -79,7 +79,7 @@
   methods: {
     load() {
       console.log('load')
-      if(this.show) this.initLayer()
+      if (this.show) this.initLayer()
     },
     initLayer() {
       const { mars3d, map } = this
@@ -105,17 +105,17 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
diff --git a/src/components/Map/components/vipLayer.vue b/src/components/Map/components/vipLayer.vue
index 154d153..9e18725 100644
--- a/src/components/Map/components/vipLayer.vue
+++ b/src/components/Map/components/vipLayer.vue
@@ -77,12 +77,12 @@
             name: item['WD02_03'],
             x: parseFloat(item['WD02_04']),
             y: parseFloat(item['WD02_05']),
-            pngNeed: item['DL03'],
-            lngNeed: item['DL02'],
-            pngSupply: item['DL03'],
-            lngSupply: item['DL02'],
-            supply: item['DL03'] + item['DL02'],
-            need: item['DL03'] + item['DL02']
+            pngNeed: item['DL01'],
+            lngNeed: 0,
+            pngSupply: item['DL01'],
+            lngSupply: 0,
+            supply: item['DL01'],
+            need: item['DL01']
           }
         })
         this.data = data
@@ -104,10 +104,10 @@
         this.layer.bindPopup(event => {
           const item = event.graphic.attr
           var html = `<div class='popup-win'><span class='title'>${item.name}</span><br/>`
-          if (showValue === 'need' || showValue==='all') {
+          if (showValue === 'need' || showValue === 'all') {
             html += `<span style="color:#63AEFF">需求：${item.need} m³</span><br/>`
           }
-          if (showValue === 'supply' || showValue==='all') {
+          if (showValue === 'supply' || showValue === 'all') {
             html += `<span style="color:#FFB861">供应：${item.supply}m³</span><br/>
             <span style="color:#FFB861">png供应：${item.pngSupply}m³</span><br/>
             <span style="color:#FFB861">lng供应：${item.lngSupply}m³</span></div>`
diff --git a/src/components/Map/components/weatherLayer.vue b/src/components/Map/components/weatherLayer.vue
index b9f2096..ff93fa0 100644
--- a/src/components/Map/components/weatherLayer.vue
+++ b/src/components/Map/components/weatherLayer.vue
@@ -92,8 +92,8 @@
             name: item['WD51_20'],
             lng: parseFloat(item['WD51_21']),
             lat: parseFloat(item['WD51_22']),
-            wd: item['WD51_15'].trim(),
-            wg: item['WD51_14'].trim(),
+            wd: item['WD51_14'].trim(),
+            wg: item['WD51_15'].trim(),
             tqxx12: item['WD51_10'],
             tqxx24: item['WD51_12']
           }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 50c4c2f..959b91c 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -148,13 +148,13 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.cities = data

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,
diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue
index 3bbeaeb..de58764 100644
--- a/src/components/Map/components/disasterLayer.vue
+++ b/src/components/Map/components/disasterLayer.vue
@@ -56,7 +56,7 @@
         '霜冻': '11',
         '大雾': '12',
         '霾': '13',
-        '道路结冰': '14'
+        '道路结冰': '14',
       }, // 灾害与数字对应表
       disasterLevel: {
         '蓝色': '01',
@@ -104,8 +104,8 @@
           let data = res.data.map(item => {
             return {
               name: item['WD52_03'].trim(),
-              lng: parseFloat(item['WD52_06'].trim()),
-              lat: parseFloat(item['WD52_05'].trim()),
+              lng: parseFloat(item['WD52_05'].trim()),
+              lat: parseFloat(item['WD52_06'].trim()),
               value: item['WD52_08'].trim(),
               zhlx: item['WD52_12'].trim(),
               zhdj: item['WD52_13'].trim()
@@ -114,7 +114,10 @@
           data = data.filter(item => item.lng != null)
           this.data = data
           for (const item of data) {
-            const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            let img='static/images/weather_disaster/0000.png'
+            if(this.disaster[item.zhlx]){
+              img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            }
             const graphic = new mars3d.graphic.BillboardEntity({
               name: '气象灾害',
               position: [item.lng, item.lat, height],
diff --git a/src/components/Map/components/supplyLayer.vue b/src/components/Map/components/supplyLayer.vue
index 9c4e07b..e64f114 100644
--- a/src/components/Map/components/supplyLayer.vue
+++ b/src/components/Map/components/supplyLayer.vue
@@ -98,19 +98,20 @@
       const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
+          debugger
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
@@ -172,6 +173,10 @@
     removeLayer() {
       const { map, layer } = this
       if (this.layer) {
+        const graphics = layer.graphics
+        for (const graphic of graphics) {
+          graphic.closePopup()
+        }
         map.removeLayer(layer)
         this.layer = null
       }
diff --git a/src/components/Map/components/supplyLayerCone.vue b/src/components/Map/components/supplyLayerCone.vue
index de46f58..fc7fc50 100644
--- a/src/components/Map/components/supplyLayerCone.vue
+++ b/src/components/Map/components/supplyLayerCone.vue
@@ -79,7 +79,7 @@
   methods: {
     load() {
       console.log('load')
-      if(this.show) this.initLayer()
+      if (this.show) this.initLayer()
     },
     initLayer() {
       const { mars3d, map } = this
@@ -105,17 +105,17 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
diff --git a/src/components/Map/components/vipLayer.vue b/src/components/Map/components/vipLayer.vue
index 154d153..9e18725 100644
--- a/src/components/Map/components/vipLayer.vue
+++ b/src/components/Map/components/vipLayer.vue
@@ -77,12 +77,12 @@
             name: item['WD02_03'],
             x: parseFloat(item['WD02_04']),
             y: parseFloat(item['WD02_05']),
-            pngNeed: item['DL03'],
-            lngNeed: item['DL02'],
-            pngSupply: item['DL03'],
-            lngSupply: item['DL02'],
-            supply: item['DL03'] + item['DL02'],
-            need: item['DL03'] + item['DL02']
+            pngNeed: item['DL01'],
+            lngNeed: 0,
+            pngSupply: item['DL01'],
+            lngSupply: 0,
+            supply: item['DL01'],
+            need: item['DL01']
           }
         })
         this.data = data
@@ -104,10 +104,10 @@
         this.layer.bindPopup(event => {
           const item = event.graphic.attr
           var html = `<div class='popup-win'><span class='title'>${item.name}</span><br/>`
-          if (showValue === 'need' || showValue==='all') {
+          if (showValue === 'need' || showValue === 'all') {
             html += `<span style="color:#63AEFF">需求：${item.need} m³</span><br/>`
           }
-          if (showValue === 'supply' || showValue==='all') {
+          if (showValue === 'supply' || showValue === 'all') {
             html += `<span style="color:#FFB861">供应：${item.supply}m³</span><br/>
             <span style="color:#FFB861">png供应：${item.pngSupply}m³</span><br/>
             <span style="color:#FFB861">lng供应：${item.lngSupply}m³</span></div>`
diff --git a/src/components/Map/components/weatherLayer.vue b/src/components/Map/components/weatherLayer.vue
index b9f2096..ff93fa0 100644
--- a/src/components/Map/components/weatherLayer.vue
+++ b/src/components/Map/components/weatherLayer.vue
@@ -92,8 +92,8 @@
             name: item['WD51_20'],
             lng: parseFloat(item['WD51_21']),
             lat: parseFloat(item['WD51_22']),
-            wd: item['WD51_15'].trim(),
-            wg: item['WD51_14'].trim(),
+            wd: item['WD51_14'].trim(),
+            wg: item['WD51_15'].trim(),
             tqxx12: item['WD51_10'],
             tqxx24: item['WD51_12']
           }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 50c4c2f..959b91c 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -148,13 +148,13 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.cities = data
diff --git a/src/views/maps/mapOverview2.vue b/src/views/maps/mapOverview2.vue
index 492e15b..8481861 100644
--- a/src/views/maps/mapOverview2.vue
+++ b/src/views/maps/mapOverview2.vue
@@ -6,7 +6,7 @@
 <template>
   <layout-map>
     <!--地图-->
-    <Map :url="configUrl" :labelShow="false" :colorful="true" @onload="onMapload">
+    <Map :url="configUrl" :colorful="true" @onload="onMapload">
       <pipe-layer ref="pipe" :show="pipeShow"/>
       <supply-layer ref="supply" :show="supplyShow"/>
       <weather-layer ref="weather" :show="weatherShow"/>
@@ -14,7 +14,7 @@
       <hca-heat-layer ref="hcaHeat" :show="hcaShow"/>
       <threat-layer ref="constructionThreat" :show="constructionThreatShow" type="construction"/>
       <threat-layer ref="sinkThreat" :show="sinkThreatShow" color="#2C06A1" type="sinkThreat"/>
-      <threat-layer ref="waterThreat" :show="waterThreatShow" color="#1FFEE6" type="waterThreat"/>
+      <threat-layer ref="waterThreat" :show="waterThreatShow" color="#ffcc00" type="waterThreat"/>
       <route-layer ref="route" :show="routeShow"/>
       <manage-station-layer ref="manageStation" :show="stationShow"/>
       <station-layer ref="station" :show="station2Show"/>
@@ -33,8 +33,8 @@
       <button2 :select="waterThreatShow" name="水保隐患" icon="icon-water" @click="showWaterThreat(waterThreatShow)"/>
     </div>
     <div class="map-point-group">
-      <button2 :select="pipeShow" name="管线" icon="icon-station2" @click="pipeShow=!pipeShow"/>
-      <button2 :select="stationShow" name="管理站" icon="icon-station2" @click="showStation(stationShow)"/>
+      <button2 style="margin-bottom:5px" :select="pipeShow" name="管线" icon="icon-station2" @click="pipeShow=!pipeShow"/>
+      <button2 style="margin-bottom:5px" :select="stationShow" name="管理站" icon="icon-station2" @click="showStation(stationShow)"/>
       <button2 :select="station2Show" name="站场" icon="icon-station2" @click="station2Show=!station2Show"/>
       <!--<button2 :select="station2Show" name="站场" icon="icon-station2" @click="showStation2(station2Show)"/>-->
 
@@ -107,7 +107,7 @@
       earthquakeShow: false,
       cameraShow: false,
       timer: null, // 轮训定时器
-      clock: 86400 // 间隔时间
+      clock: 1800 // 间隔时间,1800~30分钟
     }
   },
   mounted() {
@@ -120,7 +120,7 @@
       console.log(data)
       // 如果是数组
       if (Array.isArray(data)) {
-        const item = data[0]
+        const item = data.filter(item => item.selected)[0]
         if (item.value === '高后果区数量') {
           this.showHca()
         } else if (item.value === '第三方施工数量') {
@@ -149,7 +149,7 @@
     // 显示供应图层并打开弹窗
     showSupplyAndOpenTooltip(currentCity) {
       if (!this.supplyShow) {
-        this.supplyShow === true
+        this.supplyShow = true
         this.weatherShow = false
         this.hcaShow = false
         this.constructionThreatShow = false
@@ -319,7 +319,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .map-btn-group{
     position: absolute;
-    top:120px;
+    bottom:30px;
+    /*top:120px;*/
     left:50%;
     transform: translateX(-50%);
     display: flex;
@@ -327,10 +328,12 @@
   }
   .map-point-group{
     position: absolute;;
-    bottom:30px;
-    left:60%;
+    bottom:90px;
+    /*bottom:30px;*/
+    right:28%;
     transform: translateX(-50%);
     display: flex;
+    flex-direction: column;
     justify-content: center;
   }
 </style>

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,
diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue
index 3bbeaeb..de58764 100644
--- a/src/components/Map/components/disasterLayer.vue
+++ b/src/components/Map/components/disasterLayer.vue
@@ -56,7 +56,7 @@
         '霜冻': '11',
         '大雾': '12',
         '霾': '13',
-        '道路结冰': '14'
+        '道路结冰': '14',
       }, // 灾害与数字对应表
       disasterLevel: {
         '蓝色': '01',
@@ -104,8 +104,8 @@
           let data = res.data.map(item => {
             return {
               name: item['WD52_03'].trim(),
-              lng: parseFloat(item['WD52_06'].trim()),
-              lat: parseFloat(item['WD52_05'].trim()),
+              lng: parseFloat(item['WD52_05'].trim()),
+              lat: parseFloat(item['WD52_06'].trim()),
               value: item['WD52_08'].trim(),
               zhlx: item['WD52_12'].trim(),
               zhdj: item['WD52_13'].trim()
@@ -114,7 +114,10 @@
           data = data.filter(item => item.lng != null)
           this.data = data
           for (const item of data) {
-            const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            let img='static/images/weather_disaster/0000.png'
+            if(this.disaster[item.zhlx]){
+              img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            }
             const graphic = new mars3d.graphic.BillboardEntity({
               name: '气象灾害',
               position: [item.lng, item.lat, height],
diff --git a/src/components/Map/components/supplyLayer.vue b/src/components/Map/components/supplyLayer.vue
index 9c4e07b..e64f114 100644
--- a/src/components/Map/components/supplyLayer.vue
+++ b/src/components/Map/components/supplyLayer.vue
@@ -98,19 +98,20 @@
       const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
+          debugger
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
@@ -172,6 +173,10 @@
     removeLayer() {
       const { map, layer } = this
       if (this.layer) {
+        const graphics = layer.graphics
+        for (const graphic of graphics) {
+          graphic.closePopup()
+        }
         map.removeLayer(layer)
         this.layer = null
       }
diff --git a/src/components/Map/components/supplyLayerCone.vue b/src/components/Map/components/supplyLayerCone.vue
index de46f58..fc7fc50 100644
--- a/src/components/Map/components/supplyLayerCone.vue
+++ b/src/components/Map/components/supplyLayerCone.vue
@@ -79,7 +79,7 @@
   methods: {
     load() {
       console.log('load')
-      if(this.show) this.initLayer()
+      if (this.show) this.initLayer()
     },
     initLayer() {
       const { mars3d, map } = this
@@ -105,17 +105,17 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
diff --git a/src/components/Map/components/vipLayer.vue b/src/components/Map/components/vipLayer.vue
index 154d153..9e18725 100644
--- a/src/components/Map/components/vipLayer.vue
+++ b/src/components/Map/components/vipLayer.vue
@@ -77,12 +77,12 @@
             name: item['WD02_03'],
             x: parseFloat(item['WD02_04']),
             y: parseFloat(item['WD02_05']),
-            pngNeed: item['DL03'],
-            lngNeed: item['DL02'],
-            pngSupply: item['DL03'],
-            lngSupply: item['DL02'],
-            supply: item['DL03'] + item['DL02'],
-            need: item['DL03'] + item['DL02']
+            pngNeed: item['DL01'],
+            lngNeed: 0,
+            pngSupply: item['DL01'],
+            lngSupply: 0,
+            supply: item['DL01'],
+            need: item['DL01']
           }
         })
         this.data = data
@@ -104,10 +104,10 @@
         this.layer.bindPopup(event => {
           const item = event.graphic.attr
           var html = `<div class='popup-win'><span class='title'>${item.name}</span><br/>`
-          if (showValue === 'need' || showValue==='all') {
+          if (showValue === 'need' || showValue === 'all') {
             html += `<span style="color:#63AEFF">需求：${item.need} m³</span><br/>`
           }
-          if (showValue === 'supply' || showValue==='all') {
+          if (showValue === 'supply' || showValue === 'all') {
             html += `<span style="color:#FFB861">供应：${item.supply}m³</span><br/>
             <span style="color:#FFB861">png供应：${item.pngSupply}m³</span><br/>
             <span style="color:#FFB861">lng供应：${item.lngSupply}m³</span></div>`
diff --git a/src/components/Map/components/weatherLayer.vue b/src/components/Map/components/weatherLayer.vue
index b9f2096..ff93fa0 100644
--- a/src/components/Map/components/weatherLayer.vue
+++ b/src/components/Map/components/weatherLayer.vue
@@ -92,8 +92,8 @@
             name: item['WD51_20'],
             lng: parseFloat(item['WD51_21']),
             lat: parseFloat(item['WD51_22']),
-            wd: item['WD51_15'].trim(),
-            wg: item['WD51_14'].trim(),
+            wd: item['WD51_14'].trim(),
+            wg: item['WD51_15'].trim(),
             tqxx12: item['WD51_10'],
             tqxx24: item['WD51_12']
           }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 50c4c2f..959b91c 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -148,13 +148,13 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.cities = data
diff --git a/src/views/maps/mapOverview2.vue b/src/views/maps/mapOverview2.vue
index 492e15b..8481861 100644
--- a/src/views/maps/mapOverview2.vue
+++ b/src/views/maps/mapOverview2.vue
@@ -6,7 +6,7 @@
 <template>
   <layout-map>
     <!--地图-->
-    <Map :url="configUrl" :labelShow="false" :colorful="true" @onload="onMapload">
+    <Map :url="configUrl" :colorful="true" @onload="onMapload">
       <pipe-layer ref="pipe" :show="pipeShow"/>
       <supply-layer ref="supply" :show="supplyShow"/>
       <weather-layer ref="weather" :show="weatherShow"/>
@@ -14,7 +14,7 @@
       <hca-heat-layer ref="hcaHeat" :show="hcaShow"/>
       <threat-layer ref="constructionThreat" :show="constructionThreatShow" type="construction"/>
       <threat-layer ref="sinkThreat" :show="sinkThreatShow" color="#2C06A1" type="sinkThreat"/>
-      <threat-layer ref="waterThreat" :show="waterThreatShow" color="#1FFEE6" type="waterThreat"/>
+      <threat-layer ref="waterThreat" :show="waterThreatShow" color="#ffcc00" type="waterThreat"/>
       <route-layer ref="route" :show="routeShow"/>
       <manage-station-layer ref="manageStation" :show="stationShow"/>
       <station-layer ref="station" :show="station2Show"/>
@@ -33,8 +33,8 @@
       <button2 :select="waterThreatShow" name="水保隐患" icon="icon-water" @click="showWaterThreat(waterThreatShow)"/>
     </div>
     <div class="map-point-group">
-      <button2 :select="pipeShow" name="管线" icon="icon-station2" @click="pipeShow=!pipeShow"/>
-      <button2 :select="stationShow" name="管理站" icon="icon-station2" @click="showStation(stationShow)"/>
+      <button2 style="margin-bottom:5px" :select="pipeShow" name="管线" icon="icon-station2" @click="pipeShow=!pipeShow"/>
+      <button2 style="margin-bottom:5px" :select="stationShow" name="管理站" icon="icon-station2" @click="showStation(stationShow)"/>
       <button2 :select="station2Show" name="站场" icon="icon-station2" @click="station2Show=!station2Show"/>
       <!--<button2 :select="station2Show" name="站场" icon="icon-station2" @click="showStation2(station2Show)"/>-->
 
@@ -107,7 +107,7 @@
       earthquakeShow: false,
       cameraShow: false,
       timer: null, // 轮训定时器
-      clock: 86400 // 间隔时间
+      clock: 1800 // 间隔时间,1800~30分钟
     }
   },
   mounted() {
@@ -120,7 +120,7 @@
       console.log(data)
       // 如果是数组
       if (Array.isArray(data)) {
-        const item = data[0]
+        const item = data.filter(item => item.selected)[0]
         if (item.value === '高后果区数量') {
           this.showHca()
         } else if (item.value === '第三方施工数量') {
@@ -149,7 +149,7 @@
     // 显示供应图层并打开弹窗
     showSupplyAndOpenTooltip(currentCity) {
       if (!this.supplyShow) {
-        this.supplyShow === true
+        this.supplyShow = true
         this.weatherShow = false
         this.hcaShow = false
         this.constructionThreatShow = false
@@ -319,7 +319,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .map-btn-group{
     position: absolute;
-    top:120px;
+    bottom:30px;
+    /*top:120px;*/
     left:50%;
     transform: translateX(-50%);
     display: flex;
@@ -327,10 +328,12 @@
   }
   .map-point-group{
     position: absolute;;
-    bottom:30px;
-    left:60%;
+    bottom:90px;
+    /*bottom:30px;*/
+    right:28%;
     transform: translateX(-50%);
     display: flex;
+    flex-direction: column;
     justify-content: center;
   }
 </style>
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index cc1add3..0c2a54b 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -136,6 +136,7 @@
           tips: row.tips, // 别名，
           deptid: row.deptid, // 组织机构编号
           version: row.version, // 保留字段
+          dataScopeType: row.dataScopeType, // 保留字段
           num: row.num // 排序
         }
       }
@@ -169,6 +170,7 @@
         pids: '',
         num: 99,
         tips: '',
+        dataScopeType:'',
         version: ''
       }
     },

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,
diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue
index 3bbeaeb..de58764 100644
--- a/src/components/Map/components/disasterLayer.vue
+++ b/src/components/Map/components/disasterLayer.vue
@@ -56,7 +56,7 @@
         '霜冻': '11',
         '大雾': '12',
         '霾': '13',
-        '道路结冰': '14'
+        '道路结冰': '14',
       }, // 灾害与数字对应表
       disasterLevel: {
         '蓝色': '01',
@@ -104,8 +104,8 @@
           let data = res.data.map(item => {
             return {
               name: item['WD52_03'].trim(),
-              lng: parseFloat(item['WD52_06'].trim()),
-              lat: parseFloat(item['WD52_05'].trim()),
+              lng: parseFloat(item['WD52_05'].trim()),
+              lat: parseFloat(item['WD52_06'].trim()),
               value: item['WD52_08'].trim(),
               zhlx: item['WD52_12'].trim(),
               zhdj: item['WD52_13'].trim()
@@ -114,7 +114,10 @@
           data = data.filter(item => item.lng != null)
           this.data = data
           for (const item of data) {
-            const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            let img='static/images/weather_disaster/0000.png'
+            if(this.disaster[item.zhlx]){
+              img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            }
             const graphic = new mars3d.graphic.BillboardEntity({
               name: '气象灾害',
               position: [item.lng, item.lat, height],
diff --git a/src/components/Map/components/supplyLayer.vue b/src/components/Map/components/supplyLayer.vue
index 9c4e07b..e64f114 100644
--- a/src/components/Map/components/supplyLayer.vue
+++ b/src/components/Map/components/supplyLayer.vue
@@ -98,19 +98,20 @@
       const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
+          debugger
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
@@ -172,6 +173,10 @@
     removeLayer() {
       const { map, layer } = this
       if (this.layer) {
+        const graphics = layer.graphics
+        for (const graphic of graphics) {
+          graphic.closePopup()
+        }
         map.removeLayer(layer)
         this.layer = null
       }
diff --git a/src/components/Map/components/supplyLayerCone.vue b/src/components/Map/components/supplyLayerCone.vue
index de46f58..fc7fc50 100644
--- a/src/components/Map/components/supplyLayerCone.vue
+++ b/src/components/Map/components/supplyLayerCone.vue
@@ -79,7 +79,7 @@
   methods: {
     load() {
       console.log('load')
-      if(this.show) this.initLayer()
+      if (this.show) this.initLayer()
     },
     initLayer() {
       const { mars3d, map } = this
@@ -105,17 +105,17 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
diff --git a/src/components/Map/components/vipLayer.vue b/src/components/Map/components/vipLayer.vue
index 154d153..9e18725 100644
--- a/src/components/Map/components/vipLayer.vue
+++ b/src/components/Map/components/vipLayer.vue
@@ -77,12 +77,12 @@
             name: item['WD02_03'],
             x: parseFloat(item['WD02_04']),
             y: parseFloat(item['WD02_05']),
-            pngNeed: item['DL03'],
-            lngNeed: item['DL02'],
-            pngSupply: item['DL03'],
-            lngSupply: item['DL02'],
-            supply: item['DL03'] + item['DL02'],
-            need: item['DL03'] + item['DL02']
+            pngNeed: item['DL01'],
+            lngNeed: 0,
+            pngSupply: item['DL01'],
+            lngSupply: 0,
+            supply: item['DL01'],
+            need: item['DL01']
           }
         })
         this.data = data
@@ -104,10 +104,10 @@
         this.layer.bindPopup(event => {
           const item = event.graphic.attr
           var html = `<div class='popup-win'><span class='title'>${item.name}</span><br/>`
-          if (showValue === 'need' || showValue==='all') {
+          if (showValue === 'need' || showValue === 'all') {
             html += `<span style="color:#63AEFF">需求：${item.need} m³</span><br/>`
           }
-          if (showValue === 'supply' || showValue==='all') {
+          if (showValue === 'supply' || showValue === 'all') {
             html += `<span style="color:#FFB861">供应：${item.supply}m³</span><br/>
             <span style="color:#FFB861">png供应：${item.pngSupply}m³</span><br/>
             <span style="color:#FFB861">lng供应：${item.lngSupply}m³</span></div>`
diff --git a/src/components/Map/components/weatherLayer.vue b/src/components/Map/components/weatherLayer.vue
index b9f2096..ff93fa0 100644
--- a/src/components/Map/components/weatherLayer.vue
+++ b/src/components/Map/components/weatherLayer.vue
@@ -92,8 +92,8 @@
             name: item['WD51_20'],
             lng: parseFloat(item['WD51_21']),
             lat: parseFloat(item['WD51_22']),
-            wd: item['WD51_15'].trim(),
-            wg: item['WD51_14'].trim(),
+            wd: item['WD51_14'].trim(),
+            wg: item['WD51_15'].trim(),
             tqxx12: item['WD51_10'],
             tqxx24: item['WD51_12']
           }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 50c4c2f..959b91c 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -148,13 +148,13 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.cities = data
diff --git a/src/views/maps/mapOverview2.vue b/src/views/maps/mapOverview2.vue
index 492e15b..8481861 100644
--- a/src/views/maps/mapOverview2.vue
+++ b/src/views/maps/mapOverview2.vue
@@ -6,7 +6,7 @@
 <template>
   <layout-map>
     <!--地图-->
-    <Map :url="configUrl" :labelShow="false" :colorful="true" @onload="onMapload">
+    <Map :url="configUrl" :colorful="true" @onload="onMapload">
       <pipe-layer ref="pipe" :show="pipeShow"/>
       <supply-layer ref="supply" :show="supplyShow"/>
       <weather-layer ref="weather" :show="weatherShow"/>
@@ -14,7 +14,7 @@
       <hca-heat-layer ref="hcaHeat" :show="hcaShow"/>
       <threat-layer ref="constructionThreat" :show="constructionThreatShow" type="construction"/>
       <threat-layer ref="sinkThreat" :show="sinkThreatShow" color="#2C06A1" type="sinkThreat"/>
-      <threat-layer ref="waterThreat" :show="waterThreatShow" color="#1FFEE6" type="waterThreat"/>
+      <threat-layer ref="waterThreat" :show="waterThreatShow" color="#ffcc00" type="waterThreat"/>
       <route-layer ref="route" :show="routeShow"/>
       <manage-station-layer ref="manageStation" :show="stationShow"/>
       <station-layer ref="station" :show="station2Show"/>
@@ -33,8 +33,8 @@
       <button2 :select="waterThreatShow" name="水保隐患" icon="icon-water" @click="showWaterThreat(waterThreatShow)"/>
     </div>
     <div class="map-point-group">
-      <button2 :select="pipeShow" name="管线" icon="icon-station2" @click="pipeShow=!pipeShow"/>
-      <button2 :select="stationShow" name="管理站" icon="icon-station2" @click="showStation(stationShow)"/>
+      <button2 style="margin-bottom:5px" :select="pipeShow" name="管线" icon="icon-station2" @click="pipeShow=!pipeShow"/>
+      <button2 style="margin-bottom:5px" :select="stationShow" name="管理站" icon="icon-station2" @click="showStation(stationShow)"/>
       <button2 :select="station2Show" name="站场" icon="icon-station2" @click="station2Show=!station2Show"/>
       <!--<button2 :select="station2Show" name="站场" icon="icon-station2" @click="showStation2(station2Show)"/>-->
 
@@ -107,7 +107,7 @@
       earthquakeShow: false,
       cameraShow: false,
       timer: null, // 轮训定时器
-      clock: 86400 // 间隔时间
+      clock: 1800 // 间隔时间,1800~30分钟
     }
   },
   mounted() {
@@ -120,7 +120,7 @@
       console.log(data)
       // 如果是数组
       if (Array.isArray(data)) {
-        const item = data[0]
+        const item = data.filter(item => item.selected)[0]
         if (item.value === '高后果区数量') {
           this.showHca()
         } else if (item.value === '第三方施工数量') {
@@ -149,7 +149,7 @@
     // 显示供应图层并打开弹窗
     showSupplyAndOpenTooltip(currentCity) {
       if (!this.supplyShow) {
-        this.supplyShow === true
+        this.supplyShow = true
         this.weatherShow = false
         this.hcaShow = false
         this.constructionThreatShow = false
@@ -319,7 +319,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .map-btn-group{
     position: absolute;
-    top:120px;
+    bottom:30px;
+    /*top:120px;*/
     left:50%;
     transform: translateX(-50%);
     display: flex;
@@ -327,10 +328,12 @@
   }
   .map-point-group{
     position: absolute;;
-    bottom:30px;
-    left:60%;
+    bottom:90px;
+    /*bottom:30px;*/
+    right:28%;
     transform: translateX(-50%);
     display: flex;
+    flex-direction: column;
     justify-content: center;
   }
 </style>
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index cc1add3..0c2a54b 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -136,6 +136,7 @@
           tips: row.tips, // 别名，
           deptid: row.deptid, // 组织机构编号
           version: row.version, // 保留字段
+          dataScopeType: row.dataScopeType, // 保留字段
           num: row.num // 排序
         }
       }
@@ -169,6 +170,7 @@
         pids: '',
         num: 99,
         tips: '',
+        dataScopeType:'',
         version: ''
       }
     },
diff --git a/static/images/weather_disaster/0000.png b/static/images/weather_disaster/0000.png
new file mode 100644
index 0000000..3f3f7e0
--- /dev/null
+++ b/static/images/weather_disaster/0000.png
Binary files differ

diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 54fdd46..d6a608d 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -14,45 +14,37 @@
   })
 }
 // 各地区供给
-export function getAreaSupply(date) {
+export function getAreaSupply() {
   const baseConfig = Vue.prototype.baseConfig
   const { sign, username, timestamp } = getSignTimeStamp()
   return request({
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
-      'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
-      'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': 'E84C7DDEC62842CDAB9309D64239E4E9',
+      'distinct': true,
       'type': 0,
-      'conditionList': [
-        [
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22',
-              '23'
-            ],
-            'condition': '1',
-            'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY',
-            'key': 'WD01_01',
-            'value': [date]
-          },
-          {
-            'leftSymbolList': [
-              '21'
-            ],
-            'rightSymbolList': [
-              '22'
-            ],
-            'condition': '7',
-            'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F',
-            'key': 'WD09_05'
-
-          }
-        ]
-      ],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+// 各地区供给-旧
+export function getAreaSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
+      'showField': 'WD01_03,WD03_04,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
       'pageNo': null,
       'pageSize': null,
       'sign': sign,
@@ -78,6 +70,28 @@
     url: baseConfig.biUrl + '/factdata/index/getData',
     method: 'post',
     data: {
+      'showField': 'WD01_03,WD02_03,WD02_04,WD02_05,DL01',
+      'indexId': '8C2A9E095D0849EAAF54FFDAF832FDC3',
+      'distinct': true,
+      'type': 0,
+      'conditionList': [],
+      'pageNo': null,
+      'pageSize': null,
+      'sign': sign,
+      'name': username,
+      'time': timestamp
+    }
+  })
+}
+
+// 各用户供需数据-old
+export function getUserSupplyOld(date) {
+  const baseConfig = Vue.prototype.baseConfig
+  const { sign, username, timestamp } = getSignTimeStamp()
+  return request({
+    url: baseConfig.biUrl + '/factdata/index/getData',
+    method: 'post',
+    data: {
       'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
       'indexId': '56680A347AF44DAEB1286A7C69D97A2F',
       'type': 0,
diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue
index 3bbeaeb..de58764 100644
--- a/src/components/Map/components/disasterLayer.vue
+++ b/src/components/Map/components/disasterLayer.vue
@@ -56,7 +56,7 @@
         '霜冻': '11',
         '大雾': '12',
         '霾': '13',
-        '道路结冰': '14'
+        '道路结冰': '14',
       }, // 灾害与数字对应表
       disasterLevel: {
         '蓝色': '01',
@@ -104,8 +104,8 @@
           let data = res.data.map(item => {
             return {
               name: item['WD52_03'].trim(),
-              lng: parseFloat(item['WD52_06'].trim()),
-              lat: parseFloat(item['WD52_05'].trim()),
+              lng: parseFloat(item['WD52_05'].trim()),
+              lat: parseFloat(item['WD52_06'].trim()),
               value: item['WD52_08'].trim(),
               zhlx: item['WD52_12'].trim(),
               zhdj: item['WD52_13'].trim()
@@ -114,7 +114,10 @@
           data = data.filter(item => item.lng != null)
           this.data = data
           for (const item of data) {
-            const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            let img='static/images/weather_disaster/0000.png'
+            if(this.disaster[item.zhlx]){
+              img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
+            }
             const graphic = new mars3d.graphic.BillboardEntity({
               name: '气象灾害',
               position: [item.lng, item.lat, height],
diff --git a/src/components/Map/components/supplyLayer.vue b/src/components/Map/components/supplyLayer.vue
index 9c4e07b..e64f114 100644
--- a/src/components/Map/components/supplyLayer.vue
+++ b/src/components/Map/components/supplyLayer.vue
@@ -98,19 +98,20 @@
       const date = getToday('yyyyMMdd')
       getAreaSupply(date).then(res => {
         if (res.status === 200) {
+          debugger
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
@@ -172,6 +173,10 @@
     removeLayer() {
       const { map, layer } = this
       if (this.layer) {
+        const graphics = layer.graphics
+        for (const graphic of graphics) {
+          graphic.closePopup()
+        }
         map.removeLayer(layer)
         this.layer = null
       }
diff --git a/src/components/Map/components/supplyLayerCone.vue b/src/components/Map/components/supplyLayerCone.vue
index de46f58..fc7fc50 100644
--- a/src/components/Map/components/supplyLayerCone.vue
+++ b/src/components/Map/components/supplyLayerCone.vue
@@ -79,7 +79,7 @@
   methods: {
     load() {
       console.log('load')
-      if(this.show) this.initLayer()
+      if (this.show) this.initLayer()
     },
     initLayer() {
       const { mars3d, map } = this
@@ -105,17 +105,17 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.wholeData = data
-          this.filteredData = data
+          this.filteredData = data.filter(item => item.name !== '无')
           // 计算缩放倍数
           if (this.index == null) {
             this.index = getIndex(this.filteredData.map(item => item.supply))
diff --git a/src/components/Map/components/vipLayer.vue b/src/components/Map/components/vipLayer.vue
index 154d153..9e18725 100644
--- a/src/components/Map/components/vipLayer.vue
+++ b/src/components/Map/components/vipLayer.vue
@@ -77,12 +77,12 @@
             name: item['WD02_03'],
             x: parseFloat(item['WD02_04']),
             y: parseFloat(item['WD02_05']),
-            pngNeed: item['DL03'],
-            lngNeed: item['DL02'],
-            pngSupply: item['DL03'],
-            lngSupply: item['DL02'],
-            supply: item['DL03'] + item['DL02'],
-            need: item['DL03'] + item['DL02']
+            pngNeed: item['DL01'],
+            lngNeed: 0,
+            pngSupply: item['DL01'],
+            lngSupply: 0,
+            supply: item['DL01'],
+            need: item['DL01']
           }
         })
         this.data = data
@@ -104,10 +104,10 @@
         this.layer.bindPopup(event => {
           const item = event.graphic.attr
           var html = `<div class='popup-win'><span class='title'>${item.name}</span><br/>`
-          if (showValue === 'need' || showValue==='all') {
+          if (showValue === 'need' || showValue === 'all') {
             html += `<span style="color:#63AEFF">需求：${item.need} m³</span><br/>`
           }
-          if (showValue === 'supply' || showValue==='all') {
+          if (showValue === 'supply' || showValue === 'all') {
             html += `<span style="color:#FFB861">供应：${item.supply}m³</span><br/>
             <span style="color:#FFB861">png供应：${item.pngSupply}m³</span><br/>
             <span style="color:#FFB861">lng供应：${item.lngSupply}m³</span></div>`
diff --git a/src/components/Map/components/weatherLayer.vue b/src/components/Map/components/weatherLayer.vue
index b9f2096..ff93fa0 100644
--- a/src/components/Map/components/weatherLayer.vue
+++ b/src/components/Map/components/weatherLayer.vue
@@ -92,8 +92,8 @@
             name: item['WD51_20'],
             lng: parseFloat(item['WD51_21']),
             lat: parseFloat(item['WD51_22']),
-            wd: item['WD51_15'].trim(),
-            wg: item['WD51_14'].trim(),
+            wd: item['WD51_14'].trim(),
+            wg: item['WD51_15'].trim(),
             tqxx12: item['WD51_10'],
             tqxx24: item['WD51_12']
           }
diff --git a/src/views/maps/mapOverview.vue b/src/views/maps/mapOverview.vue
index 50c4c2f..959b91c 100644
--- a/src/views/maps/mapOverview.vue
+++ b/src/views/maps/mapOverview.vue
@@ -148,13 +148,13 @@
         if (res.status === 200) {
           const data = res.data.map(item => {
             return {
-              name: item['WD09_05'],
-              pngSupply: item['DL03'] / 10000.0,
-              pngNeed: item['DL03'] / 10000.0,
-              lngSupply: item['DL02'] / 10000.0,
-              lngNeed: item['DL02'] / 10000.0,
-              supply: (item['DL03'] + item['DL02']) / 10000.0,
-              need: (item['DL03'] + item['DL02']) / 10000.0
+              name: item['WD03_04'],
+              pngSupply: item['DL01'] / 10000.0,
+              pngNeed: item['DL01'] / 10000.0,
+              lngSupply: 0,
+              lngNeed: 0,
+              supply: (item['DL01'] + 0) / 10000.0,
+              need: (item['DL01'] + 0) / 10000.0
             }
           })
           this.cities = data
diff --git a/src/views/maps/mapOverview2.vue b/src/views/maps/mapOverview2.vue
index 492e15b..8481861 100644
--- a/src/views/maps/mapOverview2.vue
+++ b/src/views/maps/mapOverview2.vue
@@ -6,7 +6,7 @@
 <template>
   <layout-map>
     <!--地图-->
-    <Map :url="configUrl" :labelShow="false" :colorful="true" @onload="onMapload">
+    <Map :url="configUrl" :colorful="true" @onload="onMapload">
       <pipe-layer ref="pipe" :show="pipeShow"/>
       <supply-layer ref="supply" :show="supplyShow"/>
       <weather-layer ref="weather" :show="weatherShow"/>
@@ -14,7 +14,7 @@
       <hca-heat-layer ref="hcaHeat" :show="hcaShow"/>
       <threat-layer ref="constructionThreat" :show="constructionThreatShow" type="construction"/>
       <threat-layer ref="sinkThreat" :show="sinkThreatShow" color="#2C06A1" type="sinkThreat"/>
-      <threat-layer ref="waterThreat" :show="waterThreatShow" color="#1FFEE6" type="waterThreat"/>
+      <threat-layer ref="waterThreat" :show="waterThreatShow" color="#ffcc00" type="waterThreat"/>
       <route-layer ref="route" :show="routeShow"/>
       <manage-station-layer ref="manageStation" :show="stationShow"/>
       <station-layer ref="station" :show="station2Show"/>
@@ -33,8 +33,8 @@
       <button2 :select="waterThreatShow" name="水保隐患" icon="icon-water" @click="showWaterThreat(waterThreatShow)"/>
     </div>
     <div class="map-point-group">
-      <button2 :select="pipeShow" name="管线" icon="icon-station2" @click="pipeShow=!pipeShow"/>
-      <button2 :select="stationShow" name="管理站" icon="icon-station2" @click="showStation(stationShow)"/>
+      <button2 style="margin-bottom:5px" :select="pipeShow" name="管线" icon="icon-station2" @click="pipeShow=!pipeShow"/>
+      <button2 style="margin-bottom:5px" :select="stationShow" name="管理站" icon="icon-station2" @click="showStation(stationShow)"/>
       <button2 :select="station2Show" name="站场" icon="icon-station2" @click="station2Show=!station2Show"/>
       <!--<button2 :select="station2Show" name="站场" icon="icon-station2" @click="showStation2(station2Show)"/>-->
 
@@ -107,7 +107,7 @@
       earthquakeShow: false,
       cameraShow: false,
       timer: null, // 轮训定时器
-      clock: 86400 // 间隔时间
+      clock: 1800 // 间隔时间,1800~30分钟
     }
   },
   mounted() {
@@ -120,7 +120,7 @@
       console.log(data)
       // 如果是数组
       if (Array.isArray(data)) {
-        const item = data[0]
+        const item = data.filter(item => item.selected)[0]
         if (item.value === '高后果区数量') {
           this.showHca()
         } else if (item.value === '第三方施工数量') {
@@ -149,7 +149,7 @@
     // 显示供应图层并打开弹窗
     showSupplyAndOpenTooltip(currentCity) {
       if (!this.supplyShow) {
-        this.supplyShow === true
+        this.supplyShow = true
         this.weatherShow = false
         this.hcaShow = false
         this.constructionThreatShow = false
@@ -319,7 +319,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .map-btn-group{
     position: absolute;
-    top:120px;
+    bottom:30px;
+    /*top:120px;*/
     left:50%;
     transform: translateX(-50%);
     display: flex;
@@ -327,10 +328,12 @@
   }
   .map-point-group{
     position: absolute;;
-    bottom:30px;
-    left:60%;
+    bottom:90px;
+    /*bottom:30px;*/
+    right:28%;
     transform: translateX(-50%);
     display: flex;
+    flex-direction: column;
     justify-content: center;
   }
 </style>
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index cc1add3..0c2a54b 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -136,6 +136,7 @@
           tips: row.tips, // 别名，
           deptid: row.deptid, // 组织机构编号
           version: row.version, // 保留字段
+          dataScopeType: row.dataScopeType, // 保留字段
           num: row.num // 排序
         }
       }
@@ -169,6 +170,7 @@
         pids: '',
         num: 99,
         tips: '',
+        dataScopeType:'',
         version: ''
       }
     },
diff --git a/static/images/weather_disaster/0000.png b/static/images/weather_disaster/0000.png
new file mode 100644
index 0000000..3f3f7e0
--- /dev/null
+++ b/static/images/weather_disaster/0000.png
Binary files differ
diff --git a/static/project.config.json b/static/project.config.json
index 5a04df7..f75c6e3 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,11 +1,11 @@
 {
   "title": "管理者驾驶舱",
-  "baseUrl": "http://10.100.252.11:8080/cockpit/",
+  "baseUrl": "http://59.49.106.24:8080/cockpit/",
   "biUrl": "http://59.49.106.24:9001",
   "sameWindow": false,
   "toDashboard": false,
-  "biLogin": "http://10.100.252.13:9001/sso/integrationConfig/login",
-  "dashUrl": "http://10.100.252.13:9001/mobile/browse/1/06C7CB6A9DDD4175AC6DDD8EAF977D63?",
+  "biLogin": "http://59.49.106.24:9001/sso/integrationConfig/login",
+  "dashUrl": "http://59.49.106.24:9001/mobile/browse/1/06C7CB6A9DDD4175AC6DDD8EAF977D63?",
   "city":"太原市",
   "mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8",
   "labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8"