From 0b91314e2af52c3218db74cd2bdbb53a711116bd Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 18 三月 2021 16:29:01 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into master
---
src/components/plugin/MeaSure.js | 2 ++
src/components/table/summarySheets.vue | 2 +-
src/components/panel/ToolBoxPanel.vue | 1 +
src/components/table/components/WasteWater.vue | 29 ++++++++++++++---------------
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index dc129a3..92b018e 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -393,6 +393,7 @@
},
changeSelectMouse () {
this.selectGroup = true
+ this.checked = false
}
}
}
diff --git a/src/components/plugin/MeaSure.js b/src/components/plugin/MeaSure.js
index b1e4508..ce67a00 100644
--- a/src/components/plugin/MeaSure.js
+++ b/src/components/plugin/MeaSure.js
@@ -150,10 +150,12 @@
}
const startMeasureArea = function (map, L) {
+ areaMeasure.destory()
areaMeasure.init(map, L)
}
const startMeasureLen = function (map, L) {
+ distanceMeasure.destory()
distanceMeasure.init(map, L)
}
diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index 8cbdc0e..0d88a05 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" slot="reference" v-if="!isShowIcon" @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,6 @@
},
data () {
return {
- show: false,
isShowIcon: false,
tableData: [{
UserName: '闆嗗洟鍚嶇О',
@@ -214,9 +210,12 @@
handle (row, column, event, cell) {
console.log(row.UserName)
},
- doIcon () {
- console.log(1)
- this.isShowIcon = !this.isShowIcon
+ doIcon (index) {
+ if (index === 1) {
+ this.isShowIcon = !this.isShowIcon
+ } else {
+ this.isShowIcon = false
+ }
}
}
}
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 8e04c11..71f404e 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -38,7 +38,7 @@
left: 1px;
/*width: 850px;*/
/*height: 265px;*/
- z-index:2000;
+ z-index:500;
/*color: #fff;*/
.el-icon-c-scale-to-original {
width: 30px;
--
Gitblit v1.8.0