diff --git a/src/components/CMap/components/cmapSmart.vue b/src/components/CMap/components/cmapSmart.vue index c8639b6..a9baefa 100644 --- a/src/components/CMap/components/cmapSmart.vue +++ b/src/components/CMap/components/cmapSmart.vue @@ -281,7 +281,7 @@ const { mapLayers, valves } = this for (const valve of valves) { const options = { - url: './static/images/map_images/valve1.png', + url: 'static/images/map_images/valve.gif', size: [20, 20], anchor: [10, 10] } @@ -294,7 +294,7 @@ const valveOverlay = new CMarker(new CLatLng(valve.coordinateY, valve.coordinateX), opts) mapLayers.addOverlay(valveOverlay) this.valvesOverlays.push(valveOverlay) - mapLayers.setZoom(16) + mapLayers.setZoom(15) } }, // 移除影响管线 @@ -309,6 +309,7 @@ renderCloseArea() { const { mapLayers, closeAreas } = this this.removeCloseArea() + debugger // 绘制影响区域 for (const valveArea of closeAreas) { const opts = { color: '#e7944f', weight: 1, opacity: 0.9, fill: true, fillColor: '#e7944f', fillOpacity: 0.4 } @@ -320,7 +321,9 @@ removeCloseArea() { const { mapLayers } = this if (this.closeAreaOverlays) { - mapLayers.removeOverlay(this.closeAreaOverlays) + for (const closeArea of this.closeAreaOverlays) { + mapLayers.removeOverlay(closeArea) + } this.closeAreaOverlays = [] } }, diff --git a/src/components/CMap/components/cmapSmart.vue b/src/components/CMap/components/cmapSmart.vue index c8639b6..a9baefa 100644 --- a/src/components/CMap/components/cmapSmart.vue +++ b/src/components/CMap/components/cmapSmart.vue @@ -281,7 +281,7 @@ const { mapLayers, valves } = this for (const valve of valves) { const options = { - url: './static/images/map_images/valve1.png', + url: 'static/images/map_images/valve.gif', size: [20, 20], anchor: [10, 10] } @@ -294,7 +294,7 @@ const valveOverlay = new CMarker(new CLatLng(valve.coordinateY, valve.coordinateX), opts) mapLayers.addOverlay(valveOverlay) this.valvesOverlays.push(valveOverlay) - mapLayers.setZoom(16) + mapLayers.setZoom(15) } }, // 移除影响管线 @@ -309,6 +309,7 @@ renderCloseArea() { const { mapLayers, closeAreas } = this this.removeCloseArea() + debugger // 绘制影响区域 for (const valveArea of closeAreas) { const opts = { color: '#e7944f', weight: 1, opacity: 0.9, fill: true, fillColor: '#e7944f', fillOpacity: 0.4 } @@ -320,7 +321,9 @@ removeCloseArea() { const { mapLayers } = this if (this.closeAreaOverlays) { - mapLayers.removeOverlay(this.closeAreaOverlays) + for (const closeArea of this.closeAreaOverlays) { + mapLayers.removeOverlay(closeArea) + } this.closeAreaOverlays = [] } }, diff --git a/src/views/smartAnalysis/smartOverview.vue b/src/views/smartAnalysis/smartOverview.vue index cafae32..6fdf8b5 100644 --- a/src/views/smartAnalysis/smartOverview.vue +++ b/src/views/smartAnalysis/smartOverview.vue @@ -20,6 +20,7 @@ :data="waterList" :max-height="maxheight" class="alarm-list-table" + size="small" border stripe @row-click="waterRowClick"> @@ -41,6 +42,7 @@ :data="gasList" :max-height="maxheight1" class="alarm-list-table" + size="small" border stripe @row-click="gasRowClick"> @@ -64,6 +66,7 @@ class="alarm-list-table" border stripe + size="small" @row-click="hotRowClick">
详情
- + {{ wellObj.wellCode }} @@ -114,8 +117,8 @@
- 查看阀门 - 查看关阀影响区域 + 查看阀门 + 查看关阀影响区域
@@ -204,7 +207,7 @@ // this.$refs.smarttab.style.height = this.height + 'px' // const that = this this.$nextTick(function() { - this.maxheight = this.$refs.smartdiv.clientHeight - 295 + this.maxheight = this.$refs.smartdiv.clientHeight - 255 this.maxheight1 = this.$refs.smartdiv.clientHeight - 377 this.maxheight2 = this.$refs.smartdiv.clientHeight - 377 }) @@ -261,6 +264,8 @@ }, // 点击内涝列表项 waterRowClick(row, column, event) { + this.valves = [] + this.closeAreas = [] const loading = this.$loading({ lock: true, text: '正在飞速计算中...', @@ -278,6 +283,8 @@ }, // 点击燃气泄漏点列表项 gasRowClick(row, column, event) { + this.valves = [] + this.closeAreas = [] const loading = this.$loading({ lock: true, text: '正在飞速计算中...', @@ -295,6 +302,8 @@ }, // 点击热力泄漏点列表项 hotRowClick(row, column, event) { + this.valves = [] + this.closeAreas = [] // 触发计算 const loading = this.$loading({ lock: true, @@ -396,7 +405,6 @@ .el-form-item__content{ /*background-color: #edf9f0;*/ padding-left:10px; - height: 40px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap; diff --git a/src/components/CMap/components/cmapSmart.vue b/src/components/CMap/components/cmapSmart.vue index c8639b6..a9baefa 100644 --- a/src/components/CMap/components/cmapSmart.vue +++ b/src/components/CMap/components/cmapSmart.vue @@ -281,7 +281,7 @@ const { mapLayers, valves } = this for (const valve of valves) { const options = { - url: './static/images/map_images/valve1.png', + url: 'static/images/map_images/valve.gif', size: [20, 20], anchor: [10, 10] } @@ -294,7 +294,7 @@ const valveOverlay = new CMarker(new CLatLng(valve.coordinateY, valve.coordinateX), opts) mapLayers.addOverlay(valveOverlay) this.valvesOverlays.push(valveOverlay) - mapLayers.setZoom(16) + mapLayers.setZoom(15) } }, // 移除影响管线 @@ -309,6 +309,7 @@ renderCloseArea() { const { mapLayers, closeAreas } = this this.removeCloseArea() + debugger // 绘制影响区域 for (const valveArea of closeAreas) { const opts = { color: '#e7944f', weight: 1, opacity: 0.9, fill: true, fillColor: '#e7944f', fillOpacity: 0.4 } @@ -320,7 +321,9 @@ removeCloseArea() { const { mapLayers } = this if (this.closeAreaOverlays) { - mapLayers.removeOverlay(this.closeAreaOverlays) + for (const closeArea of this.closeAreaOverlays) { + mapLayers.removeOverlay(closeArea) + } this.closeAreaOverlays = [] } }, diff --git a/src/views/smartAnalysis/smartOverview.vue b/src/views/smartAnalysis/smartOverview.vue index cafae32..6fdf8b5 100644 --- a/src/views/smartAnalysis/smartOverview.vue +++ b/src/views/smartAnalysis/smartOverview.vue @@ -20,6 +20,7 @@ :data="waterList" :max-height="maxheight" class="alarm-list-table" + size="small" border stripe @row-click="waterRowClick"> @@ -41,6 +42,7 @@ :data="gasList" :max-height="maxheight1" class="alarm-list-table" + size="small" border stripe @row-click="gasRowClick"> @@ -64,6 +66,7 @@ class="alarm-list-table" border stripe + size="small" @row-click="hotRowClick">
详情
- + {{ wellObj.wellCode }} @@ -114,8 +117,8 @@
- 查看阀门 - 查看关阀影响区域 + 查看阀门 + 查看关阀影响区域
@@ -204,7 +207,7 @@ // this.$refs.smarttab.style.height = this.height + 'px' // const that = this this.$nextTick(function() { - this.maxheight = this.$refs.smartdiv.clientHeight - 295 + this.maxheight = this.$refs.smartdiv.clientHeight - 255 this.maxheight1 = this.$refs.smartdiv.clientHeight - 377 this.maxheight2 = this.$refs.smartdiv.clientHeight - 377 }) @@ -261,6 +264,8 @@ }, // 点击内涝列表项 waterRowClick(row, column, event) { + this.valves = [] + this.closeAreas = [] const loading = this.$loading({ lock: true, text: '正在飞速计算中...', @@ -278,6 +283,8 @@ }, // 点击燃气泄漏点列表项 gasRowClick(row, column, event) { + this.valves = [] + this.closeAreas = [] const loading = this.$loading({ lock: true, text: '正在飞速计算中...', @@ -295,6 +302,8 @@ }, // 点击热力泄漏点列表项 hotRowClick(row, column, event) { + this.valves = [] + this.closeAreas = [] // 触发计算 const loading = this.$loading({ lock: true, @@ -396,7 +405,6 @@ .el-form-item__content{ /*background-color: #edf9f0;*/ padding-left:10px; - height: 40px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap; diff --git a/static/images/map_images/valve.gif b/static/images/map_images/valve.gif new file mode 100644 index 0000000..cdce16d --- /dev/null +++ b/static/images/map_images/valve.gif Binary files differ