From 38fea8139670d34cedea336fbd1ba34fc92bcf02 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 22 四月 2021 21:34:59 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/components/SoilGroundwater.vue | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/components/BaseNav/SoilGroundwater/ReportTable.vue b/src/components/table/components/SoilGroundwater.vue
similarity index 72%
rename from src/components/BaseNav/SoilGroundwater/ReportTable.vue
rename to src/components/table/components/SoilGroundwater.vue
index a395b17..cad6f79 100644
--- a/src/components/BaseNav/SoilGroundwater/ReportTable.vue
+++ b/src/components/table/components/SoilGroundwater.vue
@@ -4,7 +4,7 @@
<el-table-column width="30px" label="">
<template slot-scope="{row,$index}">
<el-popover placement="bottom" trigger="click" :disabled="!isShowIcon" popper-class="popovers">
- <!-- <ChemicalWastewater v-show="$index ===1"></ChemicalWastewater> -->
+ <ChemicalWastewater v-show="$index ===1"></ChemicalWastewater>
<i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
</el-popover>
</template>
@@ -23,8 +23,8 @@
</div>
<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="鐩戞祴鐐规槑缁嗚〃">
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="涓�绾ч闄╁湴鍧�">
+ <refinery :tableHeader="tableHeader1" :tableContent="tableContent1" ></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</el-popover>
</template>
@@ -35,8 +35,8 @@
</div>
<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="鐩戞祴鐐规槑缁嗚〃">
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="浜岀骇椋庨櫓鍦板潡">
+ <refinery :tableHeader="tableHeader1" :tableContent="tableContent1"></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</el-popover>
</template>
@@ -47,8 +47,8 @@
</div>
<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="鐩戞祴鐐规槑缁嗚〃">
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="涓夌骇椋庨櫓鍦板潡">
+ <refinery :tableHeader="tableHeader1" :tableContent="tableContent1"></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</el-popover>
</template>
@@ -59,8 +59,8 @@
</div>
<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="鐩戞祴鐐规槑缁嗚〃">
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="鍦熷￥閲囨牱鐐�">
+ <refinery :tableHeader="tableHeader2" :tableContent="tableContent1"></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</el-popover>
</template>
@@ -71,8 +71,8 @@
</div>
<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="鐩戞祴鐐规槑缁嗚〃">
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="鍦颁笅姘撮噰鏍风偣">
+ <refinery :tableHeader="tableHeader2" :tableContent="tableContent1"></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</el-popover>
</template>
@@ -144,7 +144,25 @@
StopProduction: '2',
deficiency: '2'
- }]
+ }],
+ tableHeader1: [
+ { name: '浼佷笟鍚嶇О', width: '140', propS: 'value1' },
+ { name: '鍦板潡鍚嶇О', width: '140', propS: 'value2' },
+ { name: '鍦板潡淇℃伅', width: '140', propS: 'value3' },
+ { name: '鍦颁笅姘达紙涓級', width: '140', propS: 'value4' },
+ { name: '鍦熷￥锛堜釜锛�', width: '140', propS: 'value5' }
+ ],
+ tableHeader2: [
+ { name: '鍦熷￥鍚嶇О', width: '140', propS: 'value1' },
+ { name: 'PH', width: '80', propS: 'value2' },
+ { name: '鍏环鏍�', width: '100', propS: 'value3' },
+ { name: '閾�', width: '100', propS: 'value4' },
+ { name: '姹�', width: '100', propS: 'value5' }
+ ],
+ tableContent1: [
+ { value1: '1', value2: '2', value3: '3', value4: '4', value5: '5' },
+ { value1: '1', value2: '2', value3: '3', value4: '4', value5: '5' }
+ ]
}
},
methods: {
--
Gitblit v1.8.0