From 315dc0b82a482a3d145009c8f25c20e87da681d5 Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期一, 10 五月 2021 17:05:55 +0800
Subject: [PATCH] 企业应急
---
src/components/panel/RightSearchPanel.vue | 7
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue | 222 +++++++++++++
src/conf/Topic.js | 12
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue | 119 +++++++
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue | 116 +++++++
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 | 11
src/components/panel/topicSearch/SolidWasteSearch.vue | 8
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js | 17
src/conf/MapConfig.js | 8
src/components/panel/topicSearch/SewersSearch.vue | 142 ++++----
src/conf/layers/LayerEntEmer.js | 68 ++++
14 files changed, 743 insertions(+), 169 deletions(-)
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 33a4380..b025a43 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -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) {
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/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 2213bef..ea9c7c6 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,72 +1,78 @@
<template>
- <div class="sewers-search" v-if="gdVisible">
- <div class="panel-title">{{ title }}</div>
- <el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="鏌ヨ" name="first">
- <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.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>
- </div>
- <el-scrollbar style="height:380.44px;">
- <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum==index?'hover':''">
- <img class="state" :src="getImgSrc()" style="background: none"/>
- <div>
- <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
- <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgcode }}</span>
- <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.teetype }}</span>
- <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" @click="btnAffiliatedFacilities(item,index)" >闄勫睘璁炬柦</el-button>
- </p>
- </div>
- </div>
- </el-scrollbar>
- <el-card class="footer-page" v-if="total > 10">
- <el-pagination
- small
- @current-change="handlePage"
- :page-size=pageSize
- layout="prev, pager, next"
- :total=total
- :current-page=current
- class="warnPagination"
- >
- </el-pagination>
- </el-card>
- </el-tab-pane>
- <el-tab-pane label="鍒嗘瀽" name="second">
- <SewersAnalysis></SewersAnalysis>
- </el-tab-pane>
- <el-tab-pane label="鍘嗗彶" name="third">
- <SewersHistory></SewersHistory>
- </el-tab-pane>
- </el-tabs>
- <!-- 闄勫睘璁炬柦闈㈡澘 -->
- <affiliated-facilities :facilitiesParameter="facilitiesParameter" v-if="fuShuSheShiShow" ></affiliated-facilities>
- </div>
+ <div class="sewers-search" v-if="gdVisible">
+ <div class="panel-title">{{ title }}</div>
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane label="鏌ヨ" name="first">
+ <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.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>
+ </div>
+ <el-scrollbar style="height:380.44px;">
+ <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
+ :class="activeNum==index?'hover':''">
+ <img class="state" :src="getImgSrc()" style="background: none"/>
+ <div>
+ <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
+ <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgcode }}</span>
+ <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.teetype }}</span>
+ <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini"
+ style="margin-right: 0.04rem;" @click="btnAffiliatedFacilities(item,index)">
+ 闄勫睘璁炬柦
+ </el-button>
+ </p>
+ </div>
+ </div>
+ </el-scrollbar>
+ <el-card class="footer-page" v-if="total > 10">
+ <el-pagination
+ small
+ @current-change="handlePage"
+ :page-size=pageSize
+ layout="prev, pager, next"
+ :total=total
+ :current-page=current
+ class="warnPagination"
+ >
+ </el-pagination>
+ </el-card>
+ </el-tab-pane>
+ <el-tab-pane label="鍒嗘瀽" name="second">
+ <SewersAnalysis></SewersAnalysis>
+ </el-tab-pane>
+ <el-tab-pane label="鍘嗗彶" name="third">
+ <SewersHistory></SewersHistory>
+ </el-tab-pane>
+ </el-tabs>
+ <!-- 闄勫睘璁炬柦闈㈡澘 -->
+ <affiliated-facilities :facilitiesParameter="facilitiesParameter"
+ v-if="fuShuSheShiShow"></affiliated-facilities>
+ </div>
</template>
<script>
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..26a82d7
--- /dev/null
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
@@ -0,0 +1,119 @@
+<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鏃�</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>
+ </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')
+ }
+ }
+}
+</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..2cabece
--- /dev/null
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
@@ -0,0 +1,222 @@
+<template>
+ <div class="report-popup map-background" v-drag>
+ <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',
+ 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.flag = 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..e9ef1a5
--- /dev/null
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -0,0 +1,116 @@
+<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">
+ <!-- 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>
+ </div>
+</template>
+
+<script>
+import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
+
+export default {
+ name: 'ResourcesQuery',
+ data () {
+ return {
+ form: {
+ eventName: '',
+ pipelineType: '璧勬簮绫诲瀷',
+ dataType: '',
+ keyword: '',
+ eventNameList: [
+ { name: '閲戦櫟鐭冲寲' },
+ { name: '鍗椾含鍖栧' }
+ ]
+ },
+ items: [LayerEntEmer],
+ subItems: LayerEntEmer.layers,
+ searchDataDisplay: []
+ }
+ },
+ methods: {
+ 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 00899c8..4284d6f 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -443,7 +443,9 @@
myChart: null,
options: [],
+ echartsList: [],
myChartShow: false,
+
flowPipeLine: null,
// 鐢ㄤ簬鍒ゆ柇
@@ -482,9 +484,7 @@
lxTableDataResult: [],
// 妯柇闈� 绠℃鏌ヨ缁撴灉 鐨則able琛ㄦ牸鏁版嵁
- tableData: [],
-
- echartsList: []
+ tableData: []
}
},
@@ -499,7 +499,8 @@
methods: {
// tab鍒囨崲
handleClick (tab, event) {
- // console.log(tab, event)
+ console.log(event)
+ // console.log(tab)
this.clearLinkPipe()
this.clearLX()
this.linkClear()
@@ -575,7 +576,6 @@
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
linkClickStart (e) {
- // console.log(e)
// console.log('鍦板浘鐐瑰嚮璧峰绠℃')
this.linkType = 1
this.selectPipeLine()
@@ -656,6 +656,7 @@
// 鍒ゆ柇鏁版嵁缁撴灉 === 0 鍒欐病鏈夎姹傚埌鏁版嵁
if (res.data.length === 0) {
this.$message('娌℃湁鎵惧埌杩為�氱殑绠℃')
+ // 杩涜鍒ゆ柇
// if (this.tableDataLinkStart === [] && this.tableDataLinkEnd === []) {
this.currentLinkIsTrue = '涓嶈繛閫�'
// }
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/MapConfig.js b/src/conf/MapConfig.js
index 2343ab8..0acc40f 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: 15,
+ // center: [34.828558921813965, 117.41676807403564],
+ // zoom: 5,
+ center: [32.25853085517883, 118.78592848777771],
+ zoom: 15,
worldCopyJump: true,
inertia: true,
zoomControl: false,
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index 9bc0bb5..b343be2 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -8,7 +8,8 @@
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 = [{
@@ -60,7 +61,14 @@
isShow: true,
icon: 'iconguanxianxuncha',
comp: ''
-} /* {
+}, {
+ name: '浼佷笟搴旀��',
+ id: 8,
+ checked: false,
+ isShow: true,
+ icon: 'iconguanxianxuncha',
+ 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..283e161
--- /dev/null
+++ b/src/conf/layers/LayerEntEmer.js
@@ -0,0 +1,68 @@
+/**
+ * 浼佷笟棰勮
+ */
+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'
+ }
+ },
+ {
+ code: 'saltline',
+ name: '搴旀�ラ槦浼�',
+ sname: '鍚洂姹℃按',
+ checked: false,
+ type: 0,
+ minZoom: 13,
+ wfs: WFS_URL + '?TYPENAME=鍚洂姹℃按'
+ }
+ ]
+}
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