From a5a12dfed331c5d2508e1acee474c9d6dc35b774 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 18 十一月 2024 08:26:12 +0800
Subject: [PATCH] 义乌新增掰片/识别、卧式缓存、磨边（冷加工）页面 前端路由配置等
---
UI-Project/src/views/Returns/upreturns2.vue | 108 ++++++++++++++++++++++++++++++------------------------
1 files changed, 60 insertions(+), 48 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 814a0fa..8c4d9c2 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -94,7 +94,7 @@
const handlesure = async () => {
try {
const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
- stationCell: 2,
+ stationCell: 6,
engineerId: selectedProjectNo.value,
filmRemove: filmRemove.value,
})
@@ -102,9 +102,12 @@
window.localStorage.setItem('filmRemove', filmRemove.value)
if (response.code == 200) {
ElMessage.success(response.message);
- blinda.value = false;
- selectedProjectNo.value = ''
- filmRemove.value = ''
+ tableData.value = response.data;
+ dialogFormVisible.value = false;
+ selectedProjectNo.value = '';
+ filmRemove.value = '';
+ markingMachineStatus.value = '#911005';
+ cuttingMachineStatus.value = '#911005';
} else {
ElMessage.error(response.message);
}
@@ -119,7 +122,7 @@
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
- stationCell: 2,
+ stationCell: 6,
filmRemove: filmRemove,
engineerId: engineeringId,
state: 1,
@@ -145,18 +148,17 @@
console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
- stationCell: 2,
+ stationCell: 6,
engineeringId: engineeringId,
state: 0,
})
if (response.code == 200) {
- ElMessage.success(response.message);
- blinda.value = false;
+ ElMessage.success(response.message);
+ blinda.value = false;
+ } else {
+ ElMessage.error(response.message);
+ }
} else {
- ElMessage.error(response.message);
- }
- }
- else {
ElMessage({
type: 'info',
message: t('basicData.infonull'),
@@ -170,14 +172,14 @@
// 鏌ヨ鏁版嵁
const selectReportData = async () => {
let stateList = []
- if (selectValuesa[1] != null && selectValuesa[1] != 'undefined') {
- if (selectValuesa[1] != "") {
- stateList = [selectValuesa[1]];
+ if (selectValuesa[0] != null && selectValuesa[0] != 'undefined') {
+ if (selectValuesa[0] != "") {
+ stateList = [selectValuesa[0]];
}
}
- const response = await request.post("/cacheVerticalGlass/damage/selectDamage", {
+ const response = await request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
taskState: stateList,
- taskType: 1
+ taskType: 6
})
if (response.code === 200) {
tableData.value = response.data;
@@ -230,21 +232,31 @@
}
} catch (error) {
ElMessage.error(t('basicData.glassnull'));
- }
+ }
};
</script>
<template>
- <div>
- <div id="dotClass">
- <div>{{ $t('basicData.laserprinting') }}</div>
- <i :style="{ marginTop: '2px', backgroundColor: markingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- <el-button @click="confirmMarkingMachine" style="margin-left: 30px;margin-top: -3px;">{{ $t('basicData.yes') }}</el-button>
- <div style="margin-left: 70px;">{{ $t('basicData.cuttingmachine') }}</div>
- <i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- <el-button @click="confirmCuttingMachine" style="margin-left: 30px;margin-top: -3px;" >{{ $t('basicData.yes') }}</el-button>
- <div style="margin-left: 70px;">{{ upstatus }} </div>
- <i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- <el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;" >{{ $t('basicData.change') }}</el-button>
+ <div style="height: 500px;">
+ <div>
+ <div id="dotClass">
+ <div>{{ $t('basicData.laserprinting') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: markingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <el-button @click="confirmMarkingMachine" style="margin-left: 30px;margin-top: -3px;">{{
+ $t('basicData.yes')
+ }}
+ </el-button>
+ <div style="margin-left: 70px;">{{ $t('basicData.cuttingmachine') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <el-button @click="confirmCuttingMachine" style="margin-left: 30px;margin-top: -3px;">{{
+ $t('basicData.yes')
+ }}
+ </el-button>
+ <div style="margin-left: 70px;">{{ upstatus }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;">{{
+ $t('basicData.change')
+ }}
+ </el-button>
</div>
<el-button style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
@@ -301,25 +313,11 @@
</div>
</el-card>
<div style="display: flex;">
- <!-- <div style="width: 49%;float: left;margin-left: 300px;">
- <div style="display: flex;">
- <img src="../../assets/shangpianji.png" alt="" style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
- <el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 2%;"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- >
- <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60" />
- <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>
- </div>
- </div> -->
- <div style="width: 48%;float: right;margin-left: 300px;">
+ <div style="width: 49%;float: left;margin-left: 300px;">
<div style="display: flex;">
<img src="../../assets/shangpianji.png" alt=""
style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
- <el-table :data="tableDatab" border style="width: 75%;margin-top: 10%;margin-left: 2%;"
+ <el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 8%;"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
<el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60"/>
@@ -328,8 +326,22 @@
<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>
- </div>
-</div>
+ </div>
+ </div>
+ <!-- <div style="width: 48%;float: right;">
+ <div style="display: flex;">
+ <img src="../../assets/shangpianji.png" alt="" style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
+ <el-table :data="tableDatab" border style="width: 75%;margin-top: 10%;margin-left: 2%;"
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
+ >
+ <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60" />
+ <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>
+ </div>
+ </div> -->
</div>
<el-dialog v-model="blind" top="30vh" width="25%" :title="$t('basicData.startfilm')">
<template #footer>
@@ -427,7 +439,7 @@
</div>
</template>
</el-dialog>
-
+ </div>
</template>
<style scoped>
--
Gitblit v1.8.0