diff --git a/public/VideoWeb/Build/APP.data.unityweb b/public/VideoWeb/Build/APP.data.unityweb old mode 100644 new mode 100755 index 6bb89a2..58d4967 Binary files a/public/VideoWeb/Build/APP.data.unityweb and b/public/VideoWeb/Build/APP.data.unityweb differ diff --git a/public/VideoWeb/Build/APP.framework.js.unityweb b/public/VideoWeb/Build/APP.framework.js.unityweb old mode 100644 new mode 100755 index aa230c8..6557966 Binary files a/public/VideoWeb/Build/APP.framework.js.unityweb and b/public/VideoWeb/Build/APP.framework.js.unityweb differ diff --git a/public/VideoWeb/Build/APP.loader.js b/public/VideoWeb/Build/APP.loader.js old mode 100644 new mode 100755 diff --git a/public/VideoWeb/Build/APP.wasm.unityweb b/public/VideoWeb/Build/APP.wasm.unityweb old mode 100644 new mode 100755 index 326652f..8b3672b Binary files a/public/VideoWeb/Build/APP.wasm.unityweb and b/public/VideoWeb/Build/APP.wasm.unityweb differ diff --git a/src/components/chart/lineChart.vue b/src/components/chart/lineChart.vue index e67540d..709a894 100644 --- a/src/components/chart/lineChart.vue +++ b/src/components/chart/lineChart.vue @@ -258,7 +258,7 @@ export default { confine: true }; series[0].data = newVal.map(val => { - if (timeMode == '周期统计') { + if (timeMode == '固定间隔') { return val.ave_headway; } else { return val.headway; @@ -269,7 +269,7 @@ export default { this.name = "辆" series[0].data = newVal.map(val => { // return val.n_queue; - if (timeMode == '周期统计') { + if (timeMode == '固定间隔') { return val.ave_queue; } else { return val.n_queue; @@ -278,7 +278,7 @@ export default { } else if (title === '检测数') { this.name = "辆" series[0].data = newVal.map(val => { - if (timeMode == '周期统计') { + if (timeMode == '固定间隔') { return val.ave_stay; } else { return val.n_stay; diff --git a/src/components/chart/regionTable.vue b/src/components/chart/regionTable.vue index da4fd21..5a98eea 100644 --- a/src/components/chart/regionTable.vue +++ b/src/components/chart/regionTable.vue @@ -13,8 +13,8 @@
- - + + @@ -47,7 +47,7 @@ - + @@ -81,8 +81,8 @@ - - + + diff --git a/src/components/chart/tableShow.vue b/src/components/chart/tableShow.vue index 38bdfd8..c3fce76 100644 --- a/src/components/chart/tableShow.vue +++ b/src/components/chart/tableShow.vue @@ -9,11 +9,11 @@
- + - +
- + @@ -46,8 +46,8 @@ - - + + diff --git a/src/components/sensorFusion/echartsBar.vue b/src/components/sensorFusion/echartsBar.vue index 79c6254..43d0df4 100644 --- a/src/components/sensorFusion/echartsBar.vue +++ b/src/components/sensorFusion/echartsBar.vue @@ -46,7 +46,7 @@ export default { // if (this.dataList.length > 10) { // this.dataList = this.dataList.slice(-10); // } - if (this.timeMode == "触发") { + if (this.timeMode == "实时触发") { this.chartData.xData = []; this.chartData.yData = []; // debugger; @@ -66,7 +66,7 @@ export default { 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++) { // this.chartData.xData = []; // this.chartData.yData = []; @@ -91,7 +91,7 @@ export default { 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++) { // this.chartData.xData = []; // this.chartData.yData = []; diff --git a/src/components/sensorFusion/echartsLine.vue b/src/components/sensorFusion/echartsLine.vue index c1e8396..cd146aa 100644 --- a/src/components/sensorFusion/echartsLine.vue +++ b/src/components/sensorFusion/echartsLine.vue @@ -62,7 +62,7 @@ export default { val = val.slice(-10); } if (val != null) { - if (this.timeMode == "触发") { + if (this.timeMode == "实时触发") { if (this.componentType == "车头时距") { this.chartData.xData = this.extractKeyValues(val, "time"); this.chartData.yData = this.extractKeyValues(val, "headway"); @@ -104,7 +104,7 @@ export default { this.chartData.xData = this.extractKeyValues(val, "time"); this.chartData.yData = this.extractKeyValues(val, "n_queue"); } - } else if (this.timeMode == "周期时刻") { + } else if (this.timeMode == "固定时刻") { if (this.componentType == "车头时距") { this.chartData.xData = this.extractKeyValues(val, "time"); this.chartData.yData = this.extractKeyValues(val, "headway"); @@ -146,7 +146,7 @@ export default { this.chartData.xData = this.extractKeyValues(val, "time"); this.chartData.yData = this.extractKeyValues(val, "n_queue"); } - } else if (this.timeMode == "周期统计") { + } else if (this.timeMode == "固定间隔") { if (this.componentType == "车头时距") { this.chartData.xData = this.extractKeyValues(val, "time"); this.chartData.yData = this.extractKeyValues(val, "ave_headway"); @@ -255,7 +255,7 @@ export default { } else { seriesList = [ { - // name: '流量_1-zone2-曲线图-触发', + // name: '流量_1-zone2-曲线图-实时触发', type: "line", data: this.chartData.yData.reverse(), symbolSize: 8, //标记的大小 @@ -320,7 +320,7 @@ export default { }, // data: [ // { - // name: '流量_1-zone2-曲线图-触发', + // name: '流量_1-zone2-曲线图-实时触发', // icon: 'circle' // } // ] diff --git a/src/components/sensorFusion/echartsPie.vue b/src/components/sensorFusion/echartsPie.vue index 9bbc1f3..75263b0 100644 --- a/src/components/sensorFusion/echartsPie.vue +++ b/src/components/sensorFusion/echartsPie.vue @@ -56,11 +56,11 @@ export default { initEcharts() { let seriesData = null; let myChart = this.chart; - if (this.timeMode == "触发") { + if (this.timeMode == "实时触发") { seriesData = null; this.renameField(this.dataList[0].type_data, "quantity", "value"); seriesData = this.dataList[0].type_data; - } else if (this.timeMode == "周期时刻") { + } else if (this.timeMode == "固定时刻") { seriesData = null; // for (let i = 0; i < this.dataList.length; i++) { // this.renameField(this.dataList[0].type_data,'quantity','value') @@ -73,7 +73,7 @@ export default { this.renameField(this.dataList[0].type_data, "quantity", "value"); seriesData = this.dataList[0].type_data; } - } else if (this.timeMode == "周期统计") { + } else if (this.timeMode == "固定间隔") { seriesData = null; // for (let i = 0; i < this.dataList.length; i++) { // this.renameField(this.dataList[0].type_data, "quantity", "value"); @@ -123,7 +123,7 @@ export default { width: "80%", // data: [ // { - // name: '流量_1-zone2-饼状图-触发', + // name: '流量_1-zone2-饼状图-实时触发', // icon: 'circle' // } // ] @@ -147,7 +147,7 @@ export default { }, series: [ { - name: "流量_1-zone2-饼状图-触发", + name: "流量_1-zone2-饼状图-实时触发", type: "pie", center: ["50%", "55%"], radius: "70%", diff --git a/src/components/sensorFusion/thermalOD.vue b/src/components/sensorFusion/thermalOD.vue index e6f6fd8..3f283ea 100644 --- a/src/components/sensorFusion/thermalOD.vue +++ b/src/components/sensorFusion/thermalOD.vue @@ -69,7 +69,7 @@ export default { }, initEcharts() { let dataList = null; - if (this.timeMode == "触发") { + if (this.timeMode == "实时触发") { let dataOd = []; if (this.dataList.length > 0) { for (let i = 0; i < this.dataList.length; i++) { @@ -77,7 +77,7 @@ export default { dataList = this.ODhanlde(dataOd); } } - } else if (this.timeMode == "周期时刻") { + } else if (this.timeMode == "固定时刻") { let dataOd = []; // for (let i = 0; i < this.dataList.length; i++) { // dataOd.push(this.dataList[0][0].ob_data); @@ -92,7 +92,7 @@ export default { // dataOd.push(this.dataList[0][0].ob_data); // dataList = this.ODhanlde(dataOd); // } - } else if (this.timeMode == "周期统计") { + } else if (this.timeMode == "固定间隔") { let dataOd = []; // for (let i = 0; i < this.dataList.length; i++) { // dataOd.push(this.dataList[i].ob_data); diff --git a/src/components/target/typeChart.vue b/src/components/target/typeChart.vue index dd6bac7..81facea 100644 --- a/src/components/target/typeChart.vue +++ b/src/components/target/typeChart.vue @@ -5,12 +5,16 @@
-
- +
+
- {{ n.name }}
- {{ n.quantity }} + {{ n.name }}
+ {{ n.quantity || n.quantity == 0 ? n.quantity : '-' }}
@@ -24,44 +28,67 @@
- 类型数量总和
+ 类型数量总和
{{ getTotal(newDataArr) }}
-
- 速度
- +
+ 速度
+ - {{ newDataArr[0].speed }} - km/h + + + {{ + newDataArr[0].speed > 0 || newDataArr[0].speed == 0 + ? newDataArr[0].speed + : Math.abs(newDataArr[0].speed) + }} + + - + + + + {{ newDataArr[0].speed > 0 || newDataArr[0].speed == 0 ? 'km/h' : 'pix/s' }} + +
-
- 流量
- {{ newDataArr[0].flow }} +
+ 流量
+ {{ + newDataArr[0].flow || newDataArr[0].flow == 0 ? newDataArr[0].flow : '-' + }} 辆
- 车头时距
- {{ newDataArr[0].headway }} + 车头时距
+ {{ + newDataArr[0].headway || newDataArr[0].headway == 0 + ? newDataArr[0].headway == -1 + ? '-' + : newDataArr[0].headway + : '-' + }} 秒
- 排队数
- {{ queue }} - 辆 + 排队数
+ {{ queue || queue == 0 ? queue : '-' }} + 辆
- 检测数
- {{ newDataArr[0].n_stay }} - 辆 + 检测数
+ {{ + newDataArr[0].n_stay || newDataArr[0].n_stay == 0 ? newDataArr[0].n_stay : '-' + }} + 辆
- 延误
- {{ newDataArr[0].ave_delay }} + 延误
+ {{ + newDataArr[0].ave_delay || newDataArr[0].ave_delay == 0 ? newDataArr[0].ave_delay : '-' + }} 秒
@@ -79,9 +106,17 @@
- {{ this.chartName + '-' + this.componentName + '-' + '表格' + '-' + - triggerType }} + style=" + width: 10px; + height: 10px; + border-radius: 50%; + background-color: #3297ff; + display: inline-block; + vertical-align: middle; + margin-right: 8px; + " + > + {{ this.chartName + '-' + this.componentName + '-' + '表格' + '-' + triggerType }}
{{ newDataArr[0].time ? newDataArr[0].time : '' }} @@ -96,28 +131,67 @@
- +
- +
- +
- +
- +
@@ -133,7 +207,7 @@ import regionTable from '../chart/regionTable.vue'; import thermalChart from '../chart/thermalChart.vue'; export default { name: 'typeChart', //类型组件 - props: ['typeValue', 'pageType', 'triggerType', 'dataArr', 'echartArr', 'componentName', 'title', 'chartName','startEndData'], + props: ['typeValue', 'pageType', 'triggerType', 'dataArr', 'echartArr', 'componentName', 'title', 'chartName', 'startEndData'], components: { lineChart, barChart, @@ -160,16 +234,12 @@ export default { newDataArr: [] }; }, - created() { - - - - }, + created() {}, methods: { // 计算类型数量的总和 getDataArr(val) { - this.newDataArr = val - this.getNewQueue(this.newDataArr) + this.newDataArr = val; + this.getNewQueue(this.newDataArr); }, getTotal(dataArr) { if (this.title == '类型') { @@ -179,33 +249,31 @@ export default { } }, getNewQueue(val) { - if (val[0].n_queue) { this.queue = val[0].n_queue; - } - if (val[0].ave_queue) { + } + if (val[0].ave_queue) { this.queue = val[0].ave_queue; - } - if (val[0].headway) { + } + if (val[0].headway) { this.newDataArr[0].headway = val[0].headway; - } - if (val[0].ave_headway) { + } + if (val[0].ave_headway) { this.newDataArr[0].headway = val[0].ave_headway; } - if (val[0].n_stay) { + if (val[0].n_stay) { this.newDataArr[0].n_stay = val[0].n_stay; - } - if (val[0].ave_stay) { + } + if (val[0].ave_stay) { this.newDataArr[0].n_stay = val[0].ave_stay; } - }, - + } }, computed: { // 获取类型的总数量 }, - mounted() { }, + mounted() {}, watch: { // 监听触发数据 // dataArr: { @@ -215,7 +283,6 @@ export default { // this.getNewQueue(newVal); // } // }, - // immediate: true // } // typeValue:{ diff --git a/src/views/bounced/dataBoard.vue b/src/views/bounced/dataBoard.vue index 0bee552..853c792 100644 --- a/src/views/bounced/dataBoard.vue +++ b/src/views/bounced/dataBoard.vue @@ -26,13 +26,13 @@ :name="o.analogAreaComponentId"> - - - + { - if (ele.timeMode == '周期统计'&&this.$route.query.type=='实时视频') { - console.log("实时视频",'周期统计') + if (ele.timeMode == '固定间隔'&&this.$route.query.type=='实时视频') { + console.log("实时视频",'固定间隔') this.$nextTick(() => { // var thatNN = this; ele.cycleStatisticsData.forEach(item => { @@ -288,13 +288,13 @@ export default { } }) if (this.$refs.typeChartRef2 != undefined) { - // // 轮循周期时刻生成的各类组件 + // // 轮循固定时刻生成的各类组件 this.getRef(this.$refs.typeChartRef2, ele.timeMode) } }) } - if (ele.timeMode == '周期时刻'&&this.$route.query.type=='实时视频') { - console.log("实时视频",'周期时刻') + if (ele.timeMode == '固定时刻'&&this.$route.query.type=='实时视频') { + console.log("实时视频",'固定时刻') this.$nextTick(() => { ele.cycleTimeData.forEach(item => { if (item.type_data != null) { @@ -306,13 +306,13 @@ export default { }) if (this.$refs.typeChartRef1 != undefined) { - // // 轮循周期时刻生成的各类组件 + // // 轮循固定时刻生成的各类组件 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){ this.cycleHistoryData.CycleStatisticsData.forEach(ne => { @@ -335,8 +335,8 @@ export default { }) 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){ this.cycleHistoryData.CycleTimeData.forEach(ne => { if(ne.component_id== ele.analogAreaComponentId ){ @@ -368,9 +368,9 @@ export default { } }) 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) { - // // 轮循周期时刻生成的各类组件 - this.getRef(this.$refs.typeChartRef2, '周期统计') + // // 轮循固定时刻生成的各类组件 + this.getRef(this.$refs.typeChartRef2, '固定间隔') } }) }) @@ -435,8 +435,8 @@ export default { }) if (this.$refs.typeChartRef1 != undefined) { - // // 轮循周期时刻生成的各类组件 - this.getRef(this.$refs.typeChartRef1, '周期时刻') + // // 轮循固定时刻生成的各类组件 + this.getRef(this.$refs.typeChartRef1, '固定时刻') } }) }) @@ -461,11 +461,11 @@ export default { var _this = this if (newVal.length != 0 && _this.sectionData) { _this.classify.forEach((ele, index) => { - if (ele.trigger == undefined && ele.timeMode == '触发') { + if (ele.trigger == undefined && ele.timeMode == '实时触发') { ele.trigger = []; } 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(item.component_id, 'component_id'); if (ele.trigger.length == 10) { @@ -492,7 +492,7 @@ export default { let itemTypeChart = _this.$refs.typeChartRef[i] if (itemTypeChart.dataArr != undefined && itemTypeChart.dataArr.length != 0) { 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('数值')) { _this.$refs.typeChartRef[i].getDataArr(_this.$refs.typeChartRef[i].dataArr) @@ -526,11 +526,11 @@ export default { }, immediate: true }, - // 周期时刻的数据 + // 固定时刻的数据 cycleTimeData: { handler(newVal) { - // 监听到打印周期时刻数据 - // console.log(newVal, '周期时刻数据'); + // 监听到打印固定时刻数据 + // console.log(newVal, '固定时刻数据'); if (newVal != undefined && newVal.length != 0 && this.sectionData) { var thatN = this; @@ -538,7 +538,7 @@ export default { newVal.forEach(item => { - if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期时刻') { + if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '固定时刻') { if (ele.cycleTimeData.length == 10) { ele.cycleTimeData.pop(); @@ -554,7 +554,7 @@ export default { item.time = item.time.split('.')[0]; } if (item.type_data != null) { - // 周期时刻的类型数据 + // 固定时刻的类型数据 thatN.typeCycleTimeData = item; } ele.cycleTimeData.unshift(item); @@ -562,13 +562,13 @@ export default { // thatN.$nextTick(() => { if (thatN.$refs.typeChartRef1 != undefined) { // console.log("thatN.$refs.typeChartRef1",thatN.$refs.typeChartRef1) - // 轮循周期时刻生成的各类组件 + // 轮循固定时刻生成的各类组件 for (let i = 0; i < thatN.$refs.typeChartRef1.length; i++) { let itemTypeChartRef1 = thatN.$refs.typeChartRef1[i] if (itemTypeChartRef1.length != 0 && itemTypeChartRef1.dataArr != undefined && itemTypeChartRef1.dataArr.length != 0) { 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('数值')) { thatN.$refs.typeChartRef1[i].getDataArr(thatN.$refs.typeChartRef1[i].dataArr) @@ -605,26 +605,26 @@ export default { // _thatN.classify.forEach((ele, index) => { // // newVal.forEach(item => { - // if (ele.timeMode == '周期时刻') { + // if (ele.timeMode == '固定时刻') { // if (ele.cycleTimeData.length == 10) { // ele.cycleTimeData.pop(); // } // // item.time = item.time.split('.')[0]; // // if (item.type_data != null) { - // // // 周期时刻的类型数据 + // // // 固定时刻的类型数据 // // _thatN.typeCycleTimeData = item; // // } // // ele.cycleTimeData.unshift(item); // // _thatN.$nextTick(() => { // if (_thatN.$refs.typeChartRef1 != undefined) { // // console.log("thatN.$refs.typeChartRef1",_thatN.$refs.typeChartRef1) - // // 轮循周期时刻生成的各类组件 + // // 轮循固定时刻生成的各类组件 // for (let i = 0; i < _thatN.$refs.typeChartRef1.length; i++) { // let itemTypeChartRef1 = thatN.$refs.typeChartRef1[i] // if (itemTypeChartRef1.length != 0 && itemTypeChartRef1.dataArr != undefined && itemTypeChartRef1.dataArr.length != 0) { // 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('数值')) { // _thatN.$refs.typeChartRef1[i].getDataArr(_thatN.$refs.typeChartRef1[i].dataArr) @@ -657,15 +657,15 @@ export default { }, immediate: true }, - //周期统计 + //固定间隔 cycleStatisticsData: { handler(newVal) { - console.log("周期统计", newVal) + console.log("固定间隔", newVal) if (newVal != undefined && newVal.length != 0 && this.sectionData) { var that = this; that.classify.forEach((ele, index) => { newVal.forEach(item => { - if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期统计') { + if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '固定间隔') { if (ele.cycleStatisticsData.length == 10) { ele.cycleStatisticsData.pop(); } @@ -688,7 +688,7 @@ export default { if (itemTypeChartRef2.length != 0 && itemTypeChartRef2.dataArr != undefined && itemTypeChartRef2.dataArr.length != 0) { 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('数值')) { that.$refs.typeChartRef2[i].getDataArr(that.$refs.typeChartRef2[i].dataArr) @@ -723,7 +723,7 @@ export default { // var _that = this // _that.classify.forEach(ele => { - // if (ele.timeMode == '周期统计') { + // if (ele.timeMode == '固定间隔') { // if (ele.cycleStatisticsData.length == 10) { // ele.cycleStatisticsData.pop(); // } @@ -739,7 +739,7 @@ export default { // 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]) // 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('数值')) { // _that.$refs.typeChartRef2[i].getDataArr(_that.$refs.typeChartRef2[i].dataArr) diff --git a/src/views/index.vue b/src/views/index.vue index 6f5ba66..1fcf097 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,255 +1,181 @@ diff --git a/src/views/sensorFusion/index.vue b/src/views/sensorFusion/index.vue index e35ed8e..25124f8 100644 --- a/src/views/sensorFusion/index.vue +++ b/src/views/sensorFusion/index.vue @@ -1,675 +1,687 @@