From 2ad319c67414cff981354d7d4b2a8031e0e6268f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 18:59:27 +0800
Subject: [PATCH] 统一样式-修改
---
src/components/panel/RightSearchPanel.vue | 40 ++-----
src/components/panel/topicSearch/GasWasteSearch.vue | 55 +---------
src/assets/css/map/map-panel-style.less | 8 +
src/components/LayerController/modules/LcServiceLayerFilter.vue | 14 +-
src/assets/css/map/map-popup.less | 4
src/components/LayerController/LayerController.vue | 12 -
src/components/panel/topicSearch/DischargeSearch.vue | 9 +
src/components/LayerController/modules/LcServiceLayer.vue | 16 +--
src/components/panel/topicSearch/SolidWasteSearch.vue | 4
src/components/panel/topicSearch/EnvRiskSearch.vue | 15 +-
src/components/panel/topicSearch/WaterWasteSearch.vue | 4
src/styles/theme-dark/el-ui/tabs.less | 6
src/components/panel/topicSearch/SewersSearch.vue | 49 +--------
src/components/panel/topicSearch/SoilGroundWaterSearch.vue | 7
14 files changed, 81 insertions(+), 162 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 3a72b11..9303d46 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -53,6 +53,7 @@
.select-down {
border: none !important;
background-color: @background-color;
+ margin: 0;
//.el-scrollbar{
//
@@ -341,3 +342,10 @@
}
}
+.panel-title{
+ color: @color-title;
+ font-size: 18px;
+ padding: 10px;
+ text-align: center;
+ border-bottom: 1px solid @background-color-split;
+}
\ No newline at end of file
diff --git a/src/assets/css/map/map-popup.less b/src/assets/css/map/map-popup.less
index d451294..4ab0b2e 100644
--- a/src/assets/css/map/map-popup.less
+++ b/src/assets/css/map/map-popup.less
@@ -6,13 +6,15 @@
background-color: @background-color;
/*background-color: transparent;*/
border: .00521rem solid @color;
- padding: .05rem;
//-webkit-box-shadow: 0 0 0.03125rem 0 @color;
//box-shadow: 0 0 0.03125rem 0 @color;
-webkit-box-shadow: 0 0 10px 0 @color;
box-shadow: 0 0 .03rem @color;
//border-radius: .03rem;
+ padding:6px;
border-radius: 10px;
+ .leaflet-popup-content{margin: 0}
+
}
.leaflet-popup-tip-container {
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index dcb6ed3..ce4d496 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -1,7 +1,7 @@
<template>
<div :class='["float-panel",layerControllerVisible ? "active" : ""]' >
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鍥惧眰" placement="left">
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鍥惧眰鎺у埗" placement="left">
<div @click="showPanel" class="iconBtn" :class='layerControllerVisible ? "active-button" : ""' v-show="!layerControllerVisible" style=" position: absolute;top:0;left: 0;">
<img src="@assets/images/map-pages/icon/layer.png" alt="" class="icon">
<!-- <span class="icon-name">鍥惧眰</span>-->
@@ -96,10 +96,6 @@
min-height: 0.28rem;
min-width: 0.28rem;
overflow: hidden;
- div {
- color: #00fff6;
- }
-
.iconBtn.active{
display: none;
}
@@ -238,20 +234,20 @@
background: #0E3565;
}
.el-button--default{
- margin-left: 10px;
padding: 15px 3px;
background:@background-color;
color:@color-tool;
position: absolute;
top:0;
- right: -26px;
+ left: 100%;
+ margin-left: .02rem;
border-radius: 0.03rem 50% 50% 0.03rem;
}
.el-button--default:hover{
background:@background-color;
}
.legend-content{
- width: 250px;
+ width: 1.79167rem;
}
}
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 68c74b6..3308d0e 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -1,11 +1,11 @@
<template>
<div class="inner-panel">
- <div class="title"> 鍥惧眰鎺у埗 </div>
+ <div class="panel-title"> 鍥惧眰鎺у埗 </div>
<div class="wms-panel">
<el-scrollbar class="wms-panel-scrollbar">
<div v-for="item in serviceLayers" :key="item.code" class="layerbox">
<!-- 涓�绾у浘灞傞亶鍘� -->
- <div>
+ <div style="padding-left:10px;padding-top:10px">
<input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
@change="swAllLayers(item)"/>{{ item.name }}
</div>
@@ -103,13 +103,6 @@
<style scoped lang="less">
.inner-panel {
- .title{
- color: @color-title;
- font-size: 18px;
- margin: 10px;
- text-align: center;
- }
-
.btn-filter {
cursor: pointer;
color: #ffffff;
@@ -118,13 +111,14 @@
.wms-panel {
.wms-panel-scrollbar{
- height: 50vh;
+ height: 457px;
width: 100%;
+ font-size: 14px;
}
.layerbox {
width: 100%;
.layerbox-item {
- padding-left: 20px;
+ padding-left: 30px;
padding-top: 5px;
.basemap-layer-item {
margin-bottom: 5px;
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index eed1c1d..99f87b1 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -99,7 +99,6 @@
<style scoped lang="less">
.inner-panel {
- color: #90c8e0;
font-size: 13px;
position: absolute;
left: 1.82167rem;
@@ -108,21 +107,20 @@
.filter-group {
display: flex;
flex-flow: row;
-
.filter-item {
width: 0.6rem;
height: 100%;
margin-right: 5px;
-
+ background-color: @background-color;
+ box-shadow: 0 0 0.03rem #00fff6;
+ border-radius: 0.03rem;
.title {
- height: 25px;
- background-color: #091331;
- border: 1px solid #10488c;
+ border-bottom:1px solid @background-color-split;
+ padding: 5px 0;
+ background-color: @background-color;
}
.content {
- background-color: rgba(44, 62, 80, 0.6);
- border: 1px solid #10488c;
max-height: 200px;
padding-bottom: 5px;
//overflow-y: hidden;
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 875399d..30af0e3 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -10,15 +10,13 @@
<button type="button" class="el-button special-button el-button--default el-icon-d-arrow-right"></button>
</li>
</ul>
+
<ul v-for="item in topicList" :key="item.name" :class="item.checked?'module-wrap map-btn-active':'module-wrap map-btn-unactive'" @click="()=>{selected(item)}" >
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left">
- <li>
-<!-- <span>{{item.name}}</span>-->
-<!-- <div >-->
- <img src="../../assets/images/map-pages/icon/sl.png" class="icon">
-<!-- </div>-->
- </li>
- </el-tooltip>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left">
+ <li>
+ <img src="../../assets/images/map-pages/icon/sl.png" class="icon">
+ </li>
+ </el-tooltip>
</ul>
</div>
</div>
@@ -41,7 +39,7 @@
</div>
<div :class="'search-container map-background'">
- <div class="el-message-box__content" style="padding:6px;font-size: 13px;">
+ <div class="el-message-box__content" style="padding:0 6px 6px 6px;font-size: 13px;">
<component :title="title" :is="gcComp"></component>
</div>
</div>
@@ -182,11 +180,7 @@
</script>
<style lang="less">
-.search-title{
- color:@color-title;
- font-size: 18px;
- margin: 5px;
-}
+
.search-container {
position: relative;
width: 1.79167rem;
@@ -469,13 +463,14 @@
.el-icon-search{
width: 40px;
border:1px solid @color;
- height: 26px;
- line-height: 26px;
+ height: 28px;
+ line-height: 28px;
text-align: center;
color:#fff;
border-radius: 2px;
cursor:pointer;
background: rgba(0,16,30,.5);
+ padding:0;
}
}
/*鍗曢�夋寜閽牱寮�*/
@@ -524,16 +519,6 @@
color:@color-over;
background: @background-color;
}
- //.search-panel {
- // border: #07325B;
- // background-color: #07325B !important;
- // margin-top: 0px;
- //
- // .el-input__inner {
- // border-radius: 0px !important;
- // background-color: #061e51 !important;
- // }
- //}
input::-webkit-input-placeholder {
color: #569ee1;
@@ -701,10 +686,11 @@
.sewers-search{
position: relative;
overflow: hidden;
+ .panel-title{}
.search-panel{
background-color: transparent;
- border: 1px solid @background-color-split;
padding: 10px 0;
+ border-bottom: 1px solid @background-color-split;
// .el-input{width:calc(100% - 40px);position: relative}
/deep/ input {
border-radius: 0;
diff --git a/src/components/panel/topicSearch/DischargeSearch.vue b/src/components/panel/topicSearch/DischargeSearch.vue
index 981d8e8..294a471 100644
--- a/src/components/panel/topicSearch/DischargeSearch.vue
+++ b/src/components/panel/topicSearch/DischargeSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-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">
@@ -40,7 +40,7 @@
<!-- <el-form-item >-->
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
- <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
</el-form>
</div>
@@ -122,7 +122,7 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
- name: 'SewersSearch',
+ name: 'DischargeSearch',
data () {
return {
gdVisible: true,
@@ -147,7 +147,8 @@
{ name: '涓�绾ч闄�', value: '2', color: 'sandybrown' },
{ name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' },
{ name: '涓夌骇椋庨櫓', value: '4', color: 'green' }
- ]
+ ],
+ areaTypeOptions: []
}
},
props: ['title'],
diff --git a/src/components/panel/topicSearch/EnvRiskSearch.vue b/src/components/panel/topicSearch/EnvRiskSearch.vue
index 1df0f11..8c214dc 100644
--- a/src/components/panel/topicSearch/EnvRiskSearch.vue
+++ b/src/components/panel/topicSearch/EnvRiskSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-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">
@@ -13,7 +13,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浼佷笟鍚嶇О" size="mini">
+ <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"
@@ -23,7 +23,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浜岀骇鍗曚綅" size="mini">
+ <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"
@@ -33,14 +33,14 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="椋庨櫓绾у埆" size="mini"></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>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
</el-input>
- <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
</el-form>
</div>
@@ -82,7 +82,7 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
- name: 'SewersSearch',
+ name: 'EnvRiskSearch',
data () {
return {
gdVisible: true,
@@ -107,7 +107,8 @@
{ name: '涓�绾ч闄�', value: '2', color: 'sandybrown' },
{ name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' },
{ name: '涓夌骇椋庨櫓', value: '4', color: 'green' }
- ]
+ ],
+ areaTypeOptions: []
}
},
props: ['title'],
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index b46642e..80c2f12 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-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">
@@ -13,7 +13,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浼佷笟鍚嶇О" size="mini">
+ <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"
@@ -23,7 +23,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浜岀骇鍗曚綅" size="mini">
+ <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"
@@ -33,7 +33,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="涓夌骇鍗曚綅" size="mini">
+ <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"
@@ -54,7 +54,7 @@
<!-- <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>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
<!-- </el-form-item>-->
<!-- <el-form-item>-->
@@ -63,7 +63,7 @@
<!-- </el-form-item>-->
</el-form>
</div>
- <el-scrollbar style="height:300px">
+ <el-scrollbar style="height:264px">
<div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
<i class="state"></i>
<div>
@@ -72,46 +72,7 @@
<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>
<!-- <span class="location-btn" @click="handleLocation(item)">588</span> -->
<el-card class="footer-page" v-if="total > 10">
@@ -141,7 +102,7 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
- name: 'SewersSearch',
+ name: 'GasWasteSearch',
data () {
return {
gdVisible: true,
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 79f5f03..faf0832 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-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">
@@ -30,7 +30,7 @@
<!-- <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>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
<!-- </el-form-item>-->
<!-- <el-form-item>-->
@@ -40,46 +40,15 @@
</el-form>
</div>
<el-scrollbar style="height:380.44px;" >
- <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=""
- :title="item.properties.pipename">
- <span class="location-btn" @click="handleLocation(item)">{{ item.properties.pipename }}</span>
- </span>
- </div>
- <!-- <div class="B-TMD-table-list-title-c">-->
- <!-- {{ labelList[0] }}锛�-->
- <!-- <span id="plateNumber_p">-->
- <!-- <span id="plateNumber_n"><a href="#">{{ item.properties.item.p1 }}</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 v-for="itm in labelList" :key="itm.label">
+ <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" >
+ <!-- <i class="state"></i> -->
+ <div @click="handleLocation(item)">
+ <h3 class="B-TMD-table-list-title-y" :class="['B-TMD-table-list-title-y-nam', { 'warning': item.vehicleStatus==='910003' }, { 'offline': item.vehicleStatus==='910001' }]" >{{ item.properties.pipename }}</h3>
+ <p v-for="itm in labelList" :key="itm.label">
<span>{{ itm.label }}锛�</span>
- <span id="b_twe_loan" :title="item.properties[itm.key] ">{{ item.properties[itm.key] }}</span>
- </div>
- <!-- <div><span>鏀惰揣浼佷笟锛�</span> <span-->
- <!-- id="b_twe_loan1" :title="item.recvWarehouseName">{{ item.recvWarehouseName }}</span>-->
- <!-- </div>-->
+ <span :title="item.properties[itm.key] ">{{ item.properties[itm.key] }}</span>
+ </p>
</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>-->
</div>
</el-scrollbar>
<el-card class="footer-page" v-if="total > 10">
diff --git a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
index e508dfe..7b74153 100644
--- a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
+++ b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-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">
@@ -44,7 +44,7 @@
<!-- <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>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
<!-- </el-form-item>-->
@@ -157,7 +157,8 @@
{ name: '涓�绾ч闄�', value: '2', color: 'sandybrown' },
{ name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' },
{ name: '涓夌骇椋庨櫓', value: '4', color: 'green' }
- ]
+ ],
+ areaTypeOptions: []
}
},
props: ['title'],
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index eb42e35..ea1c17d 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="judgeVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-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"
@@ -26,7 +26,7 @@
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
- <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
</el-form>
</div>
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index 5aa4d31..11992d8 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WaterWasteSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="judgeVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-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"
@@ -20,7 +20,7 @@
</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>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
</el-form>
</div>
diff --git a/src/styles/theme-dark/el-ui/tabs.less b/src/styles/theme-dark/el-ui/tabs.less
index 3ca346b..17808d8 100644
--- a/src/styles/theme-dark/el-ui/tabs.less
+++ b/src/styles/theme-dark/el-ui/tabs.less
@@ -1,7 +1,7 @@
.el-tabs{}
.el-tabs__header{
- border-bottom: 1px solid #26defd;
+ border-bottom: 1px solid @background-color-split !important;
padding: 0;
position: relative;
margin: 0 0 15px;
@@ -125,7 +125,9 @@
overflow: hidden;
position: relative;
}
-
+.el-tabs--card > .el-tabs__header{
+ border-bottom: 1px solid @background-color-split;
+}
.el-tabs--card > .el-tabs__header .el-tabs__active-bar {
display: none;
}
--
Gitblit v1.8.0