From 5b42718d6fb7890d34cf614d3bb54705d2bbdf96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Fri, 5 Jan 2024 14:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/systerm.ts                            | 11 +++
 src/components/table/header/index.vue         |  2 +-
 .../admin/components/navBar/classic.vue       | 29 ++++++--
 src/layouts/admin/components/navMenus.vue     |  4 +-
 src/layouts/admin/index.vue                   |  6 +-
 src/utils/router.ts                           |  3 +-
 src/views/auth/menu/index.vue                 |  7 +-
 src/views/auth/menu/popupForm.vue             | 68 ++++++++++---------
 vite.config.ts                                |  9 +--
 9 files changed, 83 insertions(+), 56 deletions(-)
 create mode 100644 src/api/systerm.ts

diff --git a/src/api/systerm.ts b/src/api/systerm.ts
new file mode 100644
index 0000000..58e3fd1
--- /dev/null
+++ b/src/api/systerm.ts
@@ -0,0 +1,11 @@
+import createAxios from '@/utils/request'
+
+// 菜单修改
+export function updateMenu(params:anyObj) {
+    return createAxios({
+        url: '/user-boot/function/update',
+        method: 'PUT',
+        data:params
+    })
+}
+
diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index acce12d..60aa15b 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -148,7 +148,7 @@ const dateChange = () => {
     font-size: 14px;
 }
 
