From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns.vue | 162 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 105 insertions(+), 57 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 7974878..6df2a38 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -1,5 +1,5 @@
<script lang="ts" setup>
-import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref, computed} from "vue";
import {useRouter} from "vue-router"
import { ElMessage, ElMessageBox } from 'element-plus'
import {useI18n} from 'vue-i18n'
@@ -17,6 +17,7 @@
const blinda = ref(false)
const blindb = ref(false)
const dialoglea = ref(false)
+const ReportData = ref(true);
const canSelectProjecta = ref(true);
const canSelectProjectb = ref(true);
const canSelectProjectc = ref(false);
@@ -30,6 +31,15 @@
const titleSelectJson = ref({
engineerId: [],
})
+request.post("/loadGlass/up-patten-usage/setUpPattenRequest",{
+ state: null,
+ stationCell: 5
+}).then((response) => {
+ if (response.code == 200) {
+ } else {
+ ElMessage.warning(response.msg)
+ }
+ });
const handlezhiban = () => {
dialoglea.value = true;
fetchFlowCardId();
@@ -58,11 +68,13 @@
try {
const response = await request.get("/loadGlass/up-patten-usage/prioritylist");
if (response.code === 200) {
- tableData.splice(0, tableData.length, ...response.data);
+ tableData.value = response.data
+ // tableData.splice(0, tableData.length, ...response.data);
ElMessage.error(response.message);
window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
}
} catch (error) {
+ ElMessage.error(response.message);
}
};
let socket = null;
@@ -71,6 +83,7 @@
tableDataa.value = data.list[0].slice(0, 2);
if(data.loadTask1.length !=0){
tableData.value = data.loadTask1[0]
+ window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
@@ -85,10 +98,6 @@
onBeforeUnmount(() => {
closeWebSocket();
});
-// 缁撴潫宸ョ▼
-const handledelete = (row) => {
- blindb.value = true;
-};
const requestData = {
state: 100
};
@@ -126,6 +135,7 @@
filmRemove.value = '';
markingMachineStatus.value = '#911005';
cuttingMachineStatus.value = '#911005';
+ ReportData.value = false;
} else {
ElMessage.error(response.message);
}
@@ -133,47 +143,17 @@
console.error(error);
}
}
-// 缁撴潫宸ョ▼
-const deleteTask = async () => {
- try {
- let engineeringId = window.localStorage.getItem('engineeringIda')
- console.log(engineeringId);
- if (engineeringId !== '') {
- const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
- engineerId: engineeringId,
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatad.value = response.data;
- canSelectProjecta.value = true;
- canSelectProjectb.value = true;
- canSelectProjectc.value = false;
- blindb.value = false;
- } else {
- ElMessage.error(response.message);
- }
- }
- else {
- ElMessage({
- type: 'info',
- message: t('basicData.infonull'),
- })
- }
-}
-catch (error) {
- console.error(error);
- }
-}
+
// 寮�濮嬩笂鐗�
const handleon = async () => {
let filmRemove = window.localStorage.getItem('filmRemove')
- let engineeringIda = window.localStorage.getItem('engineeringIda')
+ let engineeringId = window.localStorage.getItem('engineeringIda')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
stationCell: 5,
filmRemove: filmRemove,
- engineerId: engineeringIda,
+ engineerId: engineeringId,
state: 1,
})
if (response.code == 200) {
@@ -183,7 +163,8 @@
canSelectProjectc.value = true;
socket = initializeWebSocket(socketUrl, handleMessage);
blind.value = false;
- } else {
+ ReportData.value = true;
+ } else {
ElMessage.error(response.message);
}
} catch (error) {
@@ -198,7 +179,6 @@
try {
let filmRemove = window.localStorage.getItem('filmRemove')
let engineeringId = window.localStorage.getItem('engineeringIda')
- console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/pause', {
stationCell: 5,
@@ -298,7 +278,7 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
+ const response = await request.post('/loadGlass/engineering/engineering/identControls', {
glassId: row.glassId,
line: 5,
status: 1,
@@ -328,7 +308,7 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
+ const response = await request.post('/loadGlass/engineering/engineering/identControls', {
glassId: row.glassId,
line: 5,
status: 1,
@@ -345,6 +325,74 @@
console.error('鍙戠敓閿欒:', error);
}
};
+
+// 鏋跺瓙澶嶄綅
+const handleptask = async (workstationId: number) => {
+ console.log(workstationId);
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('basicData.prackreset'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+
+ const slot = workstationId === 1 ? 101 : (workstationId === 2 ? 102 : null);
+ if (slot !== null) {
+ const response = await request.post('/glassStorage/rawGlassStorageDetails/shelfReset', {
+ slot: slot,
+ })
+ // const url = `/loadGlass/rawGlassStorageDetails/shelfReset?slot=${slot}`;
+ // const response = await request.post(url);
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ } else {
+ }
+ }
+ } catch (error) {
+ }
+};
+// 缁撴潫宸ョ▼
+const deleteTask = async () => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.pdeleteTask'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ let engineeringId = window.localStorage.getItem('engineeringIda')
+ if (engineeringId !== '') {
+ const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
+ engineerId: engineeringId,
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ canSelectProjecta.value = true;
+ canSelectProjectb.value = true;
+ canSelectProjectc.value = false;
+ blindb.value = true;
+ tableDatad.value = response.data;
+ } else {
+ ElMessage.error(response.message);
+ }
+ } else {
+ }
+ }
+ } catch (error) {
+ }
+};
function getStatusType2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -388,7 +436,7 @@
<el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
<el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
- <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
+ <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
<el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
style="margin-top: 5px;margin-left: 20px;">
@@ -397,11 +445,11 @@
<el-option :label="$t('Mounting.twoloadingline')" value="2"></el-option>
</el-select>
<el-select v-model="selectValuesa[0]" clearable :placeholder="$t('film.taskstatus')" style="margin-top: 5px;margin-left: 20px;" >
- <el-option :label="$t('Mounting.waiting')" value="1"></el-option>
- <el-option :label="$t('film.execution')" value="2"></el-option>
- <el-option :label="$t('film.finish')" value="3"></el-option>
+ <el-option :label="$t('Mounting.all')" value="null"></el-option>
+ <el-option :label="$t('Mounting.waiting')" value="0"></el-option>
+ <el-option :label="$t('Mounting.pass')" value="100"></el-option>
</el-select>
- <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('Mounting.setparameters') }}</el-button>
+ <el-button :disabled="!ReportData" type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('Mounting.setparameters') }}</el-button>
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
@@ -415,11 +463,7 @@
<el-table-column prop="height" :label="$t('Mounting.height')" align="center"/>
<el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center"/>
<el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>
- <el-table-column :label="$t('Mounting.projectnumber')" align="center">
- <template #default="{ row }">
- <span>{{ 1 }}</span>
- </template>
- </el-table-column>
+ <el-table-column prop="layoutSequence" :label="$t('Mounting.projectnumber')" align="center"/>
<el-table-column
align="center"
:label="$t('Mounting.state')"
@@ -435,7 +479,7 @@
</el-tag>
</template>
</el-table-column>
- </el-table>
+ </el-table>
</div>
</el-card>
<div style="display: flex;">
@@ -443,13 +487,18 @@
<div style="display: flex;">
<img src="../../assets/shangpianji.png" alt=""
style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
- <el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 8%;"
+ <el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="500"
: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="workstationId" align="center" :label="$t('basicData.station')" min-width="50"/>
<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 fixed="right" :label="$t('film.operate')" align="center">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</div>
@@ -485,7 +534,6 @@
</el-table>
<template #footer>
<div id="dialog-footer">
- <el-button type="danger" @click="deleteTask()">{{ $t('searchOrder.deleteTask') }}</el-button>
<el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
</div>
</template>
--
Gitblit v1.8.0