diff --git a/src/components/LeftDrawer/index.vue b/src/components/LeftDrawer/index.vue
index 784d83e..f217762 100644
--- a/src/components/LeftDrawer/index.vue
+++ b/src/components/LeftDrawer/index.vue
@@ -38,7 +38,9 @@ const close = () => {
-
+
+
+
@@ -57,6 +59,7 @@ const close = () => {
height: calc(100% - 50px);
}
.close-icon {
+ z-index: 200;
position: fixed;
top: 20px;
right: 20px;
diff --git a/src/main.js b/src/main.js
index 8fb9136..860014f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -55,7 +55,6 @@ import VueAMap, {initAMapApiLoader} from '@vuemap/vue-amap';
// import VueAMapExtra from '@vuemap/vue-amap-extra';
import '@vuemap/vue-amap/dist/style.css'
// collapse
-import { ElCollapseTransition } from 'element-plus'
const app = createApp(App)
initAMapApiLoader({
key: '62c3411d6528d67db00ad510a7ee5fb9',
@@ -87,7 +86,6 @@ app.component('RightToolbar', RightToolbar)
app.component('Editor', Editor)
app.component('LeftDrawer', LeftDrawer)
app.component('titleDivider', titleDivider)
-app.component(ElCollapseTransition.name, ElCollapseTransition)
app.use(VueAMap)
app.use(router)
app.use(store)
diff --git a/src/views/system/base/massifForm.vue b/src/views/system/base/massifForm.vue
index e9f9c20..f4f47a3 100644
--- a/src/views/system/base/massifForm.vue
+++ b/src/views/system/base/massifForm.vue
@@ -26,6 +26,8 @@ const selectOptions = reactive({
{label: '其他', value: 9},
]
})
+let emit = defineEmits(['beforeSubmit','submitSuccess']);
+const loading = ref(false)
const showDrawer = ref(false)
const formData = ref({})
const resetForm = (params) => {
@@ -35,7 +37,6 @@ const resetForm = (params) => {
{},
{},
{},
- {},
],
// 坐标上传方式
coordinateType: 1,
@@ -93,6 +94,15 @@ const uploadJson = (file) => {
}
}
}
+const saveMassif = () => {
+ emit('beforeSubmit', formData.value)
+ loading.value = true
+ setTimeout(() => {
+ loading.value = false
+ emit('submitSuccess')
+ showDrawer.value = false
+ },2000)
+}
defineExpose({
toAdd
})
@@ -193,17 +203,17 @@ defineExpose({
-
+
-
+
-
+
@@ -223,8 +233,11 @@ defineExpose({
-
+