From ec4d5c1827487f4c901b69bd9eae58e111e82b32 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 20 五月 2021 18:05:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue | 76 ++++++++------------------------------
1 files changed, 16 insertions(+), 60 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
index e8d3034..918f08e 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
@@ -8,8 +8,7 @@
<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 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>
@@ -17,17 +16,15 @@
<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>
+ <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>
import eventBus from '../../../../../eventBus'
import mapApi from '../../../../../api/mapApi'
-import DrawLine from './DrawLine'
+import DrawLine from '../../../../plugin/DrawLine'
export default {
name: 'CrossSectional',
@@ -53,7 +50,7 @@
})
},
methods: {
- // 妯柇闈㈢粯鍒剁嚎娈�
+ // 妯柇闈� 绾挎缁樺埗
drawLine () {
if (this.measure === null) {
this.measure = new DrawLine(window.map)
@@ -61,7 +58,7 @@
this.measure.destory()
this.measure.init()
},
- // 妯柇闈㈡暟鎹姹�
+ // 缁樺埗鐨勬í鏂潰 绾挎鏁版嵁鑾峰彇
async getHdmPoint (line) {
// 妯柇闈㈡暟鎹�
this.hdmParam = {
@@ -71,7 +68,7 @@
y2: line[1].lat
}
},
- // 妯柇闈㈡暟鎹姹�
+ // 妯柇闈� 鏁版嵁璇锋眰
async jdmQuery () {
this.tableData = []
if (this.hdmParam == null) {
@@ -80,67 +77,26 @@
}
// 宸茬粯鍒剁嚎鍥� 杩涜缁樺埗妯柇闈㈡暟鎹垎鏋�
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)
- // }
+ // 璋冪敤鏁版嵁澶勭悊鏂规硶
+ this.dealWithData(res)
+ // table鏁版嵁澶勭悊
const dataPoint = res.data.point
+ // 瀛樺偍闂磋窛list
+ const spacingList = res.data.pointInterval.reverse()
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)
+ z: parseFloat(dataPoint[i].crossPoint3D.z).toFixed(4),
+ spacing: spacingList[i - 1]
}
this.tableData.push(obj)
}
- this.dealWithData(res)
},
+ // 瀵硅幏鍙栧埌鐨勬暟鎹繘琛屽鐞�
dealWithData (e) {
- const dataSeries = e.data.point
- let tempData
- const storeData = []
- const dataList = []
- this.echartsList = []
- for (let i = 0; i < dataSeries.length; i++) {
- if (storeData.length === 0) {
- storeData.push(name)
- tempData = {
- name: dataSeries[i].pipelines.oilPipeID,
- data: e.data.pointInterval,
- type: 'line'
- }
- this.echartsList.push(tempData)
- }
- dataList.push(dataSeries[i].pipelines.oilPipeID)
- }
- // console.log(dataList)
- // const seriesList = e.data.pointInterval
- // let seriesdata
- // for (let i = 0; i < seriesList.length; i++) {
- // console.log(seriesList[i])
- // }
- // x鏁版嵁澶勭悊
- this.selectRow(dataList)
+ console.log(e)
},
// 妯柇闈㈢粯鍒跺畬鎴愬悗 杩涜妯柇闈㈡暟鎹垎鏋� 杩涜鍥捐〃灞曠ず
selectRow (dataList) {
--
Gitblit v1.8.0