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

20230323

This commit is contained in:
chengdandan 2023-03-23 09:43:14 +08:00
parent e98c8b7e82
commit 509769faae
6 changed files with 176 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/chart/avgChart.vue
View File

@ -42,6 +42,7 @@ export default {
}, },
methods: { methods: {
drawBar(arr) { drawBar(arr) {
console.log("均值图",arr)
let myChart = this.$echarts.getInstanceByDom(this.$refs.barChart); let myChart = this.$echarts.getInstanceByDom(this.$refs.barChart);
if (myChart == null) { if (myChart == null) {
myChart = this.$echarts.init(this.$refs.barChart); myChart = this.$echarts.init(this.$refs.barChart);

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

@ -170,7 +170,6 @@ export default {
}, },
// 计算类型的数值 // 计算类型的数值
getNewQueue(val) { getNewQueue(val) {
console.log("val",val)
this.newDataArr = val this.newDataArr = val
if (val[0].n_queue) { if (val[0].n_queue) {
this.newDataArr[0].n_queue = val[0].n_queue; this.newDataArr[0].n_queue = val[0].n_queue;

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

@ -541,14 +541,14 @@ export default {
} }
// item.time = item.time.split('.')[0]; // item.time = item.time.split('.')[0];
// if(this.$route.query.type=='离线视频'){ if(this.$route.query.type=='离线视频'){
// var timeNew = item.time.split('.')[0] var timeNew = item.time.split('.')[0]
// var dateLength = timeNew.length; var dateLength = timeNew.length;
// var key = timeNew.substring(dateLength-8,dateLength); var key = timeNew.substring(dateLength-8,dateLength);
// item.time = key; item.time = key;
// }else{ }else{
// 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;
@ -593,60 +593,61 @@ export default {
} }
}); });
}); });
} else {
var _thatN = this
_thatN.classify.forEach((ele, index) => {
// newVal.forEach(item => {
if (ele.timeMode == '周期时刻') {
if (ele.cycleTimeData.length == 10) {
ele.cycleTimeData.pop();
} }
// item.time = item.time.split('.')[0]; // else {
// if (item.type_data != null) { // var _thatN = this
// // 周期时刻的类型数据 // _thatN.classify.forEach((ele, index) => {
// _thatN.typeCycleTimeData = item;
// // newVal.forEach(item => {
// if (ele.timeMode == '周期时刻') {
// if (ele.cycleTimeData.length == 10) {
// ele.cycleTimeData.pop();
// } // }
// ele.cycleTimeData.unshift(item); // // item.time = item.time.split('.')[0];
// _thatN.$nextTick(() => { // // if (item.type_data != null) {
if (_thatN.$refs.typeChartRef1 != undefined) { // // // 周期时刻的类型数据
// console.log("thatN.$refs.typeChartRef1",_thatN.$refs.typeChartRef1) // // _thatN.typeCycleTimeData = item;
// 轮循周期时刻生成的各类组件 // // }
for (let i = 0; i < _thatN.$refs.typeChartRef1.length; i++) { // // ele.cycleTimeData.unshift(item);
let itemTypeChartRef1 = thatN.$refs.typeChartRef1[i] // // _thatN.$nextTick(() => {
if (itemTypeChartRef1.length != 0 && itemTypeChartRef1.dataArr != undefined && itemTypeChartRef1.dataArr.length != 0) { // 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('时间曲线图')) { // 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)
} // }
if (itemTypeChartRef1.echartArr.includes('直方图') && itemTypeChartRef1.$refs.barChartRef.drawBar) { // if (itemTypeChartRef1.echartArr.includes('直方图') && itemTypeChartRef1.$refs.barChartRef.drawBar) {
// 数据改变重新渲染柱状图 // // 数据改变重新渲染柱状图
itemTypeChartRef1.$refs.barChartRef.drawBar(itemTypeChartRef1.dataArr[0]) // itemTypeChartRef1.$refs.barChartRef.drawBar(itemTypeChartRef1.dataArr[0])
} // }
if (itemTypeChartRef1.echartArr.includes('饼状图') && itemTypeChartRef1.$refs.pieChartRef.drawPie) { // if (itemTypeChartRef1.echartArr.includes('饼状图') && itemTypeChartRef1.$refs.pieChartRef.drawPie) {
// 数据改变重新渲染饼图 // // 数据改变重新渲染饼图
itemTypeChartRef1.$refs.pieChartRef.drawPie(itemTypeChartRef1.dataArr[0]) // itemTypeChartRef1.$refs.pieChartRef.drawPie(itemTypeChartRef1.dataArr[0])
} // }
if (itemTypeChartRef1.echartArr.includes('均值图') && itemTypeChartRef1.$refs.avgChartRef != undefined) { // if (itemTypeChartRef1.echartArr.includes('均值图') && itemTypeChartRef1.$refs.avgChartRef.drawBar) {
itemTypeChartRef1.$refs.avgChartRef.drawBar(itemTypeChartRef1.dataArr[0]) // itemTypeChartRef1.$refs.avgChartRef.drawBar(itemTypeChartRef1.dataArr[0])
} // }
if (itemTypeChartRef1.componentName.includes('OD') && itemTypeChartRef1.$refs.ODChartRef != undefined && itemTypeChartRef1.dataArr[0].ob_data.length != 0) { // if (itemTypeChartRef1.componentName.includes('OD') && itemTypeChartRef1.$refs.ODChartRef != undefined && itemTypeChartRef1.dataArr[0].ob_data.length != 0) {
itemTypeChartRef1.$refs.ODChartRef.drawThermalChart(itemTypeChartRef1.dataArr[0].ob_data, itemTypeChartRef1.startEndData) // itemTypeChartRef1.$refs.ODChartRef.drawThermalChart(itemTypeChartRef1.dataArr[0].ob_data, itemTypeChartRef1.startEndData)
} // }
} // }
} // }
// // });
// }
// }
// // });
// }); // });
} // }
}
// });
});
}
}, },
immediate: true immediate: true
}, },
@ -696,10 +697,6 @@ export default {
// 数据改变重新渲染饼图 // 数据改变重新渲染饼图
itemTypeChartRef2.$refs.pieChartRef.drawPie(itemTypeChartRef2.dataArr[0]) itemTypeChartRef2.$refs.pieChartRef.drawPie(itemTypeChartRef2.dataArr[0])
} }
// if (item.echartArr.includes('均值图') && item.$refs.avgChartRef != undefined && item.dataArr.length != 0) {
// item.$refs.avgChartRef.drawBar(item.dataArr[0])
// }
if (itemTypeChartRef2.echartArr.includes('均值图') && itemTypeChartRef2.$refs.avgChartRef!=undefined) { if (itemTypeChartRef2.echartArr.includes('均值图') && itemTypeChartRef2.$refs.avgChartRef!=undefined) {
itemTypeChartRef2.$refs.avgChartRef.drawBar(itemTypeChartRef2.dataArr[0]) itemTypeChartRef2.$refs.avgChartRef.drawBar(itemTypeChartRef2.dataArr[0])
} }
@ -713,58 +710,58 @@ export default {
}); });
}); });
} }
else { // else {
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();
} // }
// item.time = item.time.split('.')[0]; // // item.time = item.time.split('.')[0];
// if (item.type_data != null) { // // if (item.type_data != null) {
// _that.typeCycleStatistics = item; // // _that.typeCycleStatistics = item;
// // }
// // ele.cycleStatisticsData.unshift(item);
// if (_that.$refs.typeChartRef2 != undefined) {
// for (let i = 0; i < _that.$refs.typeChartRef2.length; i++) {
// let itemTypeChartRef2 = _that.$refs.typeChartRef2[i];
// // console.log(_this.$refs.typeChartRef[i], '触发接收的表格数据');
// 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], '周期统计')
// }
// if (itemTypeChartRef2.echartArr.includes('数值')) {
// _that.$refs.typeChartRef2[i].getDataArr(_that.$refs.typeChartRef2[i].dataArr)
// }
// // console.log(item,'组件数据');
// if (itemTypeChartRef2.echartArr.includes('直方图') && itemTypeChartRef2.$refs.barChartRef.drawBar) {
// // 数据改变重新渲染柱状图
// // console.log(item, '组件');
// itemTypeChartRef2.$refs.barChartRef.drawBar(itemTypeChartRef2.dataArr[0])
// }
// if (itemTypeChartRef2.echartArr.includes('饼状图') && itemTypeChartRef2.$refs.pieChartRef.drawPie) {
// // 数据改变重新渲染饼图
// itemTypeChartRef2.$refs.pieChartRef.drawPie(itemTypeChartRef2.dataArr[0])
// }
// // if (item.echartArr.includes('均值图') && item.$refs.avgChartRef != undefined && item.dataArr.length != 0) {
// // item.$refs.avgChartRef.drawBar(item.dataArr[0])
// // }
// if (itemTypeChartRef2.echartArr.includes('均值图') && itemTypeChartRef2.$refs.avgChartRef != undefined) {
// itemTypeChartRef2.$refs.avgChartRef.drawBar(itemTypeChartRef2.dataArr[0])
// } // }
// ele.cycleStatisticsData.unshift(item);
if (_that.$refs.typeChartRef2 != undefined) {
for (let i = 0; i < _that.$refs.typeChartRef2.length; i++) {
let itemTypeChartRef2 = _that.$refs.typeChartRef2[i];
// console.log(_this.$refs.typeChartRef[i], '触发接收的表格数据');
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], '周期统计')
}
if (itemTypeChartRef2.echartArr.includes('数值')) {
_that.$refs.typeChartRef2[i].getDataArr(_that.$refs.typeChartRef2[i].dataArr)
}
// console.log(item,'组件数据');
if (itemTypeChartRef2.echartArr.includes('直方图') && itemTypeChartRef2.$refs.barChartRef.drawBar) {
// 数据改变重新渲染柱状图
// console.log(item, '组件');
itemTypeChartRef2.$refs.barChartRef.drawBar(itemTypeChartRef2.dataArr[0])
}
if (itemTypeChartRef2.echartArr.includes('饼状图') && itemTypeChartRef2.$refs.pieChartRef.drawPie) {
// 数据改变重新渲染饼图
itemTypeChartRef2.$refs.pieChartRef.drawPie(itemTypeChartRef2.dataArr[0])
}
// if (item.echartArr.includes('均值图') && item.$refs.avgChartRef != undefined && item.dataArr.length != 0) {
// item.$refs.avgChartRef.drawBar(item.dataArr[0])
// } // }
if (itemTypeChartRef2.echartArr.includes('均值图') && itemTypeChartRef2.$refs.avgChartRef != undefined) {
itemTypeChartRef2.$refs.avgChartRef.drawBar(itemTypeChartRef2.dataArr[0])
}
}
} // }
} // }
} // }
}); // });
} // }
}, },
immediate: true immediate: true
}, },

