This commit is contained in:
chengdandan 2023-02-06 14:11:37 +08:00
parent 08d9af239b
commit 58b3d31b7e
6 changed files with 41 additions and 26 deletions

View File

@ -241,6 +241,10 @@
//获取左侧区域删除图形或断面成功后返回的数据 //获取左侧区域删除图形或断面成功后返回的数据
function getdeleData(data){ function getdeleData(data){
console.log("id",data) console.log("id",data)
if(data != null){
window.parent.delSuccess()
}
} }
document.body.appendChild(script); document.body.appendChild(script);

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="content-box"> <div class="content-box">
<!-- v-if="videoTypeShow" --> <!-- v-if="videoTypeShow" -->
<div class="videoTypeBox" v-if="videoTypeShow"> <div class="videoTypeBox" >
<el-form :inline="true" :model="videoTypeForm" class="demo-form-inline" > <el-form :inline="true" :model="videoTypeForm" class="demo-form-inline" >
<el-form-item label="视频源类型:" > <el-form-item label="视频源类型:" >
<el-radio-group v-model="videoTypeForm.videoType"> <el-radio-group v-model="videoTypeForm.videoType">

View File

@ -71,7 +71,7 @@
</div> </div>
</el-drawer> </el-drawer>
<!-- 组件弹框 --> <!-- 组件弹框 -->
<el-dialog :title="componentTitle + '指标组件'" width="40%" :visible.sync="component"> <el-dialog :title="componentTitle + '指标组件'" width="40%" :visible.sync="component" :close-on-click-modal ="false">
<el-form ref="form" :model="componentForm" label-width="150px" @close="closeComponentForm()"> <el-form ref="form" :model="componentForm" label-width="150px" @close="closeComponentForm()">
<el-form-item label="名称:"> <el-form-item label="名称:">
<el-input v-model="componentForm.componentName"></el-input> <el-input v-model="componentForm.componentName"></el-input>
@ -345,7 +345,7 @@ export default {
videoName:'', videoName:'',
videoPath:'', videoPath:'',
videoTotalFrames:'', videoTotalFrames:'',
videoType:'' videoType:'实时视频'
}, },
description:'请点击视频分析' description:'请点击视频分析'
}; };
@ -364,6 +364,7 @@ export default {
window.getSingleComponentId = this.getSingleComponentIdN; window.getSingleComponentId = this.getSingleComponentIdN;
window.getSimulationAreaEdit = this.getSimulationAreaEdit; window.getSimulationAreaEdit = this.getSimulationAreaEdit;
window.OnScene = this.OnSceneN; window.OnScene = this.OnSceneN;
window.delSuccess= this.delSuccess;
this.getAllSectionalData(this.$route.query.id); this.getAllSectionalData(this.$route.query.id);
this.VideoId = this.$route.query.id; this.VideoId = this.$route.query.id;
this.number = this.$route.query.num; this.number = this.$route.query.num;
@ -374,7 +375,7 @@ export default {
this.trafficAnalysisShow = false; this.trafficAnalysisShow = false;
this.createMqtt(); this.createMqtt();
document.getElementById('mapModule').contentWindow.lixianVideo(JSON.stringify(this.analysis)); // document.getElementById('mapModule').contentWindow.lixianVideo(JSON.stringify(this.analysis));
} else if (this.$route.query.type == '离线视频'){ } else if (this.$route.query.type == '离线视频'){
this.videoAnalysisShow = true; this.videoAnalysisShow = true;
this.trafficAnalysisShow = true; this.trafficAnalysisShow = true;
@ -429,9 +430,9 @@ export default {
// //
if(res.data.data.videoAnalysisStatus == '未分析'){ if(res.data.data.videoAnalysisStatus == '未分析'){
this.disabledTrafficAnalysis= true this.disabledTrafficAnalysis= true
// this.videoUnityShow = false this.videoUnityShow = false
this.videoUnityShow = true // this.videoUnityShow = true
this.analysisData() // this.analysisData()
}else if(res.data.data.videoAnalysisStatus == '分析中'){ }else if(res.data.data.videoAnalysisStatus == '分析中'){
this.disabledVideoAnalysis= true this.disabledVideoAnalysis= true
this.videoUnityShow = false this.videoUnityShow = false
@ -464,18 +465,18 @@ export default {
message: '启动成功', message: '启动成功',
type: 'success' type: 'success'
}); });
if(this.videoAnalysisSta=='已分析'){ setTimeout(() => {
}else if(this.videoAnalysisSta=='分析中'){
this.description = '正在分析中'
setTimeout(() => {
this.getAnalysisStatus() this.getAnalysisStatus()
}, 5000); }, 5000);
}else if(this.videoAnalysisSta=='未分析'){ // if(this.videoAnalysisSta==''){
// setTimeout(() => {
// this.getAnalysisStatus() // }else if(this.videoAnalysisSta==''){
// }, 5000); // this.description = ''
} // setTimeout(() => {
// this.getAnalysisStatus()
// }, 5000);
// }else if(this.videoAnalysisSta==''){
// }
} }
}); });
}, },
@ -501,14 +502,13 @@ export default {
analysisData(){ analysisData(){
getAnalysisData(this.$route.query.id).then(res => { getAnalysisData(this.$route.query.id).then(res => {
console.log("res.data.data",res.data.data) console.log("res.data.data",res.data.data)
this.analysis.trafficAnalysisPath1 = res.data.data.trafficAnalysisPath1 this.analysis.trafficAnalysisPath1 = res.data.data.trafficAnalysisPath1
this.analysis.trafficAnalysisPath2 = res.data.data.trafficAnalysisPath2 this.analysis.trafficAnalysisPath2 = res.data.data.trafficAnalysisPath2
this.analysis.videoAnalysisPath = res.data.data.videoAnalysisPath this.analysis.videoAnalysisPath = res.data.data.videoAnalysisPath
this.analysis.videoName = res.data.data.videoName this.analysis.videoName = res.data.data.videoName
this.analysis.videoPath = res.data.data.videoPath this.analysis.videoPath = res.data.data.videoPath
this.analysis.videoTotalFrames = res.data.data.videoTotalFrames this.analysis.videoTotalFrames = res.data.data.videoTotalFrames
this.analysis.videoType=this.$route.query.type this.analysis.videoType=this.$route.query.type
}); });
}, },
//mqtt //mqtt
@ -604,6 +604,17 @@ export default {
document.getElementById('mapModule').contentWindow.postVideoId(JSON.stringify(this.$route.query.id)); document.getElementById('mapModule').contentWindow.postVideoId(JSON.stringify(this.$route.query.id));
document.getElementById('mapModule').contentWindow.lixianVideo(JSON.stringify(this.analysis)); document.getElementById('mapModule').contentWindow.lixianVideo(JSON.stringify(this.analysis));
}, },
//
delSuccess(){
if(this.$route.query.type=='离线视频'){
this.$message({
type: "warning",
message: "请点击交通分析,获取最新数据!",
showClose: true,
duration:0,
});
}
},
// //id // //id
getSingleComponentIdN(id, type, name) { getSingleComponentIdN(id, type, name) {
console.log('id', id); console.log('id', id);