From 722b29ecd080a3ebf1cad8fa79b846d4405524e0 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 24 Jun 2021 22:32:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity
---
src/store/modules/common.js | 6 +++---
src/router/views/index.js | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/router/views/index.js b/src/router/views/index.js
index ae65b12..d1010ff 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -391,10 +391,10 @@
},
{
path: '/patrolManagement',
- redirect: '/policeInformationDistribution/patrolManagement',
+ redirect: '/policeInformationDistribution/index',
component: Layout,
children: [{
- path: 'patrolManagement',
+ path: 'index',
name: '巡逻管理',
meta: {
i18n: 'policeInformationDistribution'
@@ -403,17 +403,17 @@
import ( /* webpackChunkName: "views" */ '@/views/policeInformationDistribution/patrolManagement')
}]
}, {
- path: '/policeInformationDistribution',
- redirect: '/policeInformationDistribution/policeManagementTeam',
+ path: '/security',
+ redirect: '/security/index',
component: Layout,
children: [{
- path: 'policeManagementTeam',
- name: '处警队伍管理',
+ path: 'index',
+ name: '保安管理',
meta: {
i18n: 'policeInformationDistribution'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/policeInformationDistribution/policeManagementTeam')
+ import ( /* webpackChunkName: "views" */ '@/views/security/security')
}]
}, {
path: '/report',
diff --git a/src/store/modules/common.js b/src/store/modules/common.js
index b2ec420..dd037e6 100644
--- a/src/store/modules/common.js
+++ b/src/store/modules/common.js
@@ -1,6 +1,6 @@
/*
- * @Descripttion:
- * @version:
+ * @Descripttion:
+ * @version:
* @Author: song
* @Date: 2021-01-26 08:56:33
* @LastEditors: song
@@ -17,7 +17,7 @@
state: {
language: getStore({name: 'language'}) || 'zh',
- isCollapse: true,
+ isCollapse: false,
isFullScren: false,
isMenu: true,
isShade: false,
--
Gitblit v1.9.3