chengdandan
/
TransFlow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: chengdandan:2d588051c8fe9069e8f820606becafb65e45b37d
Branches Tags
chengdandan:master
..
compare: chengdandan:260d7fe8efca7b7e1701ab6b3a6a01a48f6d4a22
Branches Tags
chengdandan:master

No commits in common. "2d588051c8fe9069e8f820606becafb65e45b37d" and "260d7fe8efca7b7e1701ab6b3a6a01a48f6d4a22" have entirely different histories.
2d588051c8 ... 260d7fe8ef

8 changed files with 49 additions and 73 deletions
Show Stats Expand all files Collapse all files

1
src/api/index.js
View File

@ -40,6 +40,7 @@ export const getStopAlgorithm = params => {
});
};
//分析-删除视频源接口
//172.16.1.26:5000/api/DeleteShipjk?F_VC_ID=9df02f1a113640c498e74a74c93aca77
export const getDeleteShipjk = params => {
return axios.get('api/DeleteShipjk', {
params

2
src/components/chart/lineChart.vue
View File

@ -115,7 +115,7 @@ export default {
},
boundaryGap: ['5%', '5%'],
data: this.xData.reverse()
data: this.xData
}
],
yAxis: [

4
src/components/chart/tableShow.vue
View File

@ -17,7 +17,7 @@
<!-- <el-table-column align="center" prop="steam_id" label="视频路"></el-table-column>
<el-table-column align="center" prop="zone_id" label="区域编号"></el-table-column> -->
<el-table-column align="center" prop="name" label="区域名称"></el-table-column>
<el-table-column align="center" prop="time" label="时间戳"></el-table-column>
<el-table-column align="center" prop="timestamp" label="时间戳"></el-table-column>
<!-- <el-table-column align="center" prop="" label="视频帧"></el-table-column> -->
<el-table-column align="center" label="目标类型">
<template slot-scope="scope">
@ -51,7 +51,7 @@
<el-table :data="msg" style="width: 100%" v-if="triggerType == '周期统计'">
<el-table-column align="center" prop="gate_id" label="断面编号"></el-table-column>
<el-table-column align="center" prop="name" label="断面名称"></el-table-column>
<el-table-column align="center" prop="time" label="时间戳"></el-table-column>
<el-table-column align="center" prop="timestamp" label="时间戳"></el-table-column>
<el-table-column align="center" prop="interval" label="时间序号"></el-table-column>
<el-table-column align="center" prop="type" label="目标类型">
<template slot-scope="scope">

19
src/components/target/typeChart.vue
View File

@ -168,15 +168,13 @@ export default {
// }else if(dataArr[0].timeMode=='周期时刻'){
// }
if (dataArr[0].timeMode=='触发') {
this.queue = dataArr[0].n_queue
} else if (dataArr[0].timeMode=='周期统计') {
this.queue = dataArr[0].ave_queue
} else if (dataArr[0].timeMode=='周期时刻') {
}
// if (dataArr[0].n_queue) {
// this.queue = dataArr[0].n_queue
// } else if (dataArr[0].ave_queue) {
// this.queue = dataArr[0].ave_queue
// } else if (dataArr[0].timeMode == '周期时刻') {
// }
}
},
@ -190,10 +188,7 @@ export default {
dataArr: {
handler(newVal) {
// console.log('dataArr', newVal);
if(newVal!=undefined&&newVal.length!=0){
this.getNewQueue(newVal)
}
// this.getNewQueue(newVal)
},
immediate: true

1
src/config/apiurl.js
View File

@ -7,7 +7,6 @@ export default {
// addFigure: "http://172.16.1.22:8080/api/AddJianktx",
// //编辑图形名称
// editFigure: "http://172.16.1.22:8080/api/EditTuxmc",
dataUrl: 'http://172.16.1.168:5000/api/AddShipjk',
getSpareElementOrder: 'http://172.16.1.168:5000/api/Upload',
postSetQuanjsz: 'http://172.16.1.168:5000/api/SetQuanjsz',

8
src/views/bounced/analysisConfiguration.vue
View File

@ -737,8 +737,8 @@ export default {
OnSceneload(newV) {
var ip = window.location.host;
this.ipData = 'http://' + ip.split(':')[0] + ':5000';
// this.$refs.analysisWeb.contentWindow.getIpData('http://172.16.1.168:5000');
this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id);
this.$refs.analysisWeb.contentWindow.getIpData('http://172.16.1.168:5000');
// this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id);
this.unityDone = true;
},
handleDeleteDian(row, idx) {
@ -1045,8 +1045,8 @@ export default {
// const host = 'ws://49.234.27.18:10087/'; // 一个测试用url，改成给的，ws://broker.emqx.io:8083/mqtt
var ip = window.location.host.split(":")[0];
console.log("ip",ip)
// const host = `ws://${ip}:10087`;
const host = 'ws://172.16.1.168:10087/';
const host = `ws://${ip}:10087`;
// const host = 'ws://172.16.1.168:10087/';
const options = {
// 配置
// 测试：订阅本机IP

78
src/views/bounced/dataBoard.vue
View File

@ -253,21 +253,21 @@ export default {
for (let i = 0; i < _this.$refs.typeChartRef.length; i++) {
// console.log(_this.$refs.typeChartRef[i], '触发接收的表格数据');
let item = _this.$refs.typeChartRef[i]
_this.$refs.typeChartRef[i].$refs.lineChartRef.drawLine(_this.$refs.typeChartRef[i].dataArr,_this.$refs.typeChartRef[i].componentName.split('_')[0])
if(item.componentName.split('_')[0]=="类型"&&item.$refs.barChartRef){
// 数据改变重新渲染柱状图
item.$refs.barChartRef.drawBar(item.dataArr[0])
}else if(item.componentName.split('_')[0]=="类型"&&item.$refs.pieChartRef){
// // 数据改变重新渲染饼图
let item = _this.$refs.typeChartRef[i]
_this.$refs.typeChartRef[i].$refs.lineChartRef.drawLine(_this.$refs.typeChartRef[i].dataArr, _this.$refs.typeChartRef[i].componentName.split('_')[0])
if (item.componentName.split('_')[0] == "类型") {
if(item.echartArr.includes('直方图')){
// 数据改变重新渲染柱状图
item.$refs.barChartRef.drawBar(item.dataArr[0])
}
if(item.echartArr.includes('饼状图')){
// 数据改变重新渲染饼图
item.$refs.pieChartRef.drawPie(item.dataArr[0])
}
}
}
})
@ -312,28 +312,17 @@ export default {
for (let i = 0; i < that.$refs.typeChartRef1.length; i++) {
item = that.$refs.typeChartRef1[i]
that.$refs.typeChartRef1[i].$refs.lineChartRef.drawLine(that.$refs.typeChartRef1[i].dataArr, that.$refs.typeChartRef[i].componentName.split('_')[0])
// if (item.componentName.split('_')[0] == "类型") {
// if (item.echartArr.includes('直方图')){
// // 数据改变重新渲染柱状图
// item.$refs.barChartRef.drawBar(item.dataArr[0])
// }
// if (item.echartArr.includes('饼状图')){
// // 数据改变重新渲染饼图
// item.$refs.pieChartRef.drawPie(item.dataArr[0])
// }
// }
if(item.componentName.split('_')[0]=="类型"&&item.$refs.barChartRef){
// 数据改变重新渲染柱状图
item.$refs.barChartRef.drawBar(item.dataArr[0])
}else if(item.componentName.split('_')[0]=="类型"&&item.$refs.pieChartRef){
// // 数据改变重新渲染饼图
// item.$refs.pieChartRef.drawPie(item.dataArr[0])
if (item.componentName.split('_')[0] == "类型") {
if (item.echartArr.includes('直方图')){
// 数据改变重新渲染柱状图
item.$refs.barChartRef.drawBar(item.dataArr[0])
}
if (item.echartArr.includes('饼状图')){
// 数据改变重新渲染饼图
item.$refs.pieChartRef.drawPie(item.dataArr[0])
}
}
}
})
}
@ -366,26 +355,17 @@ export default {
item = that.$refs.typeChartRef2[i]
// console.log(_this.$refs.typeChartRef[i], '触发接收的表格数据');
this.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(this.$refs.typeChartRef2[i].dataArr, _this.$refs.typeChartRe2f[i].componentName.split('_')[0])
// if (item.componentName.split('_')[0] == "类型") {
// if (item.echartArr.includes('直方图')) {
// // 数据改变重新渲染柱状图
// item.$refs.barChartRef.drawBar(item.dataArr[0])
// }
// if (item.echartArr.includes('饼状图')) {
// // 数据改变重新渲染饼图
// item.$refs.pieChartRef.drawPie(item.dataArr[0])
// }
// }
if(item.componentName.split('_')[0]=="类型"&&item.echartArr.includes('直方图')){
if (item.componentName.split('_')[0] == "类型") {
if (item.echartArr.includes('直方图')) {
// 数据改变重新渲染柱状图
item.$refs.barChartRef.drawBar(item.dataArr[0])
}else if(item.componentName.split('_')[0]=="类型"&&item.echartArr.includes('饼状图')){
// // 数据改变重新渲染饼图
}
if (item.echartArr.includes('饼状图')) {
// 数据改变重新渲染饼图
item.$refs.pieChartRef.drawPie(item.dataArr[0])
}
}
}
}
}
}

9
src/views/index.vue
View File

@ -267,7 +267,7 @@ export default {
presentation: [],
startValue: '',
timeMode: '',
type: ['机动车', '非机动车', '行人'],
type: [],
startSection: [],
endSection: [],
componentType: '',
@ -763,7 +763,7 @@ export default {
arr = res.data.data.type.split(',');
this.componentForm.type = arr;
} else {
this.componentForm.type = ['机动车', '非机动车', '行人'];
this.componentForm.type = [];
}
console.log('this.componentForm', this.componentForm);
}
@ -809,7 +809,8 @@ export default {
this.componentForm.componentName = res.data.data.componentName;
this.componentForm.componentParameterId = res.data.data.componentParameterId;
this.componentForm.cycleInterval = parseInt(res.data.data.cycleInterval);
this.componentForm.FlowType = res.data.data.flowType;
this.componentForm.startSectionIds = res.data.data.startSectionIds;
this.componentForm.startSectionNames = res.data.data.startSectionNames;
this.componentForm.endSectionIds = res.data.data.endSectionIds;
@ -862,7 +863,7 @@ export default {
arr = res.data.data.type.split(',');
this.componentForm.type = arr;
} else {
// this.componentForm.type = ['机动车', '非机动车', '行人'];
this.componentForm.type = [];
}
}
});