From ac41dd3a9b8632c9cbda389012a85de87135ed47 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 22 四月 2021 14:56:42 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/components/WasteSolid.vue | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/components/table/components/WasteSolid.vue b/src/components/table/components/WasteSolid.vue
index ee4dbb4..4b24e07 100644
--- a/src/components/table/components/WasteSolid.vue
+++ b/src/components/table/components/WasteSolid.vue
@@ -35,26 +35,25 @@
<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 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="WasteWaters" width="100px">
+ <div slot="header">
+ <span>澶栨帓搴熸按閲�</span>
+ <div>锛坢鲁锛�</div>
+ </div>
</el-table-column>
- <el-table-column label="姘ㄦ爱 (t)">
- <el-table-column prop="NH4NPut" label="绱浜х敓閲�"></el-table-column>
- <el-table-column prop="NH4NMonth" label="褰撴湀鐢熶骇閲�"></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>
+ <el-table-column label="姘ㄦ爱 (浜х敓閲�/t)">
+ <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">
<template slot-scope="{row,$index}">
<u v-if="$index!=2">{{ row.normal }}</u>
- <el-popover v-else
- placement="bottom-end"
- width="200"
- trigger="click"
- popper-class="popovers"
- title="鐩戞祴鐐规槑缁嗚〃"
- >
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="鐩戞祴鐐规槑缁嗚〃">
<refinery></refinery>
<u slot="reference" style="color: #00ffff">{{ row.normal }}</u>
<!-- <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
@@ -69,13 +68,7 @@
<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
- placement="bottom-end"
- width="200"
- trigger="click"
- title="澶╂触鐭冲寲鐩戞祴鐐圭己澶辨姤璀︽槑缁�"
- popper-class="popovers"
- >
+ <el-popover v-else placement="bottom-end" trigger="click" title="澶╂触鐭冲寲鐩戞祴鐐圭己澶辨姤璀︽槑缁�" popper-class="popovers">
<MissingAlarm></MissingAlarm>
<u slot="reference" style="color: #00ffff">{{ row.deficiency }}</u>
</el-popover>
--
Gitblit v1.8.0