From dda03a03f4bc75effc51e1e33d2322eca3770f4a Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Wed, 25 Oct 2023 18:52:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=9C=B0=E5=8C=BA?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=9C=B0=E5=9B=BE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
src/components/AMapComponent/index.vue | 5 +-
src/views/init-home/data/baseMenu.ts | 8 +-
src/views/system/Region/MapTool/map.vue | 293 +++++++++++++++++++++++-
src/views/system/Region/index.vue | 3 +-
yarn.lock | 8 +-
6 files changed, 303 insertions(+), 16 deletions(-)
diff --git a/package.json b/package.json
index d6fd157d..9a3707ab 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
"event-source-polyfill": "^1.0.31",
"global": "^4.4.0",
"jetlinks-store": "^0.0.3",
- "jetlinks-ui-components": "^1.0.34-2",
+ "jetlinks-ui-components": "^1.0.34-3",
"js-cookie": "^3.0.1",
"jsencrypt": "^3.3.2",
"less": "^4.1.3",
diff --git a/src/components/AMapComponent/index.vue b/src/components/AMapComponent/index.vue
index 6dec0ed4..8de55a2e 100644
--- a/src/components/AMapComponent/index.vue
+++ b/src/components/AMapComponent/index.vue
@@ -22,6 +22,8 @@ import '@vuemap/vue-amap/dist/style.css';
import { getAMapUiPromise } from './utils';
import { useSystem } from '@/store/system';
+const emit = defineEmits('init')
+
const system = useSystem();
interface AMapProps {
style?: CSSProperties;
@@ -65,8 +67,9 @@ const initMap = (e: any) => {
if (isOpenUi.value) {
getAMapUI();
}
+ emit('init', e)
};
\ No newline at end of file
+
diff --git a/src/views/init-home/data/baseMenu.ts b/src/views/init-home/data/baseMenu.ts
index 0ef0cc04..e4cdbae8 100644
--- a/src/views/init-home/data/baseMenu.ts
+++ b/src/views/init-home/data/baseMenu.ts
@@ -4132,7 +4132,7 @@ export default [
sortIndex: 12,
url: '/system/region',
icon: 'FormOutlined',
- showPage: ['region'],
+ showPage: ['area'],
permissions: [],
buttons: [
{
@@ -4140,7 +4140,7 @@ export default [
name: "新增",
permissions: [
{
- permission: "region",
+ permission: "area",
actions: [
"save"
]
@@ -4152,7 +4152,7 @@ export default [
name: "删除",
permissions: [
{
- permission: "region",
+ permission: "area",
actions: [
"delete"
]
@@ -4164,7 +4164,7 @@ export default [
name: "编辑",
permissions: [
{
- permission: "region",
+ permission: "area",
actions: [
"save"
]
diff --git a/src/views/system/Region/MapTool/map.vue b/src/views/system/Region/MapTool/map.vue
index 13a496d1..86f53450 100644
--- a/src/views/system/Region/MapTool/map.vue
+++ b/src/views/system/Region/MapTool/map.vue
@@ -1,7 +1,99 @@
-