From 12ac24e91636c9723b2e89fc354735aa27e10c69 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 13 四月 2021 16:00:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/components/SolidWaste.vue | 75 +++++++------------------------------
1 files changed, 15 insertions(+), 60 deletions(-)
diff --git a/src/components/table/components/SolidWaste.vue b/src/components/table/components/SolidWaste.vue
index 89be52e..ae00c44 100644
--- a/src/components/table/components/SolidWaste.vue
+++ b/src/components/table/components/SolidWaste.vue
@@ -18,63 +18,33 @@
placement="bottom"
trigger="click"
:disabled="!isShowIcon"
- popper-class="popovers"
- >
+ popper-class="popovers">
<ChemicalWastewater v-show="$index ===1"></ChemicalWastewater>
<i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
<!-- <i class="el-icon-caret-bottom" slot="reference" v-else @click="doIcon($index)"></i>-->
</el-popover>
</template>
</el-table-column>
- <el-table-column
- label="搴忓彿"
- width="45px"
- type="index">
+ <el-table-column label="搴忓彿" width="45px" type="index">
</el-table-column>
- <el-table-column
- prop="UserName"
- label="浼佷笟鍚嶇О"
- width="120px">
+ <el-table-column 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"
- label="澶栨帓搴熸按閲忥紙m鲁锛�"
- width="100px">
- </el-table-column>
+ <el-table-column prop="WasteWaters" label="澶栨帓搴熸按閲忥紙m鲁锛�" width="100px"></el-table-column>
<el-table-column label="COD (t)">
- <el-table-column
- prop="AddOutPut"
- label="绱浜х敓閲�"
- width="70px">
- </el-table-column>
- <el-table-column
- prop="MonthOutPut"
- label="褰撴湀鐢熶骇閲�"
- width="70px">
- </el-table-column>
+ <el-table-column prop="AddOutPut" label="绱浜х敓閲�" width="70px"></el-table-column>
+ <el-table-column prop="MonthOutPut" label="褰撴湀鐢熶骇閲�" width="70px"></el-table-column>
</el-table-column>
<el-table-column label="姘ㄦ爱 (t)">
- <el-table-column
- prop="NH4NPut"
- label="绱浜х敓閲�"
- width="70px">
- </el-table-column>
- <el-table-column
- prop="NH4NMonth"
- label="褰撴湀鐢熶骇閲�"
- width="70px">
- </el-table-column>
+ <el-table-column prop="NH4NPut" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="NH4NMonth" label="褰撴湀鐢熶骇閲�"></el-table-column>
</el-table-column>
<el-table-column label="鎺掓斁鍙ｆ娴嬬粺璁＄姸鎬�">
- <el-table-column
- prop="normal"
- label="姝ｅ父"
- width="60px">
+ <el-table-column prop="normal" label="姝ｅ父" width="60px">
<template slot-scope="{row,$index}">
<u v-if="$index!=2" >{{row.normal}}</u>
<el-popover v-else
@@ -92,25 +62,10 @@
</el-popover>
</template>
</el-table-column>
- <el-table-column
- prop="overProof"
- label="瓒呮爣"
- width="60px">
- </el-table-column>
- <el-table-column
- prop="Abnormal"
- label="寮傚父"
- width="60px">
- </el-table-column>
- <el-table-column
- prop="StopProduction"
- label="鍋滀骇"
- width="60px">
- </el-table-column>
- <el-table-column
- prop="deficiency"
- label="缂哄け"
- width="60px">
+ <el-table-column prop="overProof" label="瓒呮爣" width="60px"></el-table-column>
+ <el-table-column prop="Abnormal" label="寮傚父" width="60px"></el-table-column>
+ <el-table-column prop="StopProduction" label="鍋滀骇" width="60px"></el-table-column>
+ <el-table-column prop="deficiency" label="缂哄け" width="60px">
<template slot-scope="{row,$index}">
<u v-if="$index!=1" >{{row.deficiency}}</u>
<el-popover v-else
@@ -201,11 +156,11 @@
},
methods: {
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'
+ // 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'
+ // return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
},
// 鑾峰彇鐐瑰嚮鐨勮〃鏍�
handle (row, column, event, cell) {
--
Gitblit v1.8.0