From e2bf4ab5fbcc29209d74101d99c0690d4ffbe234 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 21 五月 2021 17:14:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 2
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue | 6 +
src/components/BaseNav/WasteWater/WasteWaterIndex.vue | 9 +
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow.vue | 11 ++
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js | 1
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue | 189 +++++++++++++++++++++----------------
src/components/panel/topicSearch/SewersSearch.vue | 3
src/components/BaseNav/WasteGas/WasteGasIndex.vue | 9 +
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue | 14 +-
9 files changed, 150 insertions(+), 94 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/WasteGasIndex.vue b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
index d86efc6..4903bd3 100644
--- a/src/components/BaseNav/WasteGas/WasteGasIndex.vue
+++ b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
@@ -95,10 +95,15 @@
margin: 0 10px;
cursor: pointer;
padding: 5px;
- border: 1px solid #2b87c8;
- border-radius: 4px;
+ /*border: 1px solid #2b87c8;*/
+ /*border-radius: 4px;*/
text-align: center;
+ vertical-align: middle !important;
color: #fff;
+ -webkit-transform: skew(30deg);
+ -moz-transform: skew(30deg);
+ -o-transform: skew(30deg);
+ transform: skew(15deg);
}
.default-uncheck {
diff --git a/src/components/BaseNav/WasteWater/WasteWaterIndex.vue b/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
index ca2be94..0e8c77a 100644
--- a/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
+++ b/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
@@ -95,10 +95,15 @@
margin: 0 10px;
cursor: pointer;
padding: 5px;
- border: 1px solid #2b87c8;
- border-radius: 4px;
+ /*border: 1px solid #2b87c8;*/
+ /*border-radius: 4px;*/
text-align: center;
+ vertical-align: middle !important;
color: #fff;
+ -webkit-transform: skew(30deg);
+ -moz-transform: skew(30deg);
+ -o-transform: skew(30deg);
+ transform: skew(15deg);
}
.default-uncheck {
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
index fdad5d6..5ec3213 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -131,7 +131,7 @@
async handleSearch () {
this.list = []
this.wfsHelper.clearFilter()
- this.wfsHelper.setTypeName(['sewer:emergency'])
+ this.wfsHelper.setTypeName(['sewer:view_emergency'])
this.wfsHelper.setMaxFeatures(100)
// form琛ㄥ崟閫夋嫨鎼滅储
if (this.form.dataType) {
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 136ed9e..c86da0d 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -38,7 +38,8 @@
:class="activeNum===index?'hover':''">
<img class="state" :src="getImgSrc()" style="background: none"/>
<div>
- <h3 @click="handleLocation(item,index)">{{ item.properties.name || item.properties.code }}</h3>
+ <h3 @click="handleLocation(item,index)">{{ item.properties.name || item.properties.code
+ }}</h3>
<p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
<p>璁炬柦绫诲瀷锛�<span>{{ item.properties.type }}</span>
<el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini"
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
index feb70b0..623cfca 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
@@ -95,12 +95,13 @@
methods: {
// 鍦板浘涓婄偣鍑�
selectPipeLine () {
+ // window.mapManager.clickDialogSwitch = false
window.map.on('click', this.selectClick)
- // 鍏抽棴寮圭獥
- window.layerFactory.clickSwitch = false
+ // window.mapManager.clickDialogSwitch = true
},
// 鍦板浘涓婄偣鍑诲洖璋�
selectClick (e) {
+ // console.log(e)
window.map.off('click', this.selectClick)
const point = [e.latlng.lng, e.latlng.lat]
this.getPipeLine(point)
@@ -114,7 +115,7 @@
}
// 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
const res = await mapApi.findPipelineByClickPoint(param)
- // console.log(res)
+ console.log(res)
if (this.linkType === 1) {
this.tableDataLinkStart = res.data
} else {
@@ -123,7 +124,6 @@
},
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
linkClickStart (e) {
- // console.log('鍦板浘鐐瑰嚮璧峰绠℃')
this.linkType = 1
this.selectPipeLine()
},
@@ -214,7 +214,11 @@
const geom = JSON.parse(itm.geomText)
const points = []
geom.coordinates.forEach((it, id) => {
- points.push(it.reverse())
+ const item = it.reverse()
+ if (it.length > 2) {
+ item.shift()
+ }
+ points.push(item)
})
linkPipe.push(points)
})
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
index a0c7fce..50bbded 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
@@ -8,15 +8,14 @@
<div slot="header" class="fixed-style">
<span>绠℃鏌ヨ缁撴灉</span>
</div>
- <el-table class="tableBox" :data="tableData" height="150" max-height="200" highlight-current-row style="width: 100%" size="mini">
- <el-table-column prop="mediumtype" label="浠嬭川绫诲瀷" :show-overflow-tooltip="true"></el-table-column>
- <el-table-column prop="x" label="鏂潰(缁忓害)" :show-overflow-tooltip="true" width="80"></el-table-column>
- <el-table-column prop="y" label="鏂潰(绾害)" :show-overflow-tooltip="true" width="80"></el-table-column>
- <el-table-column prop="z" label="鏂潰楂樼▼(m)" :show-overflow-tooltip="true" width="80"></el-table-column>
- <el-table-column prop="spacing" label="闂磋窛(m)" width="80"></el-table-column>
+ <el-table class="tableBox" :data="tableData" height="150" max-height="200" highlight-current-row
+ style="width: 100%" size="mini">
+ <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
+ :label="item.label" :show-overflow-tooltip="true" min-width="100"></el-table-column>
</el-table>
<span class="fixed-style">鏂潰鍥�</span>
- <span v-show="!myChartShow" style="color: #909399;font-size: 12px;height: 200px;display: block;text-align: center;line-height: 200px">鏆傛棤鏁版嵁</span>
+ <span v-show="!myChartShow"
+ style="color: #909399;font-size: 12px;height: 200px;display: block;text-align: center;line-height: 200px">鏆傛棤鏁版嵁</span>
<div v-show="myChartShow" id="echarts_box" ref="myChart" style="width:350px;height:200px;margin: 0 auto"></div>
</div>
</template>
@@ -30,15 +29,39 @@
name: 'CrossSectional',
data () {
return {
+ // 鐢ㄤ簬缁樺埗妯柇闈㈢嚎娈�
measure: null,
+ // 瀹氫箟 echarts瀵硅薄
myChart: null,
- options: [],
- echartsList: [],
+ // 鐢ㄤ簬鍒ゆ柇echarts鍥捐〃鐨勬樉绀轰笌闅愯棌
myChartShow: false,
- linkPipeline: [],
+ // 鐢ㄤ簬瀹氫箟鎺ユ敹妯柇闈㈡暟鎹�
+ hdmParam: null,
// 妯柇闈� 绠℃鏌ヨ缁撴灉 鐨則able琛ㄦ牸鏁版嵁
tableData: [],
- hdmParam: null
+ // table 琛ㄦ牸瀹氫箟鐨勫瓧娈�
+ listLabel: [
+ {
+ label: '浠嬭川绫诲瀷',
+ prop: 'mediumtype'
+ },
+ {
+ label: '鏂潰(缁忓害)',
+ prop: 'x'
+ },
+ {
+ label: '鏂潰(绾害)',
+ prop: 'y'
+ },
+ {
+ label: '鏂潰楂樼▼(m)',
+ prop: 'z'
+ },
+ {
+ label: '闂磋窛(m)',
+ prop: 'spacing'
+ }
+ ]
}
},
mounted () {
@@ -48,12 +71,10 @@
eventBus.$on('draw-hdm-line', (points) => {
this.getHdmPoint(points)
})
- this.$nextTick(() => {
- eventBus.$on('tabData-change', (obj) => {
- if (obj) {
- this.jdmClear()
- }
- })
+ eventBus.$on('tabData-change', (obj) => {
+ if (obj) {
+ this.jdmClear()
+ }
})
},
methods: {
@@ -104,84 +125,90 @@
// 瀵硅幏鍙栧埌鐨勬暟鎹繘琛屽鐞�
dealWithData (e) {
console.log(e)
+ const dataPoint = e.data.point
+ const spacingList = e.data.pointInterval.reverse()
+ const dataList = []
+ for (let i = 0; i < dataPoint.length; i++) {
+ const obj = {
+ mediumtype: dataPoint[i].pipelines.extraData.mediumtype,
+ startpointz: dataPoint[i].pipelines.extraData.startpointz,
+ diameter: dataPoint[i].pipelines.extraData.diameter,
+ spacing: spacingList[i - 1],
+ x: parseFloat(dataPoint[i].crossPoint3D.x).toFixed(8),
+ y: parseFloat(dataPoint[i].crossPoint3D.y).toFixed(8),
+ z: parseFloat(dataPoint[i].crossPoint3D.z).toFixed(2)
+ }
+ dataList.push(obj)
+ }
+ // 妯悜鍧愭爣鏁版嵁
+ const xAxisData = []
+ const dataObj = []
+ for (let i = 0; i < dataList.length; i++) {
+ xAxisData.push(dataList[i].mediumtype)
+ // if (dataList[i].mediumtype === '闆ㄦ按') {
+ // dataObj.color = 'red'
+ // }
+ dataObj.push(dataList[i].startpointz)
+ }
+ this.selectRow(xAxisData, dataObj)
},
// 妯柇闈㈢粯鍒跺畬鎴愬悗 杩涜妯柇闈㈡暟鎹垎鏋� 杩涜鍥捐〃灞曠ず
- selectRow (dataList) {
- // console.log(dataList)
- // 3. 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁锛屾樉绀哄浘琛�
- this.option = {
+ selectRow (xAxisData, dataObj) {
+ const option = {
tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'cross',
- label: {
- backgroundColor: '#6a7985'
- }
- }
+ trigger: 'axis'
},
// legend: {
- // // data: ['鐩存帴璁块棶', '鎼滅储寮曟搸']
- // data: dataList
+ // data: []
// },
- toolbox: {
- show: false,
- feature: {
- saveAsImage: {}
- }
- },
grid: {
- left: '10px',
- right: '0',
- top: '10px',
- bottom: '5px',
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
containLabel: true
},
- xAxis: [
- {
- type: 'category',
- boundaryGap: false,
- axisLabel: {
- // formatter: '{value}',
- textStyle: {
- color: '#fff'
- }
- }
- // data: ['鍛ㄤ竴', '鍛ㄤ簩', '鍛ㄤ笁', '鍛ㄥ洓', '鍛ㄤ簲', '鍛ㄥ叚', '鍛ㄦ棩']
- // data: dataList
- }
- ],
- yAxis: [
- {
- type: 'value',
- axisLabel: {
- // formatter: '{value}',
- textStyle: {
- color: '#fff'
- }
+ xAxis: {
+ type: 'category',
+ splitLine: {
+ lineStyle: {
+ type: 'dashed'
+ },
+ show: true
+ },
+ // data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+ data: xAxisData,
+ axisLabel: {
+ interval: 0,
+ textStyle: {
+ color: '#fff'
}
}
- ],
- // series: [
- // {
- // name: '鎼滅储寮曟搸',
- // type: 'line',
- // stack: '鎬婚噺',
- // label: {
- // show: true,
- // position: 'top'
- // },
- // areaStyle: {},
- // emphasis: {
- // focus: 'series'
- // },
- // data: [820, 932, 901, 934, 1290, 1330, 1320]
- // }
- // ]
- series: this.echartsList
+ },
+ yAxis: {
+ axisPointer: {
+ snap: true
+ },
+ splitLine: {
+ show: false
+ },
+ type: 'value',
+ axisLabel: {
+ interval: 0,
+ textStyle: {
+ color: '#fff'
+ }
+ }
+ },
+ series: [
+ {
+ type: 'scatter',
+ data: dataObj
+ }
+ ]
}
this.myChartShow = true
this.myChart.clear()
- this.myChart.setOption(this.option)
+ this.myChart.setOption(option)
},
// 妯柇闈㈡竻闄�
jdmClear () {
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow.vue
index aead8c4..fb55bd6 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow.vue
@@ -175,7 +175,11 @@
const geom = JSON.parse(itm.geomText)
const points = []
geom.coordinates.forEach((it, id) => {
- points.push(it.reverse())
+ const item = it.reverse()
+ if (it.length > 2) {
+ item.shift()
+ }
+ points.push(item)
})
linkPipe.push(points)
})
@@ -203,6 +207,11 @@
this.currentSelectResultLine.remove()
this.currentSelectResultLine = null
}
+ if (this.linkPipeline.length > 0) {
+ this.linkPipeline.forEach((itm, idx) => {
+ itm.remove()
+ })
+ }
}
}
}
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js
index 81573d0..8b8857a 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js
@@ -1,5 +1,6 @@
export function selectPipeLine () {
window.map.on('click', this.selectClick)
+ window.mapManager.clickDialogSwitch = true
}
export function createFlowLine (param) {
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue
index 11ae76b..9addf11 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue
@@ -192,7 +192,11 @@
const geom = JSON.parse(itm.geomText)
const points = []
geom.coordinates.forEach((it, id) => {
- points.push(it.reverse())
+ const item = it.reverse()
+ if (it.length > 2) {
+ item.shift()
+ }
+ points.push(item)
})
linkPipe.push(points)
})
--
Gitblit v1.8.0