ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2024-12-05 14:37:50 +08:00
parent 3a1cfe0f31
commit 8e2a22cf61
4 changed files with 76 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
frontend/src/api/device/error/errorData.ts
View File

@@ -32,175 +32,200 @@ const errordata = ref<ErrorSystem.ErrorSystemList[]>([
const errordetail = ref<ErrorSystem.Error_detail[]>([ const errordetail = ref<ErrorSystem.Error_detail[]>([
{ {
measured: '电压偏差', col1: '电压偏差',
col2: '电压偏差',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电压', measurementType:'电压',
condition: '10%~150%标称电压', condition: '10%~150%标称电压',
maxErrorValue: '±0.1%Un' maxErrorValue: '±0.1%Un'
}, },
{ {
measured: '频率偏差', col1:'频率偏差',
col2: '频率偏差',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'频率', measurementType:'频率',
condition: '42.5~57.5 Hz', condition: '42.5~57.5 Hz',
maxErrorValue: '±0.01Hz' maxErrorValue: '±0.01Hz'
}, },
{ {
measured: '三相不平衡度', col1:'三相不平衡度',
col2: '三相不平衡度',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电压', measurementType:'电压',
condition: '0.5%~5%', condition: '0.5%~5%',
maxErrorValue: '±0.15%' maxErrorValue: '±0.15%'
}, },
{ {
measured: '三相不平衡度', col1:'三相不平衡度',
col2: '三相不平衡度',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电压', measurementType:'电压',
condition: '5%（不包含）~ 40%', condition: '5%（不包含）~ 40%',
maxErrorValue: '±0.3%' maxErrorValue: '±0.3%'
}, },
{ {
measured: '三相不平衡度', col1:'三相不平衡度',
col2: '三相不平衡度',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电流', measurementType:'电流',
condition: '', condition: '',
maxErrorValue: '±1%' maxErrorValue: '±1%'
}, },
{ {
measured: '电压波动/电压幅值', col1:'电压波动',
col2: '电压幅值',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电压', measurementType:'电压',
condition: '', condition: '',
maxErrorValue: '±0.2%Un' maxErrorValue: '±0.2%Un'
}, },
{ {
measured: '电压波动/持续时间', col1:'电压波动',
col2: '持续时间',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'时间', measurementType:'时间',
condition: '', condition: '',
maxErrorValue: '±1周波' maxErrorValue: '±1周波'
}, },
{ {
measured: '闪变', col1:'闪变',
col2: '闪变',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'短时间闪变', measurementType:'短时间闪变',
condition: 'Pst：0.2~10', condition: 'Pst：0.2~10',
maxErrorValue: '±5%' maxErrorValue: '±5%'
}, },
{ {
measured: '谐波和间谐波', col1:'谐波和间谐波',
col2: '谐波和间谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电压', measurementType:'电压',
condition: 'Uh≥1%Un', condition: 'Uh≥1%Un',
maxErrorValue: '±5%Uh' maxErrorValue: '±5%Uh'
}, },
{ {
measured: '谐波和间谐波', col1:'谐波和间谐波',
col2: '谐波和间谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电压', measurementType:'电压',
condition: 'Uh＜1%Un', condition: 'Uh＜1%Un',
maxErrorValue: '±0.05%Un' maxErrorValue: '±0.05%Un'
}, },
{ {
measured: '谐波和间谐波', col1:'谐波和间谐波',
col2: '谐波和间谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电流', measurementType:'电流',
condition: 'In≥3%In', condition: 'In≥3%In',
maxErrorValue: '±5%Ih' maxErrorValue: '±5%Ih'
}, },
{ {
measured: '谐波和间谐波', col1:'谐波和间谐波',
col2: '谐波和间谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电流', measurementType:'电流',
condition: 'In＜3%In', condition: 'In＜3%In',
maxErrorValue: '±0.15%In' maxErrorValue: '±0.15%In'
}, },
{ {
measured: '谐波和间谐波', col1:'谐波和间谐波',
col2: '谐波和间谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'相角', measurementType:'相角',
condition: '', condition: '',
maxErrorValue: 'h≤5,±1°*h' maxErrorValue: 'h≤5,±1°*h'
}, },
{ {
measured: '谐波和间谐波', col1:'谐波和间谐波',
col2: '谐波和间谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'相角', measurementType:'相角',
condition: '', condition: '',
maxErrorValue: 'h>5,±5°' maxErrorValue: 'h>5,±5°'
}, },
{ {
measured: '谐波和间谐波', col1:'谐波和间谐波',
col2: '谐波和间谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'功率', measurementType:'功率',
condition: 'Ph≥150W', condition: 'Ph≥150W',
maxErrorValue: '±1%Ph' maxErrorValue: '±1%Ph'
}, },
{ {
measured: '谐波和间谐波', col1:'谐波和间谐波',
col2: '谐波和间谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'功率', measurementType:'功率',
condition: 'Ph＜150W', condition: 'Ph＜150W',
maxErrorValue: '±1.5W' maxErrorValue: '±1.5W'
}, },
{ {
measured: '高频次谐波', col1:'高频次谐波',
col2: '高频次谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电压', measurementType:'电压',
condition: 'Uh≥1%Un', condition: 'Uh≥1%Un',
maxErrorValue: '±5%Uh' maxErrorValue: '±5%Uh'
}, },
{ {
measured: '高频次谐波', col1:'高频次谐波',
col2: '高频次谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电压', measurementType:'电压',
condition: 'Uh＜1%Un', condition: 'Uh＜1%Un',
maxErrorValue: '±0.05%Un' maxErrorValue: '±0.05%Un'
}, },
{ {
measured: '高频次谐波', col1:'高频次谐波',
col2: '高频次谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电流', measurementType:'电流',
condition: 'In≥3%In', condition: 'In≥3%In',
maxErrorValue: '±5%Ih' maxErrorValue: '±5%Ih'
}, },
{ {
measured: '高频次谐波', col1:'高频次谐波',
col2: '高频次谐波',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电流', measurementType:'电流',
condition: 'In＜3%In', condition: 'In＜3%In',
maxErrorValue: '±0.15%In' maxErrorValue: '±0.15%In'
}, },
{ {
measured: '功率', col1:'功率',
col2: '功率',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'功率', measurementType:'功率',
condition: '', condition: '',
maxErrorValue: '±0.5%' maxErrorValue: '±0.5%'
}, },
{ {
measured: '电流', col1:'电流',
col2: '电流',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电流', measurementType:'电流',
condition: 'I≥0.05In', condition: 'I≥0.05In',
maxErrorValue: '±0.5%' maxErrorValue: '±0.5%'
}, },
{ {
measured: '电流', col1:'电流',
col2: '电流',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电流', measurementType:'电流',
condition: '0.01In≤I＜0.05In', condition: '0.01In≤I＜0.05In',
maxErrorValue: '±1%' maxErrorValue: '±1%'
}, },
{ {
measured: '电压暂降、电压暂升和短时中断/电压幅值', col1: '电压暂降、电压暂升和短时中断',
col2: '电压幅值',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'电压', measurementType:'电压',
condition: '', condition: '',
maxErrorValue: '±0.2%Un' maxErrorValue: '±0.2%Un'
}, },
{ {
measured: '电压暂降、电压暂升和短时中断/持续时间', col1: '电压暂降、电压暂升和短时中断',
col2: '持续时间',
deviceLevel: 'A', deviceLevel: 'A',
measurementType:'时间', measurementType:'时间',
condition: '', condition: '',

10
frontend/src/views/machine/device/components/devicePopup.vue
View File

@@ -40,7 +40,7 @@
<el-row :gutter="24" > <el-row :gutter="24" >
<el-col :span="8"> <el-col :span="8">
<el-form-item label='生产厂商' prop='manufacturer' :label-width="100"> <el-form-item label='设备厂家' prop='manufacturer' :label-width="100">
<el-select v-model="formContent.manufacturer" clearable placeholder="请选择生产厂商"> <el-select v-model="formContent.manufacturer" clearable placeholder="请选择生产厂商">
<el-option <el-option
v-for="item in dictStore.getDictData('Dev_Manufacturers')" v-for="item in dictStore.getDictData('Dev_Manufacturers')"
@@ -52,18 +52,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="生产日期" prop="createDate" :label-width="100"> <el-form-item label="出厂日期" prop="createDate" :label-width="100">
<el-date-picker <el-date-picker
v-model="formContent.createDate" v-model="formContent.createDate"
placeholder="请选择生产日期" placeholder="请选择出厂日期"
:disabled-date="disabledDate" :disabled-date="disabledDate"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="出厂编号" prop="createId" :label-width="100"> <el-form-item label="设备序列号" prop="createId" :label-width="100">
<el-input v-model="formContent.createId" placeholder="请输入出厂编号"/> <el-input v-model="formContent.createId" placeholder="请输入设备序列号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

4
frontend/src/views/machine/device/index.vue
View File

@@ -80,7 +80,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
}, },
{ {
prop: 'createDate', prop: 'createDate',
label: '生产日期', label: '出厂日期',
minWidth: 200, minWidth: 200,
search: { search: {
span: 2, span: 2,
@@ -116,7 +116,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
}, },
{ {
prop: 'manufacturer', prop: 'manufacturer',
label: '生产厂商', label: '设备厂家',
enum: dictStore.getDictData('Dev_Manufacturers'), enum: dictStore.getDictData('Dev_Manufacturers'),
search: { el: 'select', props: { filterable: true }, order: 1 }, search: { el: 'select', props: { filterable: true }, order: 1 },
fieldNames: { label: 'name', value: 'id' }, fieldNames: { label: 'name', value: 'id' },

23
frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
View File

@@ -4,13 +4,17 @@
<div class="table-container"> <div class="table-container">
<el-table :data="errorData" <el-table :data="errorData"
height="500" height="500"
:header-cell-style="{ textAlign: 'center',backgroundColor: '#003078',color: '#fff' } " :header-cell-style="rowClass"
:cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
style="width: 100%" style="width: 100%"
:span-method="spanMethod" :span-method="spanMethod"
border border
class="custom-table"> class="custom-table"
<el-table-column prop="measured" label="被测量" /> >
<el-table-column label="被测量">
<el-table-column prop="col1"/>
<el-table-column prop="col2"/>
</el-table-column>
<el-table-column prop="deviceLevel" label="检测装置级别" /> <el-table-column prop="deviceLevel" label="检测装置级别" />
<el-table-column prop="measurementType" label="测量类型" /> <el-table-column prop="measurementType" label="测量类型" />
<el-table-column prop="condition" label="测量条件" /> <el-table-column prop="condition" label="测量条件" />
@@ -57,6 +61,17 @@ interface SpanMethodProps {
columnIndex: number columnIndex: number
} }
const rowClass = ({row, column, rowIndex, columnIndex}) => {
let res = {
textAlign: 'center', backgroundColor: '#003078', color: '#fff'
}
if (rowIndex === 1) {
res = {...res, display: 'none'}
return res
}
return res
}
const spanMethod = ({ const spanMethod = ({
row, row,
column, column,
@@ -65,7 +80,7 @@ const spanMethod = ({
}: SpanMethodProps) => { }: SpanMethodProps) => {
if (columnIndex === 0 ) { // 检查是否为第一列 if (columnIndex === 0 ) { // 检查是否为第一列
if (rowIndex === 2 ||rowIndex === 21) { // 检查是否为第三行 if (rowIndex === 2 ||rowIndex === 21) { // 检查是否为第三行
return { return {
rowspan: 2, // 合并行数 rowspan: 2, // 合并行数