Browse Source

系统更新

zhengnaiwen_citu 7 months ago
parent
commit
5882b23970

+ 27 - 0
src/router/defaultRoute.js

@@ -18,6 +18,33 @@ const base = [
     meta: { title: '404' },
     meta: { title: '404' },
     hidden: true,
     hidden: true,
     component: () => import('@/views/system/error/404')
     component: () => import('@/views/system/error/404')
+  },
+  {
+    path: '/update',
+    name: '系统更新',
+    meta: { title: '系统更新' },
+    component: () => import('@/views/system/update'),
+    redirect: '/update/system',
+    children: [
+      {
+        path: 'system',
+        name: '系统更新',
+        meta: { title: '系统更新' },
+        component: () => import('@/views/system/update/system')
+      },
+      {
+        path: 'history',
+        name: '历史更新',
+        meta: { title: '历史更新' },
+        component: () => import('@/views/system/update/history')
+      },
+      {
+        path: 'monitor',
+        name: '程序监控',
+        meta: { title: '程序监控' },
+        component: () => import('@/views/system/update/monitor')
+      }
+    ]
   }
   }
 ]
 ]
 
 

+ 0 - 1
src/store/modules/user.js

@@ -54,7 +54,6 @@ const actions = {
    * @param { Boolean } isLogin 是否调用回到登录页方法
    * @param { Boolean } isLogin 是否调用回到登录页方法
    */
    */
   userLogout ({ commit }) {
   userLogout ({ commit }) {
-    debugger
     // 清空token
     // 清空token
     deleteToken()
     deleteToken()
     // 清除路由
     // 清除路由

+ 15 - 0
src/views/salary/config/index.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'salary-config'
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 6 - 2
src/views/system/menu/index.vue

@@ -115,10 +115,12 @@ export default {
           path: data.path,
           path: data.path,
           component: data.component,
           component: data.component,
           name: data.name,
           name: data.name,
+          icon: data.icon,
           code: data.code,
           code: data.code,
           sort: data.sort,
           sort: data.sort,
           hidden: data.hidden,
           hidden: data.hidden,
-          keepAlive: meta?.keepAlive
+          window: meta?.window ?? false,
+          keepAlive: meta?.keepAlive ?? false
         }, this.items, data.id)
         }, this.items, data.id)
       } catch (error) {
       } catch (error) {
         this.$message.error(error)
         this.$message.error(error)
@@ -137,10 +139,12 @@ export default {
           path: data.path,
           path: data.path,
           component: data.component,
           component: data.component,
           name: data.name,
           name: data.name,
+          icon: data.icon,
           code: data.code,
           code: data.code,
           sort: data.sort,
           sort: data.sort,
           hidden: data.hidden,
           hidden: data.hidden,
-          keepAlive: meta?.keepAlive
+          window: meta?.window ?? false,
+          keepAlive: meta?.keepAlive ?? false
         }, this.items, null)
         }, this.items, null)
       } catch (error) {
       } catch (error) {
         this.$message.error(error)
         this.$message.error(error)

+ 13 - 1
src/views/system/menu/menuEdit.vue

@@ -156,6 +156,18 @@ export default {
               { text: '不缓存', label: false }
               { text: '不缓存', label: false }
             ]
             ]
           }
           }
+        },
+        {
+          label: '开启新窗口',
+          prop: 'window',
+          type: 'radioGroup',
+          hidden: [0, 2, 3].includes(type),
+          options: {
+            items: [
+              { text: '开启', label: true },
+              { text: '关闭', label: false }
+            ]
+          }
         }
         }
       ]
       ]
     }
     }
@@ -178,7 +190,7 @@ export default {
         if (!valid) {
         if (!valid) {
           return
           return
         }
         }
-        const metaProp = ['keepAlive']
+        const metaProp = ['keepAlive', 'window']
         const obj = this.editForm.reduce((res, item) => {
         const obj = this.editForm.reduce((res, item) => {
           if (item.hidden) {
           if (item.hidden) {
             return res
             return res

+ 15 - 0
src/views/system/update/history/index.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'update-history'
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 35 - 0
src/views/system/update/index.vue

@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <el-menu
+      :default-active="$route.path"
+      class="el-menu-demo"
+      mode="horizontal"
+      background-color="#001529"
+      router
+      text-color="#fff"
+      active-text-color="#ffd04b"
+    >
+      <el-menu-item index="/update/system">系统更新</el-menu-item>
+      <el-menu-item index="/update/history">历史更新</el-menu-item>
+      <el-menu-item index="/update/monitor">程序监控</el-menu-item>
+    </el-menu>
+    <div>
+      <router-view  />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'system-update',
+  methods: {
+    handleSelect (key, keyPath) {
+      console.log(key, keyPath)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 15 - 0
src/views/system/update/monitor/index.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'update-monitor'
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 15 - 0
src/views/system/update/system/index.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'update-system'
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>