Browse Source

fix: 工艺步骤去除多余序号

master
guoapeng 2 months ago
parent
commit
39ccddad71
  1. 2
      src/apis/user.ts
  2. 4
      src/components/home/Tube/index.vue
  3. 1
      src/stores/systemStore.ts
  4. 2
      src/types/system.d.ts

2
src/apis/user.ts

@ -1,7 +1,7 @@
import http from 'libs/http'
export const current = (): Promise<User.User> => http.get('/auth/current')
export const addUser = (params: User.AddUser): Promise<null> => http.post('/user', params)
export const addUser = (params: User.User): Promise<null> => http.post('/user', params)
export const updateUser = (params: User.User): Promise<null> => http.put('/user', params)
export const userList = (params: System.Page): Promise<System.PageResponse<User.User>> => http.get('/user/list', { params })
export const delUser = (params: string): Promise<null> => http.delete(`/user/${params}`)

4
src/components/home/Tube/index.vue

@ -129,7 +129,6 @@ defineExpose({
<span v-if="craft?.state === 'FINISHED'" class="status-text">工艺执行成功</span>
<el-tooltip v-if="craft?.state === 'RUNNING' && craftSteps && craftSteps[craft.currentIndex || 0]?.params?.description" :content="`${(craft.currentIndex || 0) + 1}.${craftSteps[craft.currentIndex || 0].params.description}`" placement="top" trigger="click">
<div class="status-description">
{{ (craft.currentIndex || 0) + 1 }}.
{{ craftSteps[craft.currentIndex || 0].params.description }}
</div>
</el-tooltip>
@ -165,8 +164,11 @@ defineExpose({
</span>
<span v-show="data.fanOpen" style="color: #14A656;font-weight: bold">降温中</span>
<span v-show="data.heatingType === 'heating'" style="color: #FE0A0A;font-weight: bold ">加热中</span>
<span v-show="data.heatingType === 'constant'" style="color: #FE0A0A;font-weight: bold ">恒温中</span>
<span v-show="data.heatingType === 'drying'" style="color: #F2652D;font-weight: bold ">烘干中</span>
<span v-show="data.heatingType === 'annealing'" style="color: #1677FF;font-weight: bold ">退火中</span>
<!-- <span v-show="data.heatingType === 'finish'" style="color: #FE0A0A;font-weight: bold ">加热完成</span> -->
<!-- <span v-show="data.heatingType === 'stop'" style="color: #606266;font-weight: bold ">停止加热</span> -->
</div>
<CountDown v-if="data.startHeatTime && data.targetTime" :current="new Date().getTime()" :start-time="data.startHeatTime" :duration="data.targetTime" />
<div class="footer">

1
src/stores/systemStore.ts

@ -14,6 +14,7 @@ export const useSystemStore = defineStore('system', {
id: 1,
username: 'admin',
nickname: '管理员',
fixedUser: 'ENABLE',
},
currentTasks: null,
doorModule: {

2
src/types/system.d.ts

@ -66,7 +66,7 @@ declare namespace System {
moduleCode: 'heat_module_01' | 'heat_module_02' | 'heat_module_03' | 'heat_module_04'
trayStatus: boolean
enable: boolean
heatingType: 'heating' | 'drying' | 'annealing' | 'stop'
heatingType: 'heating' | 'drying' | 'annealing' | 'stop' | 'constant' | 'finish'
fanOpen: boolean
dryTemperature?: number
annealTemperature?: number

Loading…
Cancel
Save