From 18db6fdcd0bed3b9db803591b6057a98dd47c597 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期四, 20 五月 2021 10:55:17 +0800
Subject: [PATCH] 横断面数据修改
---
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue | 145 ++++++++++++------------------------
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 61 ++++++--------
2 files changed, 75 insertions(+), 131 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
index 11e58c9..e8d3034 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
@@ -1,38 +1,27 @@
<template>
- <div class="connectivity">
- <el-row>
- <el-button type="primary" @click="drawLine" size="mini" title="鍦板浘涓婄粯鍒惰杩涜鍒嗘瀽鎴柇闈㈢殑绾�">缁樺埗绾挎</el-button>
- <el-button type="primary" @click="jdmQuery" size="mini" title="鎴柇闈㈠垎鏋�">鎴柇闈㈠垎鏋�</el-button>
- <el-button type="primary" @click="jdmClear" size="mini" title="娓呴櫎鎴柇闈㈠垎鏋愮粨鏋�">娓呴櫎</el-button>
- </el-row>
- <!-- <el-card class="box-card">-->
- <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%" @row-click="selectRow" size="mini">
- <el-table-column prop="pipename" label="绠℃鍚嶇О"></el-table-column>
- <el-table-column prop="mediumtype" label="绠℃绫诲瀷" width="80"></el-table-column>
- <el-table-column class-name="fixed-table" fixed="right" label="鍥捐〃" width="40">
- <template slot-scope="scope">
- <el-button @click="selectRow(scope.row)" type="text" size="small">鏌ョ湅</el-button>
- </template>
- </el-table-column>
- </el-table>
- <!-- </el-card>-->
- <!-- <el-card class="box-card">
+ <div class="connectivity">
+ <el-row>
+ <el-button type="primary" @click="drawLine" size="mini" title="鍦板浘涓婄粯鍒惰杩涜鍒嗘瀽鎴柇闈㈢殑绾�">缁樺埗绾挎</el-button>
+ <el-button type="primary" @click="jdmQuery" size="mini" title="鎴柇闈㈠垎鏋�">鎴柇闈㈠垎鏋�</el-button>
+ <el-button type="primary" @click="jdmClear" size="mini" title="娓呴櫎鎴柇闈㈠垎鏋愮粨鏋�">娓呴櫎</el-button>
+ </el-row>
<div slot="header" class="fixed-style">
- <span>鏂潰鍥�</span>
+ <span>绠℃鏌ヨ缁撴灉</span>
</div>
- <span v-show="!myChartShow" style="color: #909399;font-size: 12px;">鏆傛棤鏁版嵁</span>
- <div v-show="myChartShow" id="echarts_box" ref="myChart" style="width: 350px;height:200px;"></div>
- </el-card> -->
- <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>
- <div v-show="myChartShow" id="echarts_box" ref="myChart"
- style="width:350px;height:200px;margin: 0 auto"></div><!-- v-show="myChartShow" -->
- </div>
+ <el-table class="tableBox" :data="tableData" height="150" max-height="200" highlight-current-row
+ style="width: 100%" @row-click="selectRow" 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="鏂潰(楂樼▼)" :show-overflow-tooltip="true" width="80"></el-table-column>
+ <el-table-column prop="spacing" label="闂磋窛(m)" width="80"></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>
+ <div v-show="myChartShow" id="echarts_box" ref="myChart"
+ style="width:350px;height:200px;margin: 0 auto"></div>
+ </div>
</template>
<script>
@@ -64,68 +53,8 @@
})
},
methods: {
- // tab鍒囨崲
- handleClick () {
- this.clearLinkPipe()
- this.jdmClear()
- this.currentLinkIsTrue = ''
- this.bgFm = []
- this.bgPipeLine = []
- this.tableData = []
- this.tableDataLiuxiang = []
- this.tableDataLinkStart = []
- this.tableDataLinkEnd = []
- this.tableDataLinkResult = []
- this.lxTableDataResult = []
- },
- // 鍦板浘涓婄偣鍑�
- selectPipeLine () {
- window.map.on('click', this.selectClick)
- // // 鍏抽棴寮圭獥
- window.layerFactory.clickSwitch = false
- },
- // 鍦板浘涓婄偣鍑诲洖璋�
- selectClick (e) {
- // console.log(e)
- window.map.off('click', this.selectClick)
- const point = [e.latlng.lng, e.latlng.lat]
- this.getPipeLine(point)
- },
- // 鐐瑰嚮鑾峰彇鍒ゆ柇鏁版嵁
- async getPipeLine (point) {
- const param = {
- x: point[0],
- y: point[1],
- radius: 3
- }
- // 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
- const res = await mapApi.findPipelineByClickPoint(param)
- console.log(res)
- if (this.activeName === 'first') {
- if (this.linkType === 1) {
- this.tableDataLinkStart = res.data
- } else {
- this.tableDataLinkEnd = res.data
- }
- } else if (this.activeName === 'second') {
- this.bgPipeLine = res.data
- } else if (this.activeName === 'third') {
- this.tableDataLiuxiang = res.data
- } else if (this.activeName === 'fourth') {
- }
- },
- // 娓呮鍒嗘瀽缁撴灉
- clearLinkPipe () {
- if (this.linkPipeline.length > 0) {
- this.linkPipeline.forEach((itm, idx) => {
- itm.remove()
- })
- }
- this.linkPipeline = []
- },
// 妯柇闈㈢粯鍒剁嚎娈�
drawLine () {
- // console.log('drawLine')
if (this.measure === null) {
this.measure = new DrawLine(window.map)
}
@@ -134,8 +63,6 @@
},
// 妯柇闈㈡暟鎹姹�
async getHdmPoint (line) {
- // console.log('妯柇闈㈢殑缁樺埗绾�')
- // console.table(line)
// 妯柇闈㈡暟鎹�
this.hdmParam = {
x1: line[0].lng,
@@ -153,15 +80,39 @@
}
// 宸茬粯鍒剁嚎鍥� 杩涜缁樺埗妯柇闈㈡暟鎹垎鏋�
const res = await mapApi.getCrossSection(this.hdmParam)
+ console.log(res)
+ // let obj = {}
+ const dataSpacing = res.data.pointInterval
+ for (let i = 0; i < dataSpacing.length; i++) {
+ const objSpacing = {
+ spacing: dataSpacing[i]
+ }
+ console.log(objSpacing)
+ this.tableData.push(objSpacing)
+ }
+ // const dataSpacing = res.data.pointInterval
+ // // for (let i = 0; i < dataSpacing.length; i++) {
+ // // this.obj.spacing = dataSpacing[i]
+ // // }
+ // const dataPoint = res.data.point
+ // // const obj = {}
+ // for (let i = 0; i < dataPoint.length; i++) {
+ // this.obj.mediumtype = dataPoint[i].pipelines.extraData.mediumtype
+ // this.obj.x = parseFloat(dataPoint[i].crossPoint3D.x).toFixed(4)
+ // this.obj.y = parseFloat(dataPoint[i].crossPoint3D.y).toFixed(4)
+ // this.obj.z = parseFloat(dataPoint[i].crossPoint3D.z).toFixed(4)
+ // this.obj.spacing = parseFloat(dataPoint[i].crossPoint3D.z).toFixed(4)
+ // }
const dataPoint = res.data.point
for (let i = 0; i < dataPoint.length; i++) {
const obj = {
- pipename: dataPoint[i].pipelines.extraData.pipename,
- mediumtype: dataPoint[i].pipelines.extraData.mediumtype
+ mediumtype: dataPoint[i].pipelines.extraData.mediumtype,
+ x: parseFloat(dataPoint[i].crossPoint3D.x).toFixed(4),
+ y: parseFloat(dataPoint[i].crossPoint3D.y).toFixed(4),
+ z: parseFloat(dataPoint[i].crossPoint3D.z).toFixed(4)
}
this.tableData.push(obj)
}
- // console.log(this.tableData, 'this.tableData')
this.dealWithData(res)
},
dealWithData (e) {
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 0032468..1cbc51e 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -11,6 +11,7 @@
<Flow></Flow>
</el-tab-pane>
<el-tab-pane label="妯柇闈�" name="fourth">
+ <!-- <CrossSectional></CrossSectional>-->
<el-row>
<el-button type="primary" @click="drawLine" size="mini" title="鍦板浘涓婄粯鍒惰杩涜鍒嗘瀽鎴柇闈㈢殑绾�">缁樺埗绾挎</el-button>
<el-button type="primary" @click="jdmQuery" size="mini" title="鎴柇闈㈠垎鏋�">鎴柇闈㈠垎鏋�</el-button>
@@ -22,16 +23,16 @@
</div>
<el-table class="tableBox" :data="tableData" height="150" max-height="200" highlight-current-row
style="width: 100%" @row-click="selectRow" size="mini">
- <el-table-column prop="pipename" label="浠嬭川绫诲瀷" :show-overflow-tooltip="true"></el-table-column>
+ <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="鏂潰(楂樼▼)" :show-overflow-tooltip="true" width="80"></el-table-column>
<el-table-column prop="spacing" label="闂磋窛(m)" width="80"></el-table-column>
- <el-table-column class-name="fixed-table" fixed="right" label="鍥捐〃" width="40">
- <template slot-scope="scope">
- <el-button @click="selectRow(scope.row)" type="text" size="small">鏌ョ湅</el-button>
- </template>
- </el-table-column>
+ <!-- <el-table-column class-name="fixed-table" fixed="right" label="鍥捐〃" width="40">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <el-button @click="selectRow(scope.row)" type="text" size="small">鏌ョ湅</el-button>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
<!-- </el-card>-->
<!-- <el-card class="box-card">
@@ -60,6 +61,7 @@
import Connectivity from './AnalysisChoose/Connectivity'
import Tube from './AnalysisChoose/Tube'
import Flow from './AnalysisChoose/Flow'
+// import CrossSectional from './AnalysisChoose/CrossSectional'
export default {
name: 'SewersAnalysis',
@@ -67,6 +69,7 @@
Connectivity,
Tube,
Flow
+ // CrossSectional
},
data () {
return {
@@ -118,7 +121,8 @@
lxTableDataResult: [],
// 妯柇闈� 绠℃鏌ヨ缁撴灉 鐨則able琛ㄦ牸鏁版嵁
- tableData: []
+ tableData: [],
+ obj: {}
}
},
@@ -588,33 +592,22 @@
// 宸茬粯鍒剁嚎鍥� 杩涜缁樺埗妯柇闈㈡暟鎹垎鏋�
const res = await mapApi.getCrossSection(this.hdmParam)
console.log(res)
- // let obj = {}
- const dataSpacing = res.data.pointInterval
- console.log(dataSpacing)
- // for (let i = 0; i < dataSpacing.length; i++) {
- // obj.push({
- // spacing: dataSpacing[i]
- // })
- // console.log(obj)
- // }
- // const dataPoint = res.data.point
- // const dataPointjj = res.data.pointInterval
- // for (let i = 0; i < dataPoint.length; i++) {
- // obj = {
- // pipename: dataPoint[i].pipelines.extraData.pipename,
- // x: dataPoint[i].crossPoint3D.x,
- // y: dataPoint[i].crossPoint3D.y,
- // z: dataPoint[i].crossPoint3D.z
- // }
- // this.tableData.push(obj)
- // }
- // for (let i = 0; i < dataPointjj.length; i++) {
- // obj = {
- // pointInterval: dataPointjj[i]
- // }
- // this.tableData.push(obj)
- // console.log(obj)
- // }
+ const dataPoint = res.data.point
+ // 瀛樺偍闂磋窛list
+ const spacingList = res.data.pointInterval.reverse()
+ // console.log(spacingList)
+ for (let i = 0; i < dataPoint.length; i++) {
+ const obj = {
+ mediumtype: dataPoint[i].pipelines.extraData.mediumtype,
+ x: parseFloat(dataPoint[i].crossPoint3D.x).toFixed(4),
+ y: parseFloat(dataPoint[i].crossPoint3D.y).toFixed(4),
+ z: parseFloat(dataPoint[i].crossPoint3D.z).toFixed(4),
+ spacing: spacingList[i - 1]
+ }
+ this.tableData.push(obj)
+ }
+ // spacingList.reverse()
+ // console.log(spacingList)
// console.log(this.tableData)
this.dealWithData(res)
},
--
Gitblit v1.8.0