-.table-com-search-form{
+.table-com-search-form {
     display: grid;
     grid-gap: 20px;
     grid-template-columns: repeat(5, 1fr);
diff --git a/src/layouts/admin/components/navBar/classic.vue b/src/layouts/admin/components/navBar/classic.vue
index 94e185b..6a8933d 100644
--- a/src/layouts/admin/components/navBar/classic.vue
+++ b/src/layouts/admin/components/navBar/classic.vue
@@ -1,14 +1,15 @@
 <template>
-    <div class="nav-bar">
-        <div v-if="config.layout.shrink && config.layout.menuCollapse" class="unfold">
-            <Icon @click="onMenuCollapse" name="fa fa-indent" :color="config.getColorVal('menuActiveColor')" size="18" />
+    <div class='nav-bar'>
+        <div v-if='config.layout.shrink && config.layout.menuCollapse' class='unfold'>
+            <Icon @click='onMenuCollapse' name='fa fa-indent' :color="config.getColorVal('menuActiveColor')"
+                  size='18' />
         </div>
-        <span style='color: #FFF;font-size: 24px;margin-left: 10px;font-weight: 700'>电能质量数据监测云平台</span>
+        <span class='nav-bar-title'>电能质量数据监测云平台</span>
         <NavMenus />
     </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang='ts'>
 import { useConfig } from '@/stores/config'
 import NavTabs from '@/layouts/admin/components/navBar/tabs.vue'
 import NavMenus from '../navMenus.vue'
@@ -24,17 +25,26 @@ const onMenuCollapse = () => {
 }
 </script>
 
-<style scoped lang="scss">
+<style scoped lang='scss'>
 .nav-bar {
     display: flex;
     align-items: center;
     height: 60px;
     width: 100%;
     background-color: v-bind('config.getColorVal("headerBarBackground")');
+
+    .nav-bar-title {
+        color: v-bind('config.getColorVal("headerBarTabColor")');
+        font-size: 24px;
+        margin-left: 10px;
+        font-weight: 700
+    }
+
     :deep(.nav-tabs) {
         display: flex;
         height: 100%;
         position: relative;
+
         .ba-nav-tab {
             display: flex;
             align-items: center;
@@ -47,25 +57,31 @@ const onMenuCollapse = () => {
             color: v-bind('config.getColorVal("headerBarTabColor")');
             transition: all 0.2s;
             -webkit-transition: all 0.2s;
+
             .close-icon {
                 padding: 2px;
                 margin: 2px 0 0 4px;
                 color: v-bind('config.getColorVal("headerBarTabColor")') !important;
             }
+
             &.active {
                 color: v-bind('config.getColorVal("headerBarTabActiveColor")');
+
                 .close-icon {
                     color: v-bind('config.getColorVal("headerBarTabActiveColor")') !important;;
                 }
             }
+
             &:hover {
                 color: v-bind('config.getColorVal("headerBarTabActiveColor")');
                 background-color: v-bind('config.getColorVal("headerBarHoverBackground")');
+
                 .close-icon {
                     color: v-bind('config.getColorVal("headerBarTabActiveColor")') !important;;
                 }
             }
         }
+
         .nav-tabs-active-box {
             position: absolute;
             height: 50px;
@@ -75,6 +91,7 @@ const onMenuCollapse = () => {
         }
     }
 }
+
 .unfold {
     align-self: center;
     padding-left: var(--ba-main-space);
diff --git a/src/layouts/admin/components/navMenus.vue b/src/layouts/admin/components/navMenus.vue
index 53b089c..5ea5768 100644
--- a/src/layouts/admin/components/navMenus.vue
+++ b/src/layouts/admin/components/navMenus.vue
@@ -5,14 +5,14 @@
                 :color="configStore.getColorVal('headerBarTabColor')"
                 class="nav-menu-icon"
                 v-if="state.isFullScreen"
-                name="local-full-screen-cancel"
+                name="fa-solid fa-minimize"
                 size="18"
             />
             <Icon
                 :color="configStore.getColorVal('headerBarTabColor')"
                 class="nav-menu-icon"
                 v-else
-                name="el-icon-FullScreen"
+                name="fa-solid fa-expand"
                 size="18"
             />
         </div>
diff --git a/src/layouts/admin/index.vue b/src/layouts/admin/index.vue
index f54a13f..034c039 100644
--- a/src/layouts/admin/index.vue
+++ b/src/layouts/admin/index.vue
@@ -274,6 +274,7 @@ const init = async () => {
 
         const handlerMenu = (data: any) => {
             data.forEach((item: any) => {
+
                 item.path = item.routeName || item.title
                 item.name = item.title
                 item.component = '/src/views/dashboard/index.vue'
@@ -285,8 +286,9 @@ const init = async () => {
             })
         }
         handlerMenu(res.data)
-        handleAdminRoute(arr)
-        // handleAdminRoute([...arr, ...res.data])
+        // handleAdminRoute(arr)
+        // handleAdminRoute(res.data)
+        handleAdminRoute([...arr, ...res.data])
 
         // 预跳转到上次路径
         if (route.params.to) {
diff --git a/src/utils/router.ts b/src/utils/router.ts
index e242168..dbef082 100644
--- a/src/utils/router.ts
+++ b/src/utils/router.ts
@@ -99,7 +99,6 @@ export const handleAdminRoute = (routes: any) => {
     const viewsComponent = import.meta.glob('/src/views/**/*.vue')
     addRouteAll(viewsComponent, routes, adminBaseRoute.name as string)
     const menuAdminBaseRoute = (adminBaseRoute.path as string) + '/'
-
     // 更新stores中的路由菜单数据
     const navTabs = useNavTabs()
     navTabs.setTabsViewRoutes(handleMenuRule(routes, menuAdminBaseRoute))
@@ -154,6 +153,7 @@ const handleMenuRule = (routes: any, pathPrefix = '/', type = ['menu', 'menu_dir
             name: routes[key].name,
             component: routes[key].component,
             meta: {
+                ...routes[key],
                 id: routes[key].id,
                 title: routes[key].title,
                 icon: routes[key].icon,
@@ -261,6 +261,7 @@ export const addRouteItem = (
         name: route.name,
         component: component,
         meta: {
+            ...route,
             title: route.title,
             extend: route.extend,
             icon: route.icon,
diff --git a/src/views/auth/menu/index.vue b/src/views/auth/menu/index.vue
index 7d9c8c9..7c7c995 100644
--- a/src/views/auth/menu/index.vue
+++ b/src/views/auth/menu/index.vue
@@ -80,12 +80,7 @@ onMounted(() => {
             if (item.children && item.children.length > 0) {
                 item.children = handlerRouter(item.children)
             }
-            return {
-                ...item,
-                title: item.meta.title,
-                icon: item.meta.icon,
-                id: index
-            }
+            return item.meta
         })
     }
     tableStore.table.data = handlerRouter(navTabs.state.tabsViewRoutes)
diff --git a/src/views/auth/menu/popupForm.vue b/src/views/auth/menu/popupForm.vue
index 0fc89a1..fec9291 100644
--- a/src/views/auth/menu/popupForm.vue
+++ b/src/views/auth/menu/popupForm.vue
@@ -1,49 +1,51 @@
 <template>
-    <el-dialog class="ba-operate-dialog" v-model="dialogVisible" :title="title">
+    <el-dialog class='ba-operate-dialog' v-model='dialogVisible' :title='title'>
         <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="120px">
-                <el-form-item label="上级菜单">
+            <el-form :inline='false' :model='form' label-width='120px'>
+                <el-form-item label='上级菜单'>
                     <el-cascader
-                        v-model="form.pid"
-                        :options="tableStore.table.data"
-                        :props="cascaderProps"
-                        style="width: 100%"
+                        v-model='form.pid'
+                        :options='tableStore.table.data'
+                        :props='cascaderProps'
+                        style='width: 100%'
                     />
                 </el-form-item>
-                <el-form-item label="菜单名称">
-                    <el-input v-model="form.name" placeholder="请输入菜单名称" />
+                <el-form-item label='菜单名称'>
+                    <el-input v-model='form.name' placeholder='请输入菜单名称' />
                 </el-form-item>
-                <el-form-item label="图标">
-                    <IconSelector v-model="form.icon" placeholder="请选择图标" />
+                <el-form-item label='图标'>
+                    <IconSelector v-model='form.icon' placeholder='请选择图标' />
                 </el-form-item>
-                <el-form-item label="菜单路由">
-                    <el-input v-model="form.path" placeholder="请输入菜单名称" />
+                <el-form-item label='菜单路由'>
+                    <el-input v-model='form.path' placeholder='请输入菜单名称' />
                 </el-form-item>
-                <el-form-item label="组件路径">
-                    <el-input v-model="form.routeName" placeholder="请输入组件路径，如/src/views/dashboard/index.vue" />
+                <el-form-item label='组件路径'>
+                    <el-input v-model='form.routeName' placeholder='请输入组件路径，如/src/views/dashboard/index.vue' />
                 </el-form-item>
-                <el-form-item label="排序">
-                    <el-input-number v-model="form.sort" :min="0" />
+                <el-form-item label='排序'>
+                    <el-input-number v-model='form.sort' :min='0' />
                 </el-form-item>
-                <el-form-item label="菜单描述">
-                    <el-input v-model="form.remark" :rows="2" type="textarea" placeholder="请输入描述" />
+                <el-form-item label='菜单描述'>
+                    <el-input v-model='form.remark' :rows='2' type='textarea' placeholder='请输入描述' />
                 </el-form-item>
             </el-form>
         </el-scrollbar>
 
         <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
+            <span class='dialog-footer'>
+                <el-button @click='dialogVisible = false'>取消</el-button>
+                <el-button type='primary' @click='submit'>确认</el-button>
             </span>
         </template>
     </el-dialog>
 </template>
-<script lang="ts" setup>
+<script lang='ts' setup>
 import { ref, inject } from 'vue'
 import { reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
 import IconSelector from '@/components/baInput/components/iconSelector.vue'
+import { updateMenu } from '@/api/systerm'
+
 const tableStore = inject('tableStore') as TableStore
 const cascaderProps = {
     label: 'title',
@@ -51,13 +53,13 @@ const cascaderProps = {
 }
 // do not use same name with ref
 const form = reactive({
-    code: 'menu',
-    icon: '设备月保_设备日保',
-    id: '88c61dfd02fbdab02e3bf0753d487444',
-    name: '系统配置',
-    path: '/app/setting',
-    pid: 'f517484e241c2fdd7f11a9c3fcaaa109',
-    remark: '系统配置',
+    code: '',
+    icon: '',
+    id: '',
+    name: '',
+    path: '',
+    pid: '0',
+    remark: '',
     routeName: null,
     sort: 0,
     type: 0
@@ -67,10 +69,14 @@ const dialogVisible = ref(false)
 const title = ref('新增菜单')
 const open = (text: string, data?: anyObj) => {
     title.value = text
+    Object.assign(form, data)
     dialogVisible.value = true
 }
 const submit = () => {
-    dialogVisible.value = false
+    updateMenu(form).then(res => {
+        tableStore.index()
+        dialogVisible.value = false
+    })
 }
 
 defineExpose({ open })
diff --git a/vite.config.ts b/vite.config.ts
index 14fcc77..cd58ec4 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -9,13 +9,8 @@ export default defineConfig({
     server: {
         proxy: {
             '/api': {
-                // target: "http://192.168.1.115:10215", //黄正剑
-                // target: "http://192.168.1.22:10215", //超高压
-                target: 'http://192.168.1.81:10215', //数据中心
-                // target: "http://192.168.1.13:10215", //治理
-                // target: 'http://192.168.1.24:10215', // 河北
-                // target: "http://192.168.1.31:10215", // 海南
-                // target: "http://192.168.1.29:10215", // 冀北
+                // target: 'http://192.168.1.81:10215', //数据中心
+                target: 'https://pqmcn.com:8092/api', //数据中心
                 changeOrigin: true,
                 rewrite: path => path.replace(/^\/api/, '') //路径重写，把'/api'替换为''
             }