diff --git a/src/api/threat.js b/src/api/threat.js index e2495ae..0ffc667 100644 --- a/src/api/threat.js +++ b/src/api/threat.js @@ -27,10 +27,17 @@ ], [ { + 'leftSymbolList':["21"], + 'rightSymbolList':["24"], + 'condition': '8', + 'key': 'WD63_05' + }, + { + 'rightSymbolList':["22"], 'condition': '2', 'key': 'WD63_05', 'indexDimValues': '完工' - } + }, ] ], 'pageNo': null, diff --git a/src/api/threat.js b/src/api/threat.js index e2495ae..0ffc667 100644 --- a/src/api/threat.js +++ b/src/api/threat.js @@ -27,10 +27,17 @@ ], [ { + 'leftSymbolList':["21"], + 'rightSymbolList':["24"], + 'condition': '8', + 'key': 'WD63_05' + }, + { + 'rightSymbolList':["22"], 'condition': '2', 'key': 'WD63_05', 'indexDimValues': '完工' - } + }, ] ], 'pageNo': null, diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue index de58764..45e63af 100644 --- a/src/components/Map/components/disasterLayer.vue +++ b/src/components/Map/components/disasterLayer.vue @@ -117,6 +117,8 @@ 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' + }else if(!this.disaster[item.zhlx] && this.disasterLevel[item.zhdj]){ + img = 'static/images/weather_disaster/00' + this.disasterLevel[item.zhdj] + '.png' } const graphic = new mars3d.graphic.BillboardEntity({ name: '气象灾害', diff --git a/src/api/threat.js b/src/api/threat.js index e2495ae..0ffc667 100644 --- a/src/api/threat.js +++ b/src/api/threat.js @@ -27,10 +27,17 @@ ], [ { + 'leftSymbolList':["21"], + 'rightSymbolList':["24"], + 'condition': '8', + 'key': 'WD63_05' + }, + { + 'rightSymbolList':["22"], 'condition': '2', 'key': 'WD63_05', 'indexDimValues': '完工' - } + }, ] ], 'pageNo': null, diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue index de58764..45e63af 100644 --- a/src/components/Map/components/disasterLayer.vue +++ b/src/components/Map/components/disasterLayer.vue @@ -117,6 +117,8 @@ 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' + }else if(!this.disaster[item.zhlx] && this.disasterLevel[item.zhdj]){ + img = 'static/images/weather_disaster/00' + this.disasterLevel[item.zhdj] + '.png' } const graphic = new mars3d.graphic.BillboardEntity({ name: '气象灾害', diff --git a/src/components/Map/components/hcaHeatLayer.vue b/src/components/Map/components/hcaHeatLayer.vue index 9233d92..8247076 100644 --- a/src/components/Map/components/hcaHeatLayer.vue +++ b/src/components/Map/components/hcaHeatLayer.vue @@ -79,6 +79,7 @@ } }) this.data = data.filter(item => item['高后果区级别'] !== '无') + console.log('数量',this.data.length) const heatLayer = new mars3d.layer.HeatLayer({ name: 'heatLayer', positions: this.data.map(item => { diff --git a/src/api/threat.js b/src/api/threat.js index e2495ae..0ffc667 100644 --- a/src/api/threat.js +++ b/src/api/threat.js @@ -27,10 +27,17 @@ ], [ { + 'leftSymbolList':["21"], + 'rightSymbolList':["24"], + 'condition': '8', + 'key': 'WD63_05' + }, + { + 'rightSymbolList':["22"], 'condition': '2', 'key': 'WD63_05', 'indexDimValues': '完工' - } + }, ] ], 'pageNo': null, diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue index de58764..45e63af 100644 --- a/src/components/Map/components/disasterLayer.vue +++ b/src/components/Map/components/disasterLayer.vue @@ -117,6 +117,8 @@ 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' + }else if(!this.disaster[item.zhlx] && this.disasterLevel[item.zhdj]){ + img = 'static/images/weather_disaster/00' + this.disasterLevel[item.zhdj] + '.png' } const graphic = new mars3d.graphic.BillboardEntity({ name: '气象灾害', diff --git a/src/components/Map/components/hcaHeatLayer.vue b/src/components/Map/components/hcaHeatLayer.vue index 9233d92..8247076 100644 --- a/src/components/Map/components/hcaHeatLayer.vue +++ b/src/components/Map/components/hcaHeatLayer.vue @@ -79,6 +79,7 @@ } }) this.data = data.filter(item => item['高后果区级别'] !== '无') + console.log('数量',this.data.length) const heatLayer = new mars3d.layer.HeatLayer({ name: 'heatLayer', positions: this.data.map(item => { diff --git a/src/components/Map/components/threatLayer.vue b/src/components/Map/components/threatLayer.vue index a0acbc4..e48fc65 100644 --- a/src/components/Map/components/threatLayer.vue +++ b/src/components/Map/components/threatLayer.vue @@ -117,6 +117,7 @@ } }) this.data = data.filter(item => item['经度'] !== null) + console.log('数量',this.data.length) this.addFeatures() } }) diff --git a/src/api/threat.js b/src/api/threat.js index e2495ae..0ffc667 100644 --- a/src/api/threat.js +++ b/src/api/threat.js @@ -27,10 +27,17 @@ ], [ { + 'leftSymbolList':["21"], + 'rightSymbolList':["24"], + 'condition': '8', + 'key': 'WD63_05' + }, + { + 'rightSymbolList':["22"], 'condition': '2', 'key': 'WD63_05', 'indexDimValues': '完工' - } + }, ] ], 'pageNo': null, diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue index de58764..45e63af 100644 --- a/src/components/Map/components/disasterLayer.vue +++ b/src/components/Map/components/disasterLayer.vue @@ -117,6 +117,8 @@ 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' + }else if(!this.disaster[item.zhlx] && this.disasterLevel[item.zhdj]){ + img = 'static/images/weather_disaster/00' + this.disasterLevel[item.zhdj] + '.png' } const graphic = new mars3d.graphic.BillboardEntity({ name: '气象灾害', diff --git a/src/components/Map/components/hcaHeatLayer.vue b/src/components/Map/components/hcaHeatLayer.vue index 9233d92..8247076 100644 --- a/src/components/Map/components/hcaHeatLayer.vue +++ b/src/components/Map/components/hcaHeatLayer.vue @@ -79,6 +79,7 @@ } }) this.data = data.filter(item => item['高后果区级别'] !== '无') + console.log('数量',this.data.length) const heatLayer = new mars3d.layer.HeatLayer({ name: 'heatLayer', positions: this.data.map(item => { diff --git a/src/components/Map/components/threatLayer.vue b/src/components/Map/components/threatLayer.vue index a0acbc4..e48fc65 100644 --- a/src/components/Map/components/threatLayer.vue +++ b/src/components/Map/components/threatLayer.vue @@ -117,6 +117,7 @@ } }) this.data = data.filter(item => item['经度'] !== null) + console.log('数量',this.data.length) this.addFeatures() } }) diff --git a/static/images/weather_disaster/0000.png b/static/images/weather_disaster/0000.png index 3f3f7e0..64fe04a 100644 --- a/static/images/weather_disaster/0000.png +++ b/static/images/weather_disaster/0000.png Binary files differ diff --git a/src/api/threat.js b/src/api/threat.js index e2495ae..0ffc667 100644 --- a/src/api/threat.js +++ b/src/api/threat.js @@ -27,10 +27,17 @@ ], [ { + 'leftSymbolList':["21"], + 'rightSymbolList':["24"], + 'condition': '8', + 'key': 'WD63_05' + }, + { + 'rightSymbolList':["22"], 'condition': '2', 'key': 'WD63_05', 'indexDimValues': '完工' - } + }, ] ], 'pageNo': null, diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue index de58764..45e63af 100644 --- a/src/components/Map/components/disasterLayer.vue +++ b/src/components/Map/components/disasterLayer.vue @@ -117,6 +117,8 @@ 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' + }else if(!this.disaster[item.zhlx] && this.disasterLevel[item.zhdj]){ + img = 'static/images/weather_disaster/00' + this.disasterLevel[item.zhdj] + '.png' } const graphic = new mars3d.graphic.BillboardEntity({ name: '气象灾害', diff --git a/src/components/Map/components/hcaHeatLayer.vue b/src/components/Map/components/hcaHeatLayer.vue index 9233d92..8247076 100644 --- a/src/components/Map/components/hcaHeatLayer.vue +++ b/src/components/Map/components/hcaHeatLayer.vue @@ -79,6 +79,7 @@ } }) this.data = data.filter(item => item['高后果区级别'] !== '无') + console.log('数量',this.data.length) const heatLayer = new mars3d.layer.HeatLayer({ name: 'heatLayer', positions: this.data.map(item => { diff --git a/src/components/Map/components/threatLayer.vue b/src/components/Map/components/threatLayer.vue index a0acbc4..e48fc65 100644 --- a/src/components/Map/components/threatLayer.vue +++ b/src/components/Map/components/threatLayer.vue @@ -117,6 +117,7 @@ } }) this.data = data.filter(item => item['经度'] !== null) + console.log('数量',this.data.length) this.addFeatures() } }) diff --git a/static/images/weather_disaster/0000.png b/static/images/weather_disaster/0000.png index 3f3f7e0..64fe04a 100644 --- a/static/images/weather_disaster/0000.png +++ b/static/images/weather_disaster/0000.png Binary files differ diff --git a/static/images/weather_disaster/0001.png b/static/images/weather_disaster/0001.png new file mode 100644 index 0000000..64fe04a --- /dev/null +++ b/static/images/weather_disaster/0001.png Binary files differ diff --git a/src/api/threat.js b/src/api/threat.js index e2495ae..0ffc667 100644 --- a/src/api/threat.js +++ b/src/api/threat.js @@ -27,10 +27,17 @@ ], [ { + 'leftSymbolList':["21"], + 'rightSymbolList':["24"], + 'condition': '8', + 'key': 'WD63_05' + }, + { + 'rightSymbolList':["22"], 'condition': '2', 'key': 'WD63_05', 'indexDimValues': '完工' - } + }, ] ], 'pageNo': null, diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue index de58764..45e63af 100644 --- a/src/components/Map/components/disasterLayer.vue +++ b/src/components/Map/components/disasterLayer.vue @@ -117,6 +117,8 @@ 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' + }else if(!this.disaster[item.zhlx] && this.disasterLevel[item.zhdj]){ + img = 'static/images/weather_disaster/00' + this.disasterLevel[item.zhdj] + '.png' } const graphic = new mars3d.graphic.BillboardEntity({ name: '气象灾害', diff --git a/src/components/Map/components/hcaHeatLayer.vue b/src/components/Map/components/hcaHeatLayer.vue index 9233d92..8247076 100644 --- a/src/components/Map/components/hcaHeatLayer.vue +++ b/src/components/Map/components/hcaHeatLayer.vue @@ -79,6 +79,7 @@ } }) this.data = data.filter(item => item['高后果区级别'] !== '无') + console.log('数量',this.data.length) const heatLayer = new mars3d.layer.HeatLayer({ name: 'heatLayer', positions: this.data.map(item => { diff --git a/src/components/Map/components/threatLayer.vue b/src/components/Map/components/threatLayer.vue index a0acbc4..e48fc65 100644 --- a/src/components/Map/components/threatLayer.vue +++ b/src/components/Map/components/threatLayer.vue @@ -117,6 +117,7 @@ } }) this.data = data.filter(item => item['经度'] !== null) + console.log('数量',this.data.length) this.addFeatures() } }) diff --git a/static/images/weather_disaster/0000.png b/static/images/weather_disaster/0000.png index 3f3f7e0..64fe04a 100644 --- a/static/images/weather_disaster/0000.png +++ b/static/images/weather_disaster/0000.png Binary files differ diff --git a/static/images/weather_disaster/0001.png b/static/images/weather_disaster/0001.png new file mode 100644 index 0000000..64fe04a --- /dev/null +++ b/static/images/weather_disaster/0001.png Binary files differ diff --git a/static/images/weather_disaster/0002.png b/static/images/weather_disaster/0002.png new file mode 100644 index 0000000..64fe04a --- /dev/null +++ b/static/images/weather_disaster/0002.png Binary files differ diff --git a/src/api/threat.js b/src/api/threat.js index e2495ae..0ffc667 100644 --- a/src/api/threat.js +++ b/src/api/threat.js @@ -27,10 +27,17 @@ ], [ { + 'leftSymbolList':["21"], + 'rightSymbolList':["24"], + 'condition': '8', + 'key': 'WD63_05' + }, + { + 'rightSymbolList':["22"], 'condition': '2', 'key': 'WD63_05', 'indexDimValues': '完工' - } + }, ] ], 'pageNo': null, diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue index de58764..45e63af 100644 --- a/src/components/Map/components/disasterLayer.vue +++ b/src/components/Map/components/disasterLayer.vue @@ -117,6 +117,8 @@ 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' + }else if(!this.disaster[item.zhlx] && this.disasterLevel[item.zhdj]){ + img = 'static/images/weather_disaster/00' + this.disasterLevel[item.zhdj] + '.png' } const graphic = new mars3d.graphic.BillboardEntity({ name: '气象灾害', diff --git a/src/components/Map/components/hcaHeatLayer.vue b/src/components/Map/components/hcaHeatLayer.vue index 9233d92..8247076 100644 --- a/src/components/Map/components/hcaHeatLayer.vue +++ b/src/components/Map/components/hcaHeatLayer.vue @@ -79,6 +79,7 @@ } }) this.data = data.filter(item => item['高后果区级别'] !== '无') + console.log('数量',this.data.length) const heatLayer = new mars3d.layer.HeatLayer({ name: 'heatLayer', positions: this.data.map(item => { diff --git a/src/components/Map/components/threatLayer.vue b/src/components/Map/components/threatLayer.vue index a0acbc4..e48fc65 100644 --- a/src/components/Map/components/threatLayer.vue +++ b/src/components/Map/components/threatLayer.vue @@ -117,6 +117,7 @@ } }) this.data = data.filter(item => item['经度'] !== null) + console.log('数量',this.data.length) this.addFeatures() } }) diff --git a/static/images/weather_disaster/0000.png b/static/images/weather_disaster/0000.png index 3f3f7e0..64fe04a 100644 --- a/static/images/weather_disaster/0000.png +++ b/static/images/weather_disaster/0000.png Binary files differ diff --git a/static/images/weather_disaster/0001.png b/static/images/weather_disaster/0001.png new file mode 100644 index 0000000..64fe04a --- /dev/null +++ b/static/images/weather_disaster/0001.png Binary files differ diff --git a/static/images/weather_disaster/0002.png b/static/images/weather_disaster/0002.png new file mode 100644 index 0000000..64fe04a --- /dev/null +++ b/static/images/weather_disaster/0002.png Binary files differ diff --git a/static/images/weather_disaster/0003.png b/static/images/weather_disaster/0003.png new file mode 100644 index 0000000..64fe04a --- /dev/null +++ b/static/images/weather_disaster/0003.png Binary files differ diff --git a/src/api/threat.js b/src/api/threat.js index e2495ae..0ffc667 100644 --- a/src/api/threat.js +++ b/src/api/threat.js @@ -27,10 +27,17 @@ ], [ { + 'leftSymbolList':["21"], + 'rightSymbolList':["24"], + 'condition': '8', + 'key': 'WD63_05' + }, + { + 'rightSymbolList':["22"], 'condition': '2', 'key': 'WD63_05', 'indexDimValues': '完工' - } + }, ] ], 'pageNo': null, diff --git a/src/components/Map/components/disasterLayer.vue b/src/components/Map/components/disasterLayer.vue index de58764..45e63af 100644 --- a/src/components/Map/components/disasterLayer.vue +++ b/src/components/Map/components/disasterLayer.vue @@ -117,6 +117,8 @@ 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' + }else if(!this.disaster[item.zhlx] && this.disasterLevel[item.zhdj]){ + img = 'static/images/weather_disaster/00' + this.disasterLevel[item.zhdj] + '.png' } const graphic = new mars3d.graphic.BillboardEntity({ name: '气象灾害', diff --git a/src/components/Map/components/hcaHeatLayer.vue b/src/components/Map/components/hcaHeatLayer.vue index 9233d92..8247076 100644 --- a/src/components/Map/components/hcaHeatLayer.vue +++ b/src/components/Map/components/hcaHeatLayer.vue @@ -79,6 +79,7 @@ } }) this.data = data.filter(item => item['高后果区级别'] !== '无') + console.log('数量',this.data.length) const heatLayer = new mars3d.layer.HeatLayer({ name: 'heatLayer', positions: this.data.map(item => { diff --git a/src/components/Map/components/threatLayer.vue b/src/components/Map/components/threatLayer.vue index a0acbc4..e48fc65 100644 --- a/src/components/Map/components/threatLayer.vue +++ b/src/components/Map/components/threatLayer.vue @@ -117,6 +117,7 @@ } }) this.data = data.filter(item => item['经度'] !== null) + console.log('数量',this.data.length) this.addFeatures() } }) diff --git a/static/images/weather_disaster/0000.png b/static/images/weather_disaster/0000.png index 3f3f7e0..64fe04a 100644 --- a/static/images/weather_disaster/0000.png +++ b/static/images/weather_disaster/0000.png Binary files differ diff --git a/static/images/weather_disaster/0001.png b/static/images/weather_disaster/0001.png new file mode 100644 index 0000000..64fe04a --- /dev/null +++ b/static/images/weather_disaster/0001.png Binary files differ diff --git a/static/images/weather_disaster/0002.png b/static/images/weather_disaster/0002.png new file mode 100644 index 0000000..64fe04a --- /dev/null +++ b/static/images/weather_disaster/0002.png Binary files differ diff --git a/static/images/weather_disaster/0003.png b/static/images/weather_disaster/0003.png new file mode 100644 index 0000000..64fe04a --- /dev/null +++ b/static/images/weather_disaster/0003.png Binary files differ diff --git a/static/images/weather_disaster/0004png b/static/images/weather_disaster/0004png new file mode 100644 index 0000000..64fe04a --- /dev/null +++ b/static/images/weather_disaster/0004png Binary files differ