From b5acea8ed42d534cefa34d90f9eb1cd637dfe6d7 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 31 三月 2021 09:11:49 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/components/WasteGas.vue | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 6 deletions(-)
diff --git a/src/components/table/components/WasteGas.vue b/src/components/table/components/WasteGas.vue
index 1068b8b..0c2c839 100644
--- a/src/components/table/components/WasteGas.vue
+++ b/src/components/table/components/WasteGas.vue
@@ -5,15 +5,25 @@
:data="tableData"
:header-cell-style="tableHeaderColor"
:cell-style="rowClass"
+ @cell-click="handle"
>
<el-table-column
width="30px"
label=""
>
- <template>
- <i class="el-icon-caret-right"></i>
- <span style="margin-left: 10px"></span>
- </template>
+ <template slot-scope="{row,$index}">
+ <!-- <i class="el-icon-caret-right" v-if="$index ===1"></i>-->
+ <el-popover
+ placement="bottom"
+ trigger="click"
+ :disabled="!isShowIcon"
+ 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="搴忓彿"
@@ -24,6 +34,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 +86,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 +118,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,10 +137,20 @@
</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 {
+ isActive: '',
+ isShowIcon: false,
tableData: [{
UserName: '闆嗗洟鍚嶇О',
WasteWaters: '',
@@ -154,17 +203,37 @@
}
},
methods: {
- tableHeaderColor ({ row, column, owIndex, columnIndex }) {
+ tableHeaderColor ({ 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'
+ },
+ // 鑾峰彇鐐瑰嚮鐨勮〃鏍�
+ handle (row, column, event, cell) {
+ console.log(row.UserName)
+ },
+ doIcon (index) {
+ if (index !== 1) {
+ this.isShowIcon = false
+ this.isActive = ''
+ return
+ }
+ this.isShowIcon = !this.isShowIcon
+ if (index === this.isActive) {
+ this.isActive = ''
+ return
+ }
+ this.isActive = index
}
}
}
</script>
<style scoped>
-
+.active {
+ /*color: red;*/
+ transform:rotate(90deg);
+}
</style>
--
Gitblit v1.8.0