From 144413041acb7bef97a7946df8a52655b2226765 Mon Sep 17 00:00:00 2001
From: Mrtangl <1807746833@qq.com>
Date: Mon, 27 Jun 2022 12:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/layout-aside/sub-menu.vue      | 94 +++++++++----------
 admin/src/views/organize/department/edit.vue  |  2 +
 admin/src/views/organize/department/index.vue |  2 +
 admin/src/views/organize/post/edit.vue        |  3 +-
 admin/src/views/organize/post/index.vue       |  2 +
 5 files changed, 55 insertions(+), 48 deletions(-)

diff --git a/admin/src/layout/components/layout-aside/sub-menu.vue b/admin/src/layout/components/layout-aside/sub-menu.vue
index 45838daa..0127b226 100644
--- a/admin/src/layout/components/layout-aside/sub-menu.vue
+++ b/admin/src/layout/components/layout-aside/sub-menu.vue
@@ -18,7 +18,7 @@
             v-else
             :to="{
                 path: path,
-                query: resolveQuery
+                query: resolveQuery,
             }"
         >
             <el-menu-item :index="path">
@@ -30,55 +30,55 @@
 </template>
 
 <script lang="ts">
-import { queryToObject } from '@/utils/util'
-import { isQuery } from '@/utils/validate'
-import { computed, defineComponent, toRefs } from 'vue'
-import { RouteRecordRaw } from 'vue-router'
-export default defineComponent({
-    components: {},
-    props: {
-        route: {
-            type: Object,
-            default: () => ({})
+    import { queryToObject } from '@/utils/util'
+    import { isQuery } from '@/utils/validate'
+    import { computed, defineComponent, toRefs } from 'vue'
+    import { RouteRecordRaw } from 'vue-router'
+    export default defineComponent({
+        components: {},
+        props: {
+            route: {
+                type: Object,
+                default: () => ({}),
+            },
+            path: {
+                type: String,
+            },
         },
-        path: {
-            type: String
-        }
-    },
-    setup(props) {
-        const { path, route } = toRefs(props)
-        // 是否有子路由
-        const hasChildren = computed(() => {
-            const children: RouteRecordRaw[] = route.value.children ?? []
-            return !!children.filter(item => !item.meta?.hidden).length
-        })
-        // 解析路径，后台上传的并非完整路径
-        const resolvePath = computed(() => (p?: string) => {
-            return p !== undefined ? `${path.value}/${p}` : path.value
-        })
-        // 解析参数'{id:1}'|| id=1 => {id: 1}
-        const resolveQuery = computed(() => {
-            const query = route.value.query
-            try {
-                if (isQuery(query)) {
-                    return queryToObject(query)
-                } else {
-                    return JSON.parse(query)
-                }
-            } catch (error) {}
-        })
+        setup(props) {
+            const { path, route } = toRefs(props)
+            // 是否有子路由
+            const hasChildren = computed(() => {
+                const children: RouteRecordRaw[] = route.value.children ?? []
+                return !!children.filter((item) => !item.meta?.hidden).length
+            })
+            // 解析路径，后台上传的并非完整路径
+            const resolvePath = computed(() => (p?: string) => {
+                return p !== undefined ? `${path.value}/${p}` : path.value
+            })
+            // 解析参数'{id:1}'|| id=1 => {id: 1}
+            const resolveQuery = computed(() => {
+                const query = route.value.query
+                try {
+                    if (isQuery(query)) {
+                        return queryToObject(query)
+                    } else {
+                        return JSON.parse(query)
+                    }
+                } catch (error) {}
+            })
 
-        return {
-            hasChildren,
-            resolvePath,
-            resolveQuery
-        }
-    }
-})
+            return {
+                hasChildren,
+                resolvePath,
+                resolveQuery,
+            }
+        },
+    })
 </script>
 
 <style lang="scss" scoped>
-.iconfont {
-    font-size: 26px;
-}
+    .iconfont {
+        font-size: 18px;
+    }
 </style>
diff --git a/admin/src/views/organize/department/edit.vue b/admin/src/views/organize/department/edit.vue
index eaec9b8e..f639bfc6 100644
--- a/admin/src/views/organize/department/edit.vue
+++ b/admin/src/views/organize/department/edit.vue
@@ -70,6 +70,7 @@
     import { ElForm } from 'element-plus'
     import { useAdmin } from '@/core/hooks/app'
     import FooterBtns from '@/components/footer-btns/index.vue'
+    import { ElMessage } from 'element-plus'
     import { apiDeptAdd, apiDeptEdit, apiDeptDetail, apiDeptLists } from '@/api/organize'
 
     const { router, route } = useAdmin()
@@ -169,6 +170,7 @@
                 : apiDeptAdd(formData.value)
             promise.then(() => {
                 setTimeout(() => router.go(-1), 500)
+                ElMessage({ type: 'success', message: '保存成功' })
             })
         })
     }
diff --git a/admin/src/views/organize/department/index.vue b/admin/src/views/organize/department/index.vue
index db664f11..d6b904f6 100644
--- a/admin/src/views/organize/department/index.vue
+++ b/admin/src/views/organize/department/index.vue
@@ -77,6 +77,7 @@
     import Popup from '@/components/popup/index.vue'
     import { flatten } from '@/utils/util'
     import { apiDeptLists, apiDeptDelete } from '@/api/organize'
+    import { ElMessage } from 'element-plus'
 
     // 表单数据
     const formData = reactive({
@@ -108,6 +109,7 @@
     const handleDelete = (id: number) => {
         apiDeptDelete({ id }).then(() => {
             getDeptLists()
+            ElMessage({ type: 'success', message: '删除成功' })
         })
     }
 
diff --git a/admin/src/views/organize/post/edit.vue b/admin/src/views/organize/post/edit.vue
index 2ddd0d25..cd23d91d 100644
--- a/admin/src/views/organize/post/edit.vue
+++ b/admin/src/views/organize/post/edit.vue
@@ -56,7 +56,7 @@
     import { computed, defineComponent, onMounted, reactive, Ref, ref, toRefs } from 'vue'
     import FooterBtns from '@/components/footer-btns/index.vue'
     import { apiPostAdd, apiPostEdit, apiPostDetail } from '@/api/organize'
-    import { ElForm } from 'element-plus'
+    import { ElForm, ElMessage } from 'element-plus'
     import { useAdmin } from '@/core/hooks/app'
 
     const { router, route } = useAdmin()
@@ -119,6 +119,7 @@
                 : apiPostAdd(formData.value)
             promise.then(() => {
                 setTimeout(() => router.go(-1), 500)
+                ElMessage({ type: 'success', message: '保存成功' })
             })
         })
     }
diff --git a/admin/src/views/organize/post/index.vue b/admin/src/views/organize/post/index.vue
index 514b44f2..290163d4 100644
--- a/admin/src/views/organize/post/index.vue
+++ b/admin/src/views/organize/post/index.vue
@@ -80,6 +80,7 @@
     import Popup from '@/components/popup/index.vue'
     import { usePages } from '@/core/hooks/pages'
     import { apiPostLists, apiPostDelete } from '@/api/organize'
+    import { ElMessage } from 'element-plus'
 
     // 表单数据
     const formData = reactive({
@@ -100,6 +101,7 @@
             id,
         }).then(() => {
             requestApi()
+            ElMessage({ type: 'success', message: '删除成功' })
         })
     }