Compare commits
No commits in common. "6d3f7568cb8d5467c0e149f728c865342686b744" and "a606d4cd51ef754eed0cba53692ba346f231898b" have entirely different histories.
6d3f7568cb
...
a606d4cd51
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -241,10 +241,6 @@
|
||||||
//获取左侧区域删除图形或断面成功后返回的数据
|
//获取左侧区域删除图形或断面成功后返回的数据
|
||||||
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);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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" v-if="videoTypeShow">
|
||||||
<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">
|
||||||
|
|
@ -60,7 +60,7 @@
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<div class="btn" v-if="videoTypeForm.videoType=='实时视频'">
|
<div class="btn">
|
||||||
|
|
||||||
<el-button type="primary" @click="applicationBtn">保存</el-button>
|
<el-button type="primary" @click="applicationBtn">保存</el-button>
|
||||||
<!-- <el-button type="primary" @click="stopAlgorithmBtn">关闭程序</el-button> -->
|
<!-- <el-button type="primary" @click="stopAlgorithmBtn">关闭程序</el-button> -->
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="数据看板" name="second">
|
<el-tab-pane label="数据看板" name="second">
|
||||||
<dataBoard :activeName="activeName" :triggerData="triggerData" :triggerListData="triggerListData" :cycleTimeData='cycleTimeData'></dataBoard>
|
<dataBoard :activeName="activeName" :triggerData="triggerData" :triggerListData="triggerListData"></dataBoard>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="分析配置" name="third">
|
<el-tab-pane label="分析配置" name="third">
|
||||||
<analysisConfiguration :analysisConfigurationdata="analysisConfigurationdata"></analysisConfiguration>
|
<analysisConfiguration :analysisConfigurationdata="analysisConfigurationdata"></analysisConfiguration>
|
||||||
|
|
@ -71,7 +71,7 @@
|
||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
<!-- 组件弹框 -->
|
<!-- 组件弹框 -->
|
||||||
<el-dialog :title="componentTitle + '指标组件'" width="40%" :visible.sync="component" :close-on-click-modal ="false">
|
<el-dialog :title="componentTitle + '指标组件'" width="40%" :visible.sync="component">
|
||||||
<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>
|
||||||
|
|
@ -331,8 +331,6 @@ export default {
|
||||||
//触发数据
|
//触发数据
|
||||||
triggerData: [],
|
triggerData: [],
|
||||||
triggerListData:[],
|
triggerListData:[],
|
||||||
//周期时刻
|
|
||||||
cycleTimeData:[],
|
|
||||||
//视频类型
|
//视频类型
|
||||||
videoType: '',
|
videoType: '',
|
||||||
videoAnalysisShow: false,
|
videoAnalysisShow: false,
|
||||||
|
|
@ -347,7 +345,7 @@ export default {
|
||||||
videoName:'',
|
videoName:'',
|
||||||
videoPath:'',
|
videoPath:'',
|
||||||
videoTotalFrames:'',
|
videoTotalFrames:'',
|
||||||
videoType:'实时视频'
|
videoType:''
|
||||||
},
|
},
|
||||||
description:'请点击视频分析'
|
description:'请点击视频分析'
|
||||||
};
|
};
|
||||||
|
|
@ -366,7 +364,6 @@ 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;
|
||||||
|
|
@ -377,7 +374,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;
|
||||||
|
|
@ -397,7 +394,7 @@ export default {
|
||||||
/** 创建mqtt */
|
/** 创建mqtt */
|
||||||
createMqtt() {
|
createMqtt() {
|
||||||
//创建链接,接收数据
|
//创建链接,接收数据
|
||||||
this.topicSends = ['stream' + this.number, 'trajectory' + this.number, 'detection' + this.number,'trigger-'+ this.$route.query.id,'cycle_time-'+ this.$route.query.id];
|
this.topicSends = ['stream' + this.number, 'trajectory' + this.number, 'detection' + this.number,'trigger-'+ this.$route.query.id];
|
||||||
window.PubScribe(this.topicSends, this.number, this.realInfo);
|
window.PubScribe(this.topicSends, this.number, this.realInfo);
|
||||||
// mqtt = mqttConfig;
|
// mqtt = mqttConfig;
|
||||||
/*mqtt = new mqttConfig(this.topicSends);
|
/*mqtt = new mqttConfig(this.topicSends);
|
||||||
|
|
@ -467,18 +464,18 @@ export default {
|
||||||
message: '启动成功',
|
message: '启动成功',
|
||||||
type: 'success'
|
type: 'success'
|
||||||
});
|
});
|
||||||
setTimeout(() => {
|
if(this.videoAnalysisSta=='已分析'){
|
||||||
this.getAnalysisStatus()
|
|
||||||
}, 5000);
|
|
||||||
// if(this.videoAnalysisSta=='已分析'){
|
|
||||||
|
|
||||||
// }else if(this.videoAnalysisSta=='分析中'){
|
}else if(this.videoAnalysisSta=='分析中'){
|
||||||
// this.description = '正在分析中'
|
this.description = '正在分析中'
|
||||||
// setTimeout(() => {
|
setTimeout(() => {
|
||||||
// this.getAnalysisStatus()
|
this.getAnalysisStatus()
|
||||||
// }, 5000);
|
}, 5000);
|
||||||
// }else if(this.videoAnalysisSta=='未分析'){
|
}else if(this.videoAnalysisSta=='未分析'){
|
||||||
// }
|
// setTimeout(() => {
|
||||||
|
// this.getAnalysisStatus()
|
||||||
|
// }, 5000);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
@ -504,13 +501,14 @@ 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
|
||||||
|
|
@ -587,19 +585,6 @@ export default {
|
||||||
this.triggerListData = msgN;
|
this.triggerListData = msgN;
|
||||||
} catch (error) {}
|
} catch (error) {}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'cycle_time-'+this.$route.query.id:
|
|
||||||
try {
|
|
||||||
// console.log("trigger_msgN",message)
|
|
||||||
const utf8decoder = new TextDecoder();
|
|
||||||
const u8arr = new Uint8Array(message);
|
|
||||||
const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
|
|
||||||
var detId = [];
|
|
||||||
const msgN = JSON.parse(temp);
|
|
||||||
// console.log("trigger_msgN",msgN)
|
|
||||||
this.cycleTimeData = msgN;
|
|
||||||
} catch (error) {}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
this.receiveNews = '';
|
this.receiveNews = '';
|
||||||
},
|
},
|
||||||
|
|
@ -619,17 +604,6 @@ 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);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue