From 21a76af55c4da5f1999e9dd24690b2449a7a18a7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 05 六月 2025 14:19:41 +0800
Subject: [PATCH] 磨边模块大屏代码迁移

---
 UI-Project/src/views/Returns/upreturns2.vue |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 868a296..13ef8d6 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -453,7 +453,7 @@
             :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="engineeringId" :label="$t('Mounting.project')" width="120" 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"/>
@@ -477,20 +477,20 @@
         </el-table>
       </div>
     </el-card>
-    <div style="display: flex;">
-      <div style="width: 49%;float: left;margin-left: 300px;">
+    <div style="display: flex;margin-left:5%">
+      <div style="width: 55%;float: left;margin-left: 300px;">
         <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="margin-top: 10%;margin-left: 8%;" width="500"
+               style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 3%;">
+            <el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="700"
                     :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" >
-            <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="workstationId" align="center" :label="$t('basicData.station')" min-width="65"/>
+            <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="75"/>
+            <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="75"/>
             <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
             <el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80"/>
             <el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="60"/>
-            <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+            <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="100">
             <template #default="scope">
           <el-button :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
             </template>
@@ -500,7 +500,7 @@
   </div>
 </div>
    <!-- 鍘嗗彶浠诲姟 -->
-   <el-dialog v-model="blindbd" top="5vh" width="95%">
+   <el-dialog v-model="blindbd" top="5vh" width="95%" @close="iframeUrl=''">
      <iframe 
      :src="iframeUrl" 
      marginwidth="2000px"

--
Gitblit v1.8.0