Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

wangqi

2021-04-07 944d07498da955c8f8427b71f0af0f5b52c635ae

Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

 src/assets/css/map/_map-variable.less

@@ -1,12 +1,12 @@
@color: #00fff6;
@color-highlight: #fff700;
@color-gray: #C0C4CC;
@color-title: white;
@color-title: white;//标题色
@color-over: white;
@color-tool: #C0C4CC;
@color-shadow: #00fff6;
@background-color: rgba(0, 16, 30, .5);
@background-color-light: rgba(40, 50, 100, .4);
@background-color-split: rgba(0, 255, 246, .14);
@background-color-tools: #1A4951;
@border-radius: .03rem;
@color-tool: #C0C4CC;//工具色
@color-shadow: #00fff6;//显示颜色
@background-color: rgba(0, 16, 30, .7);//背景填充色
@background-color-light: rgba(40, 50, 100, .4);//光晕
@background-color-split: rgba(0, 255, 246, .14);//分割线
@background-color-tools: #1A4951;//工具箱
@border-radius: .03rem;//倒角

 src/assets/css/map/map-panel-style.less

@@ -44,7 +44,7 @@

  .el-dialog__title {
    padding: .03125rem .08333rem;
    color: @color;
    color: @color-title;
    cursor: pointer;
    flex-shrink: 0;
  }
@@ -208,6 +208,37 @@
  margin-left: 10px;
}

.el-scrollbar__wrap{

}
.el-scrollbar__wrap::-webkit-scrollbar {
  /*滚动条整体样式*/
  width : 5px;  /*高宽分别对应横竖滚动条的尺寸*/
  height: 1px;
}
.el-scrollbar__wrap::-webkit-scrollbar-thumb {
  /*滚动条里面小方块*/
  border-radius   : 10px;
  background: none;
}
.el-scrollbar__wrap::-webkit-scrollbar-track {
  /*滚动条里面轨道*/
  box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
  background   : none;
  border-radius: 10px;
}
#el-scrollbar__wrap::-webkit-scrollbar-button { /*滚动条两端的按钮，可以用display:none让其不显示，也可以添加背景图片，颜色改变显示效果（位置2）*/
  background: #74D334;
}
/*******************操作按钮点击选中整体样式******************************/
.el-button{

}
.active-button{
  border: 0.00521rem solid #fff700 !important;
  box-shadow: 0 0 0.03rem #fff700 !important;
  color:#fff700 !important;
}

