From 6d45b149ba4164dd87152180ff8e4c365484a5b3 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期三, 19 五月 2021 18:07:11 +0800
Subject: [PATCH] 企业应急修改
---
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 11 ++---
src/conf/layers/LayerSurroundings.js | 6 +-
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 45 +++++++++++++++++-----
src/conf/layers/LayerEmergencySource.js | 6 +-
4 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
index 05777b2..04b5f3e 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -61,8 +61,7 @@
import { LayerSurroundings } from '../../../../conf/layers/LayerSurroundings'
// 寮曞叆鐨勬柟娉�
import { pulseEffect } from '../../../../utils/utils'
-// import { locate } from '../../../helpers/LocateHelper'
-// import { fitBounds, highlight, locate, openPropsPopup } from '../../../helpers/LocateHelper'
+import { loadPointWfs, pointZoom } from '../../../helpers/LocateHelper'
export default {
name: 'ResourcesQuery',
@@ -153,11 +152,11 @@
this.activeNum = index
const positionArea = [val.properties.y, val.properties.x]
window.map.setView(positionArea, 17)
+ pointZoom(positionArea, this.form.dataType.icon)
+ // 鍥剧墖
+ loadPointWfs(positionArea)
+ // 寮圭獥
pulseEffect(positionArea)
- // const config = this.form.dataType
- // locate(val, config)
- // fitBounds(val, this.form.dataType.code)
- // highlight(val, this.form.dataType)
}
}
}
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 949543b..0032468 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -22,8 +22,11 @@
</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 prop="pipename" 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>
@@ -584,15 +587,35 @@
}
// 宸茬粯鍒剁嚎鍥� 杩涜缁樺埗妯柇闈㈡暟鎹垎鏋�
const res = await mapApi.getCrossSection(this.hdmParam)
- 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
- }
- this.tableData.push(obj)
- }
- // console.log(this.tableData, 'this.tableData')
+ 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)
+ // }
+ // console.log(this.tableData)
this.dealWithData(res)
},
dealWithData (e) {
diff --git a/src/conf/layers/LayerEmergencySource.js b/src/conf/layers/LayerEmergencySource.js
index bdf018e..495c760 100644
--- a/src/conf/layers/LayerEmergencySource.js
+++ b/src/conf/layers/LayerEmergencySource.js
@@ -14,7 +14,7 @@
sname: '搴旀�ョ墿璧�',
checked: false,
type: SERVICE_TYPE.WMS,
- icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ icon: 'sewers/搴旀�ョ墿璧�.png',
typeName: 'sewer:emergencyesources',
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
},
@@ -22,7 +22,7 @@
code: 'sewersYjcl',
name: '搴旀�ヨ溅杈�',
sname: '搴旀�ヨ溅杈�',
- icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ icon: 'sewers/搴旀�ヨ溅杈�.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
minZoom: 10
@@ -31,7 +31,7 @@
code: 'sewersYjdw',
name: '搴旀�ラ槦浼�',
sname: '搴旀�ラ槦浼�',
- icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ icon: 'sewers/搴旀�ラ槦浼�.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
typeName: 'sewer:maintenanceteam',
diff --git a/src/conf/layers/LayerSurroundings.js b/src/conf/layers/LayerSurroundings.js
index 9b55d72..f4f0801 100644
--- a/src/conf/layers/LayerSurroundings.js
+++ b/src/conf/layers/LayerSurroundings.js
@@ -22,7 +22,7 @@
code: 'sewersXx',
name: '瀛︽牎',
sname: '瀛︽牎',
- icon: 'sewers/鍖婚櫌.png',
+ icon: 'sewers/瀛︽牎.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
minZoom: 10
@@ -41,7 +41,7 @@
code: 'sewersZrbhq',
name: '鑷劧淇濇姢鍖�',
sname: '鑷劧淇濇姢鍖�',
- icon: 'sewers/鍖婚櫌.png',
+ icon: 'sewers/鑷劧淇濇姢鍖�.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
wfs: 'sewer:pointpreservationzone',
@@ -51,7 +51,7 @@
code: 'sewersMgmb',
name: '鏁忔劅鐩爣',
sname: '鏁忔劅鐩爣',
- icon: 'sewers/鍖婚櫌.png',
+ icon: 'sewers/鏁忔劅鐩爣.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
wfs: 'sewer:sensitivetarget',
--
Gitblit v1.8.0