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 | 87 ++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index 47e8197..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;
@@ -600,7 +605,7 @@
<el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')"/>
<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"
@@ -633,39 +638,39 @@
</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;"
@@ -702,13 +707,13 @@
</el-table>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="71%">
+<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>
@@ -891,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;
@@ -906,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