From b6c07fd7666287a51e2f2beb99f4d1534d7aef17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= Date: Fri, 29 Jan 2021 10:27:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=90=83=E6=9C=BA=E7=AE=A1=E7=90=86=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=92=8C=E9=85=8D=E7=BD=AE=E7=94=B1model=E9=81=AE?= =?UTF-8?q?=E7=BD=A9=E6=9B=B4=E6=94=B9=E4=B8=BArouter=20change=20page?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/AsideMenu.vue | 4 +- src/plugins/axios/axios.js | 2 +- src/router/index.js | 9 +++- src/views/cameraManage/index.vue | 18 ++++++-- src/views/cameraManage/ioTable.vue | 20 ++++++--- src/views/cameraManage/model.vue | 71 +++++++++++++++++++----------- 6 files changed, 86 insertions(+), 38 deletions(-) diff --git a/src/layouts/AsideMenu.vue b/src/layouts/AsideMenu.vue index 4429520..d50e60f 100644 --- a/src/layouts/AsideMenu.vue +++ b/src/layouts/AsideMenu.vue @@ -62,7 +62,7 @@ export default { parents = this.$router.options.routes[0].children.filter(ele => { if ( this.userInfo.permissionList.some(item => { - return item.rights === ele.name && ele.name.indexOf("center") < 0 && item.rights === ele.name && ele.name.indexOf("ioTable") < 0 && item.rights === ele.name && ele.name.indexOf("realTimeMonitoringModel") < 0 && item.rights === ele.name && ele.name.indexOf("plcStatus") < 0; + return item.rights === ele.name && ele.name.indexOf("center") < 0 && item.rights === ele.name && ele.name.indexOf("ioTable") < 0 && item.rights === ele.name && ele.name.indexOf("realTimeMonitoringModel") < 0 && item.rights === ele.name && ele.name.indexOf("plcStatus") < 0 && item.rights === ele.name && ele.name.indexOf("cameraManageModel") < 0; }) ) { return ele; @@ -83,7 +83,7 @@ export default { recursionRoute(parents); }else { parents = this.$router.options.routes[0].children.filter(item => { - return !item.name.startsWith("center") && !item.name.startsWith("ioTable") && !item.name.startsWith("realTimeMonitoringModel") && !item.name.startsWith("plcStatus"); + return !item.name.startsWith("center") && !item.name.startsWith("ioTable") && !item.name.startsWith("realTimeMonitoringModel") && !item.name.startsWith("plcStatus") && !item.name.startsWith("cameraManageModel"); }); } this.routes = parents; diff --git a/src/plugins/axios/axios.js b/src/plugins/axios/axios.js index a227f6a..1d1bdbd 100644 --- a/src/plugins/axios/axios.js +++ b/src/plugins/axios/axios.js @@ -29,7 +29,7 @@ instance.interceptors.response.use((response) => { const res = response.data; // 对响应数据做点什么 if (res.code !== 200 && res.code!==0) { - console.log(res); + // console.log(res); Vue.prototype.$message.error(res.message); // 未认证 if (res.code === 401) { diff --git a/src/router/index.js b/src/router/index.js index a6232bc..cebf6cf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -43,7 +43,6 @@ const routes = [{ path: 'realTimeMonitoring/model', name: 'realTimeMonitoringModel', meta: { - icon: 'desktop', name: '实时视频流(全屏)' }, component: () => import('@/views/realTimeMonitoring/model'), @@ -122,6 +121,14 @@ const routes = [{ }, component: () => import('@/views/cameraManage/index') }, + { + path: 'cameraManage/model', + name: 'cameraManageModel', + meta: { + name: '球机管理测试or配置' + }, + component: () => import('@/views/cameraManage/model') + }, { path: 'productSpecManage', name: 'productSpecManage', diff --git a/src/views/cameraManage/index.vue b/src/views/cameraManage/index.vue index a30dbbf..b13a1ce 100644 --- a/src/views/cameraManage/index.vue +++ b/src/views/cameraManage/index.vue @@ -119,10 +119,22 @@ export default { }); }, showModel(type,data){ - this.visible = true console.log(type) - this.modelType = type - this.modelData = data + if (type == 'test') { + this.$router.push({ + name: 'cameraManageModel', + query: {modelType: type, modelData: data} + }) + } else if (type == 'config') { + this.$router.push({ + name: 'cameraManageModel', + query: {modelType: type, modelData: data} + }) + } else { + this.visible = true + this.modelType = type + this.modelData = data + } }, submit(visible){ this.visible = visible diff --git a/src/views/cameraManage/ioTable.vue b/src/views/cameraManage/ioTable.vue index 69ea322..445a989 100644 --- a/src/views/cameraManage/ioTable.vue +++ b/src/views/cameraManage/ioTable.vue @@ -1,9 +1,9 @@ @@ -271,14 +275,6 @@ export default { rtsp:newVal.rtsp }) }) - }else if (newVal.id && this.type=='test'){ - this.id = newVal.id - this.mdata = newVal - console.log(newVal) - this.$nextTick(()=>{ //this.$nextTick解决不能在表单渲染之前赋值的报错问题 - console.log(newVal.rtsp) - this.getTestVideo(newVal.rtsp) - }) }else if (newVal.id && this.type=='config'){ this.id = newVal.id this.mdata = newVal @@ -325,6 +321,20 @@ export default { }, mounted() { console.log('mounted执行了') + if (this.$route.query.modelType == 'test') { + this.isShow = true + this.id = this.$route.query.modelData.id + this.type = this.$route.query.modelType + this.mdata = this.$route.query.modelData + this.getTestVideo(this.$route.query.modelData.rtsp) + } else if (this.$route.query.modelType == 'config') { + this.isShow = true + this.id = this.$route.query.modelData.id + this.type = this.$route.query.modelType + this.mdata = this.$route.query.modelData + this.getConfigVideo(this.$route.query.modelData.rtsp) + this.getConfigIoList() + } }, methods: { handleOk() { @@ -368,9 +378,11 @@ export default { console.log('Clicked cancel button'); this.$emit('close', false, {}) if(this.type=='test') { + this.$router.go(-1); var vlc = document.getElementById('video-test'); vlc.playlist.items.clear() }else if(this.type=='config') { + this.$router.go(-1); var vlc = document.getElementById('video-config'); vlc.playlist.items.clear() } @@ -889,10 +901,17 @@ export default { img{ cursor: pointer; } - .config-table{ + .config-table { width: 800px; height: 450px; overflow: hidden; + + h2 { + padding: 15px; + font-size: 20px; + background: #fafafa; + margin: 0; + } } } .vxgplayer{