From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 127 ++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 66 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index 2b63737..4ae5acc 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -212,6 +212,11 @@
}
};
const handleEdit = (row) => {
+ patternWidth.value = row.patternWidth;
+ patternHeight.value = row.patternHeight;
+ patternThickness.value = row.patternThickness;
+ filmsId.value = row.filmsId;
+ remainQuantity.value = row.remainQuantity;
window.localStorage.setItem('deviceId', row.deviceId)
window.localStorage.setItem('slot', row.slot)
Edit.value = true;
@@ -248,7 +253,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鍘熺墖鍏ュ簱
@@ -275,7 +279,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鍏ュ簱璇锋眰
@@ -293,8 +296,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鍑哄簱璇锋眰
@@ -312,8 +313,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鍑哄簱
@@ -339,7 +338,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鏌ヨ鏁版嵁
@@ -419,7 +417,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -458,11 +455,10 @@
// }
// }
// catch (error) {
-// console.error(error);
// }
// }
// 浠诲姟鎴愬姛澶勭悊
-const successfull = async(row) => {
+const successfull = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.psuccessfullyprocessed'),
@@ -482,12 +478,11 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 浠诲姟澶辫触澶勭悊
-const handleptask = async(row) => {
+const handleptask = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.ptaskfailure'),
@@ -507,8 +502,7 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
function getStatusType1(taskType) {
@@ -603,15 +597,15 @@
</el-select>
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('film.inquire') }}</el-button>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="300" ref="table"
:data="tableDataa" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="id" align="center" :label="$t('film.enableid')"/>
<el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')"/>
- <el-table-column prop="endSlot" align="center" :label="$t('film.endslot')"/>
+ <el-table-column prop="endSlot" align="center" :label="$t('film.endoriginateslot')"/>
<el-table-column prop="patternQuantity" align="center" :label="$t('film.patternquantity')"/>
- <el-table-column
+ <el-table-column width="100"
align="center"
:label="$t('film.enabletype')"
prop="taskType"
@@ -634,44 +628,49 @@
</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 :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
+ <el-button :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>
<div class="img-dlpl">
- <div class="img-car1" style="z-index:999;top:250px;left:20px;position:absolute;"></div>
+ <div class="img-car1" style="z-index:999;top:153px;left:20px;position:absolute;"></div>
<!-- <div class="img-car1" :style="'z-index:999;top:250px;left:' + 20 + 'px;position:absolute;'"></div> -->
- <div class="card1" v-show="card1" style="z-index:999;top:430px;left:53px;position:absolute;"></div>
- <div class="card2" v-show="card2" style="z-index:999;top:430px;left:80px;position:absolute;"></div>
- <div class="card3" v-show="card3" style="z-index:999;top:430px;left:108px;position:absolute;"></div>
- <div class="card98" v-show="card98" style="z-index:999;top:430px;left:143px;position:absolute;"></div>
- <div class="card4" v-show="card4" style="z-index:999;top:430px;left:202px;position:absolute;"></div>
- <div class="card5" v-show="card5" style="z-index:999;top:430px;left:227px;position:absolute;"></div>
- <div class="card6" v-show="card6" style="z-index:999;top:430px;left:253px;position:absolute;"></div>
- <div class="card7" v-show="card7" style="z-index:999;top:430px;left:280px;position:absolute;"></div>
- <div class="card8" v-show="card8" style="z-index:999;top:430px;left:308px;position:absolute;"></div>
- <div class="card9" v-show="card9" style="z-index:999;top:430px;left:337px;position:absolute;"></div>
- <div class="card10" v-show="card10" style="z-index:999;top:430px;left:364px;position:absolute;"></div>
- <div class="card11" v-show="card11" style="z-index:999;top:430px;left:391px;position:absolute;"></div>
- <div class="card99" v-show="card99" style="z-index:999;top:430px;left:426px;position:absolute;"></div>
- <div class="card12" v-show="card12" style="z-index:999;top:430px;left:489px;position:absolute;"></div>
- <div class="card13" v-show="card13" style="z-index:999;top:430px;left:514px;position:absolute;"></div>
- <div class="card14" v-show="card14" style="z-index:999;top:430px;left:540px;position:absolute;"></div>
- <div class="card15" v-show="card15" style="z-index:999;top:430px;left:566px;position:absolute;"></div>
- <div class="card16" v-show="card16" style="z-index:999;top:430px;left:595px;position:absolute;"></div>
- <div class="card17" v-show="card17" style="z-index:999;top:430px;left:624px;position:absolute;"></div>
- <div class="card18" v-show="card18" style="z-index:999;top:430px;left:654px;position:absolute;"></div>
- <div class="card19" v-show="card19" style="z-index:999;top:430px;left:682px;position:absolute;"></div>
- <div class="card20" v-show="card20" style="z-index:999;top:430px;left:707px;position:absolute;"></div>
- <div class="card25" v-show="card25" style="z-index:999;top:109px;left:664px;position:absolute;"></div>
- <div class="card24" v-show="card24" style="z-index:999;top:109px;left:639px;position:absolute;"></div>
- <div class="card23" v-show="card23" style="z-index:999;top:109px;left:616px;position:absolute;"></div>
- <div class="card22" v-show="card22" style="z-index:999;top:109px;left:592px;position:absolute;"></div>
- <div class="card21" v-show="card21" style="z-index:999;top:109px;left:564px;position:absolute;"></div>
- <div class="card101" v-show="card101" style="z-index:999;top:109px;left:364px;position:absolute;"></div>
- <div class="card102" v-show="card102" style="z-index:999;top:109px;left:334px;position:absolute;"></div>
- <div class="card103" v-show="card103" style="z-index:999;top:109px;left:96px;position:absolute;"></div>
- <div class="card104" v-show="card104" style="z-index:999;top:109px;left:70px;position:absolute;"></div>
+ <div class="card1" v-show="card1" style="z-index:999;top:308px;left:53px;position:absolute;"></div>
+ <div class="card2" v-show="card2" style="z-index:999;top:308px;left:80px;position:absolute;"></div>
+ <div class="card3" v-show="card3" style="z-index:999;top:308px;left:108px;position:absolute;"></div>
+ <div class="card98" v-show="card98" style="z-index:999;top:308px;left:143px;position:absolute;"></div>
+ <div class="card4" v-show="card4" style="z-index:999;top:308px;left:202px;position:absolute;"></div>
+ <div class="card5" v-show="card5" style="z-index:999;top:308px;left:227px;position:absolute;"></div>
+ <div class="card6" v-show="card6" style="z-index:999;top:308px;left:253px;position:absolute;"></div>
+ <div class="card7" v-show="card7" style="z-index:999;top:308px;left:280px;position:absolute;"></div>
+ <div class="card8" v-show="card8" style="z-index:999;top:308px;left:308px;position:absolute;"></div>
+ <div class="card9" v-show="card9" style="z-index:999;top:308px;left:337px;position:absolute;"></div>
+ <div class="card10" v-show="card10" style="z-index:999;top:308px;left:364px;position:absolute;"></div>
+ <div class="card11" v-show="card11" style="z-index:999;top:308px;left:391px;position:absolute;"></div>
+ <div class="card99" v-show="card99" style="z-index:999;top:308px;left:426px;position:absolute;"></div>
+ <div class="card12" v-show="card12" style="z-index:999;top:308px;left:489px;position:absolute;"></div>
+ <div class="card13" v-show="card13" style="z-index:999;top:308px;left:514px;position:absolute;"></div>
+ <div class="card14" v-show="card14" style="z-index:999;top:308px;left:540px;position:absolute;"></div>
+ <div class="card15" v-show="card15" style="z-index:999;top:308px;left:566px;position:absolute;"></div>
+ <div class="card16" v-show="card16" style="z-index:999;top:308px;left:595px;position:absolute;"></div>
+ <div class="card17" v-show="card17" style="z-index:999;top:308px;left:624px;position:absolute;"></div>
+ <div class="card18" v-show="card18" style="z-index:999;top:308px;left:654px;position:absolute;"></div>
+ <div class="card19" v-show="card19" style="z-index:999;top:308px;left:682px;position:absolute;"></div>
+ <div class="card20" v-show="card20" style="z-index:999;top:308px;left:707px;position:absolute;"></div>
+ <div class="card25" v-show="card25" style="z-index:999;top:44px;left:664px;position:absolute;"></div>
+ <div class="card24" v-show="card24" style="z-index:999;top:44px;left:639px;position:absolute;"></div>
+ <div class="card23" v-show="card23" style="z-index:999;top:44px;left:616px;position:absolute;"></div>
+ <div class="card22" v-show="card22" style="z-index:999;top:44px;left:592px;position:absolute;"></div>
+ <div class="card21" v-show="card21" style="z-index:999;top:44px;left:564px;position:absolute;"></div>
+ <div class="card101" v-show="card101" style="z-index:999;top:44px;left:364px;position:absolute;"></div>
+ <div class="card102" v-show="card102" style="z-index:999;top:44px;left:334px;position:absolute;"></div>
+ <div class="card103" v-show="card103" style="z-index:999;top:44px;left:96px;position:absolute;"></div>
+ <div class="card104" v-show="card104" style="z-index:999;top:44px;left:70px;position:absolute;"></div>
</div>
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%" >
<el-table ref="table" style="margin-top: 20px;height: 700px;"
@@ -700,27 +699,27 @@
</el-table-column>
<el-table-column fixed="right" :label="$t('film.operate')" align="center" width="270">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('film.exit') }}</el-button>
- <el-button :disabled="!scope.row.remainQuantity" size="mini" type="text" plain @click="deleteWarehousing(scope.row)">{{ $t('film.delete') }}</el-button>
- <el-button :disabled="!scope.row.remainQuantity || scope.row.remainQuantity === 0" size="mini" type="text" plain @click="openc(scope.row)">{{ $t('film.outbound') }}</el-button>
+ <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('film.exit') }}</el-button>
+ <el-button :disabled="!scope.row.remainQuantity" type="text" plain @click="deleteWarehousing(scope.row)">{{ $t('film.delete') }}</el-button>
+ <el-button :disabled="!scope.row.remainQuantity || scope.row.remainQuantity === 0" type="text" plain @click="openc(scope.row)">{{ $t('film.outbound') }}</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="95%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
marginheight="2000px"
width="100%"
- height="700px"
+ height="750px"
frameborder="0"
></iframe>
</el-dialog>
<el-dialog v-model="dialogFormVisibleb" top="23vh" width="55%" :title="$t('film.addglass')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -832,7 +831,7 @@
</el-dialog>
<el-dialog v-model="Edit" top="23vh" width="55%" :title="$t('film.addglass')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -897,11 +896,6 @@
<style scoped>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
-.awatch{
- height: 400px;
- width: 1500px;
- max-width: 100%;
-}
#dialog-footer {
text-align: center;
margin-top: -15px;
@@ -912,12 +906,13 @@
background-image:url('../../assets/ypcc.png');
background-repeat: no-repeat;
background-attachment: local;
- min-height: 700px;
+ min-height: 450px;
width: 800px;
max-width: 100%;
- background-size: 800px 700px;
+ background-size: 800px 450px;
overflow: hidden;
- position:relative
+ position:relative;
+ margin-left: 30%
}
.img-car1{
display: flex;
--
Gitblit v1.8.0