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

chenzeping

2021-03-16 97a7d4a2a256b9171bca05e69d154996645b4722

 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)
    }
  }
}