Merge remote-tracking branch 'origin/master' into master

chenzeping

2021-03-15 0415f4c1c98109117873bcd82cf2f1216afc0fb9

Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	src/components/panel/ToolBoxPanel.vue

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

@@ -11,6 +11,29 @@
      text-align: center;
      height: 20px;
      line-height: 20px;

      color: @color;
      cursor: pointer;
      -ms-flex-negative: 0;
      flex-shrink: 0;
  }
}
.el-tabs__header{
  font-size: .08333rem;
  line-height: .10938rem;
  background: rgba(0,255,246,.14);
}
.el-dialog{
  border: 0.00521rem solid @color;
  box-shadow: 0 0 0.03rem @color;
  background: rgba(0, 16, 30, 0.8);
  border-radius: 0.05208rem;

  .el-dialog__title{
    padding: .03125rem .08333rem;
    color: @color;
    cursor: pointer;
    flex-shrink: 0;
  }
}
.select-down {
@@ -42,8 +65,31 @@
    .popper__arrow::after{
        border-bottom-color: @color ;
    }
}

.el-tabs{
  .el-tabs__item {
    height: 40px;
    line-height: 40px;
  }
}
.el-table th, .el-table tr{
  background-color: transparent;
}
.el-table{
  color: @color;
  background: transparent;

  thead {
    color: #ffffff;
    font-weight: 500;
  }
  thead.is-group th{
    background: transparent;
  }
  .el-table__expanded-cell {
     background: transparent;
   }
}
.map-input{
  input{

 src/components/panel/RightSearchPanel.vue

@@ -35,7 +35,15 @@
<!--        <div class="btn-shrink" v-else-if="!isCollapse"></div>-->
        <div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>
      </div>
      <component :title="title" :is="gcComp"></component>

        <div :class="'search-container map-background'">
            <div class="el-message-box__content" style="padding:6px;font-size: 13px;">
                <div class="search-title">
                污雨水
                </div>
                <component :title="title" :is="gcComp"></component>
            </div>
        </div>
    </div>
  </div>
</template>
@@ -145,6 +153,17 @@
</script>

<style lang="less">
.search-title{
    color: rgb(255, 255, 255);
    font-size: 16px;
    margin: 5px;
}
.search-container {
    position: relative;
    width: 1.79167rem;
    height: 3.4375rem;
    overflow: hidden;
}
.module-wrap{
  width: 0.15rem;
  height: 0.15rem;

 src/components/panel/topicSearch/SewersSearch.vue

@@ -1,8 +1,5 @@
<template>
 <div :class="'sewers-search map-background'">
    <div class="el-message-box__content" style="padding:6px;font-size: 13px;">
      <div class="box__content" v-if="gdVisible">
        <div>
        <div class="sewers-search" v-if="gdVisible">
          <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">
@@ -97,16 +94,12 @@
            </el-pagination>
          </el-card>
        </div>
      </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>
  </div>

</template>

<script>
@@ -190,8 +183,6 @@
<style lang="less" scoped>
.sewers-search{
  position: relative;
  width: 1.79167rem;
  height: 3.4375rem;
  overflow: hidden;
  .search-panel{
   background-color: transparent;

 src/components/table/components/AirQuality.vue

@@ -45,6 +45,11 @@
                    prop="RegionalColor"
                    label="区域颜色"
                    width="200px">
              <template slot-scope="scope">
                <div v-if="scope.row.RegionalColor==='四级红色'" style="background-color: red">{{scope.row.RegionalColor}}</div>
                <div v-else-if="scope.row.RegionalColor==='三级橙色'" style="background-color: orange">{{scope.row.RegionalColor}}</div>
                <div v-else style="background-color: green">{{scope.row.RegionalColor}}</div>
              </template>
            </el-table-column>
        </el-table>
    </div>

 src/components/table/components/WasteGas.vue

@@ -98,6 +98,7 @@
</template>

<script>

export default {
  name: 'WasteGas',
  data () {

 src/components/table/components/WasteWater.vue

@@ -5,16 +5,29 @@
           <el-table
                   class="tableBox"
                   :data="tableData"
                   :header-cell-style="tableHeaderColor"
                   :cell-style="rowClass"
                   :header-cell-style="tableHeaderColor"
           >
               <el-table-column
                       width="30px"
                        label=""
               >
                   <template>
                       <i class="el-icon-caret-right"></i>
                       <span style="margin-left: 10px"></span>
                 <template >
                 <el-popover :value= "show"
                         placement="bottom"
                         width="200"
                         trigger="click"
                             popper-class="popovers"
                        >
                   <ChemicalWastewater @isshow= "show=false"></ChemicalWastewater>
                   <i class="el-icon-caret-right"  slot="reference" v-if="!isShowIcon"  ></i>
                   <i class="el-icon-caret-bottom" slot="reference" v-else-if="isShowIcon"></i>
<!--                       <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
<!--                       <i v-if="isShowIcon" class="el-icon-caret-bottom" slot="reference" @click="isbtn"></i>-->
<!--                   <i v-else class="el-icon-caret-right" slot="reference" @click="isbtn"></i>-->
                     </el-popover>
<!--                       <i class="el-icon-caret-right" v-if="!isShowIcon"></i>-->
<!--                       <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
                   </template>
               </el-table-column>
               <el-table-column
@@ -26,7 +39,12 @@
                       prop="UserName"
                       label="企业名称"
                       width="120px">
               </el-table-column>
                 <template slot-scope="scope">
                   <div v-if="scope.row.UserName==='集团名称'" style="color: #00ffff">{{scope.row.UserName}}</div>
                   <div v-else-if="scope.row.UserName==='天津石化'" style="color: #00ffff">{{scope.row.UserName}}</div>
                   <div v-else >{{scope.row.UserName}}</div>
                 </template>
               </el-table-column>v-
               <el-table-column
                       prop="WasteWaters"
                       label="外排废水量（m³）"
@@ -61,6 +79,20 @@
                           prop="normal"
                           label="正常"
                           width="60px">
                     <template slot-scope="{row,$index}">
                       <u v-if="$index!=2" >{{row.normal}}</u>
                       <el-popover v-else
                           placement="bottom-end"
                           width="200"
                           trigger="click"
                       >
                         <ChemicalWastewater></ChemicalWastewater>
                         <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
                         <!--                       <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
                         <!--                       <i v-if="isShowIcon" class="el-icon-caret-bottom" slot="reference" @click="isbtn"></i>-->
                         <!--                   <i v-else class="el-icon-caret-right" slot="reference" @click="isbtn"></i>-->
                       </el-popover>
                     </template>
                   </el-table-column>
                   <el-table-column
                           prop="overProof"
@@ -84,16 +116,23 @@
                   </el-table-column>
               </el-table-column>
           </el-table>
<!--       <ChemicalWastewater v-show="isShowIcon"></ChemicalWastewater>-->
<!--           </el-col>-->
<!--       </el-row>-->
   </div>
</template>

<script>
import ChemicalWastewater from './componented/ChemicalWastewater'
export default {
  name: 'WasteWater',
  components: {
    ChemicalWastewater
  },
  data () {
    return {
      show: false,
      isShowIcon: false,
      tableData: [{
        UserName: '集团名称',
        WasteWaters: '',
@@ -152,11 +191,35 @@
    // 表头样式设置
    rowClass  () {
      return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
    },
    // cellClick (row, column, cell, event) {
    //   console.log(row.index)
    //   if (row.index === 1) {
    //     this.isShowIcon = !this.isShowIcon
    //   }
    //   // console.log(column)
    //   // console.log(cell)
    //   // console.log(event)
    // },
    // isbtn () {
    //     this.isShowIcon = !this.isShowIcon
    //   // this.isShowIcon = !this.isShowIcon
    //   // console.log(1)
    // },
    tableCellClassName ({ row, column, rowIndex, columnIndex }) {
      row.index = rowIndex
      column.index = columnIndex
    }
  }
}
</script>

<style scoped>
<style >
.popovers{
  width: auto !important;
}
.popovers.el-popover{
padding:0;
}

</style>

 src/components/table/components/componented/ChemicalWastewater.vue

New file
@@ -0,0 +1,120 @@
<template>
    <div class="Chemical-Waste-water" id="Chemical-Waste-water">
        <el-row type="flex" class="head-area" align="middle">
            <el-col>
                <span>企业指标分类统计</span>
            </el-col>
            <el-col class="head-area-button">
                <el-button style="float: right; padding: 3px 0" icon="el-icon-close" type="info" @click="closebtns"></el-button>
            </el-col>
        </el-row>
        <el-table
                class="tableBox"
                :data="tableData"
        >
            <el-table-column
                    label="序号"
                    width="60px"
                    type="index">
            </el-table-column>
            <el-table-column
                    prop="UserName"
                    label="企业名称"
                    width="120px">
            </el-table-column>
            <el-table-column
                    prop="WasteWaters"
                    label="工业外排废水量（m³）"
                    width="200px">
            </el-table-column>
            <el-table-column label="产生量 （吨）">
                <el-table-column
                        prop="AddOutPut"
                        label="一般固废"
                        width="100px">
                </el-table-column>
                <el-table-column
                        prop="MonthOutPut"
                        label="危险废物"
                        width="100px">
                </el-table-column>
            </el-table-column>
            <el-table-column label="贮存状态（个）">
                <el-table-column
                        prop="normal"
                        label="正常"
                        width="100px">
                </el-table-column>
                <el-table-column
                        prop="warning"
                        label="预警"
                        width="100px">
                </el-table-column>
            </el-table-column>
            <el-table-column label="贮存状态（个）">
                <el-table-column
                        prop="normal"
                        label="正常"
                        width="100px">
                </el-table-column>
                <el-table-column
                        prop="warning"
                        label="预警"
                        width="100px">
                </el-table-column>
            </el-table-column>
        </el-table>
    </div>
</template>

<script>
export default {
  name: 'ChemicalWastewater',
  data: function () {
    return {
      tableData: [{
        UserName: '#火炬排放口',
        WasteWaters: '1',
        AddOutPut: '',
        MonthOutPut: '',
        normal: '',
        warning: ''
      }]
    }
  },
  methods: {
    closebtns () {
      // const summary = document.getElementById('Chemical-Waste-water')
      // summary.style.display = 'none'
      // console.log(1)
      this.$emit('isshow')
    }
  }
}
</script>
<style scoped>
    /*.Chemical-Waste-water {*/
    /*    position:fixed;*/
    /*    top: 330px;*/
    /*    left: 65px;*/
    /*    !*width: 850px;*!*/
    /*    !*height: 265px;*!*/
    /*    border: #90c8e0 1px solid;*/
    /*    z-index:3000;*/
    /*    background-color: rgba(26, 73, 81, 0.901960784313726);*/
    /*    !*color: #fff;*!*/
    /*}*/
    /*.head-area{*/
    /*    color: #fff;*/
    /*    width: 100%;*/
    /*    height: 40px;*/
    /*    background-color: #002433;*/
    /*    font-size: 16px;*/
    /*    border-bottom: #90c8e0 2px solid;*/
    /*    padding-left: 16px;*/
    /*    !*line-height: 40px;*!*/
    /*}*/
    /*.head-area-button{*/
    /*    margin-right: 5px;*/
    /*}*/
</style>

 src/components/table/summarySheets.vue

@@ -1,34 +1,38 @@
<template>
    <div class="summary-sheets">
        <div id="summary">
            <el-row type="flex" class="head-area" align="middle">
                <el-col>
                    <span>企业指标分类统计</span>
                </el-col>
                <el-col class="head-area-button">
                    <el-button style="float: right; padding: 3px 0" icon="el-icon-close" type="info" @click="closebtn"></el-button>
                </el-col>
            </el-row>
<!--        <div id="summary">-->
<!--            <el-row type="flex" class="head-area" align="middle">-->
<!--                <el-col>-->
<!--                    <span>企业指标分类统计</span>-->
<!--                </el-col>-->
<!--                <el-col class="head-area-button">-->
<!--                    <el-button style="float: right; padding: 3px 0" icon="el-icon-close" type="info" @click="closeBtn"></el-button>-->
<!--                </el-col>-->
<!--            </el-row>-->
<!--        <el-tabs class="tabs-text">-->
            <el-row :gutter="20" class="el-rowscol">
                <el-col>
                        <el-tabs class="tabs-text" v-model="activeName" type="border-card" @tab-click="handleClick">
                                <el-tab-pane label="废水" name="first">
                                    <waste-water></waste-water>
                                </el-tab-pane>
                                <el-tab-pane label="废气" name="second">
                                    <waste-gas></waste-gas>
                                </el-tab-pane>
                                <el-tab-pane label="固废" name="third">
                                    <solid-waste></solid-waste>
                                </el-tab-pane>
                                <el-tab-pane label="空气质量" name="fourth">
                                    <AirQuality></AirQuality>
                                </el-tab-pane>
                        </el-tabs>
                </el-col>
            </el-row>
        </div>
            <div>
              <i class="el-icon-c-scale-to-original" @click="closeBtn"></i>
            </div>
            <Dialog ref="summarySheets" title="企业指标分类统计">
<!--              <el-row :gutter="20" >-->
<!--                <el-col>-->
                  <el-tabs  v-model="activeName" type="border-card">
                    <el-tab-pane label="废水" name="first">
                      <waste-water></waste-water>
                    </el-tab-pane>
                    <el-tab-pane label="废气" name="second">
                      <waste-gas></waste-gas>
                    </el-tab-pane>
                    <el-tab-pane label="固废" name="third">
                      <solid-waste></solid-waste>
                    </el-tab-pane>
                    <el-tab-pane label="空气质量" name="fourth">
                      <AirQuality></AirQuality>
                    </el-tab-pane>
                  </el-tabs>
<!--                </el-col>-->
<!--              </el-row>-->
            </Dialog >
    </div>
</template>

@@ -37,9 +41,11 @@
import WasteGas from './components/WasteGas'
import SolidWaste from './components/SolidWaste'
import AirQuality from './components/AirQuality'
import Dialog from '@views/popup/Dialog'
export default {
  name: 'summary sheet.vue',
  name: 'summary-sheet.vue',
  components: {
    Dialog,
    WasteWater,
    WasteGas,
    SolidWaste,
@@ -51,44 +57,51 @@
    }
  },
  methods: {
    handleClick (tab, event) {
      console.log(tab, event)
    closeBtn () {
      // const summary = document.getElementById('summary')
      // summary.style.display = 'none'
      this.$refs.summarySheets.show()
    },
    closebtn () {
      const summary = document.getElementById('summary')
      summary.style.display = 'none'
      console.log(1)
    tableHeaderColor ({ row, column, owIndex, columnIndex }) {
      return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
    },
    // 表头样式设置
    rowClass  () {
      return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
    }
  }
}
</script>

<style>
<style scoped lang="less">
    .summary-sheets {
        position: absolute;
        top: 50px;
        left: 50px;
        top: 450px;
        left: 200px;
        width: 40px;
        height: 40px;
        /*width: 850px;*/
        /*height: 265px;*/
        border: #90c8e0 1px solid;
        z-index:9999999;
        z-index:2000;
        background-color: rgba(26, 73, 81, 0.901960784313726);
        /*color: #fff;*/
       .el-icon-c-scale-to-original {
         width: 100%;
         height: 100%;
       }
    }
    .head-area{
        color: #fff;
        width: 100%;
        height: 40px;
        background-color: #002433;
        font-size: 16px;
        border-bottom: #90c8e0 2px solid;
        padding-left: 16px;
        /*line-height: 40px;*/
    }
    .head-area-button{
        margin-right: 5px;
    }
    .tabs-text{
        background-color: rgba(26, 73, 81, 0.901960784313726);
    }
    /*.head-area{*/
    /*    color: #fff;*/
    /*    width: 100%;*/
    /*    height: 40px;*/
    /*    background-color: #002433;*/
    /*    font-size: 16px;*/
    /*    border-bottom: #90c8e0 2px solid;*/
    /*    padding-left: 16px;*/
    /*    !*line-height: 40px;*!*/
    /*}*/
    /*.head-area-button{*/
    /*    margin-right: 5px;*/
    /*}*/
</style>

 src/views/MapTemplate.vue

@@ -13,9 +13,9 @@
    <tool-box-panel ref="toolBox"></tool-box-panel>
<!--    <menu-special></menu-special>-->
    <legend-panel></legend-panel>
    <summary-sheets v-show="isShowbtn"></summary-sheets>
    <summary-sheets></summary-sheets>
    <enterprise></enterprise>
    <el-button id="mapbtn" type="primary" icon="el-icon-c-scale-to-original" circle @click="isshowhidden"></el-button>
<!--    <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
  </div>
</template>

@@ -52,7 +52,7 @@
  },
  data () {
    return {
      isShowbtn: false,
      // isShowBtn: false,
      map: null,
      lcServiceLayerVisible: false,
      basemapHelper: {},
@@ -71,8 +71,8 @@
    })
  },
  methods: {
    isshowhidden () {
      this.isShowbtn = !this.isShowbtn
    isShowHidden () {
      this.isShowBtn = !this.isShowBtn
    },
    saveMapStatus () {
      window.serviceLayerHelper = this.serviceLayerHelper
@@ -164,5 +164,11 @@
    //background-color: #0661AE;
    border-top: 1px solid #0661AE;
  }
  #map-btn {
    position: fixed;
    top: 20px;
    left: 100px;
    z-index: 9999;
  }
}
</style>