From d410ba2d4d45b82286adafe6a9bf4dfb3ced6a9e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 19 四月 2024 09:04:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 9d6e547..0666da4 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -26,7 +26,21 @@
state: '鏈惎鐢�'
},
{
- id: '2',
+ id: '3',
+ long: '105',
+ wide: '183',
+ thick: '191',
+ state: '鏈惎鐢�'
+ },
+ {
+ id: '4',
+ long: '105',
+ wide: '183',
+ thick: '191',
+ state: '鏈惎鐢�'
+ },
+ {
+ id: '5',
long: '105',
wide: '183',
thick: '191',
@@ -70,6 +84,17 @@
}
}
+const dialogForm = () => {
+ ElMessageBox.confirm(
+ '鏄惁娓呯┖璇ユ潯淇℃伅?',
+ '鎻愮ず',
+ {
+ confirmButtonText: '鏄�',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }
+ )
+}
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -126,7 +151,7 @@
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
<template #default>
<el-button size="mini" type="text" plain v-show="state !== '宸插惎鐢�' " @click="dialogFormVisiblea = true">缁戝畾鏋跺瓙</el-button>
- <el-button size="mini" type="text" plain @click="dialogFormVisible = true">娓呯┖</el-button>
+ <el-button size="mini" type="text" plain @click="dialogForm">娓呯┖</el-button>
</template>
</el-table-column>
</el-table>
@@ -138,7 +163,7 @@
<div id="main-body">
<Landingindication></Landingindication>
</div>
- <!-- <div id="main-bodya">
+ <!-- <div id="main-body">
<Landingindicationtwo></Landingindicationtwo>
</div> -->
</div>
@@ -187,7 +212,7 @@
height: 450px;
}
#main-body{
- margin-top: -20px;
+ margin-top: -10px;
margin-left: 450px;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0