From bbce81a396e22743b1fbf0c54fed05ab79c99e72 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期六, 29 五月 2021 16:28:51 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/RightSearchPanel.vue |   57 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index fb58637..6df7286 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -17,13 +17,14 @@
                 @click="()=>{selected(item)}" v-show="item.isShow">
               <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">
+                  <!-- <img src="../../assets/images/map-pages/icon/sl.png" class="icon"> -->
+                  <i class="icon iconfont" :class="item.icon"></i>
                 </li>
               </el-tooltip>
             </ul>
           </div>
         </div>
-        <div class="right-control" :class="[{ 'unfold': !isCollapse },{ 'shrink': isCollapse }] ">
+        <div class="right-control" :class="[{ 'unfold': !isCollapse },{ 'shrink': isCollapse }] " v-if="gcComp!=''">
           <div class="panel-fold-btn" @click="toggleMonitorPanel">
             <div :class="[isCollapse? 'btn-stretch':'btn-shrink']"></div>
           </div>
@@ -59,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 EnterpriseEmergencySearch from './topicSearch/EnterpriseEmergencySearch'
 
 import bus from '@/eventBus'
 
@@ -69,7 +71,8 @@
     WaterWasteSearch,
     SolidWasteSearch,
     EnvRiskSearch,
-    DischargeSearch
+    DischargeSearch,
+    EnterpriseEmergencySearch
   },
   data () {
     return {
@@ -83,7 +86,6 @@
       hbVisible: false,
       pkVisible: false,
       toggleMonitorStyle: 'right:0px',
-
       title: '姹￠洦姘寸缃�',
       isCollapse: true,
       selectGroup: false
@@ -152,6 +154,9 @@
         case '绠￠亾淇℃伅':
           this.gcComp = PipeInformationSearch
           break
+        case '浼佷笟搴旀��':
+          this.gcComp = EnterpriseEmergencySearch
+          break
       }
     },
     handlePage (page) {
@@ -212,10 +217,15 @@
   mounted () {
     const that = this
     bus.$on('changeSearchBar', function (obj) {
-      // console.log(obj.checked, obj.name)
+      that.gcComp = ''
       that.topicList.forEach((item) => {
         if (item.name === obj.name) {
-          item.isShow = obj.checked
+          if (obj.type > 0) {
+            item.isShow = true
+          } else {
+            item.isShow = false
+          }
+          // item.isShow = obj.checked
           if (item.isShow) {
             that.selected(item)
           } else {
@@ -224,6 +234,7 @@
         }
       })
     })
+  //  console.log(that.topicList)
   }
 }
 </script>
@@ -242,7 +253,8 @@
 .search-container {
   position: relative;
   //width: 1.79167rem;
-  width: 4.7rem;
+  //width: 2.39167rem;
+  width: 2.3rem;
   /*  height: 5.6475rem;*/
   overflow: hidden;
 }
@@ -262,10 +274,10 @@
   cursor: pointer;
   position: relative;
   line-height: 0.15rem;
-
   li {
     margin: 0.00521rem 0;
     text-align: center;
+    font-size: 20px;
 
     img {
       width: 0.1rem;
@@ -284,7 +296,7 @@
   //top: 10px;
   height: 0;
   position: absolute;
-  top: 0.42979rem;
+  top: 0.73979rem;
   right: 0.14583rem;
   z-index: 501;
   display: -webkit-box;
@@ -315,8 +327,8 @@
     background: @background-color4;
     color: @color-tool;
     position: absolute;
-    top: 24px;
-    right: 0.02rem;
+    top: 20px;
+    left: 0.02rem;
     border: none; //1px solid @color-tool;
     width: 0.2rem;
     height: 0.2rem;
@@ -598,13 +610,12 @@
 
   .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;
-
+    h3{ cursor: pointer;}
     .state {
       width: 30px;
       height: 30px;
@@ -617,11 +628,13 @@
       background: #0B3B6D;
     }
   }
-
   .environmental-risk-list.hover,
-  .environmental-risk-list:hover {
-    color: @color-over;
+  .environmental-risk-list:hover{
     background: @background-color;
+  }
+  .environmental-risk-list.hover h3,
+  .environmental-risk-list h3:hover {
+    color: @color-highlight;
   }
 
   input::-webkit-input-placeholder {
@@ -679,12 +692,16 @@
   }
 
   .footer-page {
-    position: absolute;
+   // position: absolute;
     background-color: transparent !important;
-    bottom: 10px !important;
-    margin-left: 0px;
+  //  bottom: 10px !important;
+   // margin-left: 0px;
     border: none;
-
+    margin: 0;
+    border-top: 1px solid rgba(0, 255, 246, 0.14);
+   .el-card__body{
+     padding: 5px;
+   }
     .warnPagination {
       .btn-quicknext, .btn-quickprev {
         color: #e4e8f1 !important;

--
Gitblit v1.8.0