From 510599c58f6c61cafb8e80a260352285ee2108af Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 25 Nov 2024 16:39:42 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/api/firmInfo/firmInfo.js | 9 +++++++++
src/views/pac/components/box/dataContent.vue | 19 +++++++++++++------
src/pages/layout/components/scomponents/layersControl.vue | 17 ++++++++++++++++-
public/img/mapicon/gouqu.png | 0
public/img/mapicon/wsclc.png | 0
5 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/public/img/mapicon/gouqu.png b/public/img/mapicon/gouqu.png
new file mode 100644
index 0000000..fa78de5
--- /dev/null
+++ b/public/img/mapicon/gouqu.png
Binary files differ
diff --git a/public/img/mapicon/wsclc.png b/public/img/mapicon/wsclc.png
new file mode 100644
index 0000000..4266bb6
--- /dev/null
+++ b/public/img/mapicon/wsclc.png
Binary files differ
diff --git a/src/api/firmInfo/firmInfo.js b/src/api/firmInfo/firmInfo.js
index bbaa0c3..0577614 100644
--- a/src/api/firmInfo/firmInfo.js
+++ b/src/api/firmInfo/firmInfo.js
@@ -17,4 +17,13 @@
method: 'get',
params,
})
+}
+
+export const getPage = (params) => {
+ const url = `/yw/firmInfo/page`
+ return request({
+ url,
+ method: 'get',
+ params,
+ })
}
\ No newline at end of file
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 4edbde1..1119ba9 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/components/scomponents/layersControl.vue
@@ -59,6 +59,7 @@
})
import panorama from './popup/panorama.vue'
import { getPage } from '@/api/indParkInfo'
+import { getPage as getfirmPage } from '@/api/firmInfo/firmInfo'
import { getList, getGouQu } from "@/api/space/space"
import { getList as getRiskList } from "@/api/riskSource/riskSource"
import { getPanoramaList } from "@/api/panorama/"
@@ -441,10 +442,24 @@
params: {
type: 8,
},
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/xfs.png',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/gouqu.png',
className: 'xfs-box',
showPanel: false,
layerName: 'gouqu'
+ },
+ {
+ id: '3-9',
+ label: '废水处理站',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getfirmPage,
+ params: {
+ name: '吉水县绿源污水处理厂',
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsclc.png',
+ className: 'xfs-box',
+ showPanel: false,
+ layerName: 'fsclz'
}
]
},
diff --git a/src/views/pac/components/box/dataContent.vue b/src/views/pac/components/box/dataContent.vue
index e61c21b..1427785 100644
--- a/src/views/pac/components/box/dataContent.vue
+++ b/src/views/pac/components/box/dataContent.vue
@@ -126,17 +126,24 @@
}
})
- if (row.type == 2 || row.type == 3) {
+ if (row.type == 2) {
EventBus.emit('restHandleCheckChange', `3-3-2`)
EventBus.emit('restHandleCheckChange', `3-3-4`)
- if (row.type == 3) {
- EventBus.emit('restHandleCheckChange', `3-8`)
- } else {
- EventBus.emit('restHandleDelChange', `3-8`)
- }
+ EventBus.emit('restHandleCheckChange', `3-9`)
} else {
EventBus.emit('restHandleDelChange', `3-3-2`)
EventBus.emit('restHandleDelChange', `3-3-4`)
+ EventBus.emit('restHandleDelChange', `3-9`)
+ }
+
+ if (row.type == 3) {
+ EventBus.emit('restHandleCheckChange', `3-3-2`)
+ EventBus.emit('restHandleCheckChange', `3-3-4`)
+ EventBus.emit('restHandleCheckChange', `3-8`)
+ } else {
+ EventBus.emit('restHandleDelChange', `3-3-2`)
+ EventBus.emit('restHandleDelChange', `3-3-4`)
+ EventBus.emit('restHandleDelChange', `3-8`)
}
}
--
Gitblit v1.9.3