From 5b2b7473485069d0e83a5346db71677d5e3ee69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= Date: Wed, 23 Dec 2020 17:45:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=90=83=E6=9C=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8C=89=E5=9B=9B=E4=B8=AA=E6=8E=92=E5=88=97?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=202=E3=80=81=E5=B7=B7=E9=81=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86--=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=90=83=E6=9C=BA=E5=90=8D=E7=A7=B0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=A0=E9=99=A4bug=E4=BF=AE=E5=A4=8D=203=E3=80=81=E5=B7=B7?= =?UTF-8?q?=E9=81=93=E7=AE=A1=E7=90=86--=E5=AF=B9=E5=BA=94=E7=90=83?= =?UTF-8?q?=E6=9C=BA=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=87=8D=E5=A4=8D?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=204=E3=80=81=20=E7=90=83=E6=9C=BA?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E5=B7=B7=E9=81=93=E5=B7=B2=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E7=90=83=E6=9C=BA=E7=82=B9=E5=87=BB=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9C=AA=E6=98=BE=E7=A4=BA=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=ADbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/AsideMenu.vue | 6 +-- src/plugins/axios/axios.js | 2 +- src/router/index.js | 49 +++++++++++++++++++----- src/views/cameraManage/index.vue | 4 +- src/views/checkManage/checkOperation.vue | 5 +++ src/views/checkManage/index.vue | 5 +++ src/views/realTimeMonitoring/index.vue | 6 +-- src/views/realTimeMonitoring/model.vue | 7 ++-- src/views/roadwayManage/index.vue | 8 ++-- src/views/roadwayManage/model.vue | 9 ++++- 10 files changed, 74 insertions(+), 27 deletions(-) create mode 100644 src/views/checkManage/checkOperation.vue create mode 100644 src/views/checkManage/index.vue diff --git a/src/layouts/AsideMenu.vue b/src/layouts/AsideMenu.vue index ed94b05..4b7a98a 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("camodel") < 0; + return item.rights === ele.name && ele.name.indexOf("center") < 0; }) ) { return ele; @@ -81,9 +81,9 @@ export default { } }; recursionRoute(parents); - } else { + }else { parents = this.$router.options.routes[0].children.filter(item => { - return !item.name.startsWith("center") && !item.name.startsWith("camodel"); + return !item.name.startsWith("center"); }); } this.routes = parents; diff --git a/src/plugins/axios/axios.js b/src/plugins/axios/axios.js index 0cea315..9c7c175 100644 --- a/src/plugins/axios/axios.js +++ b/src/plugins/axios/axios.js @@ -29,7 +29,7 @@ instance.interceptors.response.use((response) => { // 对响应数据做点什么 if (res.code !== 200 && res.code!==0) { console.log(res); - Vue.prototype.$message.error(res.msg); + Vue.prototype.$message.error(res.message); // 未认证 if (res.code === 401) { // 未登录 diff --git a/src/router/index.js b/src/router/index.js index 4df591b..52db9f9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -39,14 +39,6 @@ const routes = [{ component: () => import('@/views/realTimeMonitoring/index'), }, - // { - // path: 'realTimeMonitoring/model', - // name: 'camodel', - // meta: { - // name: '球机操作' - // }, - // component: () => import('@/views/realTimeMonitoring/model') - // }, { path: 'historyMonitoring', name: 'historyMonitoring', @@ -55,7 +47,46 @@ const routes = [{ name: '历史数据' }, component: () => import('@/views/historyMonitoring/index') - }, { + }, + //设置二级菜单 + // { + // path: 'checkManage', + // name: 'checkManage', + // meta: { + // icon: 'form', + // name: '盘点管理', + // unfold:true + // }, + // children: [ + // { + // path: 'checkManage', + // name: 'checkManage', + // meta: { + // name: '盘点管理' + // }, + // component: () => import('@/views/checkManage/index'), + // }, + // { + // path: 'checkOperation', + // name: 'checkOperation', + // meta: { + // name: '盘点操作' + // }, + // component: () => import('@/views/checkManage/checkOperation'), + // }, + // ] + // }, + + { + path: 'checkManage', + name: 'checkManage', + meta: { + icon: 'form', + name: '盘点管理', + }, + component: () => import('@/views/checkManage/index') + }, + { path: 'roadwayManage', name: 'roadwayManage', meta: { diff --git a/src/views/cameraManage/index.vue b/src/views/cameraManage/index.vue index 0f61f1c..1716591 100644 --- a/src/views/cameraManage/index.vue +++ b/src/views/cameraManage/index.vue @@ -16,11 +16,11 @@ @change="handleGetCameraList" > - + 测试 - + 配置 diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue new file mode 100644 index 0000000..cb27713 --- /dev/null +++ b/src/views/checkManage/checkOperation.vue @@ -0,0 +1,5 @@ + diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue new file mode 100644 index 0000000..a38b638 --- /dev/null +++ b/src/views/checkManage/index.vue @@ -0,0 +1,5 @@ + diff --git a/src/views/realTimeMonitoring/index.vue b/src/views/realTimeMonitoring/index.vue index 9295aa7..1bc0526 100644 --- a/src/views/realTimeMonitoring/index.vue +++ b/src/views/realTimeMonitoring/index.vue @@ -109,8 +109,8 @@ export default { } }).then(res => { console.log(res.data) - // var url = 'ws://192.168.66.56:9007/api/lychee/stream/live/'+res.data.channel - var url = 'ws://127.0.0.1:9007/api/lychee/stream/live/'+res.data.channel + var url = 'ws://192.168.66.56:9007/api/lychee/stream/live/'+res.data.channel + // var url = 'ws://127.0.0.1:9007/api/lychee/stream/live/'+res.data.channel var player = new JSMpeg.Player(url, { canvas: document.querySelector('.video'+item.id), audio: false, @@ -216,7 +216,7 @@ export default { } .flex-layouts{ display: flex; - width: 1550px; + width: 1630px; flex-wrap: wrap; } .video-list{ diff --git a/src/views/realTimeMonitoring/model.vue b/src/views/realTimeMonitoring/model.vue index aec7053..cbbfab8 100644 --- a/src/views/realTimeMonitoring/model.vue +++ b/src/views/realTimeMonitoring/model.vue @@ -150,7 +150,8 @@ export default { } }).then(res => { console.log(res.data) - var url = 'ws://127.0.0.1:9007/api/lychee/stream/live/'+res.data.channel + var url = 'ws://192.168.66.56:9007/api/lychee/stream/live/'+res.data.channel + // var url = 'ws://127.0.0.1:9007/api/lychee/stream/live/'+res.data.channel var player = new JSMpeg.Player(url, { canvas: document.querySelector('.video-canvas'), audio: false, @@ -373,11 +374,9 @@ export default { }) }, - leftStop(e){ + leftStop(){ this.leftUrl=require('@/assets/left-icon.png') console.log('左转鼠标抬起') - // e.unbind('mousemove') - console.log(e) this.$axios.post('/camera/control/left/stop/'+this.id, { data: {} }).then(res => { diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue index 7e7833c..231ec25 100644 --- a/src/views/roadwayManage/index.vue +++ b/src/views/roadwayManage/index.vue @@ -18,9 +18,11 @@ diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue index 76f82c2..5422fa3 100644 --- a/src/views/roadwayManage/model.vue +++ b/src/views/roadwayManage/model.vue @@ -240,8 +240,8 @@ export default { rightShelveId:newVal.rightShelveId, rightInsideShelveId:newVal.rightInsideShelveId, rightOutsideShelveId:newVal.rightOutsideShelveId, - camera1Id:newVal.camera1Id, - camera2Id:newVal.camera2Id, + camera1Id:newVal.camera1Name, + camera2Id:newVal.camera2Name, camera1Name:newVal.camera1Name, camera2Name:newVal.camera2Name }) @@ -306,6 +306,11 @@ export default { values.rightType='1' break; } + if(!this.cameraList.length>0){ + // console.log(this.mdata.camera1Id) + values.camera1Id = this.mdata.camera1Id + values.camera2Id = this.mdata.camera2Id + } this.$api.httpApi.editStreet({ data:values }).then(res => {