From 7b2f20f1299306f087d89aa202b52708df7ec4e6 Mon Sep 17 00:00:00 2001 From: chenyabin <Chenab123!> Date: 星期三, 07 四月 2021 09:14:44 +0800 Subject: [PATCH] 统一样式修改部分完成。 --- src/components/panel/RightSearchPanel.vue | 324 ++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 257 insertions(+), 67 deletions(-) diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue index f8c5efd..d4f7db6 100644 --- a/src/components/panel/RightSearchPanel.vue +++ b/src/components/panel/RightSearchPanel.vue @@ -1,10 +1,21 @@ <template> - <div id="right-panel" > + <div class="panel-right" v-show="isShow"> <div class="panel-tab"> - <div v-for="item in topicMenu" :key="item.id" :title="item.name" class="tab-item" @click="handleGd" :class="{'B-TMT-tab-waybill-isActive': isWaybillHover}"> - <img :src="item.icon" style="width: 24px;height: 24px;"></div> -<!-- <div class="tab-item" @click="handleHb" :class="{'B-TMT-tab-route-isActive': isRouteHover}"></div>--> -<!-- <div class="tab-item" @click="handlePk" :class="{'B-TMT-tab-route-isActive': isRouteHover}"></div>--> +<!-- <div v-for="item in topicMenu" :key="item.id" :title="item.name" class="tab-item" @click="handleGd"--> +<!-- :class="{'B-TMT-tab-waybill-isActive': isWaybillHover}">--> +<!-- <img :src="item.icon" style="width: 24px;height: 24px;"></div>--> + <div class="container"> + <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> + </ul> + </div> </div> <!-- <div class="panel-fold-btn" >--> <!-- <div class="btn-stretch" @click="toggleMonitorPanel"></div>--> @@ -23,23 +34,32 @@ <!-- <div class="btn-shrink" v-else-if="!isCollapse"></div>--> <div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div> </div> - <component :title="title" :is="gcComp"></component> + + <div :class="'search-container map-background'"> + <div class="el-message-box__content" style="padding:6px;font-size: 13px;"> + <component :title="title" :is="gcComp"></component> + </div> + </div> </div> </div> </template> <script> -// import $ from 'jquery' -import EnvProtectSearch from './topicSearch/EnvProtectSearch' +import EnvRiskSearch from './topicSearch/EnvRiskSearch' import DischargeSearch from './topicSearch/DischargeSearch' import { TopicList } from '../../conf/Topic' +import GasWasteSearch from '@components/panel/topicSearch/GasWasteSearch' +import WaterWasteSearch from '@components/panel/topicSearch/WaterWasteSearch' +import SolidWasteSearch from '@components/panel/topicSearch/SolidWasteSearch' import SewersSearch from '@components/panel/topicSearch/SewersSearch' +import SoilGroundWaterSearch from '@components/panel/topicSearch/SoilGroundWaterSearch.vue' export default { name: 'MonitorPanel', - components: { EnvProtectSearch, DischargeSearch }, + components: { GasWasteSearch, WaterWasteSearch, SolidWasteSearch, EnvRiskSearch, DischargeSearch }, data () { return { + isShow: true, topicMenu: [], topicList: TopicList, topicCheckedList: [], @@ -52,8 +72,7 @@ toggleMonitorStyle: 'right:0px', title: '姹¢洦姘寸缃�', - - isCollapse: false + isCollapse: true } }, computed: {}, @@ -66,7 +85,6 @@ this.topicList.forEach((item) => { this.topicCheckedList.forEach((itm) => { if (item.name === itm) { - // item.checked = tr this.topicMenu.push(item) } }) @@ -77,7 +95,36 @@ handleClose (done) { console.log(done) }, - + selected (val) { + // console.log(val) + this.title = val.name + '锛堟绱級' + this.topicList.forEach((itm) => { + itm.checked = val.name === itm.name + }) + switch (val.name) { + case '姹℃煋婧�': + this.gcComp = DischargeSearch + break + case '搴熸按鐩戞祴': + this.gcComp = WaterWasteSearch + break + case '搴熸皵鐩戞祴': + this.gcComp = GasWasteSearch + break + case '鍥哄簾绠$悊': + this.gcComp = SolidWasteSearch + break + case '鐜椋庨櫓': + this.gcComp = EnvRiskSearch + break + case '鍦熷¥鍙婂湴涓嬫按': + this.gcComp = SoilGroundWaterSearch + break + case '姹¢洦姘寸缃�': + this.gcComp = SewersSearch + break + } + }, handlePage (page) { }, handleGd () { @@ -85,14 +132,13 @@ }, toggleMonitorPanel () { this.isCollapse = !this.isCollapse - console.log(11) // const el = $('.btn-stretch') // const el2 = $('.panel-fold-btn') // const el = document.getElementsByClassName('.btn-stretch') // const el2 = document.getElementsByClassName('.panel-fold-btn') // let = 'btn-stretch-active' - // var rightControl = $('#right-panel') - // var rightControl = document.getElementById('#right-panel') + // var rightControl = $('#panel-right') + // var rightControl = document.getElementById('#panel-right') // const right = rightControl.css('right') // const rightit = rightControl.ownerDocument.defaultView // const right = rightit.getComputedStyle(rightit, null).right @@ -131,36 +177,81 @@ </script> <style lang="less"> -@import '@assets/css/map/_map-variable'; -#right-panel { - width: 322px; - //height: 573px; - height: 100%; +.search-title{ + color:@color-title; + font-size: 18px; + margin: 5px; +} +.search-container { + position: relative; + width: 1.79167rem; + /*height: 5.6475rem;*/ + overflow: hidden; +} +.module-wrap{ + width: 0.15rem; + height: 0.15rem; + padding: .04167rem; + //padding: .00521rem; + background: rgba(0,16,30,.5); + border-radius: .03125rem; + border: .00521rem solid rgba(255,247,0,.5); + margin: .04167rem 0; + font-size: .08333rem; + -webkit-transition: all .2s linear; + transition: all .2s linear; + cursor: pointer; + position: relative; + line-height: 0.15rem; + li{ + margin: 0.00521rem 0; + text-align: center; + img{ + width: 0.1rem; + height: 0.1rem; + + } + } +} +.panel-right { + display: inline-flex; + //width: 322px; + //height: 100%; + //position: absolute; + //right: 10px; + //top: 10px; + height: 0; position: absolute; - right: 10px; - top: 10px; + top: .46rem; + right: 0.14583rem; + z-index: 501; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; - .el-card__body { - padding: 7px; - } - - .el-form-item__content { - color: rgb(52, 224, 255); - } - - .el-picker-panel { - background-color: #061e51 !important; - } - - .el-input__inner { - border-radius: 0 !important; - background-color: #061e51 !important; - border: solid 1px #0e639e !important; - } + //.el-card__body { + // padding: 7px; + //} + //.el-form-item__content { + // color: rgb(52, 224, 255); + //} + // + //.el-picker-panel { + // background-color: #061e51 !important; + //} + // + //.el-input__inner { + // border-radius: 0 !important; + // background-color: #061e51 !important; + // border: solid 1px #0e639e !important; + //} .el-form-item__label { color: rgb(52, 224, 255); - /*<!--color: @color;-->*/ + color: @color; } .el-input__inner::placeholder { @@ -264,8 +355,8 @@ background-color: rgba(5,24,66,.8); border-radius: 10px 0 0 10px; .btn-stretch { - width: 20px; - height: 40px; + //width: 20px; + //height: 40px; background: url('../../assets/images/map-pages/icon/icon.png') no-repeat -408px 5px; cursor: pointer; /*margin-left: -20px;*/ @@ -287,8 +378,8 @@ } .tab-item { - width: 32px; - height: 30px; + //width: .2rem; + //height: .2rem; color: @color; font-size: 12px; background-color: #0B3B6D; @@ -297,13 +388,16 @@ cursor: pointer; } .panel-tab { - position: absolute; - left: 0; - //height: 120px; - top: 0; - width: 32px; + position: relative; z-index: 500; - background: url('../../assets/images/map-pages/icon/caidan.png') no-repeat; + margin-right: .025rem; + .container{ + max-height: 3.125rem; + overflow: hidden; + position: relative; + position: relative; + } + } .right-control { @@ -311,11 +405,11 @@ //height: 573px; height: 100%; position: relative; - top: 0; - right: 0; - z-index: 999; - background: url('../../assets/images/map-pages/icon/bgc.png') no-repeat; - background-size: 100% 98%; + //top: 0; + //right: 0; + z-index: 500; + //background: url('../../assets/images/map-pages/icon/bgc.png') no-repeat; + //background-size: 100% 98%; } .a{ transform: translateX(328px); @@ -350,20 +444,82 @@ .search-form .el-icon-search { display: grid; - line-height: 30px; font-size: 18px; } - - .search-panel { - border: #07325B; - background-color: #07325B !important; - margin-top: 0px; - - .el-input__inner { - border-radius: 0px !important; - background-color: #061e51 !important; + /*input 鐐瑰嚮鎼滅储鏍峰紡*/ + .rightButtonSearch{ + display: flex; + justify-content: space-between; + align-items: center; + .el-input{margin-right: 10px} + .el-icon-search{ + width: 40px; + border:1px solid @color; + height: 26px; + line-height: 26px; + text-align: center; + color:#fff; + border-radius: 2px; + cursor:pointer; + background: rgba(0,16,30,.5); + } } - } + /*鍗曢�夋寜閽牱寮�*/ + .levelOfRisk{padding-left:20px} + .levelOfRisk .el-radio{padding-bottom:6px} + + .levelOfRisk-type{ + display: inline-block; + position: relative; + padding-right: 5px; + color:@color-shadow; + i{ + display: block; + width: 15px; + height: 10px; + position: absolute; + top:50%; + right: -15px; + margin-top: -5px; + } + } + .el-radio.is-checked .levelOfRisk-type{color:#409EFF} + + .environmental-risk-list{ + position: relative; + cursor: pointer; + padding-left:50px; + padding-top:5px; + padding-bottom:5px; + color: @color-shadow; + border-bottom:1px solid @background-color-split; + .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; + } + } + .environmental-risk-list.hover, + .environmental-risk-list:hover{ + 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; @@ -527,5 +683,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 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);} + } + .search-btn{ + + } + //location-btn{ + // + //} + .location-btn:hover,.el-input__icon:hover{ + color: @color; + cursor: pointer; + } + } } + </style> -- Gitblit v1.8.0