From 97a7d4a2a256b9171bca05e69d154996645b4722 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 16 三月 2021 10:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/components/table/components/WasteGas.vue | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/components/table/components/WasteGas.vue b/src/components/table/components/WasteGas.vue
index 5014038..4ebce10 100644
--- a/src/components/table/components/WasteGas.vue
+++ b/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)
}
}
}
--
Gitblit v1.8.0