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

wangqi

2021-04-06 272c1dc7490b70a50f245bd4965284f7baa15bdf

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


 Conflicts:

	src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue

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

@@ -1,13 +1,11 @@
@import "_map-variable";

/*全局设置***********/
h1,h2,h3,h4,h5,h6,ul,li,p{
h1, h2, h3, h4, h5, h6, ul, li, p {
  padding: 0;
  margin: 0;
  list-style: none;
}




.el-button--primary {
@@ -201,44 +199,55 @@
  display: none !important;
}

.el-tabs--card>.el-tabs__header .el-tabs__nav{
.el-tabs--card > .el-tabs__header .el-tabs__nav {
  border: none;
}

.el-tabs--card>.el-tabs__header .el-tabs__item{
.el-tabs--card > .el-tabs__header .el-tabs__item {
  border: none;
  margin-left: 10px;
}



/***************Company 图层 悬浮框样式。*********************************/
.company-bindTooltip{
  background:none;
  border:none;
  color:red;
.company-bindTooltip {
  background: none;
  border: none;
  color: red;
  font-size: 16px;
  font-weight: 900 !important;
  text-shadow: 0 0 5px #fff;
  box-shadow: none;
}
.company-bindTooltip-hover h3{

.company-bindTooltip-hover h3 {
  text-align: center;
  border-bottom:1px solid #0B3B6D;
  border-bottom: 1px solid #0B3B6D;
  margin: 0;
  padding:0;
  padding: 0;
}
.company-bindTooltip-hover ul{

.company-bindTooltip-hover ul {
  list-style: none;
  margin: 0;
  padding:0;
  padding: 0;
  width: 260px;
  display: flex;
  flex-wrap: wrap;
}
.company-bindTooltip-hover ul li{

.company-bindTooltip-hover ul li {
  margin: 0;
  padding:3px 0;
  padding: 3px 0;
  width: 50%;
}

/*************** PublicTable 表格样式。*********************************/
.cell {
  padding: 0;
}

.el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
  /* padding-left: 10px; */
  text-align: center;
}

 src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue

@@ -8,6 +8,7 @@
    <div class="main">
      <div class="main-video">
        <el-table
            border
            tooltip-effect="dark"
            :data="displayContentTableData"
        >
@@ -56,7 +57,8 @@

  .main-video {
    width: 100%;
    //min-height: 195px;
    min-height: 195px;

    video {
      width: 100%;
      height: 100%;

 src/components/LayerController/logic/SolidWaste.js

@@ -43,12 +43,6 @@
          iconAnchor: [25, 25]
        })
      })
      /*  marker.bindTooltip(getSolidWasteData[i].Name, {
        permanent: true,
        offset: [0, 14],
        direction: 'bottom',
        className: 'company-bindTooltip'
      }) */
      layer.addLayer(marker)
    }
  }
@@ -94,7 +88,7 @@
    this.setPanTo(e.latlng, 200)
  }

  // flayTo()
  // flayTo() 弹框的可滑动事件
  this.setPanTo = (pos, value) => {
    var position = pos
    position = window.map.latLngToLayerPoint(position)

 src/components/LayerController/modules/LcServiceLayer.vue

@@ -6,15 +6,16 @@
        <div class="wms-panel">
            <el-scrollbar class="wms-panel-scrollbar">
                <div v-for="item in serviceLayers" :key="item.code" class="layerbox">
                    <div><input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
                                @change="swAllLayers(item)"/>{{ item.name }}
                    <div>
                        <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"  @change="swAllLayers(item)"/>{{ item.name }}
                    </div>
                    <div class="layerbox-item">
                        <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code"><input type="checkbox"
                                                                                                          :name="'wmsSublayers_'+item.code+'_'+itm.code"
                                                                                                          :checked="itm.checked"
                                                                                                          :value="itm.code"
                                                                                                          @change="swWmsLayer(itm)"/>{{ itm.name }}
                        <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code">
                            <input type="checkbox"
                                   :name="'wmsSublayers_'+item.code+'_'+itm.code"
                                   :checked="itm.checked"
                                   :value="itm.code"
                                   @change="swWmsLayer(itm)"/>{{ itm.name }}
                        </div>
                    </div>
                </div>
@@ -110,7 +111,6 @@
            cursor: pointer;
            color: #ffffff;
        }

        .wms-panel {
            width:  1.79167rem;
            .wms-panel-scrollbar{
@@ -119,7 +119,6 @@
            }
            .layerbox {
                width: 100%;

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

 src/components/panel/RightSearchPanel.vue

@@ -97,6 +97,7 @@
    },
    selected (val) {
      // console.log(val)
      this.title = val.name + '（检索）'
      this.topicList.forEach((itm) => {
        itm.checked = val.name === itm.name
      })
@@ -185,8 +186,8 @@
    position: relative;
    width: 1.79167rem;
    /*height: 5.6475rem;*/
    min-height: 60vh;
    max-height: 80vh;
    min-height: 80vh;
    max-height: 90vh;
    overflow: hidden;
}
.module-wrap{
@@ -680,38 +681,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;
        // .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/topicSearch/DischargeSearch.vue

@@ -1,8 +1,6 @@
<template>
  <div class="sewers-search" v-if="gdVisible">
    <div class="search-title">
      污染源
    </div>
    <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">
@@ -41,19 +39,9 @@
        </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-input  v-model="form.keyword" size="mini"  placeholder="在此输入关键字搜索"></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:300px">

 src/components/panel/topicSearch/EnvRiskSearch.vue

@@ -1,8 +1,6 @@
<template>
  <div class="sewers-search" v-if="gdVisible">
    <div class="search-title">
      环境风险
    </div>
    <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">
@@ -39,70 +37,20 @@
        <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>
    </div>
    <el-scrollbar style="height:300px">
      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
      <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>
            <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>

 src/components/panel/topicSearch/GasWasteSearch.vue

@@ -1,8 +1,6 @@
<template>
  <div class="sewers-search" v-if="gdVisible">
    <div class="search-title">
      废气
    </div>
    <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">

 src/components/panel/topicSearch/SewersSearch.vue

@@ -1,8 +1,6 @@
<template>
        <div class="sewers-search" v-if="gdVisible">
          <div class="search-title">
            污雨水
          </div>
          <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">

 src/components/panel/topicSearch/SoilGroundWaterSearch.vue

@@ -1,88 +1,110 @@
<template>
    <div class="sewers-search">
        <div class="search-title">
            土壤及地下水
        </div>
        <el-card class="search-panel">
    <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="类型：">
                    <el-select v-model="form.pipelineType" @change="handlePipelineType">
                <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 pipelineTypeOptions"
                                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="数据类型：">
                    <el-select v-model="form.dataType">
                        <el-option
                                v-for="item in dataTypeOptions"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                        </el-option>
                    </el-select>
                <!--  <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="模糊搜索：">
                    <el-input v-model="form.key" size="mini"
                              placeholder="在此输入关键字"></el-input>
                </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-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-card>
        <el-card class="search-result" style="height:271px;">
            <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="B-TMD-table-list-title-y-num"
                                  :title="item.transNo">
                                                <span class="B-TMD-table-list-title-y-alarm">{{ item.transNo }}</span>
                                            </span>
                        </div>
                        <div class="B-TMD-table-list-title-c">
                            载具号：
                            <span id="plateNumber_p">
                                                <span id="plateNumber_n"><a href="#">{{ item.vehicleNo }}</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>
                        <span>发货企业：</span>
                        <span id="b_twe_consignment" :title="item.outWarehouseName">{{
                item.outWarehouseName == null ? "暂无" : item.outWarehouseName
              }}</span>
                    </div>
                    <div>
                        <span>承&nbsp;&nbsp;运&nbsp;&nbsp;商：</span>
                        <span id="b_twe_loan" :title="item.carrierName">{{ item.carrierName }}</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>
        <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>
        </el-card>

            <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
@@ -96,46 +118,96 @@
            </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>-->
</template>

<script>
import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'

import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
  name: 'MonitorAreaTips',
  components: {},
  name: 'SewersSearch',
  data () {
    return {
      isPanelVisible: false,
      total: 0,
      gdVisible: true,
      list: [],
      labelList: PipelineTypeOptions[0].labelList,
      total: 0,
      inareaTypeOptions: [],
      enterpriseTypeOptions: [],
      enterpriseSubunitsTypeOptions: [],
      form: {
        name: '',
        region: '',
        date1: '',
        date2: '',
        delivery: false,
        type: [],
        resource: '',
        desc: ''
      }
        areaVal: '',
        enterpriseVal: '',
        enterpriseSubunitsVal: '',
        type: ''
      },
      // pageSize: 10,
      // current: 1,
      isWaybillHover: true,
      isRouteHover: false,
      levelOfRisk: [
        { name: '重大风险', value: '1', color: 'red' },
        { name: '一级风险', value: '2', color: 'sandybrown' },
        { name: '二级风险', value: '3', color: 'yellow' },
        { name: '三级风险', value: '4', color: 'green' }
      ]
    }
  },
  props: ['title'],
  methods: {
    handleClose (done) {
      console.log(done)
    },
    handleClick (tab, event) {
      console.log(tab, event)
    },
    handleSearch () {
    // 区域筛选
    areaType (val) {
      this.pipelineTypeOptions.forEach((itm) => {
        if (val === itm.value) {

        }
      })
    },
    // 企业筛选
    enterpriseType (val) {
      this.dataTypeOptions.forEach((itm) => {
        if (val === itm.value) {

        }
      })
    },
    // 二级单位筛选
    enterpriseSubunitsType (val) {

    },
    async handleSearch () {
      const param = {
        pipelineType: this.form.pipelineType,
        dataType: this.form.dataType
      }
      console.log(param)
      var wfsHelper = new WfsHelper()
      wfsHelper.addTypeName(this.form.query.layerName)
      wfsHelper.addLike(this.form.query.key, this.form.keyword)
      // const _this = this
      const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
      if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
        this.list = res.data.features
      }
    },
    handleLocation (val) {
      console.log(val)
      const bound = this.L.geoJSON([val], {}).getBounds()
      var layer = window.serviceLayerHelper.getByLayerId(val.id)
      layer && layer.openPopup()
      this.$store.state.map.map.flyToBounds(bound)
    }
  },
  mounted () {
    this.handleSearch()
  }
}
</script>

<style lang="less">
<style lang="less" scoped>

</style>

 src/components/panel/topicSearch/SolidWasteSearch.vue

@@ -31,14 +31,67 @@
          <el-input  v-model="form.keyword" size="mini"  placeholder="在此输入关键字搜索"></el-input>
          <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
        </div>
        <el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索">
          <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i>
        </el-input>
      </el-form>
      <el-card class="box-card"
               v-for="(item,index) in searchDataDisplay"
               :key="index">
        <div>
          {{ item.CompanyName }}
      <el-scrollbar style="height:500px">
        <div class="environmental-risk-list">
          <i class="state"></i>
          <div>
            <h3>###炼化部</h3>
            <p>所属部门：<span>炼化部</span></p>
            <p>风险级别：<span>三级</span></p>
          </div>
        </div>
      </el-card>
        <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>
      <!--      <el-card class="box-card"-->
      <!--               v-for="(item,index) in searchDataDisplay"-->
      <!--               :key="index">-->
      <!--        <div>-->
      <!--          {{ item.CompanyName }}-->
      <!--        </div>-->
      <!--      </el-card>-->
    </div>
    <!--      <el-scrollbar style="height:100%">-->
    <!--      </el-scrollbar>-->
@@ -159,5 +212,43 @@
</script>

<style lang="less" scoped>
.el-radio.is-checked .levelOfRisk-type {
  color: #409EFF
}

.levelOfRisk {
  padding-left: 20px
}

.levelOfRisk .el-radio {
  padding-bottom: 6px
}

.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;
  }
}

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

