From 4378ba833ffd5262c78a8c6c8b92d8c1c744d379 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 07 四月 2021 11:03:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 297 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 148 insertions(+), 149 deletions(-)
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 480803e..c8ff02e 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -1,37 +1,37 @@
<template>
<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 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 style=" ">
- <!-- <span>{{item.name}}</span>-->
- <!-- <div >-->
- <img src="../../assets/images/map-pages/icon/sl.png" class="icon">
- <!-- </div>-->
- </li>
+ <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>-->
- <!-- </div>-->
+<!-- <div class="panel-fold-btn" >-->
+<!-- <div class="btn-stretch" @click="toggleMonitorPanel"></div>-->
+<!-- </div>-->
- <!-- <div class="panel-fold-btn" @click="toggleMonitorPanel" >-->
- <!-- <div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>-->
- <!--<!– <div class="btn-stretch" v-if="isCollapse" </div>–>-->
- <!--<!– <div class="btn-shrink" v-else-if="!isCollapse" ></div>–>-->
- <!--<!– :style = "{width:isCollapse ? '290px' : '0px'}"–>-->
- <!-- </div>-->
- <!-- <div class="right-control" v-if="!isCollapse" >-->
+<!-- <div class="panel-fold-btn" @click="toggleMonitorPanel" >-->
+<!-- <div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>-->
+<!--<!– <div class="btn-stretch" v-if="isCollapse" </div>–>-->
+<!--<!– <div class="btn-shrink" v-else-if="!isCollapse" ></div>–>-->
+<!--<!– :style = "{width:isCollapse ? '290px' : '0px'}"–>-->
+<!-- </div>-->
+<!-- <div class="right-control" v-if="!isCollapse" >-->
<div class="right-control" :class="[{ 'unfold': !isCollapse },{ 'shrink': isCollapse }] " >
<div class="panel-fold-btn" @click="toggleMonitorPanel">
- <!-- <div class="btn-stretch" v-if="isCollapse"></div>-->
- <!-- <div class="btn-shrink" v-else-if="!isCollapse"></div>-->
+<!-- <div class="btn-stretch" v-if="isCollapse"></div>-->
+<!-- <div class="btn-shrink" v-else-if="!isCollapse"></div>-->
<div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>
</div>
@@ -142,33 +142,33 @@
// const right = rightControl.css('right')
// const rightit = rightControl.ownerDocument.defaultView
// const right = rightit.getComputedStyle(rightit, null).right
- // if (right === '10px') {
- // rightControl.animate({
- // right: '-322px'
- // })
- // el.css({
- // transform: 'rotateY(180deg)',
- // 'transform-origin': '50% 50%',
- // transition: 'transform 1s linear'
- // })
- // el2.animate({
- // right: '320px',
- // speed: 1000
- // })
- // } else {
- // rightControl.animate({
- // right: '10px'
- // })
- // el.css({
- // transform: 'rotateY(0deg)',
- // 'transform-origin': '50% 50%',
- // transition: 'transform 1s linear'
- // })
- // el2.animate({
- // right: '290px',
- // speed: 1000
- // })
- // }
+ // if (right === '10px') {
+ // rightControl.animate({
+ // right: '-322px'
+ // })
+ // el.css({
+ // transform: 'rotateY(180deg)',
+ // 'transform-origin': '50% 50%',
+ // transition: 'transform 1s linear'
+ // })
+ // el2.animate({
+ // right: '320px',
+ // speed: 1000
+ // })
+ // } else {
+ // rightControl.animate({
+ // right: '10px'
+ // })
+ // el.css({
+ // transform: 'rotateY(0deg)',
+ // 'transform-origin': '50% 50%',
+ // transition: 'transform 1s linear'
+ // })
+ // el2.animate({
+ // right: '290px',
+ // speed: 1000
+ // })
+ // }
}
},
mounted () {
@@ -178,17 +178,15 @@
<style lang="less">
.search-title{
- color: rgb(255, 255, 255);
- font-size: 16px;
- margin: 5px;
+ color:@color-title;
+ font-size: 18px;
+ margin: 5px;
}
.search-container {
- position: relative;
- width: 1.79167rem;
- /*height: 5.6475rem;*/
- min-height: 80vh;
- max-height: 90vh;
- overflow: hidden;
+ position: relative;
+ width: 1.79167rem;
+ /*height: 5.6475rem;*/
+ overflow: hidden;
}
.module-wrap{
width: 0.15rem;
@@ -224,8 +222,8 @@
//top: 10px;
height: 0;
position: absolute;
- top: .4rem;
- right: .08333rem;
+ top: .46rem;
+ right: 0.14583rem;
z-index: 501;
display: -webkit-box;
display: -ms-flexbox;
@@ -365,7 +363,7 @@
transform: rotateY(0deg);
transform-origin: 50% 50%;
transition: transform 1s linear;
- /*transition: 3s linear;*/
+ /*transition: 3s linear;*/
}
.btn-shrink {
width: 20px;
@@ -416,7 +414,7 @@
.a{
transform: translateX(328px);
transition: transform 3s linear;
- }
+ }
.panel_searchTotal {
font-size: 12px;
float: right;
@@ -448,69 +446,70 @@
display: grid;
font-size: 18px;
}
- /*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;
- text-align: center;
- line-height: 26px;
- color:#fff;
- border-radius: 2px;
- cursor:pointer;
- background: rgba(0,16,30,.5);
+ /*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);
+ }
}
- .el-button {
- padding: 0;
- }
- }
- /*鍗曢�夋寜閽牱寮�*/
- .levelOfRisk{padding-left:20px}
- .levelOfRisk .el-radio{padding-bottom:6px}
+ /*鍗曢�夋寜閽牱寮�*/
+ .levelOfRisk{padding-left:20px}
+ .levelOfRisk .el-radio{padding-bottom:6px}
- .levelOfRisk-type{
- display: inline-block;
- position: relative;
- padding-right: 5px;
- color:#f5f5f5;
- i{
- display: block;
- width: 15px;
- height: 10px;
- position: absolute;
- top:50%;
- right: -15px;
- margin-top: -5px;
+ .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}
+ .el-radio.is-checked .levelOfRisk-type{color:#409EFF}
- .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;
+ .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;
@@ -684,39 +683,39 @@
transform: translateX(0px);
transition: transform 0.5s linear;
}
- /******************浠ヤ笅鍏叡閮ㄥ垎**********/
- .query-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;
+ /******************浠ヤ笅鍏叡閮ㄥ垎**********/
+ .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>
--
Gitblit v1.8.0