From 5208bc41f03abb828987d9193be6a809a64e52ac Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 15 四月 2021 09:41:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/components/SolidWaste.vue | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/components/table/components/SolidWaste.vue b/src/components/table/components/SolidWaste.vue
index ae00c44..8d635dd 100644
--- a/src/components/table/components/SolidWaste.vue
+++ b/src/components/table/components/SolidWaste.vue
@@ -20,7 +20,8 @@
: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-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>
@@ -29,9 +30,9 @@
</el-table-column>
<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>
+ <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>
@@ -46,7 +47,7 @@
<el-table-column label="鎺掓斁鍙ｆ娴嬬粺璁＄姸鎬�">
<el-table-column prop="normal" label="姝ｅ父" width="60px">
<template slot-scope="{row,$index}">
- <u v-if="$index!=2" >{{row.normal}}</u>
+ <u v-if="$index!=2">{{ row.normal }}</u>
<el-popover v-else
placement="bottom-end"
width="200"
@@ -55,7 +56,7 @@
title="鐩戞祴鐐规槑缁嗚〃"
>
<refinery></refinery>
- <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
+ <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>-->
<!-- <i v-else class="el-icon-caret-right" slot="reference" @click="isbtn"></i>-->
@@ -67,7 +68,7 @@
<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>
+ <u v-if="$index!=1">{{ row.deficiency }}</u>
<el-popover v-else
placement="bottom-end"
width="200"
@@ -76,7 +77,7 @@
popper-class="popovers"
>
<MissingAlarm></MissingAlarm>
- <u slot="reference" style="color: #00ffff">{{row.deficiency}}</u>
+ <u slot="reference" style="color: #00ffff">{{ row.deficiency }}</u>
</el-popover>
</template>
</el-table-column>
@@ -92,6 +93,7 @@
import ChemicalWastewater from './componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
import MissingAlarm from '@components/table/components/componented/MissingAlarm'
+
export default {
name: 'SolidWaste',
components: {
@@ -155,11 +157,16 @@
}
},
methods: {
- tableHeaderColor ({ row, column, owIndex, columnIndex }) {
+ 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 () {
+ rowClass () {
// return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
},
// 鑾峰彇鐐瑰嚮鐨勮〃鏍�
@@ -183,17 +190,19 @@
}
</script>
-<style scoped>
-.popovers{
+<style lang="less" scoped>
+.popovers {
width: auto !important;
background-color: gray !important;
}
-.popovers.el-popover{
- padding:0;
+
+.popovers.el-popover {
+ padding: 0;
}
+
.active {
/*color: red;*/
- transform:rotate(90deg);
+ transform: rotate(90deg);
}
</style>
--
Gitblit v1.8.0