1.17
This commit is contained in:
		
							parent
							
								
									6f92ef1360
								
							
						
					
					
						commit
						702c6b3b0e
					
				| @ -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, | ||||
| } | ||||
|  | ||||
| @ -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 } } | ||||
|       //此处为自己添加的页面
 | ||||
|   ] | ||||
| } | ||||
| 
 | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
|   <!--  <iframe style="width: 800px; height: 600px;" src="../../../../020/index.html"/>--> | ||||
|   <!--  <iframe :src="this.txtUrl"  width="100%" :style="{height:calHeight}"  sandbox></iframe>--> | ||||
|   <!--  <iframe src="../../../../public/index.html"  width="100%" :style="{height:calHeight}" ></iframe>--> | ||||
|     <iframe src=" http://192.168.1.108:8008"  width="100%" :style="{height:calHeight}" ></iframe> | ||||
|     <iframe src=" http://192.168.1.109:8008"  width="100%" :style="{height:calHeight}" ></iframe> | ||||
| <!--  <div class="baidu-page">--> | ||||
| <!--    <h1>嵌套百度页面</h1>--> | ||||
| <!--    <iframe src="https://www.baidu.com" frameborder="0"></iframe>--> | ||||
|  | ||||
							
								
								
									
										23
									
								
								src/views/modules/monitoring/ifarm2.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								src/views/modules/monitoring/ifarm2.vue
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,23 @@ | ||||
| <!--// 这里只是放了部分代码 具体逻辑根据对应的需求添加即可--> | ||||
| <template> | ||||
|   <div class="dashboard-editor-container"> | ||||
|     <div style="width: 100%" class="itemflex-div"> | ||||
|       <iframe | ||||
|           :src="newSrc" | ||||
|           class="iframemain" | ||||
|           allowfullscreen="true" | ||||
|           id="iframeId" | ||||
|       ></iframe> | ||||
|     </div> | ||||
|   </div> | ||||
| </template> | ||||
| <script> | ||||
| export default { | ||||
|   props:{ | ||||
|     newSrc:{ | ||||
|       type:String, | ||||
|       default:'' | ||||
|     } | ||||
|   }, | ||||
| }; | ||||
| </script> | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user