From d812f6f23b3f0e4ad6cd140341b494275b628ee3 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 三月 2024 10:31:51 +0800
Subject: [PATCH] 更新

---
 Albania_Mes-ui/src/views/home/index.vue |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 187cd5b..cca7c7e 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -249,7 +249,7 @@
                     </label>
                 </div>
             </div>
-            <div style="display:flex;justify-content: space-around;width: 9zz5%;margin: 0 auto;">
+            <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
                 <el-button type="primary" @click="showform(1)" :disabled="SoftEmergencyStopState"
                     :class="SoftEmergencyStopState == true ? 'hide' : ''">
                     {{ $t('Import order') }}</el-button>
@@ -323,8 +323,22 @@
             top="5vh">
         </el-dialog>
 
-        <el-dialog :visible.sync="Measure" :title="$t('Measure')"
-            top="5vh"><!--娴嬮噺椤甸潰-->
+        <el-dialog :visible.sync="Measure" :title="$t('Measure')" top="5vh"><!--娴嬮噺椤甸潰-->
+            <!--娴嬮噺椤甸潰涓讳綋-->
+            <div>
+                <!--鍔熻兘-->
+                <div>
+                    <button v-on:click="ManualMatching" style="width: 120px;height: 60px;background-color: aquamarine;border: 0px;border-radius: 5px;">浜哄伐鍖归厤</button>
+                </div>
+                <!--鏄剧ず-->
+                <div style="width:100%;height: 600px;border: 1px solid black;">
+                    <!--鐜荤拑鍥�-->
+                    <div style="top:0;bottom: 0;left: 0;right: 0;margin: auto;position:absolute;width: 100px;height: 200px;background-color: aqua;line-height: 200px;text-align: center;">
+                        100*200
+                    </div>
+                    
+                </div>
+            </div>
         </el-dialog>
 
         <el-dialog :visible.sync="StorageCage" :title="$t('StorageCage')"
@@ -727,6 +741,10 @@
                 const specialChars = /[^\w\s]/g;
                 return this.GlassIdList[num].replace(specialChars, "");
             }
+        },
+        //浜哄伐鍖归厤
+        ManualMatching() {
+            console.log(11111111);
         }
         
     }

--
Gitblit v1.8.0