Merge branch 'master' into dev-xiaole

src/assets/js/http.js

@@ -42,6 +42,7 @@ if (process.env.NODE_ENV == 'development') {
     // axios.defaults.baseURL = 'http://124.71.178.44:100/'
     // tag: 本地
     axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
+    // axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌二期
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/';
     // axios.defaults.baseURL = 'http://139.9.66.234:8/'; 
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲

src/router/index.js

@@ -1524,6 +1524,7 @@ const routes2 = [
     //         component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'),
     //     }
     // ]
+    
     },
     {
         path: '/equipmentCenter/',