Commit ade8f9f1 authored by 梁钊炜's avatar 梁钊炜

fix: 修改请求接口

parent 3f9a2f9c
...@@ -77,7 +77,9 @@ ...@@ -77,7 +77,9 @@
<template #title> <template #title>
{{ prolineGxInfo.aeProlineGx.gxName }} {{ prolineGxInfo.aeProlineGx.gxName }}
<a-tag color="red" v-if="prolineGxInfo.aeProlineGx.diProcess != null || prolineGxInfo.aeProlineGx.diProcess === '0'"></a-tag> <a-tag color="red"
v-if="prolineGxInfo.aeProlineGx.diProcess != null || prolineGxInfo.aeProlineGx.diProcess === '0'">
</a-tag>
<a-tag color="green" v-else>DI</a-tag> <a-tag color="green" v-else>DI</a-tag>
</template> </template>
<template #extra> <template #extra>
...@@ -160,19 +162,19 @@ ...@@ -160,19 +162,19 @@
</a-empty> </a-empty>
<a-form v-else :model="workpieceInfo" auto-label-width> <a-form v-else :model="workpieceInfo" auto-label-width>
<a-form-item field="onlineTime" label="上线时间"> <a-form-item field="onlineTime" label="上线时间">
<a-input disabled v-model="workpieceInfo.onlineTime" placeholder="工件未上线" /> <a-input disabled v-model="workpieceInfo.onlineTime" placeholder="工件未上线"/>
</a-form-item> </a-form-item>
<a-form-item field="onlineTime" label="下线时间"> <a-form-item field="onlineTime" label="下线时间">
<a-input disabled v-model="workpieceInfo.offlineTime" placeholder="工件未下线" /> <a-input disabled v-model="workpieceInfo.offlineTime" placeholder="工件未下线"/>
</a-form-item> </a-form-item>
<a-form-item field="onlineTime" label="缸盖号"> <a-form-item field="onlineTime" label="缸盖号">
<a-input disabled v-model="workpieceInfo.cylinderHeadNumber" placeholder="暂无" /> <a-input disabled v-model="workpieceInfo.cylinderHeadNumber" placeholder="暂无"/>
</a-form-item> </a-form-item>
<a-form-item field="onlineTime" label="缸体号"> <a-form-item field="onlineTime" label="缸体号">
<a-input disabled v-model="workpieceInfo.cylinderNumber" placeholder="暂无" /> <a-input disabled v-model="workpieceInfo.cylinderNumber" placeholder="暂无"/>
</a-form-item> </a-form-item>
<a-form-item field="onlineTime" label="托盘芯片号"> <a-form-item field="onlineTime" label="托盘芯片号">
<a-input disabled v-model="workpieceInfo.trayChipNumber" placeholder="暂无" /> <a-input disabled v-model="workpieceInfo.trayChipNumber" placeholder="暂无"/>
</a-form-item> </a-form-item>
<a-form-item field="onlineTime" label="追溯标识"> <a-form-item field="onlineTime" label="追溯标识">
<a-select v-model="workpieceInfo.backDateSign" placeholder="暂无"> <a-select v-model="workpieceInfo.backDateSign" placeholder="暂无">
...@@ -213,7 +215,7 @@ ...@@ -213,7 +215,7 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item field="onlineTime" label="当前位置"> <a-form-item field="onlineTime" label="当前位置">
<a-input disabled v-model="workpieceInfo.currentPosition" placeholder="暂无" /> <a-input disabled v-model="workpieceInfo.currentPosition" placeholder="暂无"/>
</a-form-item> </a-form-item>
<a-form-item field="onlineTime" label="抽检标识"> <a-form-item field="onlineTime" label="抽检标识">
<a-select v-model="workpieceInfo.spotCheckSign" placeholder="暂无"> <a-select v-model="workpieceInfo.spotCheckSign" placeholder="暂无">
...@@ -275,9 +277,11 @@ ...@@ -275,9 +277,11 @@
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-tooltip content="托盘芯片号在工件下线前终身绑定">
<a-form-item field="rfidNumber" label="托盘芯片号"> <a-form-item field="rfidNumber" label="托盘芯片号">
<a-input v-model="workpieceForm.trayNumber"/> <a-input v-model="workpieceForm.trayNumber"/>
</a-form-item> </a-form-item>
</a-tooltip>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item field="rfidNumber" label="写入结果"> <a-form-item field="rfidNumber" label="写入结果">
...@@ -295,7 +299,7 @@ ...@@ -295,7 +299,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item field="rfidNumber" label="缸体号" > <a-form-item field="rfidNumber" label="缸体号">
<a-input v-model="workpieceForm.cclinderNumber"/> <a-input v-model="workpieceForm.cclinderNumber"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -305,9 +309,22 @@ ...@@ -305,9 +309,22 @@
<div style="margin-left: 10px">生成的 RFID 信息:</div> <div style="margin-left: 10px">生成的 RFID 信息:</div>
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<a-typography-paragraph copyable> <div class="code">A
{{ rfidInfo }} <a-tooltip content="工件号-12位">
</a-typography-paragraph> <a-tag color="blue">{{ workpieceForm.jobNumber }}</a-tag>
</a-tooltip>
A
<a-tooltip content="缸盖号-18位">
<a-tag color="red">{{ workpieceForm.cclinderHeadNumber }}</a-tag>
</a-tooltip>
<a-tooltip content="缸体号-18位">
<a-tag color="green">{{ workpieceForm.cclinderNumber }}</a-tag>
</a-tooltip>
0000000000
<a-tooltip content="托盘芯片号-3位">
<a-tag color="purple">{{ workpieceForm.trayNumber }}</a-tag>
</a-tooltip>
</div>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
...@@ -326,7 +343,9 @@ ...@@ -326,7 +343,9 @@
<div class="equ-item">设备ID: {{ item.businessId }}</div> <div class="equ-item">设备ID: {{ item.businessId }}</div>
<div class="equ-item">PPC IP: {{ item.ppcMacAddress }}</div> <div class="equ-item">PPC IP: {{ item.ppcMacAddress }}</div>
<div class="equ-item">IPMS ID: {{ item.ipmsId }}</div> <div class="equ-item">IPMS ID: {{ item.ipmsId }}</div>
<a-button style="margin-top: 20px" type="primary" long @click="equipmentBoot(item.dmpDeviceNumber)">设备开机</a-button> <a-button style="margin-top: 20px" type="primary" long @click="equipmentBoot(item.dmpDeviceNumber)">
设备开机
</a-button>
</a-card> </a-card>
</a-col> </a-col>
</a-row> </a-row>
...@@ -389,7 +408,7 @@ const selectEquipment = ref('') ...@@ -389,7 +408,7 @@ const selectEquipment = ref('')
const equipmentInfoList = ref([]) const equipmentInfoList = ref([])
// RFID 信息 // RFID 信息
const rfidInfo = computed(() => { const rfidInfo = computed(() => {
return `00000${workpieceForm.value.jobNumber || '-'}00${workpieceForm.value.cclinderHeadNumber || '-'}${workpieceForm.value.cclinderNumber || '-'}0000` return `A${workpieceForm.value.jobNumber || '000000000000'}A${workpieceForm.value.cclinderHeadNumber || '000000000000000000'}${workpieceForm.value.cclinderNumber || '00000000000000000'}0000000000${workpieceForm.value.trayNumber}`
}) })
/** /**
* 获取产线列表 * 获取产线列表
...@@ -565,8 +584,6 @@ const equipmentBoot = async (equipmentNumber) => { ...@@ -565,8 +584,6 @@ const equipmentBoot = async (equipmentNumber) => {
} }
const unBindEquipmentGx = async (id) => { const unBindEquipmentGx = async (id) => {
const {data} = await unbindEquipment({ const {data} = await unbindEquipment({
equipmentId: id, equipmentId: id,
...@@ -621,4 +638,9 @@ const unBindEquipmentGx = async (id) => { ...@@ -621,4 +638,9 @@ const unBindEquipmentGx = async (id) => {
.equ-item { .equ-item {
margin-top: 10px; margin-top: 10px;
} }
.code {
display: flex;
align-items: center;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment