diff --git a/.env.prod b/.env.prod index 5e829ec..0a20bef 100644 --- a/.env.prod +++ b/.env.prod @@ -2,6 +2,6 @@ FT_NODE_ENV=prod -FT_WS_URL=ws://192.168.10.188:8080/ws -FT_PROXY=http://192.168.10.188:8080 +FT_WS_URL=ws://192.168.8.168:8080/ws +FT_PROXY=http://192.168.8.168:8080 FT_API_BASE=/api \ No newline at end of file diff --git a/src/apis/crafts.ts b/src/apis/crafts.ts index 8c9c5e7..2ee7c7f 100644 --- a/src/apis/crafts.ts +++ b/src/apis/crafts.ts @@ -15,14 +15,14 @@ export const updateCraft = (params: Craft): Promise => http.put(`/crafts`, export const delCraft = (ids: string): Promise => http.delete(`/crafts/${ids}`) -// 开始执行预设 +// 开始执行工艺 export const startCraft = (params: { heatId?: string, craftId?: number, columns?: number[] }): Promise => http.post(`/crafts/start`, params) export const pauseCraft = (params: { heatId: string }): Promise => http.post(`/crafts/pause`, params) export const resumeCraft = (params: { heatId: string }): Promise => http.post(`/crafts/resume`, params) export const stopCraft = (params: { heatId: string }): Promise => http.post(`/crafts/stop`, params) -// 加热区配置预设 +// 加热区配置工艺 export const setCraft = (params: { heatId?: string | number, craftId?: string | number }): Promise => http.post(`/crafts/set`, params) export const craftstatus = (): Promise => http.get(`/monitor/crafts/status`) diff --git a/src/components/common/FTButton/index.vue b/src/components/common/FTButton/index.vue index aa94953..6ff426f 100644 --- a/src/components/common/FTButton/index.vue +++ b/src/components/common/FTButton/index.vue @@ -55,7 +55,7 @@ defineExpose({ - + diff --git a/src/components/craft/AddCraft/index.vue b/src/components/craft/AddCraft/index.vue index b95530c..d3e3111 100644 --- a/src/components/craft/AddCraft/index.vue +++ b/src/components/craft/AddCraft/index.vue @@ -42,7 +42,7 @@ const form = ref({ const formRef = ref() const rules = { - name: [{ required: true, trigger: 'blur', message: '请输入预设名称' }], + name: [{ required: true, trigger: 'blur', message: '请输入工艺名称' }], } const okHandle = async () => { @@ -113,16 +113,21 @@ const cancel = () => { const stepMap = { preHeat: { name: '预热', method: 'preHeat', params: { temperature: undefined, description: undefined } }, addLiquid: { - name: '加液', + name: '加稀硝酸', method: 'addLiquid', - params: { volume: undefined, containerId: undefined, description: undefined }, + params: { volume: undefined, containerId: 1, description: undefined }, + }, + addLiquid1: { + name: '加浓硝酸', + method: 'addLiquid', + params: { volume: undefined, containerId: 2, description: undefined }, }, heat: { name: '加热', method: 'heat', params: { temperature: undefined, time: undefined, description: undefined, minutes: undefined, seconds: undefined }, }, - reduceLiquid: { name: '抽液', method: 'reduceLiquid', params: { height: undefined, description: undefined } }, + // reduceLiquid: { name: '抽液', method: 'reduceLiquid', params: { height: undefined, description: undefined } }, clean: { name: '清洗', method: 'clean', @@ -152,12 +157,12 @@ const addStep = (data: any) => {