</style>

 src/components/panel/topicSearch/WaterWasteSearch.vue

@@ -1,9 +1,6 @@
<template>
    <div class="solidwaste-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"
@@ -19,49 +16,111 @@
                    </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}}<i :style="'background:'+item.color"></i></span></el-radio>
                    <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-card class="box-card" v-for="(item,index) in searchDataDisplay" :key="index">
                    <div v-if="total > 3">
                        {{ item.CompanyName }}
            <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>-->
<!--                        <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: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>-->
        </div>
    </div>
</template>

 src/components/table/components/WasteWater.vue

@@ -82,7 +82,7 @@
                           width="200"
                           trigger="click"
                                   popper-class="popovers"
                           title="XXX1明细表"
                           title="监测点明细表"
                       >
                         <refinery></refinery>
                         <u slot="reference" style="color: #00ffff">{{row.normal}}</u>

 src/conf/Topic.js

@@ -16,41 +16,41 @@
  id: 1,
  check: false,
  icon: '/assets/images/menu/special.png',
  comp: 'dischargeSearch'
  comp: ''
}, {
  name: '废水监测',
  id: 2,
  checked: false,
  icon: '/assets/images/menu/special.png',
  comp: 'envProtectSearch'
  comp: ''
}, {
  name: '废气监测',
  id: 3,
  checked: false,
  icon: '/assets/images/menu/special.png',
  comp: 'dischargeSearch'
  comp: ''
}, {
  name: '固废管理',
  id: 4,
  checked: false,
  icon: '/assets/images/menu/special.png',
  comp: 'envProtectSearch'
  comp: ''
}, {
  name: '环境风险',
  id: 5,
  checked: false,
  icon: '/assets/images/menu/special.png',
  comp: 'envProtectSearch'
  comp: ''
}, {
  name: '土壤及地下水',
  id: 6,
  checked: false,
  icon: '/assets/images/menu/special.png',
  comp: 'soilGroundWaterSearch'
  comp: ''
}, {
  name: '污雨水管网',
  id: 7,
  checked: false,
  icon: '/assets/images/menu/special.png',
  comp: 'envProtectSearch'
  comp: ''
}]