From 1e09b147f84337bcf4d0a106cf246c2ad9d16236 Mon Sep 17 00:00:00 2001
From: lxl <lixuliang_hd@126.com>
Date: 星期二, 20 九月 2022 18:18:56 +0800
Subject: [PATCH] 第六个

---
 src/router/index.js |   27 +--------------------------
 1 files changed, 1 insertions(+), 26 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 635ad39..29d9e48 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import Vue from "vue";
 import VueRouter from "vue-router";
 import Home from "../views/Home.vue";
@@ -18,26 +17,8 @@
 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'; //鏁版嵁绠$悊-鐩綍绠$悊
 
@@ -228,7 +209,6 @@
         },
       },
       {
-<<<<<<< HEAD
         path: "/eventlogManage",
         component: eventlogManage,
         name: "eventlogManage",
@@ -239,13 +219,10 @@
       },
       {
         path: "/logLog",
-=======
         path: '/logLog',
->>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
         component: logLog,
         name: 'logLog',
         meta: {
-<<<<<<< HEAD
           title: "浜嬩欢鏃ュ織绠$悊",
           requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
         },
@@ -256,9 +233,7 @@
         name: "blackwhiteList",
         meta: {
           title: "榛�/鐧藉悕鍗�",
-=======
           title: '鐧诲綍鏃ュ織',
->>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
           requireAuth: true, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰�
         },
       },

--
Gitblit v1.9.3