diff --git a/frontend/src/api/device/interface/error.ts b/frontend/src/api/device/interface/error.ts index 80da4f9..24eaef7 100644 --- a/frontend/src/api/device/interface/error.ts +++ b/frontend/src/api/device/interface/error.ts @@ -25,7 +25,8 @@ export namespace ErrorSystem { sort: number; id:string;//误差体系子表ID errorSysId:string;//所属误差体系ID - type: string;//检测脚本类型,树形字典表(没有树形表则需要拆分字段) + errorType: string;//误差类型,树形字典表(没有树形表则需要拆分字段) + scriptType: string;//脚本类型 startValue?:number | null;//误差判断起始值(误差范围) startFlag?:number;//是否包含起始值 endValue?:number | null;//;误差判断结束值(误差范围) diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index 9fda07b..b62fad6 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -11,6 +11,7 @@ :key="tableKey" @selection-change='handleSelectionChange' :request-api='getTableList' + :toolButton = 'false' > @@ -566,9 +567,17 @@ const handleSelectionChange = (selection: any[]) => { chnNum: item.devChns, } }); - checkStore.clearDevices() - checkStore.addDevices(devices) - checkStore.setPlanId(selection[0].planId) + + if(selection.length > 0){ + checkStore.clearDevices() + checkStore.addDevices(devices) + checkStore.setPlanId(selection[0].planId) + }else{ + checkStore.clearDevices() + checkStore.setPlanId('') + + } + } //查询 diff --git a/frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue b/frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue index 2259584..af0dfa7 100644 --- a/frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue +++ b/frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue @@ -12,13 +12,24 @@ @selection-change="handleSelectionChange"> - + + + + @@ -110,7 +121,12 @@ const isStartValueDisabled = ref<{ [key: number]: boolean }>({}); const isEndValueDisabled = ref<{ [key: number]: boolean }>({}); const props = defineProps({ - options: { + errorOptions: { + type: Array as PropType, + required: true + }, + + scriptOptions: { type: Array as PropType, required: true }, @@ -121,6 +137,36 @@ } }); + +// const aaa = 'Freq_Deviation_Freq''FREQ' - + + +const handleErrorTypeChange = (value: any, row: any) =>{ + // 使用示例 + const matchedRow = findRowById(row, props.errorOptions); + + row.scriptType = value; + +} + + +// 假设 props.errorOptions 是一个数组,每个元素可能包含 children 属性 +const findRowById = (id: string, options: any[]): any | null => { + for (const option of options) { + if (option.value === id) { + return option; + } + if (option.children && option.children.length > 0) { + const result = findRowById(id, option.children); + if (result) { + return result; + } + } + } + return null; +}; + + // 监听 props.tableData 的变化,确保每次数据变化时都重新设置 sort watch(() => props.tableData, async (newTableData) => { for (let i = 0; i < newTableData.length; i++) { @@ -180,7 +226,8 @@ const handleEndFlagChange = (row: ErrorSystem.ErrorSystemDetail, value: number) conditionType: conditionTypes.length > 0 ? Number(conditionTypes[3].value) : 0, // 设置默认值为第一个选项的值 errorValueType:errorValueTypes.length > 0 ? Number(errorValueTypes[0].value) : 0, // 设置默认值为第一个选项的值 errorSysId: "", - type: "", + errorType: "", + scriptType: "", maxErrorValue: 0 }; diff --git a/frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue b/frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue index 8d21332..1d9ebc1 100644 --- a/frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue +++ b/frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue @@ -1,5 +1,5 @@