From 896776bdfb2435ba9ed49996e39f007cc487ffe0 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 11 五月 2021 10:48:04 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 10
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue | 223 ++++++++++++++
src/conf/Topic.js | 26 +
src/api/host.js | 6
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue | 138 +++++++++
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue | 126 ++++++++
src/components/table/Public.vue | 4
src/views/MapTemplate.vue | 133 ++++----
src/components/panel/topicSearch/ReportSearch.vue | 45 +++
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 34 +-
src/api/mapUrl.js | 12
src/components/panel/topicSearch/SolidWasteSearch.vue | 8
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js | 17 -
src/conf/layers/LayerEntEmer.js | 59 +++
14 files changed, 720 insertions(+), 121 deletions(-)
diff --git a/src/api/host.js b/src/api/host.js
index d2b8228..ec065c4 100644
--- a/src/api/host.js
+++ b/src/api/host.js
@@ -4,3 +4,9 @@
import { getSchemeHost } from '../utils/tools'
export const $HOST = getSchemeHost()
+
+// 绠＄嚎鍒嗘瀽-绾夸笂
+export const $HOSTANALYSE = 'http://xearth.cn:6202'
+
+// 绠＄嚎鍒嗘瀽-鏈湴
+// export const $HOSTANALYSE = 'http://10.238.105.124:8089'
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index 98b9986..bb12e82 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -1,7 +1,7 @@
/**
* 璇ユ枃浠堕厤缃帴鍙ｇ殑URL鍦板潃
*/
-import { $HOST } from './host'
+import { $HOST, $HOSTANALYSE } from './host'
export const GetUser = $HOST + '/user/getUser'
@@ -30,8 +30,8 @@
export const getCompany = $HOST + '/company/getCompany'
// 绠＄嚎鍒嗘瀽
-export const findPipelineByClickPoint = 'http://xearth.cn:6202' + '/findPipelineByClickPoint'
-export const findConnectedPipelines = 'http://xearth.cn:6202' + '/findConnectedPipelines'
-export const findFlowDirection = 'http://xearth.cn:6202' + '/findFlowDirection'
-export const findLeakages = 'http://xearth.cn:6202' + '/findLeakages'
-export const getCrossSection = 'http://xearth.cn:6202' + '/getCrossSection'
+export const findPipelineByClickPoint = $HOSTANALYSE + '/findPipelineByClickPoint'
+export const findConnectedPipelines = $HOSTANALYSE + '/findConnectedPipelines'
+export const findFlowDirection = $HOSTANALYSE + '/findFlowDirection'
+export const findLeakages = $HOSTANALYSE + '/findLeakages'
+export const getCrossSection = $HOSTANALYSE + '/getCrossSection'
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 33a4380..a53ae08 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -24,7 +24,7 @@
</ul>
</div>
</div>
- <div class="right-control" :class="[{ 'unfold': !isCollapse },{ 'shrink': isCollapse }] ">
+ <div class="right-control" :class="[{ 'unfold': !isCollapse },{ 'shrink': isCollapse }] " v-if="gcComp!=''">
<div class="panel-fold-btn" @click="toggleMonitorPanel">
<div :class="[isCollapse? 'btn-stretch':'btn-shrink']"></div>
</div>
@@ -60,6 +60,7 @@
import SoilGroundWaterSearch from '@components/panel/topicSearch/SoilGroundWaterSearch.vue'
import PipeChangesSearch from '@components/panel/topicSearch/pipeChangesSearch.vue'
import PipeInformationSearch from '@components/panel/topicSearch/pipeInformationSearch.vue'
+import ReportSearch from './topicSearch/ReportSearch'
import bus from '@/eventBus'
@@ -70,7 +71,8 @@
WaterWasteSearch,
SolidWasteSearch,
EnvRiskSearch,
- DischargeSearch
+ DischargeSearch,
+ ReportSearch
},
data () {
return {
@@ -153,6 +155,9 @@
case '绠￠亾淇℃伅':
this.gcComp = PipeInformationSearch
break
+ case '浼佷笟搴旀��':
+ this.gcComp = ReportSearch
+ break
}
},
handlePage (page) {
@@ -214,6 +219,7 @@
const that = this
bus.$on('changeSearchBar', function (obj) {
// console.log(obj.checked, obj.name)
+ that.gcComp = ''
that.topicList.forEach((item) => {
if (item.name === obj.name) {
item.isShow = obj.checked
diff --git a/src/components/panel/topicSearch/ReportSearch.vue b/src/components/panel/topicSearch/ReportSearch.vue
new file mode 100644
index 0000000..047b86a
--- /dev/null
+++ b/src/components/panel/topicSearch/ReportSearch.vue
@@ -0,0 +1,45 @@
+<template>
+ <div class="sewers-search" v-if="judgeVisible">
+ <div class="panel-title">{{ title }}</div>
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane label="浜嬩欢鏌ヨ" name="first">
+ <EventQuery></EventQuery>
+ </el-tab-pane>
+ <el-tab-pane label="璧勬簮鏌ヨ" name="second">
+ <ResourcesQuery></ResourcesQuery>
+ </el-tab-pane>
+ </el-tabs>
+ <!-- <ReportPopup></ReportPopup>-->
+ </div>
+</template>
+
+<script>
+import EventQuery from './SewersSelect/EnterpriseEmergency/EventQuery'
+import ResourcesQuery from './SewersSelect/EnterpriseEmergency/ResourcesQuery'
+// import ReportPopup from './SewersSelect/EnterpriseEmergency/ReportPopup'
+
+export default {
+ name: 'ReportSearch',
+ props: ['title'],
+ components: {
+ EventQuery,
+ ResourcesQuery
+ // ReportPopup
+ },
+ data () {
+ return {
+ judgeVisible: true,
+ activeName: 'first'
+ }
+ },
+ methods: {
+ handleClick (tab) {
+ console.log(tab)
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js
index 332249f..b55c90a 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js
@@ -1,18 +1,5 @@
export default {
- // 鐖嗙
- bgClick () {
- this.selectPipeLine()
- },
- // 娴佸悜鍦板浘涓婄偣鍑�
- selectPipeLine () {
- // console.log(map)
- window.on('click', this.selectClick)
- },
- // 鍦板浘涓婄偣鍑诲洖璋�
- selectClick (e) {
- console.log(e)
- // window.map.off('click', this.selectClick)
- // const point = [e.latlng.lng, e.latlng.lat]
- // console.log(point)
+ clickPopup () {
+ console.log('鍏叡鏂规硶')
}
}
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
new file mode 100644
index 0000000..9967bb6
--- /dev/null
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
@@ -0,0 +1,138 @@
+<template>
+ <div class="search-panel">
+ <el-form ref="form" :model="form" label-width="90px" class="search-form">
+ <el-form ref="form" :model="form" label-width="90px" class="search-form">
+ <el-form-item label="浼佷笟鍚嶇О锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="item in items"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鐘舵�侊細" size="mini">
+ <el-select style="width: 100%" v-model="form.dataType" value-key="code"
+ :popper-class="'select-down'" @change="handleDataType">
+ <el-option
+ v-for="item in subItems"
+ :key="item.code"
+ :label="item.name"
+ :value="item">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绫诲瀷锛�">
+ <el-radio-group v-model="form.transferData" class="levelOfRisk">
+ <el-radio v-for="(item,index) in form.levelOfRisk" :label="item.value" :key="index">
+ <span class="levelOfRisk-type">{{ item.name }}</span>
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ </div>
+ </el-form>
+ </el-form>
+ <el-scrollbar style="height:286.22px">
+ <div class="environmental-risk-list">
+ <i class="state"></i>
+ <div>
+ <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
+ <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�
+ <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
+ @click="btnAffiliatedFacilities()">鍒犻櫎
+ </el-button>
+ </h5>
+ <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
+ <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span>
+ <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
+ @click="btnAffiliatedFacilities()">浜嬩欢绠＄悊
+ </el-button>
+ </p>
+ </div>
+ </div>
+ <div class="environmental-risk-list">
+ <i class="state"></i>
+ <div>
+ <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
+ <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
+ <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
+ <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span>
+ <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
+ @click="btnAffiliatedFacilities()">浜嬩欢绠＄悊
+ </el-button>
+ </p>
+ </div>
+ </div>
+ <div class="environmental-risk-list">
+ <i class="state"></i>
+ <div>
+ <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
+ <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
+ <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
+ <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span>
+ <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
+ @click="btnAffiliatedFacilities()">浜嬩欢绠＄悊
+ </el-button>
+ </p>
+ </div>
+ </div>
+ </el-scrollbar>
+ </div>
+</template>
+
+<script>
+import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
+
+export default {
+ name: 'EventQuery',
+ data () {
+ return {
+ list: [],
+ items: [
+ { name: '閲戦櫟鐭冲寲' },
+ { name: '鍗椾含鍖栧' }
+ ],
+ subItems: LayerEntEmer.layers,
+ form: {
+ pipelineType: '',
+ dataType: '',
+ keyword: '',
+ transferData: 1,
+ levelOfRisk: [
+ {
+ name: '鐪熷疄浜嬩欢',
+ value: 1
+ },
+ {
+ name: '妯℃嫙婕旂粌',
+ value: 2
+ }
+ ]
+ }
+ }
+ },
+ methods: {
+ handleDataType () {
+ console.log('ite')
+ },
+ handlePipelineType () {
+ console.log('鏁版嵁鏌ヨ')
+ },
+ handleSearch () {
+ console.log('item')
+ },
+ btnAffiliatedFacilities () {
+ console.log('item')
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
new file mode 100644
index 0000000..bca7924
--- /dev/null
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
@@ -0,0 +1,223 @@
+<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">
+ <el-input v-model="ruleForm.nameEvent" class="report-input"></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-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="resource">
+ <el-radio-group v-model="ruleForm.resource">
+ <el-radio label="鐭俊鎺ㄩ��"></el-radio>
+ <el-radio label="鎵嬫満搴旂敤鎺ㄩ��"></el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鎻忚堪" prop="desc">
+ <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ <el-form-item label="鎺ユ敹浜哄憳" prop="desc">
+ <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ <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>
+import '@utils/dragBoxes'
+
+export default {
+ name: 'ReportPopup',
+ props: ['flags'],
+ data () {
+ return {
+ flag: false,
+ ruleForm: {
+ nameEvent: '',
+ eventType: '',
+ eventTypeList: [
+ {
+ name: '寰呰ˉ鍏�',
+ value: 1
+ },
+ {
+ name: '寰呰ˉ鍏�',
+ value: 2
+ },
+ {
+ name: '寰呰ˉ鍏�',
+ value: 3
+ }
+ ],
+ eventLevel: '',
+ eventLevelList: [
+ {
+ name: '寰呰ˉ鍏�',
+ value: 1
+ },
+ {
+ name: '寰呰ˉ鍏�',
+ value: 2
+ },
+ {
+ name: '寰呰ˉ鍏�',
+ value: 3
+ }
+ ],
+ atTime: ''
+ },
+ fileList: [],
+ rules: {
+ name: [
+ {
+ required: true,
+ message: '璇疯緭鍏ユ椿鍔ㄥ悕绉�',
+ trigger: 'blur'
+ },
+ {
+ min: 3,
+ max: 5,
+ message: '闀垮害鍦� 3 鍒� 5 涓瓧绗�',
+ trigger: 'blur'
+ }
+ ],
+ region: [
+ {
+ required: true,
+ message: '璇烽�夋嫨娲诲姩鍖哄煙',
+ trigger: 'change'
+ }
+ ],
+ resource: [
+ {
+ required: true,
+ message: '璇烽�夋嫨娲诲姩璧勬簮',
+ trigger: 'change'
+ }
+ ],
+ desc: [
+ {
+ required: true,
+ message: '璇峰～鍐欐椿鍔ㄥ舰寮�',
+ trigger: 'blur'
+ }
+ ]
+ }
+ }
+ },
+ methods: {
+ handleRemove (file, fileList) {
+ console.log(file, fileList)
+ },
+ handlePreview (file) {
+ console.log(file)
+ },
+ handleExceed (files, fileList) {
+ this.$message.warning(`褰撳墠闄愬埗閫夋嫨 3 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶)
+ },
+ beforeRemove (file, fileList) {
+ return this.$confirm(`纭畾绉婚櫎 ${file.name}锛焋)
+ },
+ closePopup () {
+ this.flags = false
+ },
+ submitForm (formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ alert('submit!')
+ } else {
+ console.log('error submit!!')
+ return false
+ }
+ })
+ },
+ resetForm (formName) {
+ this.$refs[formName].resetFields()
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+ /deep/ .el-form-item__label {
+ color: @color;
+ }
+
+ /deep/ .el-radio__label {
+ color: @color;
+ }
+
+ .report-popup {
+ width: 35%;
+ z-index: 999;
+ position: absolute;
+ top: 35%;
+ left: 20%;
+ }
+</style>
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
new file mode 100644
index 0000000..e57c4d2
--- /dev/null
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -0,0 +1,126 @@
+<template>
+ <div class="search-panel">
+ <el-form ref="form" :model="form" label-width="90px" class="search-form">
+ <el-form-item label="浼佷笟鍚嶇О锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.eventName" @change="handlePipelineType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="item in form.eventNameList"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧勬簮鐜锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="item in items"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item :label="form.pipelineType+'锛�'" size="mini">
+ <el-select style="width: 100%" v-model="form.dataType" value-key="code"
+ :popper-class="'select-down'" @change="handleDataType">
+ <el-option
+ v-for="item in subItems"
+ :key="item.code"
+ :label="item.name"
+ :value="item">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ </div>
+ </el-form>
+ <el-scrollbar style="height:286.22px">
+ <div class="environmental-risk-list" @click="showthePopup">
+ <!-- v-for="(item,index) in searchDataDisplay" :key="index" @click="setBounced(item)"-->
+ <i class="state"></i>
+ <div>
+ <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
+ <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
+ <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
+ <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list">
+ <i class="state"></i>
+ <div>
+ <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
+ <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
+ <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
+ <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list">
+ <i class="state"></i>
+ <div>
+ <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
+ <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
+ <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
+ <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
+ <ReportPopup :flags="flag"></ReportPopup>
+ </div>
+</template>
+
+<script>
+import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
+import ReportPopup from './ReportPopup'
+
+export default {
+ name: 'ResourcesQuery',
+ components: {
+ ReportPopup
+ },
+ data () {
+ return {
+ form: {
+ eventName: '',
+ pipelineType: '璧勬簮绫诲瀷',
+ dataType: '',
+ keyword: '',
+ eventNameList: [
+ { name: '閲戦櫟鐭冲寲' },
+ { name: '鍗椾含鍖栧' }
+ ]
+ },
+ items: [LayerEntEmer],
+ subItems: LayerEntEmer.layers,
+ searchDataDisplay: [],
+ flag: false
+ }
+ },
+ methods: {
+ showthePopup () {
+ console.log('item')
+ this.flag = !this.flag
+ },
+ handlePipelineType () {
+ console.log('item')
+ },
+ handleDataType () {
+ console.log('item')
+ },
+ handleSearch () {
+ console.log('鏁版嵁鏌ヨ')
+ },
+ setBounced (item) {
+ console.log(item)
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 8f2624c..a717a7a 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -55,8 +55,8 @@
<el-tab-pane label="鐖嗙" style="color: #cccccc" name="second">
<el-row>
<span>鐖嗙锛堢浉鍏冲紑鍏筹級</span>
- <el-button type="primary" @click="bgClick" size="mini" style="margin-bottom: 5px;" title="鍦板浘涓婄偣鍑婚�夋嫨鍙戠敓鐖嗙鐨勭娈�">閫夋嫨绠℃</el-button>
- <el-button type="primary" @click="handleClick" size="mini" style="margin-bottom: 5px;" title="娓呴櫎缁樺埗">娓呴櫎</el-button>
+ <el-button type="primary" @click="bgClick" size="mini" title="鍦板浘涓婄偣鍑婚�夋嫨鍙戠敓鐖嗙鐨勭娈�">閫夋嫨绠℃</el-button>
+ <el-button type="primary" @click="handleClick" size="mini" title="娓呴櫎缁樺埗">娓呴櫎</el-button>
</el-row>
<!-- <el-card shadow="hover">-->
<span class="fixed-style">鍙戠敓鐖嗚鐨勭娈�</span>
@@ -86,8 +86,8 @@
<!-- </el-card>-->
</el-tab-pane>
<el-tab-pane label="娴佸悜" name="third">
- <el-button type="primary" @click="selectPipeLine" size="mini" style="margin-bottom: 5px;" title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭娈�">閫夋嫨绠℃</el-button>
- <el-table max-height="200" class="tableBox" :data="tableDataLiuxiang" size="mini">
+ <el-button type="primary" @click="selectPipeLine" size="mini" highlight-current-row title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭娈�">閫夋嫨绠℃</el-button>
+ <el-table max-height="200" class="tableBox" highlight-current-row :data="tableDataLiuxiang" size="mini">
<el-table-column :show-overflow-tooltip="true" prop="pipecode" label="绠℃绫诲瀷"></el-table-column>
<el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="绠℃鍚嶇О"></el-table-column>
<el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="璧风偣缂栧彿"></el-table-column>
@@ -113,15 +113,15 @@
</el-tab-pane>
<el-tab-pane label="妯柇闈�" name="fourth">
<div>
- <el-button type="primary" @click="drawLine" size="mini" style="margin-bottom: 5px;" title="鍦板浘涓婄粯鍒惰杩涜鍒嗘瀽鎴柇闈㈢殑绾�">缁樺埗绾挎</el-button>
- <el-button type="primary" @click="jdmQuery" size="mini" style="margin-bottom: 5px;" title="鎴柇闈㈠垎鏋�">鎴柇闈㈠垎鏋�</el-button>
- <el-button type="primary" @click="jdmClear" size="mini" style="margin-bottom: 5px;" title="娓呴櫎鎴柇闈㈠垎鏋愮粨鏋�">娓呴櫎</el-button>
+ <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>
</div>
- <!-- <el-card class="box-card">-->
+ <!-- <el-card class="box-card">-->
<div slot="header" class="fixed-style">
<span>绠℃鏌ヨ缁撴灉</span>
</div>
- <el-table class="tableBox" :data="tableData" max-height="200" style="width: 100%" @row-click="selectRow" size="mini">
+ <el-table class="tableBox" :data="tableData" 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">
@@ -130,7 +130,7 @@
</template>
</el-table-column>
</el-table>
- <!-- </el-card>-->
+ <!-- </el-card>-->
<!-- <el-card class="box-card">
<div slot="header" class="fixed-style">
<span>鏂潰鍥�</span>
@@ -166,7 +166,9 @@
myChart: null,
options: [],
+ echartsList: [],
myChartShow: false,
+
flowPipeLine: null,
// 鐢ㄤ簬鍒ゆ柇
@@ -205,9 +207,7 @@
lxTableDataResult: [],
// 妯柇闈� 绠℃鏌ヨ缁撴灉 鐨則able琛ㄦ牸鏁版嵁
- tableData: [],
-
- echartsList: []
+ tableData: []
}
},
@@ -222,7 +222,8 @@
methods: {
// tab鍒囨崲
handleClick (tab, event) {
- // console.log(tab, event)
+ console.log(event)
+ // console.log(tab)
this.clearLinkPipe()
this.clearLX()
this.linkClear()
@@ -298,7 +299,6 @@
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
linkClickStart (e) {
- // console.log(e)
// console.log('鍦板浘鐐瑰嚮璧峰绠℃')
this.linkType = 1
this.selectPipeLine()
@@ -379,6 +379,7 @@
// 鍒ゆ柇鏁版嵁缁撴灉 === 0 鍒欐病鏈夎姹傚埌鏁版嵁
if (res.data.length === 0) {
this.$message('娌℃湁鎵惧埌杩為�氱殑绠℃')
+ // 杩涜鍒ゆ柇
// if (this.tableDataLinkStart === [] && this.tableDataLinkEnd === []) {
this.currentLinkIsTrue = '涓嶈繛閫�'
// }
@@ -670,6 +671,7 @@
},
// 妯柇闈㈡暟鎹姹�
async jdmQuery () {
+ this.tableData = []
if (this.hdmParam == null) {
this.$message('璇峰厛鍦ㄥ湴鍥句笂缁樺埗鎴柇绾�')
return false
@@ -684,6 +686,7 @@
}
this.tableData.push(obj)
}
+ // console.log(this.tableData, 'this.tableData')
this.dealWithData(res)
},
dealWithData (e) {
@@ -845,6 +848,7 @@
/deep/ .el-table__body .el-table__row.hover-row td {
background: none !important;
+ color:yellow;
}
/deep/ .el-table__body tr.current-row > td {
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index a57c29f..5814b50 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -73,12 +73,6 @@
],
// 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
searchDataDisplay: [],
- instance: null,
- intervals: [],
- layer: window.map,
- L: window.L,
- times: 5,
- colors: ['#98FB98', '#ff0000'],
solidWasteTypeOptions: [{
value: '1',
label: '鍖哄煙',
@@ -163,7 +157,7 @@
},
// 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
setBounced (val) {
- console.log(val)
+ // console.log(val)
const pos = [val.Latitude, val.Longitude]
window.map.flyTo(pos, 15)
window.$layer.open({
diff --git a/src/components/table/Public.vue b/src/components/table/Public.vue
index fec41b2..e0da037 100644
--- a/src/components/table/Public.vue
+++ b/src/components/table/Public.vue
@@ -12,8 +12,8 @@
<script>
-// 寮曞叆鎷栨嫿
-import '@/utils/dragBoxes'
+// 寮规澶撮儴鎷栨嫿
+// import '@/utils/dragBoxes'
export default {
name: 'Public'
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index 9bc0bb5..f0d22ff 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -8,59 +8,67 @@
dischargeSearch: () => import('@components/panel/topicSearch/DischargeSearch'),
envProtectSearch: () => import('@components/panel/topicSearch/EnvRiskSearch'),
soilGroundWaterSearch: () => import('@components/panel/topicSearch/SoilGroundWaterSearch'),
- sewersSearch: () => import('@components/panel/topicSearch/SewersSearch.vue')
+ sewersSearch: () => import('@components/panel/topicSearch/SewersSearch.vue'),
+ ReportSearchL: () => import('@components/panel/topicSearch/ReportSearch.vue')
}
export const TopicList = [{
name: '姹℃煋婧�',
id: 1,
check: false,
- isShow: true,
+ isShow: false,
icon: 'iconwuranyuan',
comp: ''
}, {
name: '搴熸按',
id: 2,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'iconfs',
comp: ''
}, {
name: '搴熸皵',
id: 3,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'iconfq',
comp: ''
}, {
name: '鍥哄簾',
id: 4,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'icongf_green2',
comp: ''
}, {
name: '鐜椋庨櫓',
id: 5,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'iconditu',
comp: ''
}, {
name: '鍦熷￥鍙婂湴涓嬫按',
id: 6,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'icondxs_green',
comp: ''
}, {
name: '绠＄嚎',
id: 7,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'iconguanxianxuncha',
comp: ''
-} /* {
+}, {
+ name: '浼佷笟搴旀��',
+ id: 8,
+ checked: false,
+ isShow: false,
+ icon: 'iconguanxianyanghu',
+ comp: ''
+}/* {
name: '绠￠亾鍙樻洿',
id: 8,
checked: false,
diff --git a/src/conf/layers/LayerEntEmer.js b/src/conf/layers/LayerEntEmer.js
new file mode 100644
index 0000000..bbf0f85
--- /dev/null
+++ b/src/conf/layers/LayerEntEmer.js
@@ -0,0 +1,59 @@
+/**
+ * 浼佷笟棰勮
+ */
+import { LayerHbss } from './LayerHbss'
+import { LayerFsss } from './LayerFsss'
+
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
+
+export const LayerEntEmer = {
+ code: 'reportEntemeage',
+ name: '浼佷笟棰勮',
+ checked: false,
+ type: 0,
+ childLayer: [LayerFsss, LayerHbss],
+ layers: [
+ {
+ code: 'rainline',
+ name: '浜嬪墠闃舵',
+ sname: '绠＄綉',
+ checked: false,
+ type: 0,
+ wmsLayers: 'sewer:pipeline_rain',
+ // wfs: WFS_URL + '?TYPENAME=绠＄綉&FILTER=<Filter xmlns="http://www.opengis.net/ogc"><PropertyIsEqualTo><PropertyName>mediumtype</PropertyName><Literal>闆ㄦ按绠＄嚎</Literal></PropertyIsEqualTo></Filter>',
+ icon: 'sewers/闆ㄦ按绾�.png',
+ color: '#0070ff',
+ minZoom: 13,
+ styles: {
+ COLOR: '#0070ff',
+ FILL_COLOR: '#0070ff'
+ }
+ },
+ {
+ code: 'accidentline',
+ name: '瀹℃壒闃舵',
+ sname: '浜嬫晠姘�',
+ checked: false,
+ // wmsLayers: 'sewer:pipeline_accident',
+ type: 0,
+ minZoom: 13,
+ wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�'
+ },
+ {
+ code: 'oilline',
+ 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'
+ }
+ }
+ ]
+}
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index d0bffe7..38605bf 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -1,23 +1,24 @@
<template>
- <div class="full-screen">
- <!--<popup ref="popup" @callPopup="callPopup"></popup>-->
- <div id="map" ref="rootmap">
+ <div class="full-screen">
+ <!--<popup ref="popup" @callPopup="callPopup"></popup>-->
+ <div id="map" ref="rootmap">
+ </div>
+ <sgis-layer-controller></sgis-layer-controller>
+ <monitor-panel></monitor-panel>
+ <!-- <top-enterprise-panel></top-enterprise-panel>-->
+ <tool-box-panel ref="toolBox"></tool-box-panel>
+ <!-- <menu-special></menu-special>-->
+ <legend-panel></legend-panel>
+ <!-- <summary-sheets></summary-sheets>-->
+ <SummarySheet></SummarySheet>
+ <!-- <enterprise></enterprise> -->
+ <!-- <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
+ <!-- <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>-->
+ <!-- <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>-->
+ <!-- <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
+ <PublicBounced ref="PublicBounced"></PublicBounced>
+ <!-- <ReportPopup></ReportPopup>-->
</div>
- <sgis-layer-controller></sgis-layer-controller>
- <monitor-panel></monitor-panel>
- <!-- <top-enterprise-panel></top-enterprise-panel>-->
- <tool-box-panel ref="toolBox"></tool-box-panel>
- <!-- <menu-special></menu-special>-->
- <legend-panel></legend-panel>
-<!-- <summary-sheets></summary-sheets>-->
- <SummarySheet></SummarySheet>
- <!-- <enterprise></enterprise> -->
- <!-- <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
- <!-- <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>-->
- <!-- <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>-->
- <!-- <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
- <PublicBounced ref="PublicBounced"></PublicBounced>
- </div>
</template>
<script>
@@ -37,6 +38,7 @@
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
import EventHandler from '../components/LayerController/event/EventHandler'
+// import ReportPopup from '../components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup'
export default {
name: 'MapTemplate',
@@ -51,6 +53,7 @@
// summarySheets,
SummarySheet,
PublicBounced
+ // ReportPopup
},
data () {
return {
@@ -121,59 +124,59 @@
</script>
<style lang="less">
-.flue-gas {
- position: fixed;
- top: 88px;
- left: 180px;
- z-index: 500;
-}
+ .flue-gas {
+ position: fixed;
+ top: 88px;
+ left: 180px;
+ z-index: 500;
+ }
-.solid-waste {
- position: absolute;
- top: 88px;
- left: 88px;
- z-index: 999;
-}
+ .solid-waste {
+ position: absolute;
+ top: 88px;
+ left: 88px;
+ z-index: 999;
+ }
-.full-screen {
- width: 100%;
- height: 100%;
- margin: 0;
- padding: 0;
- position: absolute;
+ .full-screen {
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ position: absolute;
- #map {
- height: 100%;
- width: 100%;
- }
+ #map {
+ height: 100%;
+ width: 100%;
+ }
- .barline {
- //width: 100%;
- //height: 1px;
- //background-color: #0661AE;
- border-top: 1px solid #0661AE;
- }
+ .barline {
+ //width: 100%;
+ //height: 1px;
+ //background-color: #0661AE;
+ border-top: 1px solid #0661AE;
+ }
- #map-btn {
- position: fixed;
- top: 20px;
- left: 100px;
- z-index: 9999;
- }
+ #map-btn {
+ position: fixed;
+ top: 20px;
+ left: 100px;
+ z-index: 9999;
+ }
- .leaflet-custom-icon {
- background: white;
- }
+ .leaflet-custom-icon {
+ background: white;
+ }
- .leaflet-marker-icon {
- background: none;
- }
+ .leaflet-marker-icon {
+ background: none;
+ }
- #migic {
- width: 48px;
- height: 48px;
- margin: -18px -20px;
- z-index: 999;
- }
-}
+ #migic {
+ width: 48px;
+ height: 48px;
+ margin: -18px -20px;
+ z-index: 999;
+ }
+ }
</style>
--
Gitblit v1.8.0