From 7e9713191b2674a240108afec6683717b3465ee6 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 19 Aug 2025 15:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/tq/electricity/apilog/ApiLogModal.vue | 1 -
 src/views/iot/tq/electricity/index.vue              | 2 ++
 src/views/iot/tq/water/index.vue                    | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/iot/tq/electricity/apilog/ApiLogModal.vue b/src/views/iot/tq/electricity/apilog/ApiLogModal.vue
index f6301e6..a2d7a5b 100644
--- a/src/views/iot/tq/electricity/apilog/ApiLogModal.vue
+++ b/src/views/iot/tq/electricity/apilog/ApiLogModal.vue
@@ -3,7 +3,6 @@
   <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
     :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <DepartUtilsList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DepartUtilsList>
-    <ConfigMaterialTypeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialTypeForm>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
       <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
diff --git a/src/views/iot/tq/electricity/index.vue b/src/views/iot/tq/electricity/index.vue
index 2e81bb4..4572f87 100644
--- a/src/views/iot/tq/electricity/index.vue
+++ b/src/views/iot/tq/electricity/index.vue
@@ -155,10 +155,12 @@ import { defHttp } from '/@/utils/http/axios';
       {
         label: '拉闸',
         onClick: handleControlLz.bind(null, record),
+        ifShow: record.relayState == 1,
       },
       {
         label: '合闸',
         onClick: handleControlHz.bind(null, record),
+        ifShow: record.relayState == 0,
       },
       {
         label: '清零',
diff --git a/src/views/iot/tq/water/index.vue b/src/views/iot/tq/water/index.vue
index aeac94a..a74534e 100644
--- a/src/views/iot/tq/water/index.vue
+++ b/src/views/iot/tq/water/index.vue
@@ -149,10 +149,12 @@
       {
         label: '开阀',
         onClick: handleWaterControlKf.bind(null, record),
+        ifShow: record.relayState == 0,
       },
       {
         label: '关阀',
         onClick: handleWaterControlGf.bind(null, record),
+        ifShow: record.relayState == 1,
       },
       {
         label: '清零',