From 9b4ceb50b9ccb0f19ad3ace69baf8351fb1b9d98 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 28 Jan 2021 16:58:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
.eslintrc.js | 5 +++--
src/router/views/index.js | 14 ++++++++++++++
src/page/index/top/top-theme.vue | 2 +-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index 20034fd..968344a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,9 +9,10 @@
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
- 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+ 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+ "no-unused-vars": 'off'
},
parserOptions: {
parser: 'babel-eslint'
}
-}
\ No newline at end of file
+}
diff --git a/src/page/index/top/top-theme.vue b/src/page/index/top/top-theme.vue
index d1c22c6..be64989 100644
--- a/src/page/index/top/top-theme.vue
+++ b/src/page/index/top/top-theme.vue
@@ -32,7 +32,7 @@
data () {
return {
box: false,
- text: "",
+ text: "白色主题",
list: [
{
name: "默认主题",
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 73d6823..d184a83 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -125,4 +125,18 @@
component: () =>
import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
}]
+},
+{
+ path: '/realTimePolice',
+ component: Layout,
+ redirect: '/realTimePolice/real',
+ children: [{
+ path: 'index',
+ name: '实时报警',
+ meta: {
+ i18n: 'real'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
+ }]
}]
--
Gitblit v1.9.3