From b8720f30d8916555067c22acb7fda83efbc2f9f3 Mon Sep 17 00:00:00 2001
From: lxl <lixuliang_hd@126.com>
Date: 星期二, 20 九月 2022 17:36:12 +0800
Subject: [PATCH] 暂存
---
src/router/index.js | 194 +++++++++++++++++++++++++++++-------------------
1 files changed, 116 insertions(+), 78 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 8500c73..635ad39 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
import Vue from "vue";
import VueRouter from "vue-router";
import Home from "../views/Home.vue";
@@ -17,196 +18,217 @@
import systemMonitoring from "@/views/maintenance/systemMonitoring.vue"; //绯荤粺鐩戞帶
import databaseMonitoring from "@/views/maintenance/databaseMonitoring.vue"; //鏁版嵁搴撶洃鎺�
import parameterConfiguration from "@/views/maintenance/parameterConfiguration.vue"; //鍙傛暟閰嶇疆
+=======
+import Vue from 'vue';
+import VueRouter from 'vue-router';
+import Home from '../views/Home.vue';
+import login from '../components/login';
+import Synthesis from '../views/Synthesis/index.vue'; //缁煎悎灞曠ず
+import Thematic from '../views/Thematic/index.vue'; //涓撻鍦板浘
+import Archive from '../views/Archive/index.vue'; //璧勬枡棣�
+import userManagement from '@/views/maintenance/userManagement.vue'; //鐢ㄦ埛绠＄悊
+import menuSettings from '@/views/maintenance/menuSettings.vue'; //鑿滃崟璁剧疆
+import rests from '@/views/maintenance/rests.vue'; //鍏朵粬
+import authorityManagement from '@/views/maintenance/authorityManagement.vue'; //鏉冮檺绠＄悊
+import safetyManagement from '@/views/maintenance/safetyManagement.vue'; //瀹夊叏绠＄悊
+import operationLog from '@/views/maintenance/operationLog.vue'; //鎿嶄綔鏃ュ織
+import logLog from '@/views/maintenance/logLog.vue'; //鐧诲綍鏃ュ織
+import systemMonitoring from '@/views/maintenance/systemMonitoring.vue'; //绯荤粺鐩戞帶
+import databaseMonitoring from '@/views/maintenance/databaseMonitoring.vue'; //鏁版嵁搴撶洃鎺�
+import tokentool from '@/views/maintenance/tokentool.vue'; //token 宸ュ叿
+import parameterConfiguration from '@/views/maintenance/parameterConfiguration.vue'; //鍙傛暟閰嶇疆
+>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
//鏁版嵁绠＄悊妯″潡
-import catalogueManage from "../views/datamanage/catalogueManage.vue"; //鏁版嵁绠＄悊-鐩綍绠＄悊
+import catalogueManage from '../views/datamanage/catalogueManage.vue'; //鏁版嵁绠＄悊-鐩綍绠＄悊
-import dataUpdata from "../views/datamanage/dataUpdata.vue"; //鏁版嵁绠＄悊-鏁版嵁涓婁紶
-import dataLoading from "../views/datamanage/dataLoading.vue"; //鏁版嵁绠＄悊-鏁版嵁鍏ュ簱
-import metadataManage from "../views/datamanage/metadataManage.vue"; //鏁版嵁绠＄悊-鍏冩暟鎹鐞�
-import SpatialData from "../views/datamanage/SpatialData.vue"; //鏁版嵁绠＄悊-绌洪棿鏁版嵁
-import versionManage from "../views/datamanage/versionManage.vue"; //鏁版嵁绠＄悊-鐗堟湰绠＄悊
-import dictionaryManage from "../views/datamanage/dictionaryManage.vue"; //鏁版嵁绠＄悊-瀛楀吀绠＄悊
-import styleManage from "../views/datamanage/styleManage.vue"; //鏁版嵁绠＄悊-鏍峰紡绠＄悊
-import addStyle from "../views/datamanage/addStyle.vue"; //鏁版嵁绠＄悊-鏍峰紡绠＄悊-娣诲姞鏍峰紡
+import dataUpdata from '../views/datamanage/dataUpdata.vue'; //鏁版嵁绠＄悊-鏁版嵁涓婁紶
+import dataLoading from '../views/datamanage/dataLoading.vue'; //鏁版嵁绠＄悊-鏁版嵁鍏ュ簱
+import metadataManage from '../views/datamanage/metadataManage.vue'; //鏁版嵁绠＄悊-鍏冩暟鎹鐞�
+import SpatialData from '../views/datamanage/SpatialData.vue'; //鏁版嵁绠＄悊-绌洪棿鏁版嵁
+import versionManage from '../views/datamanage/versionManage.vue'; //鏁版嵁绠＄悊-鐗堟湰绠＄悊
+import dictionaryManage from '../views/datamanage/dictionaryManage.vue'; //鏁版嵁绠＄悊-瀛楀吀绠＄悊
+import styleManage from '../views/datamanage/styleManage.vue'; //鏁版嵁绠＄悊-鏍峰紡绠＄悊
+import addStyle from '../views/datamanage/addStyle.vue'; //鏁版嵁绠＄悊-鏍峰紡绠＄悊-娣诲姞鏍峰紡
Vue.use(VueRouter);
const routes = [
{
- path: "/",
- name: "login",
+ path: '/',
+ name: 'login',
component: login,
},
{
- path: "/Home",
- name: "Home",
+ path: '/Home',
+ name: 'Home',
component: Home,
children: [
{
- path: "/Synthesis",
- name: "Synthesis",
+ path: '/Synthesis',
+ name: 'Synthesis',
component: Synthesis,
meta: {
- title: "缁煎悎灞曠ず",
+ title: '缁煎悎灞曠ず',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/Thematic",
- name: "Thematic",
+ path: '/Thematic',
+ name: 'Thematic',
component: Thematic,
meta: {
- title: "涓撻鍦板浘",
+ title: '涓撻鍦板浘',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/Archive",
- name: "Archive",
+ path: '/Archive',
+ name: 'Archive',
component: Archive,
meta: {
- title: "璧勬枡棣�",
+ title: '璧勬枡棣�',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/catalogueManage",
- name: "catalogueManage",
+ path: '/catalogueManage',
+ name: 'catalogueManage',
component: catalogueManage,
meta: {
- title: "鐩綍绠＄悊",
+ title: '鐩綍绠＄悊',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/dataUpdata",
- name: "dataUpdata",
+ path: '/dataUpdata',
+ name: 'dataUpdata',
component: dataUpdata,
meta: {
- title: "鏁版嵁涓婁紶",
+ title: '鏁版嵁涓婁紶',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/metadataManage",
+ path: '/metadataManage',
component: metadataManage,
- name: "metadataManage",
+ name: 'metadataManage',
meta: {
- title: "鍏冩暟鎹鐞�",
+ title: '鍏冩暟鎹鐞�',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/dataLoading",
- name: "dataLoading",
+ path: '/dataLoading',
+ name: 'dataLoading',
component: dataLoading,
meta: {
- title: "鏁版嵁鍏ュ簱",
+ title: '鏁版嵁鍏ュ簱',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/SpatialData",
+ path: '/SpatialData',
component: SpatialData,
- name: "SpatialData",
+ name: 'SpatialData',
meta: {
- title: "绌洪棿鏁版嵁",
+ title: '绌洪棿鏁版嵁',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/versionManage",
+ path: '/versionManage',
component: versionManage,
- name: "versionManage",
+ name: 'versionManage',
meta: {
- title: "鐗堟湰绠＄悊",
+ title: '鐗堟湰绠＄悊',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/dictionaryManage",
+ path: '/dictionaryManage',
component: dictionaryManage,
- name: "dictionaryManage",
+ name: 'dictionaryManage',
meta: {
- title: "瀛楀吀绠＄悊",
+ title: '瀛楀吀绠＄悊',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/styleManage",
+ path: '/styleManage',
component: styleManage,
- name: "styleManage",
+ name: 'styleManage',
meta: {
- title: "鏍峰紡绠＄悊",
+ title: '鏍峰紡绠＄悊',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/addStyle",
+ path: '/addStyle',
component: addStyle,
- name: "addStyle",
+ name: 'addStyle',
meta: {
- title: "鏍峰紡绠＄悊",
+ title: '鏍峰紡绠＄悊',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/userManagement",
+ path: '/userManagement',
component: userManagement,
- name: "userManagement",
+ name: 'userManagement',
meta: {
- title: "鐢ㄦ埛绠＄悊",
+ title: '鐢ㄦ埛绠＄悊',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/menuSettings",
+ path: '/menuSettings',
component: menuSettings,
- name: "menuSettings",
+ name: 'menuSettings',
meta: {
- title: "鑿滃崟璁剧疆",
+ title: '鑿滃崟璁剧疆',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/rests",
+ path: '/rests',
component: rests,
- name: "rests",
+ name: 'rests',
meta: {
- title: "鍏朵粬璁剧疆",
+ title: '鍏朵粬璁剧疆',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/authorityManagement",
+ path: '/authorityManagement',
component: authorityManagement,
- name: "authorityManagement",
+ name: 'authorityManagement',
meta: {
- title: "鏉冮檺绠＄悊",
+ title: '鏉冮檺绠＄悊',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/safetyManagement",
+ path: '/safetyManagement',
component: safetyManagement,
- name: "safetyManagement",
+ name: 'safetyManagement',
meta: {
- title: "瀹夊叏绠＄悊",
+ title: '瀹夊叏绠＄悊',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/operationLog",
+ path: '/operationLog',
component: operationLog,
- name: "operationLog",
+ name: 'operationLog',
meta: {
- title: "鎿嶄綔鏃ュ織",
+ title: '鎿嶄綔鏃ュ織',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
+<<<<<<< HEAD
path: "/eventlogManage",
component: eventlogManage,
name: "eventlogManage",
@@ -217,9 +239,13 @@
},
{
path: "/logLog",
+=======
+ path: '/logLog',
+>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
component: logLog,
- name: "logLog",
+ name: 'logLog',
meta: {
+<<<<<<< HEAD
title: "浜嬩欢鏃ュ織绠＄悊",
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
@@ -230,33 +256,45 @@
name: "blackwhiteList",
meta: {
title: "榛�/鐧藉悕鍗�",
+=======
+ title: '鐧诲綍鏃ュ織',
+>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/systemMonitoring",
+ path: '/systemMonitoring',
component: systemMonitoring,
- name: "systemMonitoring",
+ name: 'systemMonitoring',
meta: {
- title: "绯荤粺鐩戞帶",
+ title: '绯荤粺鐩戞帶',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/databaseMonitoring",
+ path: '/databaseMonitoring',
component: databaseMonitoring,
- name: "databaseMonitoring",
+ name: 'databaseMonitoring',
meta: {
- title: "鏁版嵁搴撶洃鎺�",
+ title: '鏁版嵁搴撶洃鎺�',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
{
- path: "/parameterConfiguration",
- component: parameterConfiguration,
- name: "parameterConfiguration",
+ path: '/tokentool',
+ component: tokentool,
+ name: 'tokentool',
meta: {
- title: "鍙傛暟閰嶇疆",
+ title: 'Token宸ュ叿',
+ requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
+ },
+ },
+ {
+ path: '/parameterConfiguration',
+ component: parameterConfiguration,
+ name: 'parameterConfiguration',
+ meta: {
+ title: '鍙傛暟閰嶇疆',
requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
},
},
--
Gitblit v1.9.3