diff --git a/frontend/.env.development b/frontend/.env.development index 8f13788..f2c6db3 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -19,6 +19,6 @@ VITE_API_URL=/api # 开发环境跨域代理,支持配置多个 -VITE_PROXY=[["/api","http://192.168.1.124:18092/"]] +VITE_PROXY=[["/api","http://192.168.1.125:18092/"]] #VITE_PROXY=[["/api","http://192.168.1.125:18092/"]] # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文 diff --git a/frontend/src/api/device/interface/device.ts b/frontend/src/api/device/interface/device.ts index 7dc90e8..9f5d335 100644 --- a/frontend/src/api/device/interface/device.ts +++ b/frontend/src/api/device/interface/device.ts @@ -56,7 +56,7 @@ export namespace Device { createTime?: string| null; //创建时间 updateBy?: string| null; //更新用户 updateTime?: string| null; //更新时间 - icd: string; + icdId: string; power: string; } diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue index bfe0bc6..535fbcf 100644 --- a/frontend/src/views/machine/device/components/devicePopup.vue +++ b/frontend/src/views/machine/device/components/devicePopup.vue @@ -231,7 +231,7 @@ const fetchDevTypeOptions = async () => { reCheckNum:0, state: 1, factorFlag:0, - icd:'', + icdId:'', power:'' }) return { dialogVisible, titleType, formContent } @@ -260,7 +260,7 @@ const fetchDevTypeOptions = async () => { reCheckNum:0, state: 1, factorFlag:0, - icd:'', + icdId:'', power:'' } } @@ -438,7 +438,7 @@ const handleDevTypeChange = (value: string) => { formContent.value.devChns = dev.devChns; // 默认值为1 formContent.value.devCurr = dev.devCurr; // 默认值为1 formContent.value.devVolt = dev.devVolt; // 默认值为1 - formContent.value.icd = dev.icd + formContent.value.icdId = dev.icd formContent.value.power = dev.power } else { formContent.value.devChns = 1; // 默认值为1