diff --git a/src/layouts/AsideMenu.vue b/src/layouts/AsideMenu.vue
index 4b7a98a..c14e722 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;
+ return item.rights === ele.name && ele.name.indexOf("center") < 0 && item.rights === ele.name && ele.name.indexOf("ioTable") < 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");
+ return !item.name.startsWith("center") && !item.name.startsWith("ioTable");
});
}
this.routes = parents;
diff --git a/src/router/index.js b/src/router/index.js
index 21e37f3..da0c0b6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -112,6 +112,14 @@ const routes = [{
},
component: () => import('@/views/cameraManage/index')
},
+ {
+ path: 'cameraManage/ioTable',
+ name: 'ioTable',
+ meta: {
+ name: 'IO表配置'
+ },
+ component: () => import('@/views/cameraManage/ioTable')
+ },
{
path: 'center',
name: 'center',
diff --git a/src/views/cameraManage/index.vue b/src/views/cameraManage/index.vue
index 1699c14..5f320de 100644
--- a/src/views/cameraManage/index.vue
+++ b/src/views/cameraManage/index.vue
@@ -4,7 +4,7 @@
新增球机
-
+
PLC IO表配置
@@ -19,7 +19,7 @@
测试
-
+
配置
@@ -145,6 +145,9 @@ export default {
}).catch(err => {
})
+ },
+ goIo(){
+ this.$router.push({ name: "ioTable" });
}
},
components:{
diff --git a/src/views/cameraManage/ioModel.vue b/src/views/cameraManage/ioModel.vue
new file mode 100644
index 0000000..41f33ab
--- /dev/null
+++ b/src/views/cameraManage/ioModel.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
diff --git a/src/views/cameraManage/ioTable.vue b/src/views/cameraManage/ioTable.vue
new file mode 100644
index 0000000..57472dc
--- /dev/null
+++ b/src/views/cameraManage/ioTable.vue
@@ -0,0 +1,163 @@
+
+
+
+
+
+
+
+ 编辑
+
+
+ delDosage(record)"
+ >
+ 删除
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/cameraManage/model.vue b/src/views/cameraManage/model.vue
index 251c6a5..3fd0213 100644
--- a/src/views/cameraManage/model.vue
+++ b/src/views/cameraManage/model.vue
@@ -109,6 +109,7 @@ export default {
modelData: function(newVal){
// console.log(newVal)
this.mdata=newVal
+ console.log(this.type)
if(newVal.id && this.type=='edit'){
this.id = newVal.id
// console.log('触发了watch,重新赋值')
@@ -204,7 +205,9 @@ export default {
handleCancel() {
console.log('Clicked cancel button');
console.log(this.title);
- window.vxgplayer('video-test').dispose();
+ if(this.type=='test'){
+ window.vxgplayer('video-test').dispose();
+ }
this.$emit('close',false,{})
},
getTestVideo(rtsp){
@@ -215,14 +218,7 @@ export default {
vxgplayer('video-test').size('100%', '100%');
})
},
- beforeRouteLeave(to,form,next){
- if(window.vxgplayer){
- window.vxgplayer('video-test').dispose();
- next(true)
- }else {
- next(true)
- }
- },
+
zoomDecStart(){
console.log('变倍-按下')
this.zoomSubUrl=require('@/assets/sub-active-icon.png')