UI-Project/src/lang/en.js
@@ -136,6 +136,8 @@ takeon:'The arrangement is complete', }, searchOrder:{ startCell:'目标层号', endCell:'预留层号', begin:'开始', finish:'完成', uncar:'未上车', UI-Project/src/lang/py.js
@@ -135,6 +135,8 @@ takeaway: 'Взять вручную', }, searchOrder: { startCell:'目标层号', endCell:'预留层号', begin:'开始', finish:'完成', uncar:'未上车', UI-Project/src/lang/zh.js
@@ -135,6 +135,8 @@ takeon:'摆片完成', }, searchOrder:{ startCell:'目标层号', endCell:'预留层号', begin:'开始', finish:'完成', uncar:'未上车', UI-Project/src/views/Caching/cachingbefore.vue
@@ -447,7 +447,7 @@ </div> </div> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="95%"> <el-dialog v-model="blindb" top="10vh" width="71%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/Caching/cachingbeforehistory.vue
@@ -53,7 +53,11 @@ </el-form> </div> <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.glassID')" min-width="80" /> <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" /> <el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" /> <el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" /> <el-table-column prop="startCell" align="center" :label="$t('searchOrder.startCell')" min-width="80" /> <el-table-column prop="endCell" align="center" :label="$t('searchOrder.endCell')" min-width="80" /> <el-table-column align="center" :label="$t('film.taskstatus')" @@ -78,8 +82,8 @@ </el-tag> </template> </el-table-column> <el-table-column prop="createTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" /> <el-table-column prop="updateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" /> <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="100" /> <el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="100" /> </el-table> <div style="margin-top: 20px;margin-left: 40%;"> <el-pagination UI-Project/src/views/Caching/cachingun.vue
@@ -424,7 +424,7 @@ </div> </div> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="95%"> <el-dialog v-model="blindb" top="10vh" width="71%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/Caching/cachingunhistory.vue
@@ -53,7 +53,11 @@ </el-form> </div> <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.glassID')" min-width="80" /> <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" /> <el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" /> <el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" /> <el-table-column prop="startCell" align="center" :label="$t('searchOrder.startCell')" min-width="80" /> <el-table-column prop="endCell" align="center" :label="$t('searchOrder.endCell')" min-width="80" /> <el-table-column align="center" :label="$t('film.taskstatus')" @@ -78,8 +82,8 @@ </el-tag> </template> </el-table-column> <el-table-column prop="createTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" /> <el-table-column prop="updateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" /> <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="100" /> <el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="100" /> </el-table> <div style="margin-top: 20px;margin-left: 40%;"> <el-pagination UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -462,7 +462,7 @@ // } // } // 任务成功处理 const successfull = async(row) => { const successfull = async(row) => { try { const confirmResult = await ElMessageBox.confirm( t('searchOrder.psuccessfullyprocessed'), @@ -487,7 +487,7 @@ } }; // 任务失败处理 const handleptask = async(row) => { const handleptask = async(row) => { try { const confirmResult = await ElMessageBox.confirm( t('searchOrder.ptaskfailure'), @@ -634,7 +634,12 @@ </template> </el-table-column> <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" /> <el-table-column fixed="right" :label="$t('film.operate')" align="center"> <template #default="scope"> <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button> <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button> </template> </el-table-column> </el-table> </div> </el-card> @@ -708,7 +713,7 @@ </el-table> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="95%"> <el-dialog v-model="blindb" top="10vh" width="71%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/GlassStorage/rawhistory.vue
@@ -22,14 +22,14 @@ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button> </div> <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="80" /> <el-table-column prop="endSlot" align="center" :label="$t('film.endslot')" min-width="80" /> <el-table-column prop="shelf" align="center" :label="$t('film.resetnumber')" min-width="80" /> <el-table-column prop="patternQuantity" align="center" :label="$t('film.thickremainquant')" min-width="80" /> <el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="50" /> <el-table-column prop="endSlot" align="center" :label="$t('film.endslot')" min-width="50" /> <el-table-column prop="shelf" align="center" :label="$t('film.resetnumber')" min-width="50" /> <el-table-column prop="patternQuantity" align="center" :label="$t('film.thickremainquant')" min-width="50" /> <el-table-column align="center" :label="$t('film.taskstatus')" min-width="80" min-width="50" prop="taskState" > <template #default="scope"> @@ -41,7 +41,7 @@ <el-table-column align="center" :label="$t('film.enabletype')" min-width="80" min-width="50" prop="taskType" > <template #default="scope"> @@ -50,8 +50,14 @@ </el-tag> </template> </el-table-column> <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" /> <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" /> <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="50" /> <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="50" /> <el-table-column fixed="right" :label="$t('film.operate')" align="center"> <template #default="scope"> <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button> <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button> </template> </el-table-column> </el-table> <div style="margin-top: 20px;margin-left: 40%;"> <el-pagination @@ -118,6 +124,55 @@ console.error(error); } } const successfull = async(row) => { try { const confirmResult = await ElMessageBox.confirm( t('searchOrder.psuccessfullyprocessed'), t('workOrder.prompt'), { confirmButtonText: t('workOrder.yes'), cancelButtonText: t('workOrder.cancel'), type: 'warning', } ); if (confirmResult === 'confirm') { var url="/glassStorage/rawGlassStorageTask/taskSuccess?taskId="+ row.id; const response = await request.post(url) if (response.code === 200) { ElMessage.success(response.message); } else { ElMessage.error(response.msg); } } } catch (error) { console.error('发生错误:', error); } }; // 任务失败处理 const handleptask = async(row) => { try { const confirmResult = await ElMessageBox.confirm( t('searchOrder.ptaskfailure'), t('workOrder.prompt'), { confirmButtonText: t('workOrder.yes'), cancelButtonText: t('workOrder.cancel'), type: 'warning', } ); if (confirmResult === 'confirm') { var url="/glassStorage/rawGlassStorageTask/taskError?taskId="+ row.id; const response = await request.post(url) if (response.code === 200) { ElMessage.success(response.message); } else { ElMessage.error(response.msg); } } } catch (error) { console.error('发生错误:', error); } }; const handlePageChange2 = (newPage) => { currentPage2.value = newPage; console.log(currentPage2.value); UI-Project/src/views/Returns/upreturnhistory.vue
@@ -19,8 +19,8 @@ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button> </div> <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="80" /> <el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="80" /> <el-table-column prop="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="70" /> <el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="70" /> <el-table-column prop="rawGlassThickness" align="center" :label="$t('Mounting.thickness')" min-width="80" /> <el-table-column prop="rawGlassFilmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" /> <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" /> UI-Project/src/views/Returns/upreturnhistory2.vue
@@ -19,8 +19,8 @@ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button> </div> <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="80" /> <el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="80" /> <el-table-column prop="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="70" /> <el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="70" /> <el-table-column prop="rawGlassThickness" align="center" :label="$t('Mounting.thickness')" min-width="80" /> <el-table-column prop="rawGlassFilmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" /> <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" /> UI-Project/src/views/Returns/upreturns.vue
@@ -496,10 +496,11 @@ <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80"/> <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/> <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/> <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/> <el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80"/> <el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="80"/> <el-table-column fixed="right" :label="$t('film.operate')" align="center"> <template #default="scope"> <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button> <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button> </template> </el-table-column> </el-table> @@ -604,7 +605,7 @@ </template> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindbd" top="10vh" width="95%"> <el-dialog v-model="blindbd" top="10vh" width="71%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/Returns/upreturns2.vue
@@ -491,10 +491,11 @@ <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80"/> <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/> <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/> <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/> <el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80"/> <el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="80"/> <el-table-column fixed="right" :label="$t('film.operate')" align="center"> <template #default="scope"> <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button> <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button> </template> </el-table-column> </el-table> @@ -502,7 +503,7 @@ </div> </div> <!-- 历史任务 --> <el-dialog v-model="blindbd" top="10vh" width="95%"> <el-dialog v-model="blindbd" top="10vh" width="71%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/Slicecage/slicecage.vue
@@ -1445,7 +1445,7 @@ </div> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="95%"> <el-dialog v-model="blindb" top="10vh" width="71%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/hollow/hollowequipment.vue
@@ -986,7 +986,7 @@ </template> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindb" top="5vh" width="95%"> <el-dialog v-model="blindb" top="5vh" width="71%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -480,7 +480,7 @@ </template> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindb" top="5vh" width="95%"> <el-dialog v-model="blindb" top="5vh" width="71%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/hollow/hollowslicecage.vue
@@ -990,7 +990,7 @@ </div> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindb" top="5vh" width="95%"> <el-dialog v-model="blindb" top="5vh" width="71%"> <iframe :src="iframeUrl" marginwidth="2000px"
