From 272c1dc7490b70a50f245bd4965284f7baa15bdf Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 06 四月 2021 09:03:13 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 64 ++--
src/conf/Topic.js | 14
src/components/panel/topicSearch/GasWasteSearch.vue | 4
src/assets/css/map/map-panel-style.less | 43 ++-
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 4
src/components/panel/topicSearch/DischargeSearch.vue | 16 -
src/components/LayerController/modules/LcServiceLayer.vue | 17
src/components/panel/topicSearch/SolidWasteSearch.vue | 103 +++++++
src/components/panel/topicSearch/EnvRiskSearch.vue | 56 ----
src/components/panel/topicSearch/WaterWasteSearch.vue | 137 +++++++---
src/components/table/components/WasteWater.vue | 2
src/components/panel/topicSearch/SewersSearch.vue | 4
src/components/panel/topicSearch/SoilGroundWaterSearch.vue | 264 ++++++++++++-------
src/components/LayerController/logic/SolidWaste.js | 8
14 files changed, 448 insertions(+), 288 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index aa623c9..b806be3 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -1,13 +1,11 @@
@import "_map-variable";
/*鍏ㄥ眬璁剧疆***********/
-h1,h2,h3,h4,h5,h6,ul,li,p{
+h1, h2, h3, h4, h5, h6, ul, li, p {
padding: 0;
margin: 0;
list-style: none;
}
-
-
.el-button--primary {
@@ -201,44 +199,55 @@
display: none !important;
}
-.el-tabs--card>.el-tabs__header .el-tabs__nav{
+.el-tabs--card > .el-tabs__header .el-tabs__nav {
border: none;
}
-.el-tabs--card>.el-tabs__header .el-tabs__item{
+.el-tabs--card > .el-tabs__header .el-tabs__item {
border: none;
margin-left: 10px;
}
-
/***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/
-.company-bindTooltip{
- background:none;
- border:none;
- color:red;
+.company-bindTooltip {
+ background: none;
+ border: none;
+ color: red;
font-size: 16px;
font-weight: 900 !important;
text-shadow: 0 0 5px #fff;
box-shadow: none;
}
-.company-bindTooltip-hover h3{
+
+.company-bindTooltip-hover h3 {
text-align: center;
- border-bottom:1px solid #0B3B6D;
+ border-bottom: 1px solid #0B3B6D;
margin: 0;
- padding:0;
+ padding: 0;
}
-.company-bindTooltip-hover ul{
+
+.company-bindTooltip-hover ul {
list-style: none;
margin: 0;
- padding:0;
+ padding: 0;
width: 260px;
display: flex;
flex-wrap: wrap;
}
-.company-bindTooltip-hover ul li{
+
+.company-bindTooltip-hover ul li {
margin: 0;
- padding:3px 0;
+ padding: 3px 0;
width: 50%;
}
+/*************** PublicTable 琛ㄦ牸鏍峰紡銆�*********************************/
+.cell {
+ padding: 0;
+}
+
+.el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
+ /* padding-left: 10px; */
+ text-align: center;
+}
\ No newline at end of file
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 26092fa..3781da2 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -8,6 +8,7 @@
<div class="main">
<div class="main-video">
<el-table
+ border
tooltip-effect="dark"
:data="displayContentTableData"
>
@@ -56,7 +57,8 @@
.main-video {
width: 100%;
- //min-height: 195px;
+ min-height: 195px;
+
video {
width: 100%;
height: 100%;
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index 3ea18d7..9344ecf 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -43,12 +43,6 @@
iconAnchor: [25, 25]
})
})
- /* marker.bindTooltip(getSolidWasteData[i].Name, {
- permanent: true,
- offset: [0, 14],
- direction: 'bottom',
- className: 'company-bindTooltip'
- }) */
layer.addLayer(marker)
}
}
@@ -94,7 +88,7 @@
this.setPanTo(e.latlng, 200)
}
- // flayTo()
+ // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
this.setPanTo = (pos, value) => {
var position = pos
position = window.map.latLngToLayerPoint(position)
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 81b4278..6f43745 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -6,15 +6,16 @@
<div class="wms-panel">
<el-scrollbar class="wms-panel-scrollbar">
<div v-for="item in serviceLayers" :key="item.code" class="layerbox">
- <div><input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
- @change="swAllLayers(item)"/>{{ item.name }}
+ <div>
+ <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item)"/>{{ item.name }}
</div>
<div class="layerbox-item">
- <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code"><input type="checkbox"
- :name="'wmsSublayers_'+item.code+'_'+itm.code"
- :checked="itm.checked"
- :value="itm.code"
- @change="swWmsLayer(itm)"/>{{ itm.name }}
+ <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code">
+ <input type="checkbox"
+ :name="'wmsSublayers_'+item.code+'_'+itm.code"
+ :checked="itm.checked"
+ :value="itm.code"
+ @change="swWmsLayer(itm)"/>{{ itm.name }}
</div>
</div>
</div>
@@ -110,7 +111,6 @@
cursor: pointer;
color: #ffffff;
}
-
.wms-panel {
width: 1.79167rem;
.wms-panel-scrollbar{
@@ -119,7 +119,6 @@
}
.layerbox {
width: 100%;
-
.layerbox-item {
display: flex;
flex-flow: row wrap;
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index f9abbfb..dacfcbe 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -97,6 +97,7 @@
},
selected (val) {
// console.log(val)
+ this.title = val.name + '锛堟绱級'
this.topicList.forEach((itm) => {
itm.checked = val.name === itm.name
})
@@ -185,8 +186,8 @@
position: relative;
width: 1.79167rem;
/*height: 5.6475rem;*/
- min-height: 60vh;
- max-height: 80vh;
+ min-height: 80vh;
+ max-height: 90vh;
overflow: hidden;
}
.module-wrap{
@@ -680,38 +681,39 @@
transform: translateX(0px);
transition: transform 0.5s linear;
}
-}
-/******************浠ヤ笅鍏叡閮ㄥ垎**********/
-.sewers-search{
- position: relative;
- overflow: hidden;
- .search-panel{
- background-color: transparent;
- border: 1px solid @background-color-split;
- padding: 10px;
- // .el-input{width:calc(100% - 40px);position: relative}
- /deep/ input {
- border-radius: 0;
- background-color: @background-color-split ;
- border: solid 1px @color ;
- color: @color-gray;
- font-size: 0.01rem;
- padding:0 15px;
- .el-select .el-input.is-focus .el-input__inner{
- border-color: @color;
+ /******************浠ヤ笅鍏叡閮ㄥ垎**********/
+ .sewers-search{
+ position: relative;
+ overflow: hidden;
+ .search-panel{
+ background-color: transparent;
+ border: 1px solid @background-color-split;
+ padding: 10px 0;
+ // .el-input{width:calc(100% - 40px);position: relative}
+ /deep/ input {
+ border-radius: 0;
+ background-color: @background-color-split ;
+ border: solid 1px @color ;
+ color: @color-gray;
+ font-size: 0.01rem;
+ padding:0 15px;
+ .el-select .el-input.is-focus .el-input__inner{
+ border-color: @color;
+ }
}
+ .el-input__inner{background: none;color:#fff;font-size: 14px;border-radius: 0; border-color: @color;background: rgba(0,16,30,.5);}
}
- .el-input__inner{background: none;color:#fff;font-size: 14px;border-radius: 0; border-color: @color;background: rgba(0,16,30,.5);}
- }
- .search-btn{
+ .search-btn{
- }
- //location-btn{
- //
- //}
- .location-btn:hover,.el-input__icon:hover{
- color: @color;
- cursor: pointer;
+ }
+ //location-btn{
+ //
+ //}
+ .location-btn:hover,.el-input__icon:hover{
+ color: @color;
+ cursor: pointer;
+ }
}
}
+
</style>
diff --git a/src/components/panel/topicSearch/DischargeSearch.vue b/src/components/panel/topicSearch/DischargeSearch.vue
index 7c5a92c..8993cb9 100644
--- a/src/components/panel/topicSearch/DischargeSearch.vue
+++ b/src/components/panel/topicSearch/DischargeSearch.vue
@@ -1,8 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">
- 姹℃煋婧�
- </div>
+ <div class="search-title">{{title}}</div>
<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">
@@ -41,19 +39,9 @@
</el-radio-group> -->
<!-- <el-form-item >-->
<div class="rightButtonSearch">
- <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
- <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
- <!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
- <!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
- </el-input>
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
</div>
-
- <!-- </el-form-item>-->
- <!-- <el-form-item>-->
- <!-- <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">-->
- <!-- <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">-->
- <!-- </el-form-item>-->
</el-form>
</div>
<el-scrollbar style="height:300px">
diff --git a/src/components/panel/topicSearch/EnvRiskSearch.vue b/src/components/panel/topicSearch/EnvRiskSearch.vue
index b86c2c4..ffb2dc0 100644
--- a/src/components/panel/topicSearch/EnvRiskSearch.vue
+++ b/src/components/panel/topicSearch/EnvRiskSearch.vue
@@ -1,8 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">
- 鐜椋庨櫓
- </div>
+ <div class="search-title">{{title}}</div>
<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">
@@ -39,70 +37,20 @@
<el-radio-group v-model="form.type" class="levelOfRisk">
<el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio>
</el-radio-group>
- <!-- <el-form-item >-->
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
- <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
- <!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
- <!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
</el-input>
<el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
</div>
-
- <!-- </el-form-item>-->
- <!-- <el-form-item>-->
- <!-- <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">-->
- <!-- <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">-->
- <!-- </el-form-item>-->
</el-form>
</div>
<el-scrollbar style="height:300px">
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <div class="environmental-risk-list" v-for="(item,index) in 5" :key="index" ><!-- v-for="(item,index) in list" :key="index" -->
<i class="state"></i>
<div>
<h3>###鐐煎寲閮�</h3>
<p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
<p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
</div>
</div>
</el-scrollbar>
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 7790a2c..b46642e 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -1,8 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">
- 搴熸皵
- </div>
+ <div class="search-title">{{title}}</div>
<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">
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 35cbab1..f63efb1 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,8 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">
- 姹￠洦姘�
- </div>
+ <div class="search-title">{{title}}</div>
<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">
diff --git a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
index 92b1fc9..5091b91 100644
--- a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
+++ b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
@@ -1,88 +1,110 @@
<template>
- <div class="sewers-search">
- <div class="search-title">
- 鍦熷￥鍙婂湴涓嬫按
- </div>
- <el-card class="search-panel">
+ <div class="sewers-search" v-if="gdVisible">
+ <div class="search-title">{{title}}</div>
+ <div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
- <el-form-item label="绫诲瀷锛�">
- <el-select v-model="form.pipelineType" @change="handlePipelineType">
+ <el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.areaVal" @change="areaType" :popper-class="'select-down'">
<el-option
- v-for="item in pipelineTypeOptions"
+ v-for="item in areaTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鏁版嵁绫诲瀷锛�">
- <el-select v-model="form.dataType">
- <el-option
- v-for="item in dataTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
+ <!-- <el-form-item label="浼佷笟鍚嶇О" size="mini">
+ <el-select style="width: 100%" v-model="form.enterpriseVal" @change="enterpriseType" :popper-class="'select-down'">
+ <el-option
+ v-for="item in enterpriseTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="妯＄硦鎼滅储锛�">
- <el-input v-model="form.key" size="mini"
- placeholder="鍦ㄦ杈撳叆鍏抽敭瀛�"></el-input>
- </el-form-item>
- <el-form-item>
- <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">
- <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">
- </el-form-item>
+ <el-form-item label="浜岀骇鍗曚綅" size="mini">
+ <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'">
+ <el-option
+ v-for="item in enterpriseSubunitsTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item> -->
+ <!-- <el-form-item label="椋庨櫓绾у埆" size="mini"></el-form-item>
+ <el-radio-group v-model="form.type" class="levelOfRisk">
+ <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio>
+ </el-radio-group> -->
+ <!-- <el-form-item >-->
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
+ <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
+ <!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
+ <!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
+ </el-input>
+ <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ </div>
+
+ <!-- </el-form-item>-->
+ <!-- <el-form-item>-->
+ <!-- <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">-->
+ <!-- <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">-->
+ <!-- </el-form-item>-->
</el-form>
- </el-card>
- <el-card class="search-result" style="height:271px;">
- <div class="B-TMD-table-list" v-for="(item,index) in list" :key="index">
- <div class="B-TMD-table-list-title">
- <div class="B-TMD-table-list-head">
- <div class="B-TMD-table-list-title-y"
- :class="['B-TMD-table-list-title-y-nam', { 'warning': item.vehicleStatus==='910003' }, { 'offline': item.vehicleStatus==='910001' }]">
- <span>杩愬崟鍙凤細</span>
- <span id="waybillNumber" class="B-TMD-table-list-title-y-num"
- :title="item.transNo">
- <span class="B-TMD-table-list-title-y-alarm">{{ item.transNo }}</span>
- </span>
- </div>
- <div class="B-TMD-table-list-title-c">
- 杞藉叿鍙凤細
- <span id="plateNumber_p">
- <span id="plateNumber_n"><a href="#">{{ item.vehicleNo }}</a></span>
- </span>
- </div>
- </div>
- <div class="B-TMD-table-icons" style="float:right">
- <ul>
- <li class="B-TMD-table-list-title-y-adress"
- @click="handleLocation(item)"></li>
- <li :class="[{'B-TMD-table-list-title-y-car': item.vehicleStatus ==='910002', 'B-TMD-table-list-title-y-car-offline': item.vehicleStatus ==='910001','B-TMD-table-list-title-y-car-warning': item.vehicleStatus==='910003' }]"></li>
- </ul>
- </div>
- </div>
- <div class="B-TMD-table-list-content">
- <div>
- <span>鍙戣揣浼佷笟锛�</span>
- <span id="b_twe_consignment" :title="item.outWarehouseName">{{
- item.outWarehouseName == null ? "鏆傛棤" : item.outWarehouseName
- }}</span>
- </div>
- <div>
- <span>鎵� 杩� 鍟嗭細</span>
- <span id="b_twe_loan" :title="item.carrierName">{{ item.carrierName }}</span>
- </div>
- <div><span>鏀惰揣浼佷笟锛�</span> <span
- id="b_twe_loan1" :title="item.recvWarehouseName">{{ item.recvWarehouseName }}</span></div>
- </div>
- <div class="B-TMD-table-list-bottom">
- <div class="B-TMD-table-list-bottom-name">
- 璐х墿鍚嶇О锛�<span :title="item.materialName">{{ item.materialName }}</span></div>
+ </div>
+ <el-scrollbar style="height:300px">
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
</div>
</div>
- </el-card>
-
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
+ <!-- <span class="location-btn" @click="handleLocation(item)">588</span> -->
<el-card class="footer-page" v-if="total > 10">
<el-pagination
small
@@ -96,46 +118,96 @@
</el-pagination>
</el-card>
</div>
+ <!-- <div class="monitor2" v-if="hbVisible">-->
+ <!-- <env-protect-search></env-protect-search>-->
+ <!-- </div>-->
+ <!-- <div class="monitor2" v-if="pkVisible">-->
+ <!-- <discharge-search></discharge-search>-->
+ <!-- </div>-->
</template>
<script>
+import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
+
+import WfsHelper from '@components/helpers/WfsHelper'
+import AjaxUtils from '@utils/AjaxUtils'
export default {
- name: 'MonitorAreaTips',
- components: {},
+ name: 'SewersSearch',
data () {
return {
- isPanelVisible: false,
- total: 0,
+ gdVisible: true,
list: [],
+ labelList: PipelineTypeOptions[0].labelList,
+ total: 0,
+ inareaTypeOptions: [],
+ enterpriseTypeOptions: [],
+ enterpriseSubunitsTypeOptions: [],
form: {
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: ''
- }
+ areaVal: '',
+ enterpriseVal: '',
+ enterpriseSubunitsVal: '',
+ type: ''
+ },
+ // pageSize: 10,
+ // current: 1,
+ isWaybillHover: true,
+ isRouteHover: false,
+ levelOfRisk: [
+ { name: '閲嶅ぇ椋庨櫓', value: '1', color: 'red' },
+ { name: '涓�绾ч闄�', value: '2', color: 'sandybrown' },
+ { name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' },
+ { name: '涓夌骇椋庨櫓', value: '4', color: 'green' }
+ ]
}
},
+ props: ['title'],
methods: {
- handleClose (done) {
- console.log(done)
- },
- handleClick (tab, event) {
- console.log(tab, event)
- },
- handleSearch () {
+ // 鍖哄煙绛涢��
+ areaType (val) {
+ this.pipelineTypeOptions.forEach((itm) => {
+ if (val === itm.value) {
+ }
+ })
+ },
+ // 浼佷笟绛涢��
+ enterpriseType (val) {
+ this.dataTypeOptions.forEach((itm) => {
+ if (val === itm.value) {
+
+ }
+ })
+ },
+ // 浜岀骇鍗曚綅绛涢��
+ enterpriseSubunitsType (val) {
+
+ },
+ async handleSearch () {
+ const param = {
+ pipelineType: this.form.pipelineType,
+ dataType: this.form.dataType
+ }
+ console.log(param)
+ var wfsHelper = new WfsHelper()
+ wfsHelper.addTypeName(this.form.query.layerName)
+ wfsHelper.addLike(this.form.query.key, this.form.keyword)
+ // const _this = this
+ const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
+ this.list = res.data.features
+ }
+ },
+ handleLocation (val) {
+ console.log(val)
+ const bound = this.L.geoJSON([val], {}).getBounds()
+ var layer = window.serviceLayerHelper.getByLayerId(val.id)
+ layer && layer.openPopup()
+ this.$store.state.map.map.flyToBounds(bound)
}
- },
- mounted () {
- this.handleSearch()
}
}
</script>
-<style lang="less">
+<style lang="less" scoped>
</style>
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 0e5555d..b283cb1 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -31,14 +31,67 @@
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
</div>
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
+ <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i>
+ </el-input>
</el-form>
- <el-card class="box-card"
- v-for="(item,index) in searchDataDisplay"
- :key="index">
- <div>
- {{ item.CompanyName }}
+ <el-scrollbar style="height:500px">
+ <div class="environmental-risk-list">
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
</div>
- </el-card>
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
+ <!-- <el-card class="box-card"-->
+ <!-- v-for="(item,index) in searchDataDisplay"-->
+ <!-- :key="index">-->
+ <!-- <div>-->
+ <!-- {{ item.CompanyName }}-->
+ <!-- </div>-->
+ <!-- </el-card>-->
</div>
<!-- <el-scrollbar style="height:100%">-->
<!-- </el-scrollbar>-->
@@ -159,5 +212,43 @@
</script>
<style lang="less" scoped>
+.el-radio.is-checked .levelOfRisk-type {
+ color: #409EFF
+}
+
+.levelOfRisk {
+ padding-left: 20px
+}
+
+.levelOfRisk .el-radio {
+ padding-bottom: 6px
+}
+
+.environmental-risk-list {
+ border: 1px solid @color;
+ margin-right: 10px;
+ margin-bottom: 15px;
+ position: relative;
+ padding-left: 50px;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ color: #f5f5f5;
+
+ .state {
+ width: 30px;
+ height: 30px;
+ position: absolute;
+ top: 50%;
+ left: 10px;
+ margin-top: -15px;
+ border-radius: 50%;
+ box-shadow: 0 0 3px #000;
+ background: #0B3B6D;
+ }
+}
+
+.el-input {
+ margin: 15px auto;
+}
</style>
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index 39bd33c..340ce3e 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WaterWasteSearch.vue
@@ -1,9 +1,6 @@
<template>
- <div class="solidwaste-search" v-if="judgeVisible">
- <div class="search-title">
- <span>搴熸按</span>
- <!-- <span>{{ title }}</span>-->
- </div>
+ <div class="sewers-search" v-if="judgeVisible">
+ <div class="search-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'锛�'" size="mini"
@@ -19,49 +16,111 @@
</el-select>
</el-form-item>
<el-radio-group v-model="form.type" class="levelOfRisk">
- <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio>
+ <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}</span></el-radio>
</el-radio-group>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
</div>
</el-form>
- <div>
- <el-card class="box-card" v-for="(item,index) in searchDataDisplay" :key="index">
- <div v-if="total > 3">
- {{ item.CompanyName }}
+ <el-scrollbar style="height:300px">
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
</div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
+ <div>
+<!-- <el-card class="box-card" v-for="(item,index) in searchDataDisplay" :key="index">-->
+<!-- <div v-if="total > 3">-->
+<!-- {{ item.CompanyName }}-->
+<!-- </div>-->
+<!-- </el-card>-->
+ <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-pagination-->
- <!-- small-->
- <!-- layout="prev, pager, next"-->
- <!-- :total=total-->
- <!-- :current-page=1-->
- <!-- class="warnPagination"-->
- <!-- >-->
- <!-- </el-pagination>-->
+<!-- <el-pagination-->
+<!-- small-->
+<!-- layout="prev, pager, next"-->
+<!-- :total=total-->
+<!-- :current-page=1-->
+<!-- class="warnPagination"-->
+<!-- >-->
+<!-- </el-pagination>-->
</div>
- <!-- <el-scrollbar style="height:100%">-->
- <!-- <el-card class="footer-page">-->
- <!-- <ul>-->
- <!-- {{ searchDataDisplay }}-->
- <!-- <li v-for="(item,index) in searchDataDisplay" :key="index">-->
- <!-- {{ item.CompanyName }}-->
- <!-- </li>-->
- <!-- </ul>-->
- <!-- </el-card>-->
- <!-- <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-scrollbar>-->
+<!-- <el-scrollbar style="height:100%">-->
+<!-- <el-card class="footer-page">-->
+<!-- <ul>-->
+<!-- {{ searchDataDisplay }}-->
+<!-- <li v-for="(item,index) in searchDataDisplay" :key="index">-->
+<!-- {{ item.CompanyName }}-->
+<!-- </li>-->
+<!-- </ul>-->
+<!-- </el-card>-->
+<!-- <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-scrollbar>-->
</div>
</div>
</template>
diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index 3291fb1..af191ce 100644
--- a/src/components/table/components/WasteWater.vue
+++ b/src/components/table/components/WasteWater.vue
@@ -82,7 +82,7 @@
width="200"
trigger="click"
popper-class="popovers"
- title="XXX1鏄庣粏琛�"
+ title="鐩戞祴鐐规槑缁嗚〃"
>
<refinery></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index cf856cf..49707dd 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -16,41 +16,41 @@
id: 1,
check: false,
icon: '/assets/images/menu/special.png',
- comp: 'dischargeSearch'
+ comp: ''
}, {
name: '搴熸按鐩戞祴',
id: 2,
checked: false,
icon: '/assets/images/menu/special.png',
- comp: 'envProtectSearch'
+ comp: ''
}, {
name: '搴熸皵鐩戞祴',
id: 3,
checked: false,
icon: '/assets/images/menu/special.png',
- comp: 'dischargeSearch'
+ comp: ''
}, {
name: '鍥哄簾绠＄悊',
id: 4,
checked: false,
icon: '/assets/images/menu/special.png',
- comp: 'envProtectSearch'
+ comp: ''
}, {
name: '鐜椋庨櫓',
id: 5,
checked: false,
icon: '/assets/images/menu/special.png',
- comp: 'envProtectSearch'
+ comp: ''
}, {
name: '鍦熷￥鍙婂湴涓嬫按',
id: 6,
checked: false,
icon: '/assets/images/menu/special.png',
- comp: 'soilGroundWaterSearch'
+ comp: ''
}, {
name: '姹￠洦姘寸缃�',
id: 7,
checked: false,
icon: '/assets/images/menu/special.png',
- comp: 'envProtectSearch'
+ comp: ''
}]
--
Gitblit v1.8.0