From f7ba8b6aab4a763feee8938e93c97079b52baf1d Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 30 三月 2021 12:30:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/components/WasteWater.vue | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index 8cbdc0e..3291fb1 100644
--- a/src/components/table/components/WasteWater.vue
+++ b/src/components/table/components/WasteWater.vue
@@ -12,21 +12,18 @@
width="30px"
label=""
>
- <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></ChemicalWastewater>
- <i class="el-icon-caret-right" slot="reference" v-if="!isShowIcon" @click="doIcon"></i>
-<!-- <i class="el-icon-caret-bottom" slot="reference" v-else-if="isShowIcon&&$index===1"></i>-->
-<!-- <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>-->
- </el-popover>
-<!-- <i class="el-icon-caret-right" v-if="!isShowIcon"></i>-->
-<!-- <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
+ <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
@@ -43,7 +40,7 @@
<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>v-
+ </el-table-column>
<el-table-column
prop="WasteWaters"
label="澶栨帓搴熸按閲忥紙m鲁锛�"
@@ -149,7 +146,7 @@
},
data () {
return {
- show: false,
+ isActive: '',
isShowIcon: false,
tableData: [{
UserName: '闆嗗洟鍚嶇О',
@@ -214,9 +211,18 @@
handle (row, column, event, cell) {
console.log(row.UserName)
},
- doIcon () {
- console.log(1)
+ 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
}
}
}
@@ -230,5 +236,9 @@
.popovers.el-popover{
padding:0;
}
+.active {
+ /*color: red;*/
+ transform:rotate(90deg);
+}
</style>
--
Gitblit v1.8.0