diff --git a/public/config.js b/public/config.js index 90e086f..8ef0047 100644 --- a/public/config.js +++ b/public/config.js @@ -1,6 +1,6 @@ window.GLOBAL_CONFIG = { - apiURL: "http://192.168.1.108:8889/face", + apiURL: "http://192.168.1.109:8889/face", IMG_SERVER_URL: "http://192.168.1.133:9000", - SOCKET_URL: "ws://127.0.0.1:8889/face/webSocketServer", + SOCKET_URL: "ws://192.168.1.109:8889/face/webSocketServer", rtspApi_URL: window.location.protocol + '//' + window.location.hostname + ':' + window.location.port, } diff --git a/src/router/index.js b/src/router/index.js index 187312b..a9e56a1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,9 +2,18 @@ import Vue from 'vue' import Router from 'vue-router' import http from '@/utils/request' import { isURL } from '@/utils/validate' +import F1 from '@/views/modules/monitoring/ifarm' Vue.use(Router) - +//ifarm 单独路由 +export const ifarmRoutes =[ + { + path:'/monitoring/ifarm', + name:'ifarm', + // ifarmComponent:printReportShow, + // component:() => import('@/views/modules/monitoring/ifarm') + } +] // 页面路由(独立页面) export const pageRoutes = [ { @@ -33,6 +42,7 @@ export const moduleRoutes = { meta: { title: '主入口布局' }, children: [ { path: '/home', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } } + //此处为自己添加的页面 ] } diff --git a/src/views/modules/monitoring/ifarm.vue b/src/views/modules/monitoring/ifarm.vue index 60d040c..dcdc25d 100644 --- a/src/views/modules/monitoring/ifarm.vue +++ b/src/views/modules/monitoring/ifarm.vue @@ -2,7 +2,7 @@ - + diff --git a/src/views/modules/monitoring/ifarm2.vue b/src/views/modules/monitoring/ifarm2.vue new file mode 100644 index 0000000..4c563fa --- /dev/null +++ b/src/views/modules/monitoring/ifarm2.vue @@ -0,0 +1,23 @@ + + +