wang
2024-04-10 6a756da345a4a882a7fae1af99241cee9f4d25fa
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>