/***************Company 图层 悬浮框样式。*********************************/
.company-bindTooltip {
@@ -270,3 +301,40 @@
.el-table .success-row {
  background: #30455f;
}
/***********************************************动画效果************/
.transition{
  transition: all .5s;
 /* transform-origin: top left;*/
  animation: bounce-in .2s;
}
@keyframes bounce-in {
  0% {
    transform: scale(0);
    opacity: 0;
  }
  100% {
    transform: scale(1);
    opacity: 1;
  }
}
/**map 页面图标按钮*/
.iconBtn {
  width:0.26rem;
  height: 0.26rem;
  text-align: center;
  background: rgba(0, 16, 30, 0.5);
  cursor: pointer;
  color: #00fff6;
  border: 0.00521rem solid #00fff6;
  box-shadow: 0 0 0.03rem #00fff6;
  display: flex;
  flex-direction: column;
  justify-content: center;
  justify-items: center;
  border-radius: 0.03rem;
  .icon{
    width: 20px;
    margin: 0 auto;
  }

}

 src/components/LayerController/LayerController.vue

@@ -1,9 +1,13 @@
<template>
  <div class="float-panel">
    <div :class='["iconBtn",layerControllerVisible ? "active" : ""]' @click="showPanel"><span><img src="@assets/images/map-pages/icon/layer.png" alt="" width="26px" style="display: block;margin: auto"><span class="icon-name">图层</span></span></div>
  <div :class='["float-panel",layerControllerVisible ? "active" : ""]' >
    <div @click="showPanel" class="iconBtn transition" :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>
    </div>
    <transition name="fade">
      <div :class="'legend-content map-background'" style="position: absolute;left: 50px;top: 0" v-show="layerControllerVisible">
      <div :class="'legend-content map-background'" v-show="layerControllerVisible" style=" transform-origin: top left;">
        <lc-service-layer></lc-service-layer>
        <buttom  @click="showPanel" type="button" class="el-button special-button el-button--default el-icon-d-arrow-left"></buttom>
      </div>
    </transition>
  </div>
@@ -69,27 +73,19 @@
<style lang="less">
.float-panel {
  position: absolute;
  left: 2px;
  top: 120px;
  left: 0.14583rem;
  top: 0.8rem;
  height: auto;
  font-size: 11px;
  z-index: 1000;
  display: flex;

  div {
    color: #00fff6;
  }
  .iconBtn {
    width:45px;
    text-align: center;
    background: rgba(0, 16, 30, 0.5);
    cursor: pointer;
    color: #00fff6;
    border: 0.00521rem solid #00fff6;
    box-shadow: 0 0 0.03rem #00fff6;
  }
  .active {
    border: 0.00521rem solid #fff700;
    box-shadow: 0 0 0.03rem #fff700;

  .iconBtn.active{
    display: none;
  }
  .title-border {
    width: 100%;
@@ -196,9 +192,8 @@
  .switch-head-down {
    transform: rotateX(180deg);
    transform-origin: 50% 50%;
    transition: transform 0.5s linear 0s;
    transition: transform 2s linear 0s;
  }

  select {
    background: transparent;
    margin: 6px;
@@ -226,6 +221,21 @@
    border-radius: 0px;
    background: #0E3565;
  }
  .el-button--default{
   margin-left: 10px;
    padding: 15px 3px;
    background:@background-color;
    color:@color-tool;
    position: absolute;
    top:0;
    right: -26px;
  }
  .el-button--default:hover{
    background:@background-color;
  }
  .legend-content{
    width:  1.79167rem;
  }
}

</style>

 src/components/LayerController/modules/LcServiceLayer.vue

@@ -105,10 +105,9 @@

<style scoped lang="less">
    .inner-panel {
        .title {
            color: #ffffff;
            font-size: 16px;
            font-weight: 600;
        .title{
            color: @color-title;
            font-size: 18px;
            margin: 10px;
            text-align: center;
        }
@@ -119,16 +118,13 @@
        }

        .wms-panel {
            width: 1.79167rem;

            .wms-panel-scrollbar {
            .wms-panel-scrollbar{
                height: 50vh;
                width: 100%;
            }

            .layerbox {
                width: 100%;

                .layerbox-item {
                    display: flex;
                    flex-flow: row wrap;

 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>-->
    <!--&lt;!&ndash;                <div class="btn-stretch" v-if="isCollapse"  </div>&ndash;&gt;-->
    <!--&lt;!&ndash;            <div class="btn-shrink" v-else-if="!isCollapse" ></div>&ndash;&gt;-->
    <!--&lt;!&ndash;        :style = "{width:isCollapse ? '290px' : '0px'}"&ndash;&gt;-->
    <!--      </div>-->
    <!--    <div class="right-control" v-if="!isCollapse"  >-->
<!--      <div class="panel-fold-btn" @click="toggleMonitorPanel" >-->
<!--            <div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>-->
<!--&lt;!&ndash;                <div class="btn-stretch" v-if="isCollapse"  </div>&ndash;&gt;-->
<!--&lt;!&ndash;            <div class="btn-shrink" v-else-if="!isCollapse" ></div>&ndash;&gt;-->
<!--&lt;!&ndash;        :style = "{width:isCollapse ? '290px' : '0px'}"&ndash;&gt;-->
<!--      </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>

 src/components/panel/ToolBoxPanel.vue

@@ -1,10 +1,9 @@
<template>
  <div class="left-top-toolbox-panel">
    <div class="specific-tools">
      <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"
                 @mouseover.enter.native="changeSelectMouse">
        <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt=""/>
        <span class="span-default">工具</span>
      <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"   @mouseover.enter.native="changeSelectMouse">
          <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="" class="icon" />
          <span class="span-default">工具</span>
      </el-button>
      <transition name="animationChange">
        <el-row v-show="selectGroup" class="specific-tools-group">
@@ -404,8 +403,8 @@

.left-top-toolbox-panel {
  position: absolute;
  left: 0;
  top: 15px;
  left: 0.14583rem;
  top: 0.11979rem;
  z-index: 999;

  .specific-tools {
@@ -427,22 +426,18 @@
      .base-map-img:hover {
        cursor: pointer;
      }

      img {
        width: 22px;
        height: 22px;
      }

      .span-default {
        display: block;
        color: @color-shadow;
        font-size: 11px;
        font-size: 10px;
      }

      span {
        display: block;
        color: @color-over;
        font-size: 11px;
        font-size: 10px;
        color: #0B89B5;
      }
    }

@@ -450,7 +445,8 @@
      left: 500px;
      z-index: 999;
      padding: 0;
      margin: 0 0.015rem;
      margin: 0;
      margin-right:0.015rem;
      width: 45px;
      height: 45px;
      background: @background-color;

 src/components/panel/topicSearch/DischargeSearch.vue

@@ -44,8 +44,8 @@
        </div>
      </el-form>
    </div>
    <el-scrollbar style="height:300px">
      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
    <el-scrollbar style="height:416.44px">
      <div class="environmental-risk-list hover" ><!-- v-for="(item,index) in list" :key="index" -->
        <i class="state"></i>
        <div>
          <h3>###炼化部</h3>

 src/components/panel/topicSearch/EnvRiskSearch.vue

@@ -44,7 +44,7 @@
        </div>
      </el-form>
    </div>
    <el-scrollbar style="height:300px">
    <el-scrollbar style="height:264px">
      <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>

 src/components/panel/topicSearch/SewersSearch.vue

@@ -1,106 +1,106 @@
<template>
  <div class="query-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="设施类型：" size="mini" class="search-panel-item">
          <el-select style="width: 100%"  v-model="form.pipelineType" @change="handlePipelineType"  :popper-class="'select-down'">
            <el-option
                v-for="item in pipelineTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item :label="form.pipelineType+'：'" size="mini">
          <el-select style="width: 100%"  v-model="form.dataType"  @change="handleDataType" :popper-class="'select-down'">
            <el-option
                v-for="item in dataTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <!--              <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-button class="el-icon-search" @click="handleSearch"></el-button>
        </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:100%">
      <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">
        <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="设施类型：" size="mini" class="search-panel-item">
                <el-select style="width: 100%"  v-model="form.pipelineType" @change="handlePipelineType"  :popper-class="'select-down'">
                  <el-option
                      v-for="item in pipelineTypeOptions"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value">
                  </el-option>
                </el-select>
              </el-form-item>
              <el-form-item :label="form.pipelineType+'：'" size="mini">
                <el-select style="width: 100%"  v-model="form.dataType"  @change="handleDataType" :popper-class="'select-down'">
                  <el-option
                      v-for="item in dataTypeOptions"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value">
                  </el-option>
                </el-select>
              </el-form-item>
              <!--              <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: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>
                  <!--                  <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">
            <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>-->
                <div 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>-->
              </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">
            <el-pagination
                small
                @current-change="handlePage"
                :page-size=pageSize
                layout="prev, pager, next"
                :total=total
                :current-page=current
                class="warnPagination"
            >
            </el-pagination>
          </el-card>
        </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">
      <el-pagination
          small
          @current-change="handlePage"
          :page-size=pageSize
          layout="prev, pager, next"
          :total=total
          :current-page=current
          class="warnPagination"
      >
      </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>-->
      <!--        <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>

 src/components/panel/topicSearch/SoilGroundWaterSearch.vue

@@ -1,129 +1,129 @@
<template>
  <div class="query-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="区域：" 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 areaTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <!--  <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="二级单位" 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>
    <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="区域：" 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 areaTypeOptions"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                        </el-option>
                    </el-select>
                </el-form-item>
                <!--  <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="二级单位" 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-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:416.44px">
            <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>
        <!--   <span class="location-btn" @click="handleLocation(item)">588</span> -->
        <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>
    </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>
      <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
          @current-change="handlePage"
          :page-size=pageSize
          layout="prev, pager, next"
          :total=total
          :current-page=current
          class="warnPagination"
      >
      </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>-->
    <!--        <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>

 src/components/panel/topicSearch/SolidWasteSearch.vue

@@ -1,9 +1,6 @@
<template>
  <div class="query-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"
@@ -18,35 +15,31 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-radio-group v-model="radio" class="levelOfRisk">
          <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
            <span class="levelOfRisk-type">{{ item.name }}</span>
          </el-radio>
        <!--  <div class="search-radio">
          <el-radio v-model="radio" label="1">全部</el-radio>
          <el-radio v-model="radio" label="2">正常</el-radio>
          <el-radio v-model="radio" label="3">预警</el-radio>
        </div> -->
        <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}}</span></el-radio>
        </el-radio-group>

        <div class="rightButtonSearch">
          <el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索"></el-input>
          <el-button class="el-icon-search" @click="handleSearch"></el-button>
          <el-input  v-model="form.keyword" size="mini"  placeholder="在此输入关键字搜索"></el-input>
          <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
        </div>
      </el-form>
      <el-scrollbar style="height:300px">
        <div class="environmental-risk-list">
          <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 searchDataDisplay" :key="index">
          <i class="state"></i>
          <div>
            <h3>{{ item.StoragePlaceTypeName }}</h3>
            <p>所属部门：<span>{{ item.CompanyName }}</span></p>
            <p>风险级别：<span>{{ item.StoragePlaceTypeName }}</span></p>
          </div>
        </div>
      </el-scrollbar>
    </div>
    <el-scrollbar style="height:286.22px">
      <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :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>
    </el-scrollbar>
  </div>
</template>

@@ -60,18 +53,9 @@
  data () {
    return {
      levelOfRisk: [
        {
          name: '全部',
          value: '1'
        },
        {
          name: '正常',
          value: '2'
        },
        {
          name: '预警',
          value: '3'
        }
        { name: '全部', value: '1' },
        { name: '正常', value: '2' },
        { name: '预警', value: '3' }
      ],
      judgeVisible: true,
      solidWasteTypeOptions: [{
@@ -151,8 +135,13 @@
  },
  methods: {
    handlePipelineType (val) {
      // console.log(val)
      this.solidWasteTypeOptions.forEach(item => {
        // console.log(item.value)
        if (val === item.value) {
          // console.log('数据选择相同')
          // 接收数据 用于之后接口数据的调用
          // this.form.transferData = item.value
          this.handleSearch(item.value)
        }
      })
@@ -169,9 +158,5 @@
</script>

<style lang="less" scoped>

.el-scrollbar {
  margin: 15px auto;
}

</style>

 src/components/panel/topicSearch/WaterWasteSearch.vue

@@ -1,128 +1,40 @@
<template>
  <div class="query-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"
                      class="search-panel-item">
          <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
                     :popper-class="'select-down'">
            <el-option
                v-for="item in solidWasteTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </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}}</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 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"
                              class="search-panel-item">
                    <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
                               :popper-class="'select-down'">
                        <el-option
                                v-for="item in solidWasteTypeOptions"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                        </el-option>
                    </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}}</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-form>
      <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>-->
      </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:264px">
            <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :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>
        </el-scrollbar>
    </div>
  </div>
</template>

<script>

 src/components/plugin/FullScreen.js

@@ -48,7 +48,7 @@
      },



      _toggleTitle: function () {

        this.link.title = this.options.title[this._map.isFullscreen()]

        this.link.title = this.optionsthis._map.isFullscreen()]

      }

    })




 src/components/table/enterprise.vue

@@ -1,13 +1,22 @@
<template>
    <div class="enterprise-panel">
        <div class="enterprise-function" @click="showWarnDialog()">
            <div :class='["iconBtn",warnVisible ? "active" : ""]'><span><img src="@/assets/images/map-pages/icon/map/warn.png" alt="" width="26px" style="display: block;margin: auto"><span class="icon-name">预报警</span></span></div>
            <div :class='["iconBtn",warnVisible ? "active-button" : ""]'>
                <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" class="icon">
                <span class="icon-name">预报警</span>
                <!--    <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="预报警" placement="left">
                    <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" width="26px" style="display: block;margin: auto">

                </el-tooltip> -->
            </div>
        </div>
        <div class="enterprise-function" @click="showStatisDialog()">
            <div :class='["iconBtn",companyVisible ? "active" : ""]'><span><img src="@/assets/images/map-pages/icon/map/company.png" alt="" width="26px" style="display: block;margin: auto"><span class="icon-name">指标</span></span></div>
            <div :class='["iconBtn",companyVisible ? "active-button" : ""]'>
                <img src="@/assets/images/map-pages/icon/map/company.png" alt="" class="icon">
                <span class="icon-name">指标</span>
            </div>
        </div>
        <Dialog ref="warnDialog" title="企业预警报警分类统计">
        <Dialog ref="warnDialog" title="企业预警报警分类统计" >
            <warn></warn>
        </Dialog>
        <Dialog ref="indexStatisticsDialog" title="企业指标分类统计">
@@ -47,6 +56,17 @@
      this.$refs.indexStatisticsDialog.show()
      this.companyVisible = true
    }
  },
  mounted () {
    const that = this
    this.$nextTick(() => {
      this.$refs.warnDialog.$on('closeDialog', () => {
        that.warnVisible = false
      })
      this.$refs.indexStatisticsDialog.$on('closeDialog', () => {
        that.companyVisible = false
      })
    })
  }
}
</script>
@@ -54,27 +74,15 @@
<style lang="less" scoped>
.enterprise-panel{
    position: absolute;
    right: 5px;
    top:5px;
    right: 0.14583rem;
    top:0.11979rem;
    z-index: 9999;

    .enterprise-function{
        width: 50px;
        float: left;
        cursor: pointer;
    }
    .iconBtn {
        width:45px;
        text-align: center;
        background: rgba(0, 16, 30, 0.5);
        cursor: pointer;
        color: #00fff6;
        border: 0.00521rem solid #00fff6;
        box-shadow: 0 0 0.03rem #00fff6;
    }
    .active {
        // border: 0.00521rem solid #fff700;
        // box-shadow: 0 0 0.03rem #fff700;
    .enterprise-function:not(:first-child){
        margin-left: 10px;
    }
}
</style>

 src/components/table/summarySheets.vue

@@ -1,6 +1,9 @@
<template>
    <div class="summary-sheets">
        <div :class='["iconBtn",summaryVisible ? "active" : ""]' @click="closeBtn"><span><img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" width="26px" style="display: block;margin: auto"><span class="icon-name">统计表</span></span></div>
        <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
            <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon">
            <span class="icon-name">统计表</span>
        </div>
        <Dialog ref="summarySheets" title="企业指标分类统计">
          <tab-handover></tab-handover>
        </Dialog >
@@ -26,7 +29,16 @@
      // const summary = document.getElementById('summary')
      // summary.style.display = 'none'
      this.$refs.summarySheets.show()
      this.summaryVisible = true
    }
  },
  mounted () {
    const that = this
    this.$nextTick(() => {
      this.$refs.summarySheets.$on('closeDialog', () => {
        that.summaryVisible = false
      })
    })
  }
}
</script>
@@ -34,29 +46,17 @@
<style scoped lang="less">
    .summary-sheets {
        position: absolute;
        top: 70px;
        left: 1px;
        top: 0.46rem;
        left: 0.14583rem;
        /*width: 850px;*/
        /*height: 265px;*/
        z-index:500;

        /*color: #fff;*/
       .el-icon-c-scale-to-original {
         width: 30px;
         height: 30px;
         font-size: 30px;
       }
        .iconBtn {
            width:45px;
            text-align: center;
            background: rgba(0, 16, 30, 0.5);
            cursor: pointer;
            color: #00fff6;
            border: 0.00521rem solid #00fff6;
            box-shadow: 0 0 0.03rem #00fff6;
        }
        .active {
            border: 0.00521rem solid #fff700;
            box-shadow: 0 0 0.03rem #fff700;
        }
    }
</style>

 src/styles/theme-dark/el-ui/button.less

@@ -1,35 +1,35 @@
.el-button--primary{
--primary{
    color: @dark--text-base;
    background-color: @dark--button-primary-background-color;
    border-color: @dark--primary-color;
}

.el-button--primary:hover, .el-button--primary:focus{
--primary:hover, --primary:focus{
    background: rgb(51, 163, 182);
    border-color: rgb(81, 229, 253);
    color: @dark--title-color;
}

.el-button--primary:active{
--primary:active{
    background: rgb(0, 126, 148);
    border-color: rgb(34, 200, 228);
    color: @dark--title-color;
    outline: none;
}

.el-button--primary.is-active{
--primary.is-active{
    background: rgb(0, 126, 148);
    border-color: rgb(34, 200, 228);
    color: @dark--title-color;
}

.el-button--primary.is-plain{
--primary.is-plain{
    background: transparent;
    border: 1px solid #198CA7;
    color: rgb(31, 45, 61);
}

.el-button--primary.is-plain:hover, .el-button--primary.is-plain:focus{
--primary.is-plain:hover, --primary.is-plain:focus{
    background: transparent;
    border-color: @dark--primary-color;
    color: @dark--button-primary-background-color;

 src/views/popup/Dialog.vue

@@ -5,6 +5,7 @@
            width="30%"
            :modal="false"
            :close-on-click-modal="false"
             @close='closeDialog'
            center>
        <slot></slot>
    </el-dialog>
@@ -27,6 +28,9 @@
  methods: {
    show () {
      this.centerDialogVisible = true
    },
    closeDialog () {
      this.$emit('closeDialog')
    }
  }
}