diff --git a/src/main.js b/src/main.js
index f37b5c0..188b748 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,11 +1,10 @@
 import Vue from "vue";
 import App from "./App.vue";
 import ElementUI from "element-ui";
-// import "./util/rem";
 import router from "./router";
 import "element-ui/lib/theme-chalk/index.css";
 Vue.config.productionTip = false;
-Vue.prototype.$fontSize = fontSize;
+// Vue.prototype.$fontSize = fontSize;
 Vue.use(ElementUI);
 new Vue({
   router,
diff --git a/src/router/index.js b/src/router/index.js
index 637d4a5..0af4979 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -22,6 +22,128 @@ const routes = [
         name: "channelconfig",
         component: () => import("../views/ChannelConfig.vue"),
       },
+
+      // 刘龙龙新加的全部路由
+      //db网关-ip配置-无线网关
+      {
+        path: "/wirelessgatewayip",
+        name: "wirelessgatewayip",
+        component: () => import("../views/WirelessGatewayIP.vue"),
+      },
+      //db网关-ip配置-有线网关
+      {
+        path: "/wiredgatewayip",
+        name: "wiredgatewayip",
+        component: () => import("../views/WiredGatewayIP.vue"),
+      },
+      //MQTT上云-MQTT1配置
+      {
+        path: "/mqttconfig",
+        name: "mqttconfig",
+        component: () => import("../views/MqttConfig.vue"),
+      },
+      //斥候工业网关-ip配置-无线网关
+      {
+        path: "/chwirelessgatewayip",
+        name: "chwirelessgatewayip",
+        component: () => import("../views/ChWirelessGatewayIP.vue"),
+      },
+      //斥候工业网关-ip配置-有线网关
+      {
+        path: "/chwiredgatewayip",
+        name: "chwiredgatewayip",
+        component: () => import("../views/ChWiredGatewayIP.vue"),
+      },
+      //斥候工业网关-数据采集配置-网关配置
+      {
+        path: "/gatewayconfiguration",
+        name: "gatewayconfiguration",
+        component: () => import("../views/GatewayConfiguration.vue"),
+      },
+      //斥候工业网关-数据采集配置-设备配置
+      {
+        path: "/configuration",
+        name: "configuration",
+        component: () => import("../views/Configuration.vue"),
+      },
+      //斥候工业网关-数据采集配置-采集点配置
+      {
+        path: "collectionpoint",
+        name: "collectionpoint",
+        component: () => import("../views/CollectionPoint.vue"),
+      },
+      //斥候工业网关-数据上云配置-MQTT上云
+      {
+        path: "chmqtt",
+        name: "chmqtt",
+        component: () => import("../views/ChMqtt.vue"),
+      },
+      //串口服务器-Ip配置
+      {
+        path: "/ckipconfig",
+        name: "ckipconfig",
+        component: () => import("../views/CkIpConfig.vue"),
+      },
+      //串口服务器-端口配置
+      {
+        path: "/ckportconfig",
+        name: "ckportconfig",
+        component: () => import("../views/CkPortConfig.vue"),
+      },
+      //串口服务器-485towifi-串口及网络协议设置
+      {
+        path: "/towifi",
+        name: "towifi",
+        component: () => import("../views/ToWifi.vue"),
+      },
+      //串口服务器-485towifi-网口配置
+      {
+        path: "/cknet",
+        name: "cknet",
+        component: () => import("../views/CkNet.vue"),
+      },
+      //串口服务器-485towifi-无线配置
+      {
+        path: "/ckwireless",
+        name: "ckwireless",
+        component: () => import("../views/CkWireless.vue"),
+      },
+      //工业网闸配置-网络管理
+      {
+        path: "/networkmanagement",
+        name: "networkmanagement",
+        component: () => import("../views/NetworkManagement.vue"),
+      },
+      //工业网闸配置-对象管理
+      {
+        path: "/objmanagement",
+        name: "objmanagement",
+        component: () => import("../views/ObjManagement.vue"),
+      },
+      //工业网闸配置-策略管理
+      {
+        path: "/strategyManagement",
+        name: "strategyManagement",
+        component: () => import("../views/StrategyManagement.vue"),
+      },
+      //工业网闸配置-策略管理-添加策略
+      {
+        path: "/addstrategy",
+        name: "addstrategy",
+        component: () => import("../views/AddStrategy.vue"),
+      },
+      //网络优化-网关配置
+      {
+        path: "/ntconfig",
+        name: "ntconfig",
+        component: () => import("../views/NtConfig.vue"),
+      },
+      //网络优化-网关维护
+      {
+        path: "/ntmaintenance",
+        name: "ntmaintenance",
+        component: () => import("../views/NtMaintenance.vue"),
+      },
     ],
   },
   {
diff --git a/src/util/request.js b/src/util/request.js
index 8afead8..74647c6 100644
--- a/src/util/request.js
+++ b/src/util/request.js
@@ -1,35 +1,41 @@
-import axios from 'axios';
+import axios from "axios";
 // import store from '@/store/index.js';
-import { Message } from 'element-ui';
+import { Message } from "element-ui";
 
 // 创建 axios 实例
 const service = axios.create({
-    baseURL: process.env.BASE_API, // api 的 base_url
-    withCredentials: true,
-    // withCredentials: true,
-    timeout: 600000
+  baseURL: process.env.BASE_API, // api 的 base_url
+  withCredentials: true,
+  // withCredentials: true,
+  timeout: 600000,
 });
 
 // 请求拦截器
-service.interceptors.request.use(config => {
+service.interceptors.request.use(
+  (config) => {
     // config.headers['authToken'] = store.state.authToken;
-    config.headers['ms_username'] = localStorage.getItem('ms_username');
+    config.headers["ms_username"] = localStorage.getItem("ms_username");
     return config;
-}, error => {
-    console.log('request error', error);
+  },
+  (error) => {
+    console.log("request error", error);
     return Promise.reject(error);
-});
+  }
+);
 
 // 响应拦截器
-service.interceptors.response.use(response => {
+service.interceptors.response.use(
+  (response) => {
     return response;
-}, error => {
-    console.log('response error', error);
+  },
+  (error) => {
+    console.log("response error", error);
     Message({
-        message: error.message,
-        type: 'error'
+      message: error.message,
+      type: "error",
     });
     return Promise.reject(error);
-});
+  }
+);
 
-export default service;
\ No newline at end of file
+export default service;
diff --git a/src/views/AddStrategy.vue b/src/views/AddStrategy.vue
new file mode 100644
index 0000000..e908384
--- /dev/null
+++ b/src/views/AddStrategy.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工业网闸配置-策略管理-添加策略</div>
+</template>
diff --git a/src/views/ChMqtt.vue b/src/views/ChMqtt.vue
new file mode 100644
index 0000000..0ddaff5
--- /dev/null
+++ b/src/views/ChMqtt.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>斥候工业网关-数据上云配置-MQTT上云</div>
+</template>
diff --git a/src/views/ChWiredGatewayIP.vue b/src/views/ChWiredGatewayIP.vue
new file mode 100644
index 0000000..24cb8d6
--- /dev/null
+++ b/src/views/ChWiredGatewayIP.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>斥候工业网关-ip配置-有线网关</div>
+</template>
diff --git a/src/views/ChWirelessGatewayIP.vue b/src/views/ChWirelessGatewayIP.vue
new file mode 100644
index 0000000..f776c83
--- /dev/null
+++ b/src/views/ChWirelessGatewayIP.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>斥候工业网关-ip配置-无线网关</div>
+</template>
diff --git a/src/views/CkIpConfig.vue b/src/views/CkIpConfig.vue
new file mode 100644
index 0000000..5ed7903
--- /dev/null
+++ b/src/views/CkIpConfig.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>串口服务器-Ip配置</div>
+</template>
diff --git a/src/views/CkNet.vue b/src/views/CkNet.vue
new file mode 100644
index 0000000..865d5d5
--- /dev/null
+++ b/src/views/CkNet.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>串口服务器-485towifi-网口配置</div>
+</template>
diff --git a/src/views/CkPortConfig.vue b/src/views/CkPortConfig.vue
new file mode 100644
index 0000000..59b83a9
--- /dev/null
+++ b/src/views/CkPortConfig.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>串口服务器-端口配置</div>
+</template>
diff --git a/src/views/CkWireless.vue b/src/views/CkWireless.vue
new file mode 100644
index 0000000..120eb4c
--- /dev/null
+++ b/src/views/CkWireless.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>串口服务器-485towifi-无线配置</div>
+</template>
diff --git a/src/views/CollectionPoint.vue b/src/views/CollectionPoint.vue
new file mode 100644
index 0000000..a93d6fe
--- /dev/null
+++ b/src/views/CollectionPoint.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>斥候工业网关-数据采集配置-采集点配置</div>
+</template>
diff --git a/src/views/Configuration.vue b/src/views/Configuration.vue
new file mode 100644
index 0000000..5110dc9
--- /dev/null
+++ b/src/views/Configuration.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>斥候工业网关-数据采集配置-设备配置</div>
+</template>
diff --git a/src/views/GatewayConfiguration.vue b/src/views/GatewayConfiguration.vue
new file mode 100644
index 0000000..c6e40ff
--- /dev/null
+++ b/src/views/GatewayConfiguration.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>斥候工业网关-数据采集配置-网关配置</div>
+</template>
diff --git a/src/views/Index.vue b/src/views/Index.vue
index bb280cc..62f68fe 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -1,9 +1,48 @@
 <template>
   <div id="app">
-    <div class="db_lite">
+    <!-- 所有路由跳转链接 -->
+
+    <div class="db_lite" style="background-color: aqua; height: 200px">
+      <router-link to="/cockpit">驾驶舱</router-link>
       <router-link to="/ipsetting">IP设置</router-link>
       <router-link to="/datacollect">数据采集配置</router-link>
-      <router-link to="/cockpit">驾驶舱</router-link>
+
+      <router-link to="/wirelessgatewayip">db网关-ip配置-无线网关</router-link>
+      <router-link to="/wiredgatewayip">db网关-ip配置-有线网关</router-link>
+      <router-link to="/mqttconfig">MQTT上云-MQTT1配置</router-link>
+      <router-link to="/chwirelessgatewayip"
+        >斥候工业网关-ip配置-无线网关</router-link
+      >
+      <router-link to="/chwiredgatewayip"
+        >斥候工业网关-ip配置-有线网关</router-link
+      >
+      <router-link to="/gatewayconfiguration"
+        >斥候工业网关-数据采集配置-网关配置</router-link
+      >
+      <router-link to="/configuration"
+        >斥候工业网关-数据采集配置-设备配置</router-link
+      >
+      <router-link to="/collectionpoint"
+        >斥候工业网关-数据采集配置-采集点配置</router-link
+      >
+      <router-link to="/chmqtt">斥候工业网关-数据上云配置-MQTT上云</router-link>
+      <router-link to="/ckipconfig">串口服务器-Ip配置</router-link>
+      <router-link to="/ckportconfig">串口服务器-端口配置</router-link>
+      <router-link to="/towifi"
+        >串口服务器-485towifi-串口及网络协议设置</router-link
+      >
+      <router-link to="/cknet">串口服务器-485towifi-网口配置</router-link>
+      <router-link to="/ckwireless">串口服务器-485towifi-无线配置</router-link>
+      <router-link to="/networkmanagement">工业网闸配置-网络管理</router-link>
+      <router-link to="/objmanagement">工业网闸配置-对象管理</router-link>
+      <router-link to="/strategyManagement">工业网闸配置-策略管理</router-link>
+      <router-link to="/addstrategy"
+        >工业网闸配置-策略管理-添加策略</router-link
+      >
+      <router-link to="/ntconfig">网络优化-网关配置</router-link>
+      <router-link to="/ntmaintenance">网络优化-网关维护</router-link>
+
+      <!-- 刘龙龙写的全部路由 -->
     </div>
     <div class="chihou">
       <h2>斥候工业网关</h2>
@@ -34,12 +73,6 @@
       <GatewayConfiguration />
       <!-- 网关维护 -->
       <GatewayMaintenance />
-<<<<<<< HEAD
-      <div class="ip">
-      </div>
-=======
-      <div class="ip"></div>
->>>>>>> da05b5f78cb7e04a82ff4852e4352b58e087d9c0
 
       <div>
         <router-view></router-view>
@@ -74,7 +107,6 @@ export default {
   },
   methods: {},
   components: {
-
     CollectionView,
     CloneView,
     ChiGate,
diff --git a/src/views/MqttConfig.vue b/src/views/MqttConfig.vue
new file mode 100644
index 0000000..47845b8
--- /dev/null
+++ b/src/views/MqttConfig.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>MQTT上云-MQTT1配置</div>
+</template>
diff --git a/src/views/NetworkManagement.vue b/src/views/NetworkManagement.vue
new file mode 100644
index 0000000..7f35a9c
--- /dev/null
+++ b/src/views/NetworkManagement.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工业网闸配置-网络管理</div>
+</template>
diff --git a/src/views/NtConfig.vue b/src/views/NtConfig.vue
new file mode 100644
index 0000000..adc2f9d
--- /dev/null
+++ b/src/views/NtConfig.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>网络优化-网关配置</div>
+</template>
diff --git a/src/views/NtMaintenance.vue b/src/views/NtMaintenance.vue
new file mode 100644
index 0000000..a0cc50d
--- /dev/null
+++ b/src/views/NtMaintenance.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>网络优化-网关维护</div>
+</template>
diff --git a/src/views/ObjManagement.vue b/src/views/ObjManagement.vue
new file mode 100644
index 0000000..dda2032
--- /dev/null
+++ b/src/views/ObjManagement.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工业网闸配置-对象管理</div>
+</template>
diff --git a/src/views/StrategyManagement.vue b/src/views/StrategyManagement.vue
new file mode 100644
index 0000000..3e9fed4
--- /dev/null
+++ b/src/views/StrategyManagement.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工业网闸配置-策略管理</div>
+</template>
diff --git a/src/views/ToWifi.vue b/src/views/ToWifi.vue
new file mode 100644
index 0000000..323ac52
--- /dev/null
+++ b/src/views/ToWifi.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>串口服务器-485towifi-串口及网络协议设置</div>
+</template>
diff --git a/src/views/WiredGatewayIP.vue b/src/views/WiredGatewayIP.vue
new file mode 100644
index 0000000..9b2573d
--- /dev/null
+++ b/src/views/WiredGatewayIP.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>ip配置-有线网关</div>
+</template>
diff --git a/src/views/WirelessGatewayIP.vue b/src/views/WirelessGatewayIP.vue
new file mode 100644
index 0000000..145842a
--- /dev/null
+++ b/src/views/WirelessGatewayIP.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>ip配置-无线网关</div>
+</template>