From 39d91d2b2042e86a45c8b56b53f35d4a8b53b365 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Dec 2024 13:09:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/views/space/components/leftContainer.vue | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/src/views/space/components/leftContainer.vue b/src/views/space/components/leftContainer.vue
index bbf0452..23fa5d6 100644
--- a/src/views/space/components/leftContainer.vue
+++ b/src/views/space/components/leftContainer.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-10 15:27:59
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-18 16:10:10
+ * @LastEditTime: 2024-11-28 11:35:07
* @FilePath: \bigScreen\src\views\space\components\leftContainer.vue
* @Description:
*
@@ -19,6 +19,16 @@
const gawList = ref([
{
+ label: '污水管网',
+ value: "3-3-2",
+ select: true
+ },
+ {
+ label: '雨水管网',
+ value: "3-3-4",
+ select: false
+ },
+ {
label: '给水管网',
value: "3-3-1",
select: false
@@ -28,16 +38,7 @@
value: "3-3-3",
select: false
},
- {
- label: '污水管网',
- value: "3-3-2",
- select: true
- },
- {
- label: '雨水管网',
- value: "3-3-4",
- select: true
- },
+
])
const curSelect = ref('')
@@ -47,7 +48,7 @@
code: code,
}
getDictionary(param).then((res) => {
- resData.data = res.data.data.map(item => {
+ resData.data = res.data.data.filter(i => i.dictKey != 7 && i.dictKey != 9 && i.dictKey != 11).map(item => {
return {
label: item.dictValue,
value: item.dictKey
@@ -59,21 +60,28 @@
}
const tabClick = (item) => {
- console.log('tabClick', item)
+ EventBus.emit('destroyPop', 'destroyPop')
if (curSelect.value) {
if (curSelect.value == '3') {
+ EventBus.emit('restHandleDelChange', `3-3`)
EventBus.emit('restHandleDelChange', `3-3-1`)
EventBus.emit('restHandleDelChange', `3-3-2`)
EventBus.emit('restHandleDelChange', `3-3-3`)
EventBus.emit('restHandleDelChange', `3-3-4`)
} else {
+ gawList.value.forEach(element => {
+ if (element.value == `3-3-2`) {
+ element.select = true
+ } else {
+ element.select = false
+ }
+ });
EventBus.emit('restHandleDelChange', `3-${curSelect.value}`)
}
}
curSelect.value = item.value
if (item.value == '3') {
EventBus.emit('restHandleCheckChange', `3-3-2`)
- EventBus.emit('restHandleCheckChange', `3-3-4`)
} else {
EventBus.emit('restHandleCheckChange', `3-${item.value}`)
}
@@ -122,8 +130,8 @@
</div>
</div>
<div v-if="curSelect == '3'">
- <div class="left-container cur-container-title">
- <div class="tablist h100">
+ <div class="cur-container-title">
+ <div class="tablist">
<div class="cursor-p" :class="{ on: item.select }" v-for="item, index in gawList" :key="index"
@click="tabClickGW(item)">
<div class="label-box">
@@ -139,7 +147,7 @@
<style lang="scss" scoped>
.left-container {
- width: 64px;
+ width: auto;
}
.cur-container {
@@ -156,12 +164,13 @@
margin-top: 10px;
padding: 8px;
width: 64px;
- height: 64px;
+ height: 48px;
border-radius: 50%;
box-shadow: inset 0 0 40px #409eff;
color: #fff;
box-sizing: content-box;
+ font-size: 12px;
&.on {
position: relative;
@@ -170,7 +179,8 @@
}
.label-box {
- line-height: 24px;
+ padding: 8px;
+ line-height: 20px;
text-align: center;
}
}
@@ -182,7 +192,6 @@
pointer-events: none;
margin-left: 120px;
margin-top: 60px;
- font-size: 12px;
.tablist {
pointer-events: all;
@@ -193,13 +202,14 @@
justify-content: center;
margin-top: 10px;
padding: 8px;
- width: 54px;
- height: 54px;
+ width: 64px;
+ height: 48px;
+ color: #fff;
border-radius: 50%;
box-shadow: inset 0 0 40px #409eff;
- color: #fff;
box-sizing: content-box;
+ font-size: 12px;
&.on {
position: relative;
@@ -208,7 +218,8 @@
}
.label-box {
- line-height: 14px;
+ padding: 8px;
+ line-height: 16px;
text-align: center;
}
}
--
Gitblit v1.9.3