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

bug修改

This commit is contained in:
qiudan 2023-11-03 14:16:02 +08:00
parent 4f12905530
commit 5a424d5409
4 changed files with 129 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/VideoWeb/index.html
View File

@ -185,7 +185,8 @@
// console.log("图形类型",string) // console.log("图形类型",string)
// console.log("图形名称",string1) // console.log("图形名称",string1)
// console.log("图形位置",string2) // console.log("图形位置",string2)
window.parent.getFigure(string,string1,string2); // numberNew 判断2-模拟区，1-画布区
window.parent.getFigure(string,string1,string2,1);
} }
//新增图形传图形id //新增图形传图形id
function postFigureId(string){ function postFigureId(string){

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

@ -68,9 +68,17 @@
style="font-size: 30px; font-weight: bold" style="font-size: 30px; font-weight: bold"
v-if="title == '流量' && dataArr && dataArr.length != 0 && dataArr != undefined" v-if="title == '流量' && dataArr && dataArr.length != 0 && dataArr != undefined"
> >
<span style="font-size: 15px">流量</span><br /> <span style="font-size: 15px">流量</span
<span style="font-size: 30px; font-weight: bold">{{ ><br />
cycleAccumulateDataArr[0].flow || cycleAccumulateDataArr[0].flow === 0 ? cycleAccumulateDataArr[0].flow : ' - ' <span style="font-size: 30px; font-weight: bold" v-if="itemData.flowType && itemData.flowType == '出流'">{{
cycleAccumulateDataArr[0].out_flow || cycleAccumulateDataArr[0].out_flow === 0
? cycleAccumulateDataArr[0].out_flow
: ' - '
}}</span>
<span style="font-size: 30px; font-weight: bold" v-if="itemData.flowType && itemData.flowType == '入流'">{{
cycleAccumulateDataArr[0].in_flow || cycleAccumulateDataArr[0].in_flow === 0
? cycleAccumulateDataArr[0].in_flow
: ' - '
}}</span> }}</span>
<span style="font-size: 20px; font-weight: 200">辆</span> <span style="font-size: 20px; font-weight: 200">辆</span>
</div> </div>
@ -146,8 +154,15 @@
v-if="title == '流量' && dataArr && dataArr.length != 0 && dataArr != undefined" v-if="title == '流量' && dataArr && dataArr.length != 0 && dataArr != undefined"
> >
<span style="font-size: 15px">流量</span><br /> <span style="font-size: 15px">流量</span><br />
<span style="font-size: 30px; font-weight: bold">{{ <span style="font-size: 30px; font-weight: bold" v-if="itemData.flowType && itemData.flowType == '出流'">{{
newDataArr[0].flow || newDataArr[0].flow === 0 ? newDataArr[0].flow : ' - ' newDataArr[0].out_flow || newDataArr[0].out_flow === 0
? newDataArr[0].out_flow
: ' - '
}}</span>
<span style="font-size: 30px; font-weight: bold" v-if="itemData.flowType && itemData.flowType == '入流'">{{
newDataArr[0].in_flow || newDataArr[0].in_flow === 0
? newDataArr[0].in_flow
: ' - '
}}</span> }}</span>
<span style="font-size: 20px; font-weight: 200">辆</span> <span style="font-size: 20px; font-weight: 200">辆</span>
</div> </div>

6
src/views/index.vue
View File

@ -1530,7 +1530,7 @@ export default {
const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串 const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
var detId = []; var detId = [];
const msgN = JSON.parse(temp); const msgN = JSON.parse(temp);
//console.log('cycle_accumulate-周期统计实时累计数据主题', msgN); // console.log('cycle_accumulate-周期统计实时累计数据主题', msgN);
this.cycleAccumulateData = msgN; this.cycleAccumulateData = msgN;
} catch (error) {} } catch (error) {}
break; break;
@ -1908,11 +1908,13 @@ export default {
} }
return type; return type;
}, },
getFigureD(item, index, indexNew) { getFigureD(item, index, indexNew,numberNew) {
//console.log('图形类型', item); //console.log('图形类型', item);
//console.log('初始图形名称', index); //console.log('初始图形名称', index);
this.startFigureName = index; this.startFigureName = index;
//console.log('图形位置', indexNew); //console.log('图形位置', indexNew);
// numberNew 1-画布区 2-模拟区
this.numberNew = numberNew
this.dialogFormVisible = true; this.dialogFormVisible = true;
this.switchValue = 0; this.switchValue = 0;
this.typeCheckList = [ this.typeCheckList = [

137
src/views/sensorFusion/index.vue
View File

@ -554,7 +554,16 @@
}}</span }}</span
> >
<span style="font-size: 14px" v-if="i.componentType == '车头时距'">秒</span> <span style="font-size: 14px" v-if="i.componentType == '车头时距'">秒</span>
<span style="font-size: 14px" v-if="i.componentType == '速度'">秒</span> <span style="font-size: 14px" v-if="i.componentType == '速度'">
<span
v-if="
(i.triggerData.speed && i.triggerData.speed != -1) ||
i.triggerData.speed === 0
"
>
{{ i.triggerData.speed > 0 || i.triggerData.speed === 0 ? 'km/h' : 'pix/s' }}
</span>
</span>
<span style="font-size: 14px" v-if="i.componentType == '类型'"></span> <span style="font-size: 14px" v-if="i.componentType == '类型'"></span>
<span style="font-size: 14px" v-if="i.componentType == '流量'">辆</span> <span style="font-size: 14px" v-if="i.componentType == '流量'">辆</span>
<span <span
@ -1291,24 +1300,44 @@
:default-expanded-keys="defaultExpanded" :default-expanded-keys="defaultExpanded"
> >
<span class="custom-childTree-node" slot-scope="{ node, data }"> <span class="custom-childTree-node" slot-scope="{ node, data }">
<span v-if="node.level != 3"> {{ node.label }}</span> <template v-if="addChartTitle == '添加图表'">
<el-checkbox-group <span v-if="node.level != 4"> {{ node.label }}</span>
v-model="checkList" <el-checkbox-group
:disabled="disabledCheckList.includes(`${data.componentId},${node.parent.parent.data.videoId}`)" v-model="checkList"
v-else :disabled="disabledCheckList.includes(`${node.label},${node.parent.data.componentId},${node.parent.parent.parent.data.videoId}`)"
@change="changeChild(data, node)" v-else
> @change="changeChild(data, node)"
<el-checkbox
:label="
!data.componentId
? node.label + ',' + node.parent.data.componentId + ',' + node.parent.parent.data.videoId
: data.componentId + ',' + node.parent.parent.data.videoId
"
> >
{{ node.label }} <el-checkbox
</el-checkbox> :label="
</el-checkbox-group> !data.componentId
? node.label + ',' + node.parent.data.componentId + ',' + node.parent.parent.parent.data.videoId
: data.componentId + ',' + node.parent.parent.parent.data.videoId
"
>
{{ node.label }}
</el-checkbox>
</el-checkbox-group>
</template>
<template v-if="addChartTitle == '添加分析项'">
<span v-if="node.level != 3"> {{ node.label }}</span>
<el-checkbox-group
v-model="checkList"
:disabled="disabledCheckList.includes(`${data.componentId},${node.parent.parent.data.videoId}`)"
v-else
@change="changeChild(data, node)"
>
<el-checkbox
:label="
!data.componentId
? node.label + ',' + node.parent.data.componentId + ',' + node.parent.parent.data.videoId
: data.componentId + ',' + node.parent.parent.data.videoId
"
>
{{ node.label }}
</el-checkbox>
</el-checkbox-group>
</template>
<!-- <el-checkbox-group <!-- <el-checkbox-group
v-model="data.checked" v-model="data.checked"
v-else v-else
@ -2040,32 +2069,70 @@ export default {
getChartComponent().then((res) => { getChartComponent().then((res) => {
//吧子数组变成想要的 //吧子数组变成想要的
let transformedData = res.data.data.map((item) => { let transformedData = res.data.data.map((item) => {
let newData = { // let newData = {
videoId: item.videoId, // videoId: item.videoId,
videoName: item.videoName, // videoName: item.videoName,
data: item.data.map((subItem) => { // data: item.data.map((subItem) => {
let presentationForms = subItem.presentationForm.split(','); // let presentationForms = subItem.presentationForm.split(',');
return { // return {
componentId: subItem.componentId, // componentId: subItem.componentId,
componentName: subItem.componentName, // componentName: subItem.componentName,
interfaceComponentId: subItem.interfaceComponentId, // interfaceComponentId: subItem.interfaceComponentId,
presentationForm: subItem.presentationForm, // presentationForm: subItem.presentationForm,
// data: presentationForms.map((form) => ({ videoName: form }))
// };
// })
// };
// return newData;
const newData = item.data.reduce((acc, obj) => {
const existingData = acc.find((entry) => entry.combinationName === obj.combinationName);
let presentationForms = obj.presentationForm.split(',');
if (existingData) {
existingData.data.push({
componentId: obj.componentId,
componentName: obj.componentName,
interfaceComponentId: obj.interfaceComponentId,
presentationForm: obj.presentationForm,
data: presentationForms.map((form) => ({ videoName: form })) data: presentationForms.map((form) => ({ videoName: form }))
}; });
}) } else {
acc.push({
combinationName: obj.combinationName,
data: [
{
componentId: obj.componentId,
componentName: obj.componentName,
interfaceComponentId: obj.interfaceComponentId,
presentationForm: obj.presentationForm,
data: presentationForms.map((form) => ({ videoName: form }))
}
]
});
}
return acc;
}, []);
return {
...item,
data: newData
}; };
return newData;
}); });
this.renameField(transformedData, 'combinationName', 'videoName'); this.renameField(transformedData, 'combinationName', 'videoName');
this.renameField(transformedData, 'componentName', 'videoName'); this.renameField(transformedData, 'componentName', 'videoName');
this.addCheckedField(transformedData); this.addCheckedField(transformedData);
this.addChildThreeData = transformedData; this.addChildThreeData = transformedData;
// this.addChildThreeData.map((item) => {
// item.data.map((key) => {
// key.data = key.data.filter((d) => d.videoName != '数值');
// });
// });
this.addChildThreeData.map((item) => { this.addChildThreeData.map((item) => {
item.data.map((key) => { item.data.map((key) => {
key.data = key.data.filter((d) => d.videoName != '数值'); key.data.map((t) => {
t.data = t.data.filter((d) => d.videoName != '数值');
});
}); });
}); });
//console.log(this.addChildThreeData, ' this.addChildThreeData'); // console.log(this.addChildThreeData, ' this.addChildThreeData');
}); });
this.addThreeNodeData.data = data; this.addThreeNodeData.data = data;
this.addThreeNodeData.node = node; this.addThreeNodeData.node = node;
@ -2078,7 +2145,7 @@ export default {
}).then((res) => { }).then((res) => {
res.data.data.forEach((item) => { res.data.data.forEach((item) => {
this.checkList.push(`${item.presentationForm},${item.analogAreaComponentId},${item.videoId}`); this.checkList.push(`${item.presentationForm},${item.analogAreaComponentId},${item.videoId}`);
this.disabledCheckList.push(`${item.analogAreaComponentId},${item.videoId}`); this.disabledCheckList.push(`${item.presentationForm},${item.analogAreaComponentId},${item.videoId}`);
this.defaultExpanded.push(item.analogAreaComponentId); this.defaultExpanded.push(item.analogAreaComponentId);
// item.data.forEach((subItem) => { // item.data.forEach((subItem) => {
// const labels = subItem.presentationForm.split(","); // const labels = subItem.presentationForm.split(",");
@ -2091,6 +2158,8 @@ export default {
// }); // });
// }); // });
}); });
// console.log(this.disabledCheckList, ' this.disabledCheckList');
// console.log(this.checkList, ' this.disabledCheckList');
}); });
} else if (node.level == 4) { } else if (node.level == 4) {
this.addChartTitle = '添加分析项'; this.addChartTitle = '添加分析项';