diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..2b36948
Binary files /dev/null and b/dist.zip differ
diff --git a/src/views/cameraManage/index.vue b/src/views/cameraManage/index.vue
index 4116dd6..5ff73ff 100644
--- a/src/views/cameraManage/index.vue
+++ b/src/views/cameraManage/index.vue
@@ -17,9 +17,9 @@
@change="handleGetCameraList"
>
-
+
配置
diff --git a/src/views/cameraManage/model.vue b/src/views/cameraManage/model.vue
index 6ef92ef..1085ff5 100644
--- a/src/views/cameraManage/model.vue
+++ b/src/views/cameraManage/model.vue
@@ -29,50 +29,61 @@
-
-
-
-
-
-
![]()
-
变倍
-
![]()
-
-
-
![]()
-
变焦
-
![]()
-
-
-
![]()
-
光圈
-
![]()
-
-
-
-
-
-
![]()
-
![]()
-
-
-
-
+
+
+
+
+
+
+
![]()
+
变倍
+
![]()
+
+
+
![]()
+
变焦
+
![]()
+
+
+
![]()
+
光圈
+
![]()
+
+
+
+
+
+
![]()
+
![]()
+
+
+
+
+
@@ -229,6 +240,7 @@ export default {
data() {
return {
isShow:false,
+ player:null,
type:'',
title:'',
closable:false,//取消model模态框右上角的X号
@@ -265,7 +277,6 @@ export default {
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)
this.$nextTick(() => {
this.autoPlay(this.id)
})
@@ -274,13 +285,15 @@ export default {
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()
this.$nextTick(() => {
this.autoPlay(this.id)
})
+ this.getConfigIoList()
}
},
+ destroy(){
+ //this.player.destroy()
+ },
methods: {
handleOk() {
this.confirmLoading = true;
@@ -320,24 +333,29 @@ export default {
},
handleCancel() {
+ this.player.destroy()
console.log('Clicked cancel button');
this.$emit('close', false, {})
if(this.type=='test') {
this.$router.go(-1);
- this.player.destroy()
+ //this.player.destroy();
+ this.player = null;
}else if(this.type=='config') {
this.$router.go(-1);
- this.player.destroy()
+ //this.player.destroy();
+ this.player = null;
}
+
},
+ //写两个会让渲染快一点,避开两个重连机制
autoPlay(id){
let video = document.getElementById('camera'+id);
- console.log(video)
- if(this.player == null){
- this.player = new WebRtcPlayer(video,'camera'+id);
- }
+
+ this.player = new WebRtcPlayer(video,'camera'+id);
+
this.player.load('camera'+id);
},
+
setVideoServer(){
this.$api.httpApi.getVideoServer({
data: {}
@@ -375,7 +393,7 @@ export default {
type: type
}
}).then(res => {
- console.log(res)
+
this.getConfigIoList()
}).catch(err => {
diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index d335aa5..e99b1ea 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -161,7 +161,10 @@ export default {
},
mounted() {
//this.changeTab('1-1')
- this.getStatus();
+ this.$nextTick(() => {
+ this.getStatus();
+ })
+
},
created() {
//this.getStatus();
@@ -246,7 +249,7 @@ export default {
this.getStatusBg(a.row,a.column,a.status)
}
}
- this.columnTabStatus = res.data.columnTabStatus
+
var i = 1;
for(let a in res.data.columnTabStatus){
this.status.column[i] = res.data.columnTabStatus[a]
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 1d37d40..873849e 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -62,7 +62,24 @@
{{ checkObj[item.key] }}
-
+
+
+ 盘点图:
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无盘点图
+
+
@@ -99,11 +116,11 @@