From d838248f54e3bcacf9c2a54f7dc692525af3c051 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 10:04:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/components/WasteWater.vue | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index 3291fb1..c8ad3dd 100644
--- a/src/components/table/components/WasteWater.vue
+++ b/src/components/table/components/WasteWater.vue
@@ -3,9 +3,6 @@
<el-table
class="tableBox"
:data="tableData"
- style="width: 100%"
- :header-cell-style="tableHeaderColor"
- :cell-style="rowClass"
@cell-click="handle"
>
<el-table-column
@@ -41,11 +38,7 @@
<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鲁锛�"></el-table-column>
<el-table-column label="COD (t)">
<el-table-column
prop="AddOutPut"
@@ -82,7 +75,7 @@
width="200"
trigger="click"
popper-class="popovers"
- title="XXX1鏄庣粏琛�"
+ title="鐩戞祴鐐规槑缁嗚〃"
>
<refinery></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
@@ -201,11 +194,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) {
@@ -228,17 +221,6 @@
}
</script>
-<style scoped>
-.popovers{
- width: auto !important;
- background-color: gray !important;
-}
-.popovers.el-popover{
-padding:0;
-}
-.active {
- /*color: red;*/
- transform:rotate(90deg);
-}
+<style>
</style>
--
Gitblit v1.8.0