41
src/views/general/AboutMachine.vue
View File

@ -42,6 +42,31 @@
<el-col :span="12"> <el-col :span="12">
<el-button type="primary" @click="handleagain()" size="small">重新启动</el-button> <el-button type="primary" @click="handleagain()" size="small">重新启动</el-button>
</el-col> </el-col>
</el-form-item>
<el-form-item label="分别重启：">
<el-col :span="3">
<el-select v-model="value1" multiple placeholder="请选择">
<el-option
v-for="item in optionsruan"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-col>
<el-col :span="4">
<el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/"
:on-preview="handlePreview" :on-remove="handleRemove" :before-remove="beforeRemove" multiple
:limit="3" :on-exceed="handleExceed" :file-list="fileList">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-col>
</el-form-item>
<p>更正软件</p>
<el-form-item label="更新软件版本：">
<el-col :span="12">
<el-button type="primary" @click="handleagain()" size="small">重新启动</el-button>
</el-col>
</el-form-item> </el-form-item>
<p>全局设置</p> <p>全局设置</p>
<el-form-item label="视频接入上限："> <el-form-item label="视频接入上限：">
@ -100,7 +125,21 @@ export default {
value: '4', value: '4',
label: '4' label: '4'
} }
] ],
optionsruan: [{
value: '选项1',
label: '软件1'
}, {
value: '选项2',
label: '软件2'
}, {
value: '选项3',
label: '软件3'
}, {
value: '选项4',
label: '软件4'
}],
value1: [],
}; };
}, },
mounted() { mounted() {

24
src/views/general/network.vue
View File

@ -268,39 +268,33 @@ export default {
// value.split("/")[0] // value.split("/")[0]
let valdata = value.split('/')[0]; let valdata = value.split('/')[0];
let valdata2 = value.split('/')[1]; let valdata2 = value.split('/')[1];
console.log("valdata",valdata)
console.log("valdata2",valdata2)
let valdata3 = value.split('/')[2]; let valdata3 = value.split('/')[2];
let isCorrect = true; let isCorrect = true;
if (valdata.length) { if (valdata.length) {
for (let i = 0; i < valdata.length; i++) { for (let i = 0; i < valdata.length; i++) {
const re = /^[0-9]*[1-9][0-9]*$/; if(valdata3){
const rsCheck = re.test(value); isCorrect = false;
// if (regexp.test(valdata[i]) == false&&!Number(valdata2)&&(valdata2 < 1 || valdata2 > 32)&&valdata3&&!rsCheck) { callback(new Error('请输入正确的IP地址'));
if (regexp.test(valdata[i]) == false) { }else{
if (regexp.test(valdata) == false) {
isCorrect = false; isCorrect = false;
callback(new Error('请输入正确的IP地址')); callback(new Error('请输入正确的IP地址'));
}else{ }else{
if (!Number(valdata2)) { if (!Number(valdata2)) {
// callback(new Error('请输入整数，值为[1,32]'));
isCorrect = false; isCorrect = false;
callback(new Error('请输入正确的IP地址')); callback(new Error('请输入正确的IP地址'));
} else { } else {
if (valdata2 < 1 || valdata2 > 32) { const re = /^[0-9]*[1-9][0-9]*$/;
const rsCheck = re.test(valdata2);
if (valdata2 < 1 || valdata2 > 32|| !rsCheck) {
callback(new Error('请输入整数，值为[1,32]')); callback(new Error('请输入整数，值为[1,32]'));
isCorrect = false; isCorrect = false;
} }
if(valdata3){
isCorrect = false;
callback(new Error('请输入正确的IP地址'));
} }
} }
} }
} }
} }
} }

21
src/views/logs.vue
View File

@ -26,16 +26,19 @@
<!-- <el-table-column show-overflow-tooltip align="center" prop="content" label="内容"></el-table-column> --> <!-- <el-table-column show-overflow-tooltip align="center" prop="content" label="内容"></el-table-column> -->
<el-table-column show-overflow-tooltip align="center" label="下载" > <el-table-column show-overflow-tooltip align="center" label="下载" >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="downBox" v-if="scope.row.content.includes(',')" > <div class="downBox" v-if="scope.row.content.includes(',')" >
<span @click="downloadFile(scope.row.path.split(',')[0])"> <el-tag
{{ scope.row.content.split(',')[0] }} v-for="(item, index) in scope.row.content.split(',')" :key="index"
</span> style="margin-left:10px"
<span @click="downloadFile(scope.row.path.split(',')[1])"> :type="scope.row.content.split(',')[0] === '计算' ? 'primary' : 'success'"
{{ scope.row.content.split(',')[1] }} @click="downloadFile(scope.row.path.split(',')[index])"
</span> disable-transitions>{{item}}</el-tag>
</div> </div>
<div class="downBox" v-else> <div class="downBox" v-else>
<span @click="downloadFile(scope.row.path)">{{ scope.row.content }}</span> <el-tag
@click="downloadFile(scope.row.path)"
disable-transitions>{{scope.row.content}}</el-tag>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -47,10 +50,10 @@
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize" :current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
layout="sizes, total,prev, pager, next" :total="totalNumber" style="padding-top: 10px;"> layout="sizes, total,prev, pager, next" :total="totalNumber" style="padding-top: 10px;">
</el-pagination> </el-pagination> -->
<el-dialog :title="concetData.notificationType" :visible.sync="dialogVisible" width="30%" <el-dialog :title="concetData.notificationType" :visible.sync="dialogVisible" width="30%"
@close="notificClosed"> @close="notificClosed">