From 4a80ef5544ff210d9e0aaa4cb1eaf3dba8c39645 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 11:14:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/SourcesPollution.js | 11 -
src/utils/dragBoxes.js | 1
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue | 206 ++++++++++++++++++++--------------------
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue | 16 ++
src/conf/LayerTopic.js | 3
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue | 13 +-
src/conf/MapConfig.js | 8
public/static/SourcesPoll.json | 16 +-
src/conf/layers/LayerEntEmer.js | 26 ++++-
9 files changed, 159 insertions(+), 141 deletions(-)
diff --git a/public/static/SourcesPoll.json b/public/static/SourcesPoll.json
index b4f36d6..e3eab29 100644
--- a/public/static/SourcesPoll.json
+++ b/public/static/SourcesPoll.json
@@ -4,20 +4,20 @@
"ErrorMsg": "",
"DataInfo": [
[
- 116.38927817344666,
- 39.90751504898071
+ 39.90751504898071,
+ 116.38927817344666
],
[
- 116.38689637184143,
- 39.9088454246521
+ 39.9088454246521,
+ 116.38689637184143
],
[
- 116.39344096183777,
- 39.90931749343872
+ 39.90931749343872,
+ 116.39344096183777
],
[
- 116.39116644859314,
- 39.90489721298218
+ 39.90489721298218,
+ 116.39116644859314
]
]
}
diff --git a/src/components/LayerController/logic/SourcesPollution.js b/src/components/LayerController/logic/SourcesPollution.js
index 9fd5fd6..a701f1c 100644
--- a/src/components/LayerController/logic/SourcesPollution.js
+++ b/src/components/LayerController/logic/SourcesPollution.js
@@ -16,14 +16,7 @@
const result = await mapApi.getSourcesPoll()
console.log(result)
const resultData = result.Result.DataInfo || []
- console.log(resultData)
- // 寰幆閬嶅巻鏁版嵁 鏍规嵁杩涜marker 鐨勫垱寤�
- for (let i = 0; i < resultData.length; i++) {
- const polygon = L.polygon(resultData, {
- // totransferData: resultData[i],
- color: 'red'
- })
- layer.addLayer(polygon)
- }
+ const polygon = L.polygon(resultData, { color: 'yellow' })
+ polygon.addTo(layer)
}
}
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
index 9967bb6..08e502c 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
@@ -86,7 +86,9 @@
</template>
<script>
-import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
+// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
+
+import ReportPopup from './ReportPopup'
export default {
name: 'EventQuery',
@@ -97,7 +99,7 @@
{ name: '閲戦櫟鐭冲寲' },
{ name: '鍗椾含鍖栧' }
],
- subItems: LayerEntEmer.layers,
+ subItems: ['浜嬪墠闃舵', '瀹℃壒闃舵', '浜嬩欢瀹岀粨'],
form: {
pipelineType: '',
dataType: '',
@@ -128,6 +130,16 @@
},
btnAffiliatedFacilities () {
console.log('item')
+ window.$layer.open({
+ content: {
+ content: ReportPopup, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ // storagePlaceId: e.layer.options.totransferData.StoragePlaceId
+ }
+ }
+ // title: 'title' // 鏍囬
+ })
}
}
}
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
index a2be7c7..17e97de 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
@@ -1,107 +1,107 @@
<template>
- <div class="report-popup map-background" v-drag v-show="flags">
- <div class="public-bounced-title panel-title">
- <span>涓婃姤浜嬩欢</span>
- <i class="el-icon-circle-close" @click="closePopup"></i>
- </div>
- <div class="report-content">
- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="search-form">
- <el-form-item label="浜嬩欢鍚嶇О" prop="nameEvent" class="input-event-name">
- <el-input v-model="ruleForm.nameEvent" placeholder="灏嗕簨浠跺懡鍚�"></el-input>
- </el-form-item>
- <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
- <el-radio-group v-model="ruleForm.eventType">
- <el-radio v-for="(item,index) in ruleForm.eventTypeList" :label="item.value" :key="index">
- <span>{{ item.name }}</span>
- </el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="浜嬩欢绛夌骇" prop="eventLevel">
- <el-radio-group v-model="ruleForm.eventLevel">
- <el-radio v-for="(item,index) in ruleForm.eventLevelList" :label="item.value" :key="index">
- <span>{{ item.name }}</span>
- </el-radio>
- </el-radio-group>
- </el-form-item>
- <el-row>
- <el-col :span="12">
- <el-form-item label="浜嬪彂鍗曚綅" prop="region">
- <el-select v-model="ruleForm.region" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
- <el-option label="鍗曚綅浣嶇疆1" value="shanghai"></el-option>
- <el-option label="鍗曚綅浣嶇疆2" value="beijing"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浜嬪彂鏃堕棿" prop="region" class="search-panel-item">
- <el-date-picker
- v-model="ruleForm.atTime"
- type="datetime"
- placeholder="閫夋嫨鏃ユ湡鏃堕棿">
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="浜嬪彂浣嶇疆" prop="region" class="search-panel-item">
- <el-input v-model="ruleForm.name" class="report-input"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浣嶇疆鎻忚堪" prop="name">
- <el-input v-model="ruleForm.name" class="report-input"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="绠＄嚎鍚嶇О" prop="region" class="search-panel-item">
- <el-input v-model="ruleForm.name" class="report-input"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="绠＄嚎绫诲瀷" prop="name">
- <label>鑷姩甯﹀嚭涓嶅彲淇敼</label>
- </el-form-item>
- </el-col>
- </el-row>
- <el-form-item>
- <el-upload
- class="upload-demo"
- action="https://jsonplaceholder.typicode.com/posts/"
- :on-preview="handlePreview"
- :on-remove="handleRemove"
- :before-remove="beforeRemove"
- multiple
- :limit="3"
- :on-exceed="handleExceed"
- :file-list="fileList">
- <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
- </el-upload>
- </el-form-item>
- <el-form-item label="娑堟伅鎺ㄩ��" prop="beingPush">
- <el-radio-group v-model="ruleForm.beingPush">
- <el-radio v-for="(item,index) in ruleForm.beingPushList" :label="item.value" :key="index">
- <span>{{ item.name }}</span>
- </el-radio>
- </el-radio-group>
- </el-form-item>
- <div v-show="wayTo">
- <el-form-item label="浜嬩欢鎻忚堪" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ <!-- <div class="public-bounced map-background">-->
+ <!-- <div class="public-bounced-title panel-title">-->
+ <!-- <span>涓婃姤浜嬩欢</span>-->
+ <!-- <i class="el-icon-circle-close" @click="closePopup"></i>-->
+ <!-- </div>-->
+ <div class="public-bounced-content">
+ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="search-form">
+ <el-form-item label="浜嬩欢鍚嶇О" prop="nameEvent" class="input-event-name">
+ <el-input v-model="ruleForm.nameEvent" placeholder="灏嗕簨浠跺懡鍚�"></el-input>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
+ <el-radio-group v-model="ruleForm.eventType">
+ <el-radio v-for="(item,index) in ruleForm.eventTypeList" :label="item.value" :key="index">
+ <span>{{ item.name }}</span>
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绛夌骇" prop="eventLevel">
+ <el-radio-group v-model="ruleForm.eventLevel">
+ <el-radio v-for="(item,index) in ruleForm.eventLevelList" :label="item.value" :key="index">
+ <span>{{ item.name }}</span>
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="浜嬪彂鍗曚綅" prop="region">
+ <el-select v-model="ruleForm.region" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
+ <el-option label="鍗曚綅浣嶇疆1" value="shanghai"></el-option>
+ <el-option label="鍗曚綅浣嶇疆2" value="beijing"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="鎺ユ敹浜哄憳" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浜嬪彂鏃堕棿" prop="region" class="search-panel-item">
+ <el-date-picker
+ v-model="ruleForm.atTime"
+ type="datetime"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
</el-form-item>
- </div>
- <el-form-item>
- <el-button type="primary" @click="submitForm('ruleForm')">纭</el-button>
- <el-button @click="resetForm('ruleForm')">鍙栨秷</el-button>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="浜嬪彂浣嶇疆" prop="region" class="search-panel-item">
+ <el-input v-model="ruleForm.name" class="report-input"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浣嶇疆鎻忚堪" prop="name">
+ <el-input v-model="ruleForm.name" class="report-input"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="绠＄嚎鍚嶇О" prop="region" class="search-panel-item">
+ <el-input v-model="ruleForm.name" class="report-input"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="绠＄嚎绫诲瀷" prop="name">
+ <label>鑷姩甯﹀嚭涓嶅彲淇敼</label>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item>
+ <el-upload
+ class="upload-demo"
+ action="https://jsonplaceholder.typicode.com/posts/"
+ :on-preview="handlePreview"
+ :on-remove="handleRemove"
+ :before-remove="beforeRemove"
+ multiple
+ :limit="3"
+ :on-exceed="handleExceed"
+ :file-list="fileList">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ </el-upload>
+ </el-form-item>
+ <el-form-item label="娑堟伅鎺ㄩ��" prop="beingPush">
+ <el-radio-group v-model="ruleForm.beingPush">
+ <el-radio v-for="(item,index) in ruleForm.beingPushList" :label="item.value" :key="index">
+ <span>{{ item.name }}</span>
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <div v-show="wayTo">
+ <el-form-item label="浜嬩欢鎻忚堪" prop="desc">
+ <el-input type="textarea" v-model="ruleForm.desc"></el-input>
</el-form-item>
- </el-form>
- </div>
+ <el-form-item label="鎺ユ敹浜哄憳" prop="desc">
+ <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </div>
+ <el-form-item>
+ <el-button type="primary" @click="submitForm('ruleForm')">纭</el-button>
+ <el-button @click="resetForm('ruleForm')">鍙栨秷</el-button>
+ </el-form-item>
+ </el-form>
</div>
+ <!-- </div>-->
</template>
<script>
@@ -109,7 +109,6 @@
export default {
name: 'ReportPopup',
- props: ['flags'],
data () {
return {
flag: false,
@@ -232,12 +231,11 @@
</script>
<style lang="less" scoped>
- .report-popup {
- width: 35%;
- z-index: 999;
+ .public-bounced {
+ z-index: 2000;
position: absolute;
top: 15%;
- left: 35%;
+ left: 20%;
}
/deep/ input {
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
index e57c4d2..687a39e 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -69,19 +69,18 @@
</div>
</div>
</el-scrollbar>
- <ReportPopup :flags="flag"></ReportPopup>
</div>
</template>
<script>
import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
-import ReportPopup from './ReportPopup'
+// import ReportPopup from './ReportPopup'
export default {
name: 'ResourcesQuery',
- components: {
- ReportPopup
- },
+ // components: {
+ // ReportPopup
+ // },
data () {
return {
form: {
@@ -96,14 +95,12 @@
},
items: [LayerEntEmer],
subItems: LayerEntEmer.layers,
- searchDataDisplay: [],
- flag: false
+ searchDataDisplay: []
}
},
methods: {
showthePopup () {
console.log('item')
- this.flag = !this.flag
},
handlePipelineType () {
console.log('item')
diff --git a/src/conf/LayerTopic.js b/src/conf/LayerTopic.js
index e27ab87..ef7ca3d 100644
--- a/src/conf/LayerTopic.js
+++ b/src/conf/LayerTopic.js
@@ -12,6 +12,7 @@
import { LayerArea } from './layers/LayerArea'
import { LayerVideo } from './layers/LayerVideo'
import { LayerPk } from './layers/LayerPk'
+import { LayerEntEmer } from './layers/LayerEntEmer'
export const LayerTopic = {
code: 'sewersTopic',
@@ -19,5 +20,5 @@
checked: false,
isShow: true,
type: 0,
- layers: [LayerPollutionSources, LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater, LayerPipeLines, LayerPk, LayerVideo, LayerArea]
+ layers: [LayerPollutionSources, LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater, LayerPipeLines, LayerPk, LayerVideo, LayerArea, LayerEntEmer]
}
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index f3a720e..e125556 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -22,10 +22,10 @@
minZoom: 3,
maxZoom: 17,
// center: [26, 104],
- // center: [34.828558921813965, 117.41676807403564],
- // zoom: 5,
- center: [32.25853085517883, 118.78592848777771],
- zoom: 16,
+ center: [34.828558921813965, 117.41676807403564],
+ zoom: 5,
+ // center: [39.907214641571045, 116.39019012451172],
+ // zoom: 16,
worldCopyJump: true,
inertia: true,
zoomControl: false,
diff --git a/src/conf/layers/LayerEntEmer.js b/src/conf/layers/LayerEntEmer.js
index bbf0f85..d63a663 100644
--- a/src/conf/layers/LayerEntEmer.js
+++ b/src/conf/layers/LayerEntEmer.js
@@ -1,22 +1,23 @@
/**
- * 浼佷笟棰勮
+ * 浼佷笟搴旀��
*/
import { LayerHbss } from './LayerHbss'
import { LayerFsss } from './LayerFsss'
import { PIPELINE_WFS } from '../Constants'
+
const WFS_URL = PIPELINE_WFS
export const LayerEntEmer = {
code: 'reportEntemeage',
- name: '浼佷笟棰勮',
+ name: '浼佷笟搴旀��',
checked: false,
type: 0,
childLayer: [LayerFsss, LayerHbss],
layers: [
{
code: 'rainline',
- name: '浜嬪墠闃舵',
+ name: '鍩虹鍥惧眰',
sname: '绠＄綉',
checked: false,
type: 0,
@@ -32,7 +33,7 @@
},
{
code: 'accidentline',
- name: '瀹℃壒闃舵',
+ name: '鍦ㄧ嚎鐩戞祴',
sname: '浜嬫晠姘�',
checked: false,
// wmsLayers: 'sewer:pipeline_accident',
@@ -42,7 +43,22 @@
},
{
code: 'oilline',
- name: '浜嬩欢瀹岀粨',
+ name: '搴旀�ヨ祫婧�',
+ sname: '鍚补姹℃按',
+ checked: false,
+ type: 0,
+ minZoom: 13,
+ color: '#ffaa00',
+ wmsLayers: 'sewer:pipeline_sewer',
+ // wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鍚补姹℃按\'',
+ styles: {
+ COLOR: '#ffaa00',
+ FILL_COLOR: '#ffaa00'
+ }
+ },
+ {
+ code: 'oil',
+ name: '鍛ㄨ竟鐜',
sname: '鍚补姹℃按',
checked: false,
type: 0,
diff --git a/src/utils/dragBoxes.js b/src/utils/dragBoxes.js
index 1e17b89..e2c8225 100644
--- a/src/utils/dragBoxes.js
+++ b/src/utils/dragBoxes.js
@@ -4,6 +4,7 @@
const drag = Vue.directive('drag', {
bind (el, binding, vnode, oldVnode) {
const dialogHeaderEl = el.querySelector('.public-bounced-title')
+ dialogHeaderEl.style.cursor = 'move'
dialogHeaderEl.onmousedown = function (e) {
var distX = e.pageX - el.offsetLeft
var distY = e.pageY - el.offsetTop
--
Gitblit v1.8.0