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

chenzeping

2021-03-16 97a7d4a2a256b9171bca05e69d154996645b4722

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

 src/components/LayerController/LayerController.vue

@@ -93,7 +93,7 @@

.float-panel {
  position: absolute;
  top: 80px;
  top: 120px;
  height: auto;
  font-size: 11px;
  z-index: 1000;

 src/components/panel/topicSearch/SewersSearch.vue

@@ -3,7 +3,7 @@
          <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%" :popper-append-to-body="false" v-model="form.pipelineType" @change="handlePipelineType"  :popper-class="'select-down'">
                <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"
@@ -13,7 +13,7 @@
                </el-select>
              </el-form-item>
              <el-form-item :label="form.pipelineType+'：'" size="mini">
                <el-select style="width: 100%" :popper-append-to-body="false" v-model="form.dataType"  @change="handleDataType" :popper-class="'select-down'">
                <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"

 src/components/table/components/SolidWaste.vue

@@ -5,6 +5,7 @@
               :data="tableData"
               :header-cell-style="tableHeaderColor"
               :cell-style="rowClass"
               @cell-click="handle"
       >
           <el-table-column
                   width="30px"
@@ -24,11 +25,11 @@
                   prop="UserName"
                   label="企业名称"
                   width="120px">
           </el-table-column>
           <el-table-column
                   prop="WasteWaters"
                   label="工业外排废水量（m³）"
                   width="200px">
             <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>
           <el-table-column label="产生量 （吨）">
               <el-table-column
@@ -47,6 +48,18 @@
                       prop="normal"
                       label="正常"
                       width="100px">
                 <template slot-scope="{row,$index}">
                   <u v-if="$index!=1" >{{row.normal}}</u>
                   <el-popover v-else
                               placement="bottom-end"
                               width="200"
                               trigger="click"
                               title="监测点排放明细"
                   >
                     <ChemicalWastewater></ChemicalWastewater>
                     <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
                   </el-popover>
                 </template>
               </el-table-column>
               <el-table-column
                       prop="warning"
@@ -59,17 +72,20 @@
</template>

<script>
import ChemicalWastewater from '@components/table/components/componented/ChemicalWastewater'
export default {
  name: 'SolidWaste',
  components: {
    ChemicalWastewater
  },
  data () {
    return {
      tableData: [{
        UserName: '集团名称',
        WasteWaters: '',
        AddOutPut: '',
        MonthOutPut: '',
        normal: '',
        warning: ''
        AddOutPut: '580',
        MonthOutPut: '250',
        normal: '10',
        warning: '9'
      }, {
        UserName: '天津石化',
        WasteWaters: '116.6',
@@ -100,6 +116,10 @@
    // 表头样式设置
    rowClass  () {
      return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
    },
    // 获取点击的表格
    handle (row, column, event, cell) {
      console.log(row.UserName)
    }
  }
}

 src/components/table/components/WasteGas.vue

@@ -5,6 +5,7 @@
                :data="tableData"
                :header-cell-style="tableHeaderColor"
                :cell-style="rowClass"
                @cell-click="handle"
        >
            <el-table-column
                    width="30px"
@@ -24,6 +25,11 @@
                    prop="UserName"
                    label="企业名称"
                    width="120px">
              <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>
            <el-table-column
                    prop="WasteWaters"
@@ -71,6 +77,18 @@
                        prop="normal"
                        label="正常"
                        width="60px">
                  <template slot-scope="{row,$index}">
                    <u v-if="$index!=1" >{{row.normal}}</u>
                    <el-popover v-else
                                placement="bottom-end"
                                width="200"
                                trigger="click"
                                title="监测点排放明细"
                    >
                      <refinery></refinery>
                      <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
                    </el-popover>
                  </template>
                </el-table-column>
                <el-table-column
                        prop="overProof"
@@ -91,6 +109,18 @@
                        prop="deficiency"
                        label="缺失"
                        width="60px">
                  <template slot-scope="{row,$index}">
                    <u v-if="$index!=1" >{{row.deficiency}}</u>
                    <el-popover v-else
                                placement="bottom-end"
                                width="200"
                                trigger="click"
                                title="监测点排放明细"
                    >
                      <MissingAlarm></MissingAlarm>
                      <u slot="reference" style="color: #00ffff">{{row.deficiency}}</u>
                    </el-popover>
                  </template>
                </el-table-column>
            </el-table-column>
        </el-table>
@@ -98,9 +128,16 @@
</template>

<script>

// import ChemicalWastewater from '@components/table/components/componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
import MissingAlarm from '@components/table/components/componented/MissingAlarm'
export default {
  name: 'WasteGas',
  components: {
    MissingAlarm,
    Refinery
    // ChemicalWastewater
  },
  data () {
    return {
      tableData: [{
@@ -161,6 +198,10 @@
    // 表头样式设置
    rowClass  () {
      return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
    },
    // 获取点击的表格
    handle (row, column, event, cell) {
      console.log(row.UserName)
    }
  }
}

 src/components/table/components/WasteWater.vue

@@ -1,27 +1,26 @@
<template>
   <div class="waste-water">
<!--       <el-row>-->
<!--           <el-col>-->
           <el-table
                   class="tableBox"
                   :data="tableData"
                   :cell-style="rowClass"
                   style="width: 100%"
                   :header-cell-style="tableHeaderColor"
                   :cell-style="rowClass"
                   @cell-click="handle"
           >
               <el-table-column
                       width="30px"
                        label=""
               >
                 <template >
                 <el-popover :value= "show"
                 <template>
                 <el-popover
                         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>
                   <ChemicalWastewater></ChemicalWastewater>
                   <i class="el-icon-caret-right"  slot="reference" v-if="!isShowIcon" @click="doIcon"></i>
<!--                   <i class="el-icon-caret-bottom" slot="reference" v-else-if="isShowIcon&&$index===1"></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>-->
@@ -85,8 +84,10 @@
                           placement="bottom-end"
                           width="200"
                           trigger="click"
                                   popper-class="popovers"
                           title="XXX1明细表"
                       >
                         <ChemicalWastewater></ChemicalWastewater>
                         <refinery></refinery>
                         <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>-->
@@ -113,6 +114,19 @@
                           prop="deficiency"
                           label="缺失"
                           width="60px">
                     <template slot-scope="{row,$index}">
                       <u v-if="$index!=1" >{{row.deficiency}}</u>
                       <el-popover v-else
                                   placement="bottom-end"
                                   width="200"
                                   trigger="click"
                                   title="天津石化监测点缺失报警明细"
                                   popper-class="popovers"
                       >
                         <MissingAlarm></MissingAlarm>
                         <u slot="reference" style="color: #00ffff">{{row.deficiency}}</u>
                       </el-popover>
                     </template>
                   </el-table-column>
               </el-table-column>
           </el-table>
@@ -124,9 +138,13 @@

<script>
import ChemicalWastewater from './componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
import MissingAlarm from '@components/table/components/componented/MissingAlarm'
export default {
  name: 'WasteWater',
  components: {
    MissingAlarm,
    Refinery,
    ChemicalWastewater
  },
  data () {
@@ -192,31 +210,22 @@
    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
    // 获取点击的表格
    handle (row, column, event, cell) {
      console.log(row.UserName)
    },
    doIcon () {
      console.log(1)
      this.isShowIcon = !this.isShowIcon
    }
  }
}
</script>

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

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

@@ -2,11 +2,11 @@
    <div class="Chemical-Waste-water" id="Chemical-Waste-water">
        <el-row type="flex" class="head-area" align="middle">
            <el-col>
                <span>企业指标分类统计</span>
                <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-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"
@@ -83,17 +83,14 @@
    }
  },
  methods: {
    closebtns () {
      // const summary = document.getElementById('Chemical-Waste-water')
      // summary.style.display = 'none'
      // console.log(1)
      this.$emit('isshow')
    }
    // closeBtns () {
    //   this.$emit('isShow')
    // }
  }
}
</script>
<style scoped>
    /*.Chemical-Waste-water {*/
    .Chemical-Waste-water {
    /*    position:fixed;*/
    /*    top: 330px;*/
    /*    left: 65px;*/
@@ -101,9 +98,10 @@
    /*    !*height: 265px;*!*/
    /*    border: #90c8e0 1px solid;*/
    /*    z-index:3000;*/
    /*    background-color: rgba(26, 73, 81, 0.901960784313726);*/
    /*    !*color: #fff;*!*/
    /*}*/
      text-align: center;
        background-color: rgba(26, 73, 81, 0.901960784313726);
        color: #fff;
    }
    /*.head-area{*/
    /*    color: #fff;*/
    /*    width: 100%;*/

 src/components/table/components/componented/MissingAlarm.vue

New file
@@ -0,0 +1,142 @@
<template>
<div class="MissingAlarm">
  <el-tabs v-model="activeName">
    <el-tab-pane label="小时数据" name="first">
      <el-table
          :data="tableData"
          border
          style="width: 100%"
      >
        <el-table-column
            prop="date"
            label="排放点"
            width="150">
        </el-table-column>
          <el-table-column
              prop="name"
              label="排放类型"
              width="120">
          </el-table-column>
          <el-table-column
              prop="name"
              label="报警时间"
              width="120">
          </el-table-column>
          <el-table-column
              prop="name"
              label="恢复时间"
              width="120">
          </el-table-column>
        <el-table-column
            prop="name"
            label="缺失小时数"
            width="120">
        </el-table-column>
        <el-table-column
            prop="name"
            label="缺失原因类型"
            width="120">
        </el-table-column>
        <el-table-column
            prop="name"
            label="原因描述"
            width="120">
        </el-table-column>
        <el-table-column
            prop="name"
            label="整改措施"
            width="120">
        </el-table-column>
        <el-table-column
            prop="name"
            label="限定整改结束时间"
            width="120">
        </el-table-column>
        <el-table-column
            prop="name"
            label="实际整改结束时间"
            width="120">
        </el-table-column>
        <el-table-column
            prop="name"
            label="联网时间"
            width="120">
        </el-table-column>
        <el-table-column
            prop="name"
            label="凭证"
            width="120">
        </el-table-column>
      </el-table>
    </el-tab-pane>
    <el-tab-pane label="日数据" name="second">
      <el-table
          :data="tableData"
          border
          style="width: 100%">
        <el-table-column
            prop="date"
            label="排放点"
            width="150">
        </el-table-column>
          <el-table-column
              prop="name"
              label="排放类型"
              width="120">
          </el-table-column>
          <el-table-column
              prop="name"
              label="检测时间"
              width="120">
          </el-table-column>
          <el-table-column
              prop="name"
              label="状态"
              width="120">
          </el-table-column>
      </el-table>
    </el-tab-pane>
  </el-tabs>
</div>
</template>

<script>
export default {
  name: 'MissingAlarm',
  data () {
    return {
      activeName: 'first',
      tableData: [{
        date: '2016-05-03',
        name: '王小虎',
        province: '上海',
        city: '普陀区',
        address: '上海市普陀区金沙江路 1518 弄',
        zip: 200333
      }, {
        date: '2016-05-02',
        name: '王小虎',
        province: '上海',
        city: '普陀区',
        address: '上海市普陀区金沙江路 1518 弄',
        zip: 200333
      }, {
        date: '2016-05-04',
        name: '王小虎',
        province: '上海',
        city: '普陀区',
        address: '上海市普陀区金沙江路 1518 弄',
        zip: 200333
      }]
    }
  }
}
</script>

<style scoped>
.MissingAlarm {
  background-color: #0E3565;
  color: #fff;
  text-align: center;
}
</style>

 src/components/table/components/componented/refinery.vue

New file
@@ -0,0 +1,69 @@
<template>
  <div class="refinery">
    <el-table
        :data="tableData"
        border
        style="width: 100%">
      <el-table-column
          label="序号"
          width="45px"
          type="index">
      </el-table-column>
      <el-table-column
          prop="date"
          label="排放点"
          width="180">
      </el-table-column>
      <el-table-column
          prop="name"
          label="单位部门"
          width="180">
      </el-table-column>
      <el-table-column
          prop="address"
          label="废水产生量（m3）">
      </el-table-column>
      <el-table-column
          prop="address"
          label="COD (t)">
      </el-table-column>
      <el-table-column
          prop="address"
          label="氨氮(t)">
      </el-table-column>
    </el-table>
  </div>
</template>

<script>
export default {
  name: 'refinery',
  data () {
    return {
      tableData: [{
        date: '2016-05-02',
        name: '王小虎',
        address: '上海市普陀区金沙江路 1518 弄'
      }, {
        date: '2016-05-04',
        name: '王小虎',
        address: '上海市普陀区金沙江路 1517 弄'
      }, {
        date: '2016-05-01',
        name: '王小虎',
        address: '上海市普陀区金沙江路 1519 弄'
      }, {
        date: '2016-05-03',
        name: '王小虎',
        address: '上海市普陀区金沙江路 1516 弄'
      }]
    }
  }
}
</script>

<style scoped lang="less">
.refinery {
  background-color: #0E3565;
}
</style>

 src/components/table/components/tabHandover.vue

New file
@@ -0,0 +1,41 @@
<template>
  <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>
</template>

<script>
import WasteWater from '@components/table/components/WasteWater'
import WasteGas from '@components/table/components/WasteGas'
import SolidWaste from '@components/table/components/SolidWaste'
import AirQuality from '@components/table/components/AirQuality'
export default {
  name: 'tabHandover',
  components: {
    WasteWater,
    WasteGas,
    SolidWaste,
    AirQuality
  },
  data () {
    return {
      activeName: 'first'
    }
  }
}
</script>

<style scoped>

</style>

 src/components/table/summarySheets.vue

@@ -1,73 +1,29 @@
<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>-->
<!--        <el-tabs class="tabs-text">-->
            <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>-->
              <tab-handover></tab-handover>
            </Dialog >
    </div>
</template>

<script>
import WasteWater from '@/components/table/components/WasteWater.vue'
import WasteGas from './components/WasteGas'
import SolidWaste from './components/SolidWaste'
import AirQuality from './components/AirQuality'
import tabHandover from '@components/table/components/tabHandover'
import Dialog from '@views/popup/Dialog'
export default {
  name: 'summary-sheet.vue',
  components: {
    Dialog,
    WasteWater,
    WasteGas,
    SolidWaste,
    AirQuality
    tabHandover,
    Dialog
  },
  data () {
    return {
      activeName: 'first'
    }
  },

  methods: {
    closeBtn () {
      // const summary = document.getElementById('summary')
      // summary.style.display = 'none'
      this.$refs.summarySheets.show()
    },
    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'
    }
  }
}
@@ -76,10 +32,8 @@
<style scoped lang="less">
    .summary-sheets {
        position: absolute;
        top: 450px;
        left: 200px;
        width: 40px;
        height: 40px;
        top: 70px;
        left: 1px;
        /*width: 850px;*/
        /*height: 265px;*/
        border: #90c8e0 1px solid;
@@ -87,21 +41,9 @@
        background-color: rgba(26, 73, 81, 0.901960784313726);
        /*color: #fff;*/
       .el-icon-c-scale-to-original {
         width: 100%;
         height: 100%;
         width: 30px;
         height: 30px;
         font-size: 30px;
       }
    }
    /*.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>