diff --git a/frontend/src/api/device/icd/index.ts b/frontend/src/api/device/icd/index.ts index 0830ffd..ffe4a26 100644 --- a/frontend/src/api/device/icd/index.ts +++ b/frontend/src/api/device/icd/index.ts @@ -20,12 +20,12 @@ export const getICDAllList = (params: ICD.ResICD) => { //添加ICD export const addICD = (params: ICD.ResICD) => { - return http.post(`/icd/add`, params) + return http.upload(`/icd/add`, params) } //编辑ICD export const updateICD = (params: ICD.ResICD) => { - return http.post(`/icd/update`, params) + return http.upload(`/icd/update`, params) } //删除ICD diff --git a/frontend/src/api/device/interface/icd.ts b/frontend/src/api/device/interface/icd.ts index b3e69e7..6905ebd 100644 --- a/frontend/src/api/device/interface/icd.ts +++ b/frontend/src/api/device/interface/icd.ts @@ -26,6 +26,7 @@ export namespace ICD { updateTime?: string| null; //更新时间 angle: number; // 是否支持电压相角、电流相角指标 usePhaseIndex: number; // 角型接线时是否使用相别的指标来进行检测 + mappingFile: string | null;//映射文件 } /** diff --git a/frontend/src/views/home/components/compareTestPopup.vue b/frontend/src/views/home/components/compareTestPopup.vue index e2639de..8bafebf 100644 --- a/frontend/src/views/home/components/compareTestPopup.vue +++ b/frontend/src/views/home/components/compareTestPopup.vue @@ -278,7 +278,6 @@ const open = async ( pairs.value = pair showSteps.value = true initOperate() - dialogTitle.value = title dialogVisible.value = true // 等待组件渲染完成 diff --git a/frontend/src/views/home/components/deviceConnectionPopup.vue b/frontend/src/views/home/components/deviceConnectionPopup.vue index e8b9bd3..49a3c13 100644 --- a/frontend/src/views/home/components/deviceConnectionPopup.vue +++ b/frontend/src/views/home/components/deviceConnectionPopup.vue @@ -215,7 +215,7 @@ const planIdKey = ref('') const deviceMonitor = ref>(); const planIsOnlyWave = ref(false) const open = async ( - + title: string, device: Device.ResPqDev[], standardDev: StandardDevice.ResPqStandardDevice[], fatherPlanId: string, @@ -223,6 +223,7 @@ const open = async ( checkType: string, isOnlyWave:boolean ) => { + dialogTitle.value = title planIsOnlyWave.value = isOnlyWave CompareTestVisible.value = false devIdList.value = device diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index cdde362..850db8b 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -845,8 +845,9 @@ const handleTest2 = async (val: string) => { // 检查数组长度是否为1且唯一元素是'wave_data' const isOnlyWave = targetPlan.datasourceIds.length === 1 && targetPlan.datasourceIds[0] === 'wave_data' - + dialogTitle.value = val deviceConnectionPopupRef.value?.open( + dialogTitle.value, filteredChannelsSelection, pqStandardDevList.value, props.id, diff --git a/frontend/src/views/machine/icd/components/icdPopup.vue b/frontend/src/views/machine/icd/components/icdPopup.vue index 0055e1e..55de2ef 100644 --- a/frontend/src/views/machine/icd/components/icdPopup.vue +++ b/frontend/src/views/machine/icd/components/icdPopup.vue @@ -14,6 +14,23 @@ show-word-limit /> + + + 选择文件 + + 仅支持上传大小不超过1MB的.txt文件 +