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

10.26bug修改

This commit is contained in:
qiudan 2023-10-26 19:22:56 +08:00
parent 246b730fd2
commit 8752eae7ed
15 changed files with 6272 additions and 6700 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/VideoWeb/Build/APP.data.unityweb Normal file → Executable file
View File

Binary file not shown.

BIN
public/VideoWeb/Build/APP.framework.js.unityweb Normal file → Executable file
View File

Binary file not shown.

0
public/VideoWeb/Build/APP.loader.js Normal file → Executable file
View File

BIN
public/VideoWeb/Build/APP.wasm.unityweb Normal file → Executable file
View File

Binary file not shown.

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

@ -258,7 +258,7 @@ export default {
confine: true confine: true
}; };
series[0].data = newVal.map(val => { series[0].data = newVal.map(val => {
if (timeMode == '周期统计') { if (timeMode == '固定间隔') {
return val.ave_headway; return val.ave_headway;
} else { } else {
return val.headway; return val.headway;
@ -269,7 +269,7 @@ export default {
this.name = "辆" this.name = "辆"
series[0].data = newVal.map(val => { series[0].data = newVal.map(val => {
// return val.n_queue; // return val.n_queue;
if (timeMode == '周期统计') { if (timeMode == '固定间隔') {
return val.ave_queue; return val.ave_queue;
} else { } else {
return val.n_queue; return val.n_queue;
@ -278,7 +278,7 @@ export default {
} else if (title === '检测数') { } else if (title === '检测数') {
this.name = "辆" this.name = "辆"
series[0].data = newVal.map(val => { series[0].data = newVal.map(val => {
if (timeMode == '周期统计') { if (timeMode == '固定间隔') {
return val.ave_stay; return val.ave_stay;
} else { } else {
return val.n_stay; return val.n_stay;

10
src/components/chart/regionTable.vue
View File

@ -13,8 +13,8 @@
<div v-if="msg" class="regionBox"> <div v-if="msg" class="regionBox">
<!-- 触发 --> <!-- 实时触发 -->
<el-table :data="msg" style="width: 100%" v-if="triggerType == '触发' "> <el-table :data="msg" style="width: 100%" v-if="triggerType == '实时触发' ">
<!-- <el-table-column align="center" prop="steam_id" label="视频路"></el-table-column> --> <!-- <el-table-column align="center" prop="steam_id" label="视频路"></el-table-column> -->
<!-- <el-table-column align="center" prop="graphical_id" label="区域编号"></el-table-column> --> <!-- <el-table-column align="center" prop="graphical_id" label="区域编号"></el-table-column> -->
<el-table-column align="center" prop="name" label="区域名称"></el-table-column> <el-table-column align="center" prop="name" label="区域名称"></el-table-column>
@ -47,7 +47,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" prop="speed" label="空间平均速度"></el-table-column> <el-table-column align="center" prop="speed" label="空间平均速度"></el-table-column>
</el-table> </el-table>
<el-table :data="msg" style="width: 100%" v-if="triggerType == '周期时刻' "> <el-table :data="msg" style="width: 100%" v-if="triggerType == '固定时刻' ">
<!-- <el-table-column align="center" prop="steam_id" label="视频路"></el-table-column> --> <!-- <el-table-column align="center" prop="steam_id" label="视频路"></el-table-column> -->
<!-- <el-table-column align="center" prop="graphical_id" label="区域编号"></el-table-column> --> <!-- <el-table-column align="center" prop="graphical_id" label="区域编号"></el-table-column> -->
<el-table-column align="center" prop="name" label="区域名称"></el-table-column> <el-table-column align="center" prop="name" label="区域名称"></el-table-column>
@ -81,8 +81,8 @@
</el-table-column> </el-table-column>
<el-table-column align="center" prop="speed" label="空间平均速度"></el-table-column> <el-table-column align="center" prop="speed" label="空间平均速度"></el-table-column>
</el-table> </el-table>
<!-- 周期统计 --> <!-- 固定间隔 -->
<el-table :data="msg" style="width: 100%" v-if="triggerType == '周期统计'"> <el-table :data="msg" style="width: 100%" v-if="triggerType == '固定间隔'">
<!-- <el-table-column align="center" prop="zone_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="name" label="区域名称"></el-table-column>
<el-table-column align="center" prop="time" label="时间戳"></el-table-column> <el-table-column align="center" prop="time" label="时间戳"></el-table-column>

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

@ -9,11 +9,11 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
<!-- 触发 --> <!-- 实时触发 -->
<!-- 触发 --> <!-- 实时触发 -->
<div v-if="msg"> <div v-if="msg">
<el-table :data="msg" style="width: 100%" v-if="triggerType == '触发'"> <el-table :data="msg" style="width: 100%" v-if="triggerType == '实时触发'">
<!-- <el-table-column align="center" prop="steam_id" label="视频路"></el-table-column> <!-- <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="zone_id" label="区域编号"></el-table-column> -->
<el-table-column align="center" prop="name" label="区域名称"></el-table-column> <el-table-column align="center" prop="name" label="区域名称"></el-table-column>
@ -46,8 +46,8 @@
</el-table> </el-table>
<!-- 周期统计 --> <!-- 固定间隔 -->
<el-table :data="msg" style="width: 100%" v-if="triggerType == '周期统计'"> <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="gate_id" label="断面编号"></el-table-column>
<el-table-column align="center" prop="name" 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="time" label="时间戳"></el-table-column>

6
src/components/sensorFusion/echartsBar.vue
View File

@ -46,7 +46,7 @@ export default {
// if (this.dataList.length > 10) { // if (this.dataList.length > 10) {
// this.dataList = this.dataList.slice(-10); // this.dataList = this.dataList.slice(-10);
// } // }
if (this.timeMode == "触发") { if (this.timeMode == "实时触发") {
this.chartData.xData = []; this.chartData.xData = [];
this.chartData.yData = []; this.chartData.yData = [];
// debugger; // debugger;
@ -66,7 +66,7 @@ export default {
this.chartData.xData.push(this.dataList[0].type_data[j].name); this.chartData.xData.push(this.dataList[0].type_data[j].name);
} }
} }
} else if (this.timeMode == "周期时刻") { } else if (this.timeMode == "固定时刻") {
// for (let i = 0; i < this.dataList.length; i++) { // for (let i = 0; i < this.dataList.length; i++) {
// this.chartData.xData = []; // this.chartData.xData = [];
// this.chartData.yData = []; // this.chartData.yData = [];
@ -91,7 +91,7 @@ export default {
this.chartData.xData.push(this.dataList[0].type_data[j].name); this.chartData.xData.push(this.dataList[0].type_data[j].name);
} }
} }
} else if (this.timeMode == "周期统计") { } else if (this.timeMode == "固定间隔") {
// for (let i = 0; i < this.dataList.length; i++) { // for (let i = 0; i < this.dataList.length; i++) {
// this.chartData.xData = []; // this.chartData.xData = [];
// this.chartData.yData = []; // this.chartData.yData = [];

10
src/components/sensorFusion/echartsLine.vue
View File

@ -62,7 +62,7 @@ export default {
val = val.slice(-10); val = val.slice(-10);
} }
if (val != null) { if (val != null) {
if (this.timeMode == "触发") { if (this.timeMode == "实时触发") {
if (this.componentType == "车头时距") { if (this.componentType == "车头时距") {
this.chartData.xData = this.extractKeyValues(val, "time"); this.chartData.xData = this.extractKeyValues(val, "time");
this.chartData.yData = this.extractKeyValues(val, "headway"); this.chartData.yData = this.extractKeyValues(val, "headway");
@ -104,7 +104,7 @@ export default {
this.chartData.xData = this.extractKeyValues(val, "time"); this.chartData.xData = this.extractKeyValues(val, "time");
this.chartData.yData = this.extractKeyValues(val, "n_queue"); this.chartData.yData = this.extractKeyValues(val, "n_queue");
} }
} else if (this.timeMode == "周期时刻") { } else if (this.timeMode == "固定时刻") {
if (this.componentType == "车头时距") { if (this.componentType == "车头时距") {
this.chartData.xData = this.extractKeyValues(val, "time"); this.chartData.xData = this.extractKeyValues(val, "time");
this.chartData.yData = this.extractKeyValues(val, "headway"); this.chartData.yData = this.extractKeyValues(val, "headway");
@ -146,7 +146,7 @@ export default {
this.chartData.xData = this.extractKeyValues(val, "time"); this.chartData.xData = this.extractKeyValues(val, "time");
this.chartData.yData = this.extractKeyValues(val, "n_queue"); this.chartData.yData = this.extractKeyValues(val, "n_queue");
} }
} else if (this.timeMode == "周期统计") { } else if (this.timeMode == "固定间隔") {
if (this.componentType == "车头时距") { if (this.componentType == "车头时距") {
this.chartData.xData = this.extractKeyValues(val, "time"); this.chartData.xData = this.extractKeyValues(val, "time");
this.chartData.yData = this.extractKeyValues(val, "ave_headway"); this.chartData.yData = this.extractKeyValues(val, "ave_headway");
@ -255,7 +255,7 @@ export default {
} else { } else {
seriesList = [ seriesList = [
{ {
// name: '流量_1-zone2-曲线图-触发', // name: '流量_1-zone2-曲线图-实时触发',
type: "line", type: "line",
data: this.chartData.yData.reverse(), data: this.chartData.yData.reverse(),
symbolSize: 8, //标记的大小 symbolSize: 8, //标记的大小
@ -320,7 +320,7 @@ export default {
}, },
// data: [ // data: [
// { // {
// name: '流量_1-zone2-曲线图-触发', // name: '流量_1-zone2-曲线图-实时触发',
// icon: 'circle' // icon: 'circle'
// } // }
// ] // ]

10
src/components/sensorFusion/echartsPie.vue
View File

@ -56,11 +56,11 @@ export default {
initEcharts() { initEcharts() {
let seriesData = null; let seriesData = null;
let myChart = this.chart; let myChart = this.chart;
if (this.timeMode == "触发") { if (this.timeMode == "实时触发") {
seriesData = null; seriesData = null;
this.renameField(this.dataList[0].type_data, "quantity", "value"); this.renameField(this.dataList[0].type_data, "quantity", "value");
seriesData = this.dataList[0].type_data; seriesData = this.dataList[0].type_data;
} else if (this.timeMode == "周期时刻") { } else if (this.timeMode == "固定时刻") {
seriesData = null; seriesData = null;
// for (let i = 0; i < this.dataList.length; i++) { // for (let i = 0; i < this.dataList.length; i++) {
// this.renameField(this.dataList[0].type_data,'quantity','value') // this.renameField(this.dataList[0].type_data,'quantity','value')
@ -73,7 +73,7 @@ export default {
this.renameField(this.dataList[0].type_data, "quantity", "value"); this.renameField(this.dataList[0].type_data, "quantity", "value");
seriesData = this.dataList[0].type_data; seriesData = this.dataList[0].type_data;
} }
} else if (this.timeMode == "周期统计") { } else if (this.timeMode == "固定间隔") {
seriesData = null; seriesData = null;
// for (let i = 0; i < this.dataList.length; i++) { // for (let i = 0; i < this.dataList.length; i++) {
// this.renameField(this.dataList[0].type_data, "quantity", "value"); // this.renameField(this.dataList[0].type_data, "quantity", "value");
@ -123,7 +123,7 @@ export default {
width: "80%", width: "80%",
// data: [ // data: [
// { // {
// name: '流量_1-zone2-饼状图-触发', // name: '流量_1-zone2-饼状图-实时触发',
// icon: 'circle' // icon: 'circle'
// } // }
// ] // ]
@ -147,7 +147,7 @@ export default {
}, },
series: [ series: [
{ {
name: "流量_1-zone2-饼状图-触发", name: "流量_1-zone2-饼状图-实时触发",
type: "pie", type: "pie",
center: ["50%", "55%"], center: ["50%", "55%"],
radius: "70%", radius: "70%",

6
src/components/sensorFusion/thermalOD.vue
View File

@ -69,7 +69,7 @@ export default {
}, },
initEcharts() { initEcharts() {
let dataList = null; let dataList = null;
if (this.timeMode == "触发") { if (this.timeMode == "实时触发") {
let dataOd = []; let dataOd = [];
if (this.dataList.length > 0) { if (this.dataList.length > 0) {
for (let i = 0; i < this.dataList.length; i++) { for (let i = 0; i < this.dataList.length; i++) {
@ -77,7 +77,7 @@ export default {
dataList = this.ODhanlde(dataOd); dataList = this.ODhanlde(dataOd);
} }
} }
} else if (this.timeMode == "周期时刻") { } else if (this.timeMode == "固定时刻") {
let dataOd = []; let dataOd = [];
// for (let i = 0; i < this.dataList.length; i++) { // for (let i = 0; i < this.dataList.length; i++) {
// dataOd.push(this.dataList[0][0].ob_data); // dataOd.push(this.dataList[0][0].ob_data);
@ -92,7 +92,7 @@ export default {
// dataOd.push(this.dataList[0][0].ob_data); // dataOd.push(this.dataList[0][0].ob_data);
// dataList = this.ODhanlde(dataOd); // dataList = this.ODhanlde(dataOd);
// } // }
} else if (this.timeMode == "周期统计") { } else if (this.timeMode == "固定间隔") {
let dataOd = []; let dataOd = [];
// for (let i = 0; i < this.dataList.length; i++) { // for (let i = 0; i < this.dataList.length; i++) {
// dataOd.push(this.dataList[i].ob_data); // dataOd.push(this.dataList[i].ob_data);

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

@ -5,12 +5,16 @@
<!-- 触发数据数值渲染 --> <!-- 触发数据数值渲染 -->
<div class="typeContent"> <div class="typeContent">
<div v-if="newDataArr && newDataArr.length != 0 && newDataArr != undefined"> <div v-if="newDataArr && newDataArr.length != 0 && newDataArr != undefined">
<div v-if="title == '类型'" style="display:flex; flex-wrap: wrap;"> <div v-if="title == '类型'" style="display: flex; flex-wrap: wrap">
<el-card v-for="(n, i) in newDataArr[0].type_data" :key="i" <el-card
style="width: 150px; margin-bottom: 20px; text-align: center"> v-for="(n, i) in newDataArr[0].type_data"
:key="i"
style="width: 150px; margin-bottom: 20px; text-align: center"
>
<div> <div>
<span style="font-size: 15px;">{{ n.name }}</span><br /> <span style="font-size: 15px">{{ n.name }}</span
<span style="font-size: 30px; font-weight: bold">{{ n.quantity }}</span> ><br />
<span style="font-size: 30px; font-weight: bold">{{ n.quantity || n.quantity == 0 ? n.quantity : '-' }}</span>
<!-- <span v-if="n.name=='速度'">km/h</span> --> <!-- <span v-if="n.name=='速度'">km/h</span> -->
</div> </div>
<div> <div>
@ -24,44 +28,67 @@
<el-card v-show="echartArr.includes('数值')" style="width: 150px; margin-bottom: 20px; text-align: center"> <el-card v-show="echartArr.includes('数值')" style="width: 150px; margin-bottom: 20px; text-align: center">
<div v-if="newDataArr && newDataArr.length != 0 && newDataArr != undefined"> <div v-if="newDataArr && newDataArr.length != 0 && newDataArr != undefined">
<div v-if="title == '类型'"> <div v-if="title == '类型'">
<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">
{{ getTotal(newDataArr) }} {{ getTotal(newDataArr) }}
</span> </span>
</div> </div>
<div style="font-size: 30px; font-weight: bold" <div style="font-size: 30px; font-weight: bold" v-if="title == '速度' && dataArr.length != 0 && dataArr != undefined">
v-if="title == '速度' && 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">{{ typeValue.speed }}</span> --> <!-- <span style="font-size: 30px; font-weight: bold">{{ typeValue.speed }}</span> -->
<span style="font-size: 30px; font-weight: bold">{{ newDataArr[0].speed }}</span> <span style="font-size: 30px; font-weight: bold">
<span style="font-size: 20px; font-weight: 200">km/h</span> <span v-if="(newDataArr[0].speed && newDataArr[0].speed != -1) || newDataArr[0].speed == 0">
{{
newDataArr[0].speed > 0 || newDataArr[0].speed == 0
? newDataArr[0].speed
: Math.abs(newDataArr[0].speed)
}}
</span>
<span v-else>-</span>
</span>
<span style="font-size: 20px; font-weight: 200">
<span v-if="(newDataArr[0].speed && newDataArr[0].speed != -1) || newDataArr[0].speed == 0">
{{ newDataArr[0].speed > 0 || newDataArr[0].speed == 0 ? 'km/h' : 'pix/s' }}
</span>
</span>
</div> </div>
<div style="font-size: 30px; font-weight: bold" <div style="font-size: 30px; font-weight: bold" v-if="title == '流量' && dataArr.length != 0 && dataArr != undefined">
v-if="title == '流量' && 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">{{ newDataArr[0].flow }}</span> newDataArr[0].flow || newDataArr[0].flow == 0 ? newDataArr[0].flow : '-'
}}</span>
<span style="font-size: 20px; font-weight: 200">辆</span> <span style="font-size: 20px; font-weight: 200">辆</span>
</div> </div>
<div style="font-size: 30px; font-weight: bold" v-if="title == '车头时距'"> <div style="font-size: 30px; font-weight: bold" v-if="title == '车头时距'">
<span style="font-size: 15px;">车头时距</span><br /> <span style="font-size: 15px">车头时距</span><br />
<span style="font-size: 30px; font-weight: bold">{{ newDataArr[0].headway }}</span> <span style="font-size: 30px; font-weight: bold">{{
newDataArr[0].headway || newDataArr[0].headway == 0
? newDataArr[0].headway == -1
? '-'
: newDataArr[0].headway
: '-'
}}</span>
<!-- <span style="font-size: 30px; font-weight: bold">100</span> --> <!-- <span style="font-size: 30px; font-weight: bold">100</span> -->
<span style="font-size: 20px; font-weight: 200">秒</span> <span style="font-size: 20px; font-weight: 200">秒</span>
</div> </div>
<div style="font-size: 30px; font-weight: bold" v-if="title == '排队数'"> <div style="font-size: 30px; font-weight: bold" v-if="title == '排队数'">
<span style="font-size: 15px;">排队数</span><br /> <span style="font-size: 15px">排队数</span><br />
<span style="font-size: 30px; font-weight: bold">{{ queue }}</span> <span style="font-size: 30px; font-weight: bold">{{ queue || queue == 0 ? queue : '-' }}</span>
<span style="font-size: 20px; font-weight: 200">辆</span> <span style="font-size: 20px; font-weight: 200">辆</span>
</div> </div>
<div style="font-size: 30px; font-weight: bold" v-if="title == '检测数'"> <div style="font-size: 30px; font-weight: bold" v-if="title == '检测数'">
<span style="font-size: 15px;">检测数</span><br /> <span style="font-size: 15px">检测数</span><br />
<span style="font-size: 30px; font-weight: bold">{{ newDataArr[0].n_stay }}</span> <span style="font-size: 30px; font-weight: bold">{{
newDataArr[0].n_stay || newDataArr[0].n_stay == 0 ? newDataArr[0].n_stay : '-'
}}</span>
<span style="font-size: 20px; font-weight: 200">辆</span> <span style="font-size: 20px; font-weight: 200">辆</span>
</div> </div>
<div style="font-size: 30px; font-weight: bold" v-if="title == '延误'"> <div style="font-size: 30px; font-weight: bold" v-if="title == '延误'">
<span style="font-size: 15px;">延误</span><br /> <span style="font-size: 15px">延误</span><br />
<span style="font-size: 30px; font-weight: bold">{{ newDataArr[0].ave_delay }}</span> <span style="font-size: 30px; font-weight: bold">{{
newDataArr[0].ave_delay || newDataArr[0].ave_delay == 0 ? newDataArr[0].ave_delay : '-'
}}</span>
<span style="font-size: 20px; font-weight: 200">秒</span> <span style="font-size: 20px; font-weight: 200">秒</span>
</div> </div>
<div> <div>
@ -79,9 +106,17 @@
<div class="tableTitle" v-if="newDataArr && newDataArr.length != 0"> <div class="tableTitle" v-if="newDataArr && newDataArr.length != 0">
<div> <div>
<span <span
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"></span> style="
<span style="font-size:18px;">{{ this.chartName + '-' + this.componentName + '-' + '表格' + '-' + width: 10px;
triggerType }}</span> height: 10px;
border-radius: 50%;
background-color: #3297ff;
display: inline-block;
vertical-align: middle;
margin-right: 8px;
"
></span>
<span style="font-size: 18px">{{ this.chartName + '-' + this.componentName + '-' + '表格' + '-' + triggerType }}</span>
</div> </div>
<div class="tableTime"> <div class="tableTime">
{{ newDataArr[0].time ? newDataArr[0].time : '' }} {{ newDataArr[0].time ? newDataArr[0].time : '' }}
@ -96,28 +131,67 @@
</div> </div>
<div class="border" v-if="echartArr.includes('曲线图')"> <div class="border" v-if="echartArr.includes('曲线图')">
<detailDialog /> <detailDialog />
<lineChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="newDataArr" <lineChart
:status="triggerType" :title="title" :typeValue="typeValue" ref="lineChartRef" /> :componentName="componentName"
:chartName="chartName"
:pageType="pageType"
:list="newDataArr"
:status="triggerType"
:title="title"
:typeValue="typeValue"
ref="lineChartRef"
/>
</div> </div>
<div class="border" v-if="echartArr.includes('饼状图')"> <div class="border" v-if="echartArr.includes('饼状图')">
<detailDialog /> <detailDialog />
<pieChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="newDataArr" <pieChart
:status="triggerType" :title="title" :typeValue="typeValue" ref="pieChartRef" /> :componentName="componentName"
:chartName="chartName"
:pageType="pageType"
:list="newDataArr"
:status="triggerType"
:title="title"
:typeValue="typeValue"
ref="pieChartRef"
/>
</div> </div>
<div class="border" v-if="echartArr.includes('均值图')"> <div class="border" v-if="echartArr.includes('均值图')">
<detailDialog /> <detailDialog />
<avgChart ref="avgChartRef" :componentName="componentName" :chartName="chartName" :pageType="pageType" <avgChart
:list="newDataArr" :status="triggerType" :title="title" :typeValue="typeValue" /> ref="avgChartRef"
:componentName="componentName"
:chartName="chartName"
:pageType="pageType"
:list="newDataArr"
:status="triggerType"
:title="title"
:typeValue="typeValue"
/>
</div> </div>
<div class="border" v-if="echartArr.includes('直方图')"> <div class="border" v-if="echartArr.includes('直方图')">
<detailDialog /> <detailDialog />
<barChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="newDataArr" <barChart
:status="triggerType" :title="title" :typeValue="typeValue" ref="barChartRef" /> :componentName="componentName"
:chartName="chartName"
:pageType="pageType"
:list="newDataArr"
:status="triggerType"
:title="title"
:typeValue="typeValue"
ref="barChartRef"
/>
</div> </div>
<div class="border" v-if="echartArr.includes('矩阵图')"> <div class="border" v-if="echartArr.includes('矩阵图')">
<detailDialog /> <detailDialog />
<thermalChart :componentName="componentName" :pageType="pageType" :list="newDataArr" <thermalChart
:status="triggerType" :title="title" :typeValue="typeValue" ref="ODChartRef" /> :componentName="componentName"
:pageType="pageType"
:list="newDataArr"
:status="triggerType"
:title="title"
:typeValue="typeValue"
ref="ODChartRef"
/>
</div> </div>
</div> </div>
</template> </template>
@ -133,7 +207,7 @@ import regionTable from '../chart/regionTable.vue';
import thermalChart from '../chart/thermalChart.vue'; import thermalChart from '../chart/thermalChart.vue';
export default { export default {
name: 'typeChart', //类型组件 name: 'typeChart', //类型组件
props: ['typeValue', 'pageType', 'triggerType', 'dataArr', 'echartArr', 'componentName', 'title', 'chartName','startEndData'], props: ['typeValue', 'pageType', 'triggerType', 'dataArr', 'echartArr', 'componentName', 'title', 'chartName', 'startEndData'],
components: { components: {
lineChart, lineChart,
barChart, barChart,
@ -160,16 +234,12 @@ export default {
newDataArr: [] newDataArr: []
}; };
}, },
created() { created() {},
},
methods: { methods: {
// 计算类型数量的总和 // 计算类型数量的总和
getDataArr(val) { getDataArr(val) {
this.newDataArr = val this.newDataArr = val;
this.getNewQueue(this.newDataArr) this.getNewQueue(this.newDataArr);
}, },
getTotal(dataArr) { getTotal(dataArr) {
if (this.title == '类型') { if (this.title == '类型') {
@ -179,7 +249,6 @@ export default {
} }
}, },
getNewQueue(val) { getNewQueue(val) {
if (val[0].n_queue) { if (val[0].n_queue) {
this.queue = val[0].n_queue; this.queue = val[0].n_queue;
} }
@ -198,14 +267,13 @@ export default {
if (val[0].ave_stay) { if (val[0].ave_stay) {
this.newDataArr[0].n_stay = val[0].ave_stay; this.newDataArr[0].n_stay = val[0].ave_stay;
} }
}, }
}, },
computed: { computed: {
// 获取类型的总数量 // 获取类型的总数量
}, },
mounted() { }, mounted() {},
watch: { watch: {
// 监听触发数据 // 监听触发数据
// dataArr: { // dataArr: {
@ -215,7 +283,6 @@ export default {
// this.getNewQueue(newVal); // this.getNewQueue(newVal);
// } // }
// }, // },
// immediate: true // immediate: true
// } // }
// typeValue:{ // typeValue:{

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

@ -26,13 +26,13 @@
:name="o.analogAreaComponentId"> :name="o.analogAreaComponentId">
<!--触发的组件 --> <!--触发的组件 -->
<typeChart ref="typeChartRef" v-if="o.timeMode === '触发'" <typeChart ref="typeChartRef" v-if="o.timeMode === '实时触发'"
:pageType="o.graphicType" :triggerType="o.timeMode" :pageType="o.graphicType" :triggerType="o.timeMode"
:componentName="o.componentName" :dataArr="o.trigger" :componentName="o.componentName" :dataArr="o.trigger"
:echartArr="o.presentationForm" :title="o.componentName.split('_')[0]" :echartArr="o.presentationForm" :title="o.componentName.split('_')[0]"
:chartName="o.combinationName" :typeValue="typeTimeMode" :chartName="o.combinationName" :typeValue="typeTimeMode"
:startEndData="{ start: o.startSectionNames, end: o.endSectionNames }" /> :startEndData="{ start: o.startSectionNames, end: o.endSectionNames }" />
<typeChart ref="typeChartRef1" v-if="o.timeMode === '周期时刻'" <typeChart ref="typeChartRef1" v-if="o.timeMode === '固定时刻'"
:pageType="o.graphicType" :triggerType="o.timeMode" :pageType="o.graphicType" :triggerType="o.timeMode"
:componentName="o.componentName" :dataArr="o.cycleTimeData" :componentName="o.componentName" :dataArr="o.cycleTimeData"
:echartArr="o.presentationForm" :title="o.componentName.split('_')[0]" :echartArr="o.presentationForm" :title="o.componentName.split('_')[0]"
@ -40,9 +40,9 @@
:startEndData="{ start: o.startSectionNames, end: o.endSectionNames }" :startEndData="{ start: o.startSectionNames, end: o.endSectionNames }"
/> />
<!-- 周期统计的组件 --> <!-- 固定间隔的组件 -->
<typeChart ref="typeChartRef2" style="width: 100%;" <typeChart ref="typeChartRef2" style="width: 100%;"
v-if="o.timeMode === '周期统计'" :pageType="o.graphicType" v-if="o.timeMode === '固定间隔'" :pageType="o.graphicType"
:triggerType="o.timeMode" :componentName="o.componentName" :triggerType="o.timeMode" :componentName="o.componentName"
:dataArr="o.cycleStatisticsData" :echartArr="o.presentationForm" :dataArr="o.cycleStatisticsData" :echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]" :chartName="o.combinationName" :title="o.componentName.split('_')[0]" :chartName="o.combinationName"
@ -87,14 +87,14 @@ export default {
return []; return [];
} }
}, },
// 周期时刻数据 // 固定时刻数据
cycleTimeData: { cycleTimeData: {
type: Array, type: Array,
default() { default() {
return []; return [];
} }
}, },
//周期统计 //固定间隔
cycleStatisticsData: { cycleStatisticsData: {
type: Array, type: Array,
default() { default() {
@ -136,7 +136,7 @@ export default {
//触发的类型数值看板显示 //触发的类型数值看板显示
typeTimeMode: {}, typeTimeMode: {},
// 周期时刻的数值看板展示 // 固定时刻的数值看板展示
typeCycleTimeData: {}, typeCycleTimeData: {},
typeCycleStatistics: {}, typeCycleStatistics: {},
@ -191,12 +191,12 @@ export default {
if (item.title == val.combinationName) { if (item.title == val.combinationName) {
this.classify.push(val); this.classify.push(val);
item.children.push(val); item.children.push(val);
if (val.timeMode == '周期统计' || this.cycleStatisticsData.length == 0) { if (val.timeMode == '固定间隔' || this.cycleStatisticsData.length == 0) {
item.cycleStatisticsData = val.cycleStatisticsData item.cycleStatisticsData = val.cycleStatisticsData
} }
if (val.timeMode == '周期时刻' || this.cycleTimeData.length == 0) { if (val.timeMode == '固定时刻' || this.cycleTimeData.length == 0) {
item.cycleTimeData = val.cycleTimeData item.cycleTimeData = val.cycleTimeData
} }
} }
@ -278,8 +278,8 @@ export default {
if (newVal != undefined && newVal.length != 0) { if (newVal != undefined && newVal.length != 0) {
newVal.forEach(ele => { newVal.forEach(ele => {
if (ele.timeMode == '周期统计'&&this.$route.query.type=='实时视频') { if (ele.timeMode == '固定间隔'&&this.$route.query.type=='实时视频') {
console.log("实时视频",'周期统计') console.log("实时视频",'固定间隔')
this.$nextTick(() => { this.$nextTick(() => {
// var thatNN = this; // var thatNN = this;
ele.cycleStatisticsData.forEach(item => { ele.cycleStatisticsData.forEach(item => {
@ -288,13 +288,13 @@ export default {
} }
}) })
if (this.$refs.typeChartRef2 != undefined) { if (this.$refs.typeChartRef2 != undefined) {
// // 轮循周期时刻生成的各类组件 // // 轮循固定时刻生成的各类组件
this.getRef(this.$refs.typeChartRef2, ele.timeMode) this.getRef(this.$refs.typeChartRef2, ele.timeMode)
} }
}) })
} }
if (ele.timeMode == '周期时刻'&&this.$route.query.type=='实时视频') { if (ele.timeMode == '固定时刻'&&this.$route.query.type=='实时视频') {
console.log("实时视频",'周期时刻') console.log("实时视频",'固定时刻')
this.$nextTick(() => { this.$nextTick(() => {
ele.cycleTimeData.forEach(item => { ele.cycleTimeData.forEach(item => {
if (item.type_data != null) { if (item.type_data != null) {
@ -306,13 +306,13 @@ export default {
}) })
if (this.$refs.typeChartRef1 != undefined) { if (this.$refs.typeChartRef1 != undefined) {
// // 轮循周期时刻生成的各类组件 // // 轮循固定时刻生成的各类组件
this.getRef(this.$refs.typeChartRef1, ele.timeMode) this.getRef(this.$refs.typeChartRef1, ele.timeMode)
} }
}) })
} }
if(ele.timeMode == '周期统计'&&this.$route.query.type=='离线视频'){ if(ele.timeMode == '固定间隔'&&this.$route.query.type=='离线视频'){
if(this.cycleHistoryData.CycleStatisticsData!=undefined&&this.cycleHistoryData.CycleStatisticsData.lenght!=0){ if(this.cycleHistoryData.CycleStatisticsData!=undefined&&this.cycleHistoryData.CycleStatisticsData.lenght!=0){
this.cycleHistoryData.CycleStatisticsData.forEach(ne => { this.cycleHistoryData.CycleStatisticsData.forEach(ne => {
@ -335,8 +335,8 @@ export default {
}) })
if (this.$refs.typeChartRef2 != undefined) { if (this.$refs.typeChartRef2 != undefined) {
// // 轮循周期时刻生成的各类组件 // // 轮循固定时刻生成的各类组件
this.getRef(this.$refs.typeChartRef2, '周期统计') this.getRef(this.$refs.typeChartRef2, '固定间隔')
} }
}) })
@ -345,7 +345,7 @@ export default {
} if(ele.timeMode == '周期时刻'&&this.$route.query.type=='离线视频'){ } if(ele.timeMode == '固定时刻'&&this.$route.query.type=='离线视频'){
if(this.cycleHistoryData.CycleTimeData!=undefined &&this.cycleHistoryData.CycleTimeData.lenght!=0){ if(this.cycleHistoryData.CycleTimeData!=undefined &&this.cycleHistoryData.CycleTimeData.lenght!=0){
this.cycleHistoryData.CycleTimeData.forEach(ne => { this.cycleHistoryData.CycleTimeData.forEach(ne => {
if(ne.component_id== ele.analogAreaComponentId ){ if(ne.component_id== ele.analogAreaComponentId ){
@ -368,9 +368,9 @@ export default {
} }
}) })
if (this.$refs.typeChartRef1 != undefined) { if (this.$refs.typeChartRef1 != undefined) {
// // 轮循周期时刻生成的各类组件 // // 轮循固定时刻生成的各类组件
this.getRef(this.$refs.typeChartRef1, '周期时刻') this.getRef(this.$refs.typeChartRef1, '固定时刻')
} }
}) })
@ -408,8 +408,8 @@ export default {
} }
}) })
if (this.$refs.typeChartRef2 != undefined) { if (this.$refs.typeChartRef2 != undefined) {
// // 轮循周期时刻生成的各类组件 // // 轮循固定时刻生成的各类组件
this.getRef(this.$refs.typeChartRef2, '周期统计') this.getRef(this.$refs.typeChartRef2, '固定间隔')
} }
}) })
}) })
@ -435,8 +435,8 @@ export default {
}) })
if (this.$refs.typeChartRef1 != undefined) { if (this.$refs.typeChartRef1 != undefined) {
// // 轮循周期时刻生成的各类组件 // // 轮循固定时刻生成的各类组件
this.getRef(this.$refs.typeChartRef1, '周期时刻') this.getRef(this.$refs.typeChartRef1, '固定时刻')
} }
}) })
}) })
@ -461,11 +461,11 @@ export default {
var _this = this var _this = this
if (newVal.length != 0 && _this.sectionData) { if (newVal.length != 0 && _this.sectionData) {
_this.classify.forEach((ele, index) => { _this.classify.forEach((ele, index) => {
if (ele.trigger == undefined && ele.timeMode == '触发') { if (ele.trigger == undefined && ele.timeMode == '实时触发') {
ele.trigger = []; ele.trigger = [];
} }
newVal.forEach(item => { newVal.forEach(item => {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '触发') { if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '实时触发') {
// console.log(ele.analogAreaComponentId, 'analogAreaComponentId'); // console.log(ele.analogAreaComponentId, 'analogAreaComponentId');
// console.log(item.component_id, 'component_id'); // console.log(item.component_id, 'component_id');
if (ele.trigger.length == 10) { if (ele.trigger.length == 10) {
@ -492,7 +492,7 @@ export default {
let itemTypeChart = _this.$refs.typeChartRef[i] let itemTypeChart = _this.$refs.typeChartRef[i]
if (itemTypeChart.dataArr != undefined && itemTypeChart.dataArr.length != 0) { if (itemTypeChart.dataArr != undefined && itemTypeChart.dataArr.length != 0) {
if (itemTypeChart.echartArr.includes('时间曲线图')) { if (itemTypeChart.echartArr.includes('时间曲线图')) {
_this.$refs.typeChartRef[i].$refs.lineChartRef.drawLine(_this.$refs.typeChartRef[i].dataArr, _this.$refs.typeChartRef[i].componentName.split('_')[0], '触发') _this.$refs.typeChartRef[i].$refs.lineChartRef.drawLine(_this.$refs.typeChartRef[i].dataArr, _this.$refs.typeChartRef[i].componentName.split('_')[0], '实时触发')
} }
if (itemTypeChart.echartArr.includes('数值')) { if (itemTypeChart.echartArr.includes('数值')) {
_this.$refs.typeChartRef[i].getDataArr(_this.$refs.typeChartRef[i].dataArr) _this.$refs.typeChartRef[i].getDataArr(_this.$refs.typeChartRef[i].dataArr)
@ -526,11 +526,11 @@ export default {
}, },
immediate: true immediate: true
}, },
// 周期时刻的数据 // 固定时刻的数据
cycleTimeData: { cycleTimeData: {
handler(newVal) { handler(newVal) {
// 监听到打印周期时刻数据 // 监听到打印固定时刻数据
// console.log(newVal, '周期时刻数据'); // console.log(newVal, '固定时刻数据');
if (newVal != undefined && newVal.length != 0 && this.sectionData) { if (newVal != undefined && newVal.length != 0 && this.sectionData) {
var thatN = this; var thatN = this;
@ -538,7 +538,7 @@ export default {
newVal.forEach(item => { newVal.forEach(item => {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期时刻') { if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '固定时刻') {
if (ele.cycleTimeData.length == 10) { if (ele.cycleTimeData.length == 10) {
ele.cycleTimeData.pop(); ele.cycleTimeData.pop();
@ -554,7 +554,7 @@ export default {
item.time = item.time.split('.')[0]; item.time = item.time.split('.')[0];
} }
if (item.type_data != null) { if (item.type_data != null) {
// 周期时刻的类型数据 // 固定时刻的类型数据
thatN.typeCycleTimeData = item; thatN.typeCycleTimeData = item;
} }
ele.cycleTimeData.unshift(item); ele.cycleTimeData.unshift(item);
@ -562,13 +562,13 @@ export default {
// thatN.$nextTick(() => { // thatN.$nextTick(() => {
if (thatN.$refs.typeChartRef1 != undefined) { if (thatN.$refs.typeChartRef1 != undefined) {
// console.log("thatN.$refs.typeChartRef1",thatN.$refs.typeChartRef1) // console.log("thatN.$refs.typeChartRef1",thatN.$refs.typeChartRef1)
// 轮循周期时刻生成的各类组件 // 轮循固定时刻生成的各类组件
for (let i = 0; i < thatN.$refs.typeChartRef1.length; i++) { for (let i = 0; i < thatN.$refs.typeChartRef1.length; i++) {
let itemTypeChartRef1 = thatN.$refs.typeChartRef1[i] let itemTypeChartRef1 = thatN.$refs.typeChartRef1[i]
if (itemTypeChartRef1.length != 0 && itemTypeChartRef1.dataArr != undefined && itemTypeChartRef1.dataArr.length != 0) { if (itemTypeChartRef1.length != 0 && itemTypeChartRef1.dataArr != undefined && itemTypeChartRef1.dataArr.length != 0) {
if (itemTypeChartRef1.echartArr.includes('时间曲线图')) { if (itemTypeChartRef1.echartArr.includes('时间曲线图')) {
thatN.$refs.typeChartRef1[i].$refs.lineChartRef.drawLine(thatN.$refs.typeChartRef1[i].dataArr, thatN.$refs.typeChartRef1[i].componentName.split('_')[0], '周期时刻') thatN.$refs.typeChartRef1[i].$refs.lineChartRef.drawLine(thatN.$refs.typeChartRef1[i].dataArr, thatN.$refs.typeChartRef1[i].componentName.split('_')[0], '固定时刻')
} }
if (itemTypeChartRef1.echartArr.includes('数值')) { if (itemTypeChartRef1.echartArr.includes('数值')) {
thatN.$refs.typeChartRef1[i].getDataArr(thatN.$refs.typeChartRef1[i].dataArr) thatN.$refs.typeChartRef1[i].getDataArr(thatN.$refs.typeChartRef1[i].dataArr)
@ -605,26 +605,26 @@ export default {
// _thatN.classify.forEach((ele, index) => { // _thatN.classify.forEach((ele, index) => {
// // newVal.forEach(item => { // // newVal.forEach(item => {
// if (ele.timeMode == '周期时刻') { // if (ele.timeMode == '固定时刻') {
// if (ele.cycleTimeData.length == 10) { // if (ele.cycleTimeData.length == 10) {
// ele.cycleTimeData.pop(); // ele.cycleTimeData.pop();
// } // }
// // item.time = item.time.split('.')[0]; // // item.time = item.time.split('.')[0];
// // if (item.type_data != null) { // // if (item.type_data != null) {
// // // 周期时刻的类型数据 // // // 固定时刻的类型数据
// // _thatN.typeCycleTimeData = item; // // _thatN.typeCycleTimeData = item;
// // } // // }
// // ele.cycleTimeData.unshift(item); // // ele.cycleTimeData.unshift(item);
// // _thatN.$nextTick(() => { // // _thatN.$nextTick(() => {
// if (_thatN.$refs.typeChartRef1 != undefined) { // if (_thatN.$refs.typeChartRef1 != undefined) {
// // console.log("thatN.$refs.typeChartRef1",_thatN.$refs.typeChartRef1) // // console.log("thatN.$refs.typeChartRef1",_thatN.$refs.typeChartRef1)
// // 轮循周期时刻生成的各类组件 // // 轮循固定时刻生成的各类组件
// for (let i = 0; i < _thatN.$refs.typeChartRef1.length; i++) { // for (let i = 0; i < _thatN.$refs.typeChartRef1.length; i++) {
// let itemTypeChartRef1 = thatN.$refs.typeChartRef1[i] // let itemTypeChartRef1 = thatN.$refs.typeChartRef1[i]
// if (itemTypeChartRef1.length != 0 && itemTypeChartRef1.dataArr != undefined && itemTypeChartRef1.dataArr.length != 0) { // if (itemTypeChartRef1.length != 0 && itemTypeChartRef1.dataArr != undefined && itemTypeChartRef1.dataArr.length != 0) {
// if (itemTypeChartRef1.echartArr.includes('时间曲线图')) { // if (itemTypeChartRef1.echartArr.includes('时间曲线图')) {
// _thatN.$refs.typeChartRef1[i].$refs.lineChartRef.drawLine(_thatN.$refs.typeChartRef1[i].dataArr, _thatN.$refs.typeChartRef1[i].componentName.split('_')[0], '周期时刻') // _thatN.$refs.typeChartRef1[i].$refs.lineChartRef.drawLine(_thatN.$refs.typeChartRef1[i].dataArr, _thatN.$refs.typeChartRef1[i].componentName.split('_')[0], '固定时刻')
// } // }
// if (itemTypeChartRef1.echartArr.includes('数值')) { // if (itemTypeChartRef1.echartArr.includes('数值')) {
// _thatN.$refs.typeChartRef1[i].getDataArr(_thatN.$refs.typeChartRef1[i].dataArr) // _thatN.$refs.typeChartRef1[i].getDataArr(_thatN.$refs.typeChartRef1[i].dataArr)
@ -657,15 +657,15 @@ export default {
}, },
immediate: true immediate: true
}, },
//周期统计 //固定间隔
cycleStatisticsData: { cycleStatisticsData: {
handler(newVal) { handler(newVal) {
console.log("周期统计", newVal) console.log("固定间隔", newVal)
if (newVal != undefined && newVal.length != 0 && this.sectionData) { if (newVal != undefined && newVal.length != 0 && this.sectionData) {
var that = this; var that = this;
that.classify.forEach((ele, index) => { that.classify.forEach((ele, index) => {
newVal.forEach(item => { newVal.forEach(item => {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期统计') { if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '固定间隔') {
if (ele.cycleStatisticsData.length == 10) { if (ele.cycleStatisticsData.length == 10) {
ele.cycleStatisticsData.pop(); ele.cycleStatisticsData.pop();
} }
@ -688,7 +688,7 @@ export default {
if (itemTypeChartRef2.length != 0 && itemTypeChartRef2.dataArr != undefined && itemTypeChartRef2.dataArr.length != 0) { if (itemTypeChartRef2.length != 0 && itemTypeChartRef2.dataArr != undefined && itemTypeChartRef2.dataArr.length != 0) {
if (itemTypeChartRef2.echartArr.includes('时间曲线图')) { if (itemTypeChartRef2.echartArr.includes('时间曲线图')) {
that.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(that.$refs.typeChartRef2[i].dataArr, that.$refs.typeChartRef2[i].componentName.split('_')[0], '周期统计') that.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(that.$refs.typeChartRef2[i].dataArr, that.$refs.typeChartRef2[i].componentName.split('_')[0], '固定间隔')
} }
if (itemTypeChartRef2.echartArr.includes('数值')) { if (itemTypeChartRef2.echartArr.includes('数值')) {
that.$refs.typeChartRef2[i].getDataArr(that.$refs.typeChartRef2[i].dataArr) that.$refs.typeChartRef2[i].getDataArr(that.$refs.typeChartRef2[i].dataArr)
@ -723,7 +723,7 @@ export default {
// var _that = this // var _that = this
// _that.classify.forEach(ele => { // _that.classify.forEach(ele => {
// if (ele.timeMode == '周期统计') { // if (ele.timeMode == '固定间隔') {
// if (ele.cycleStatisticsData.length == 10) { // if (ele.cycleStatisticsData.length == 10) {
// ele.cycleStatisticsData.pop(); // ele.cycleStatisticsData.pop();
// } // }
@ -739,7 +739,7 @@ export default {
// if (itemTypeChartRef2.length != 0 && itemTypeChartRef2.dataArr != undefined && itemTypeChartRef2.dataArr.length != 0) { // if (itemTypeChartRef2.length != 0 && itemTypeChartRef2.dataArr != undefined && itemTypeChartRef2.dataArr.length != 0) {
// // this.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(this.$refs.typeChartRef2[i].dataArr, _this.$refs.typeChartRe2f[i].componentName.split('_')[0]) // // this.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(this.$refs.typeChartRef2[i].dataArr, _this.$refs.typeChartRe2f[i].componentName.split('_')[0])
// if (itemTypeChartRef2.echartArr.includes('时间曲线图')) { // if (itemTypeChartRef2.echartArr.includes('时间曲线图')) {
// _that.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(_that.$refs.typeChartRef2[i].dataArr, _that.$refs.typeChartRef2[i].componentName.split('_')[0], '周期统计') // _that.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(_that.$refs.typeChartRef2[i].dataArr, _that.$refs.typeChartRef2[i].componentName.split('_')[0], '固定间隔')
// } // }
// if (itemTypeChartRef2.echartArr.includes('数值')) { // if (itemTypeChartRef2.echartArr.includes('数值')) {
// _that.$refs.typeChartRef2[i].getDataArr(_that.$refs.typeChartRef2[i].dataArr) // _that.$refs.typeChartRef2[i].getDataArr(_that.$refs.typeChartRef2[i].dataArr)

1888
src/views/index.vue
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff