From 3e0136494253e17019801f0d2c07fc7c65acaeb5 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 22 十一月 2024 14:18:47 +0800
Subject: [PATCH] 预览成功删除线路与除膜状态，更改开始上片逻辑，页面样式更改
---
UI-Project/src/views/Returns/upreturns.vue | 81 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 27a1d77..6d07843 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -122,10 +122,10 @@
let engineeringId = window.localStorage.getItem('engineeringId')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
- const response = await request.post('/loadGlass/engineering/engineering/pause', {
- // const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
- // stationCell: 5,
- // filmRemove: filmRemove,
+ // const response = await request.post('/loadGlass/engineering/engineering/pause', {
+ const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ stationCell: 5,
+ filmRemove: filmRemove,
engineerId: engineeringId,
state: 1,
})
@@ -146,11 +146,13 @@
// 鏆傚仠
const handleup = async () => {
try {
+ let filmRemove = window.localStorage.getItem('filmRemove')
let engineeringId = window.localStorage.getItem('engineeringId')
console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/pause', {
- // stationCell: 5,
+ stationCell: 5,
+ filmRemove: filmRemove,
engineerId: engineeringId,
state: 0,
})
@@ -301,26 +303,26 @@
<el-button 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
- height="350"
- ref="table"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- :data="tableData"
- >
- <el-table-column prop="layoutSequence" :label="$t('Mounting.project')" width="100" align="center"/>
- <el-table-column prop="engineeringId" :label="$t('Mounting.width')" width="200" align="center"/>
- <el-table-column prop="width" :label="$t('Mounting.height')" align="center"/>
- <el-table-column prop="height" :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 }">
- <!-- 杩欓噷鎬绘槸鏄剧ず 1 -->
- <span>{{ 1 }}</span>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- :label="$t('Mounting.state')"
+ <el-table
+ height="350"
+ ref="table"
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
+ :data="tableData"
+ >
+ <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center"/>
+ <el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center"/>
+ <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 }">
+ <!-- 杩欓噷鎬绘槸鏄剧ず 1 -->
+ <span>{{ 1 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ :label="$t('Mounting.state')"
min-width="80"
prop="state"
>
@@ -333,21 +335,20 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="filmsId" :label="$t('Mounting.createtime')" align="center"/>
- <!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->
- <el-table-column
- align="center"
- :label="$t('Mounting.removalmethodp')"
- prop="filmRemove"
- >
- <template #default="scope">
- <el-tag :type="getStatusType2(scope.row.filmRemove)">
- {{ getStatusText2(scope.row.filmRemove) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/>
- </el-table>
+ <!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->
+ <!-- <el-table-column
+ align="center"
+ :label="$t('Mounting.removalmethodp')"
+ prop="filmRemove"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusType2(scope.row.filmRemove)">
+ {{ getStatusText2(scope.row.filmRemove) }}
+ </el-tag>
+ </template>
+ </el-table-column> -->
+ <!-- <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/> -->
+ </el-table>
</div>
</el-card>
<div style="display: flex;">
--
Gitblit v1.8.0