From 6a756da345a4a882a7fae1af99241cee9f4d25fa Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 10 四月 2024 08:52:02 +0800
Subject: [PATCH] 更新页面
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 58910c7..7b8b00f 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -269,17 +269,10 @@
<el-table-column prop="deviceId" align="center" label="璁惧鍙�" min-width="120" />
<el-table-column prop="enableState" align="center" label="鍚敤鐘舵��" min-width="120" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
-<<<<<<< HEAD
<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="dialogForm">娓呯┖</el-button>
</template>
-=======
- <template #default="scope">
- <el-button size="mini" type="text" plain v-show="scope.row.enableState !== '宸插惎鐢�' " @click="handleBindRack(scope.row)">缁戝畾鏋跺瓙</el-button>
- <el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">娓呯┖</el-button>
- </template>
->>>>>>> 96b63f125687d8ef610745fd9041da2cc77a24af
</el-table-column>
</el-table>
</div>
--
Gitblit v1.8.0