不同电脑的样式微调

This commit is contained in:
GYYM
2024-11-22 11:45:33 +08:00
parent 6137ac18b7
commit b77ad54309
2 changed files with 669 additions and 19 deletions

View File

@@ -45,7 +45,7 @@
<div class="change-errsys-content">
<div class="tabs-title">
<el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">合格92项/共103项</el-button>
<el-button type="primary" v-if="activeIndex === activeTotalNum">合格92项/共103项</el-button>
<el-button type="primary" v-if="activeIndex >= activeTotalNum">合格92项/共103项</el-button>
</div>
<div class="dialog-content">
<el-table :data="tableData" row-key="id" height="545px" :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " style="width: 100%" border>
@@ -191,6 +191,10 @@
</div>
</div>
<ReportPopup :visible="reportDialogVisible" @update:visible="reportDialogVisible = $event"></ReportPopup>
<dataCheckSingleChannelSingleTestPopup
:visible="dataCheckSingleChannelSingleTestDialogVisable"
@update:visible="dataCheckSingleChannelSingleTestDialogVisable = $event"
></dataCheckSingleChannelSingleTestPopup>
</el-dialog>
</template>
@@ -214,6 +218,7 @@ import DataCheckResultTable from './dataCheckResultTable.vue'
import DataCheckRawDataTable from './dataCheckRawDataTable.vue'
import {dictPattern,dictTestState,dictReportState,dictResult,testPlanDataList,sourceDataList,deviceDataList,testSoureDataList,testScriptDataList,testErrSystDataList,planData,testFatherPlanList} from '@/api/plan/planData'
import ReportPopup from './reportPopup.vue'
import dataCheckSingleChannelSingleTestPopup from './dataCheckSingleChannelSingleTestPopup.vue'
const reportDisabled = ref(true)
const reportDialogVisible = ref(false)
@@ -279,8 +284,17 @@ const props = defineProps<{
(e: 'submit', data: any): void;
}>();
function clear() {
activeIndex.value = 0;
}
const handleCancel = () => {
emit('update:visible', false); // 关闭对话框
//clearInterval(timer.value);
activeIndex.value = 0;
tableData.value.length = 0;
tableData.value = operatorTableData.value;
};
const openReportDlg = () => {
@@ -447,8 +461,6 @@ const isPause = ref<boolean>(false);
const resultDialogVisible = ref(false)
const dataCheckSingleChannelSingleTestDialogVisable = ref(false);
function clear() {
}
function traverseTableData(data: any[],id: string): void {
data.forEach(item => {
@@ -522,7 +534,644 @@ interface User {
// resultType3: 'danger',
// resultValue3:'×',
const operatorTableData = ref([
{
id: '1',
scriptItemName: '频率',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
children: [
{
id: '1-1',
scriptItemName: '额定条件下的测量',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
children: [
{
id: '1-1-1',
scriptItemName: '频率42.5Hz',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '1-1-2',
scriptItemName: '频率50Hz',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '1-1-3',
scriptItemName: '频率50.5Hz',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '1-1-4',
scriptItemName: '频率57.5Hz',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
],
},
{
id: '1-2',
scriptItemName: '电压对频率测量的影响',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
children: [
{
id: '1-2-1',
scriptItemName: '频率50.5Hz 电压10%Un',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
],
},
{
id: '1-3',
scriptItemName: '谐波对频率测量的影响',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
children: [
{
id: '1-3-1',
scriptItemName: '频率50.5Hz 谐波电压h3 10%Un;h7 10%Un;h11 10%Un;h15 4%Un; h19 5%Un; h23 5%Un',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
],
},
],
},
{
id: '2',
scriptItemName: '电压',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
children: [
{
id: '2-1',
scriptItemName: '额定条件下的测量',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
children: [
{
id: '2-1-1',
scriptItemName: '频率50Hz 电压10%Un',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '2-1-2',
scriptItemName: '频率50Hz 电压45%Un',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '2-1-3',
scriptItemName: '频率50Hz 电压80%Un',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '2-1-4',
scriptItemName: '频率50Hz 电压115%Un',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '2-1-5',
scriptItemName: '频率50Hz 电压150%Un',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
],
},
{
id: '2-2',
scriptItemName: '频率对电压测量的影响',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
children: [
{
id: '2-2-1',
scriptItemName: '频率42.5Hz 电压80%Un',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
],
},
{
id: '2-3',
scriptItemName: '谐波对电压测量的影响',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
children: [
{
id: '2-3-1',
scriptItemName: '频率50Hz 电压80%Un 谐波电压h3 10%Un;h7 10%Un;h11 10%Un;h15 4%Un; h19 5%Un; h23 5%Un',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
],
},
],
},
{
id: '3',
scriptItemName: '谐波电压',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '4',
scriptItemName: '谐波电流',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '5',
scriptItemName: '谐波有功功率',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '6',
scriptItemName: '间谐波电压',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '7',
scriptItemName: '间谐波电流',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '8',
scriptItemName: '暂态',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '9',
scriptItemName: '电流',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '10',
scriptItemName: '电压不平衡度',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '11',
scriptItemName: '电流不平衡度',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
{
id: '12',
scriptItemName: '短时闪变',
resultType1: 'info',
resultValue1:'-',
resultType2: 'info',
resultValue2:'-',
resultType3: 'info',
resultValue3:'-',
resultType4: 'info',
resultValue4:'-',
resultType5: 'info',
resultValue5:'-',
resultType6: 'info',
resultValue6:'-',
resultType7: 'info',
resultValue7:'-',
resultType8: 'info',
resultValue8:'-',
},
])
const tableData = ref([
{
@@ -1170,11 +1819,11 @@ const ts = ref('');
const startTimer = () => {
//if (timer.value !== null) return; // 如果定时器已经启动,则不再重复启动
timer.value = setInterval(() => {
console.log(activeIndex.value,111)
if(activeIndex.value <= activeTotalNum.value)
{
activeIndex.value++;
updateLog()
switch(activeIndex.value)
{
@@ -1218,23 +1867,24 @@ const startTimer = () => {
}
if (percentage.value < 100) {
percentage.value = Math.trunc(activeIndex.value/activeTotalNum.value * 100);
// if (percentage.value < 100) {
// percentage.value = Math.trunc(activeIndex.value/activeTotalNum.value * 100);
} else {
percentage.value = 100;
clearInterval(timer)
// } else {
// percentage.value = 100;
// clearInterval(timer)
reportDisabled.value = false;
clear();
}
// reportDisabled.value = false;
// }
}
else
{
clearInterval(timer)
console.log(activeIndex.value,222)
clearInterval(timer.value)
reportDisabled.value = false;
console.log(activeIndex.value,333)
}
}, 100);

View File

@@ -1,5 +1,5 @@
<template>
<el-dialog title="数据查询" :model-value='visible' @close="handleCancel" width="1050px">
<el-dialog title="数据查询" :model-value='visible' @close="handleCancel" width="1065px">
<div class="data-check-dialog">
<div class="data-check-title">
<el-form :model='formContent'>
@@ -122,13 +122,13 @@ const monitorIdxList = [
value: '1',
},
{
value: '2',
value: '2 (不合格)',
},
{
value: '3',
},
{
value: '4',
value: '4 (不合格)',
},
]
const handleNodeClick = (data) => {