diff --git a/src/views/biz/nuBaseInfo/QyxxList.vue b/src/views/biz/nuBaseInfo/QyxxList.vue
index 6d6afbf..5631c48 100644
--- a/src/views/biz/nuBaseInfo/QyxxList.vue
+++ b/src/views/biz/nuBaseInfo/QyxxList.vue
@@ -69,11 +69,9 @@
             <p>单元名称：{{item.nuName}}</p>
             <p>创建时间：{{item.createTime}}</p>
             <p>单元类型：{{item.areaFlag_dictText}}</p>
-            <div style="text-align: center;">
-                <a-button size="small" @click="handleQiyong(item)" v-if="item.status == 5" style="margin-left:10px" >启用</a-button>
-                <a-button size="small" @click="handleTingyong(item)" v-if="item.status != 5" style="margin-left:10px" >停用</a-button>
-                <a-button size="small" @click="handleEdit(item)" style="margin-left:10px" >更名</a-button>
-                <a-button size="small" @click="handleWlsb(item)" style="margin-left:10px" >设备</a-button>
+            <div style="float:left;">
+                <a-button type="dashed" size="small" @click="handleEdit(item)">更名</a-button>
+                <a-button type="dashed" size="small" @click="handleWlsb(item)" style="margin-left:10px" >设备</a-button>
                 <a-popover title="二维码"  >
                   <template #content>
                     <QRCodeWithLogo 
@@ -83,9 +81,14 @@
                           :logoSize="40"
                         />
                   </template>
-                  <a-button size="small" style="margin-left:10px">二维码</a-button>
+                  <a-button type="dashed" size="small" style="margin-left:10px">二维码</a-button>
                 </a-popover>
             </div>
+            
+            <div style="float:right;">
+                <a-switch style="margin-left:10px" :checked="item.status!=5" checked-children="启" @change="(checked) => handleChangeValidateStatus(item, checked)" un-checked-children="停" />
+            </div>
+
           </div>
           
         </a-card>
@@ -150,6 +153,14 @@ const { createMessage } = useMessage();
     queryParam.status = '';
   }
 
+function handleChangeValidateStatus(record,checked) {
+    console.log("🚀 ~ handleChangeValidateStatus ~ record,checked:", record,checked)
+    if (checked) {
+      handleQiyong(record);
+    } else {
+      handleTingyong(record);
+    }
+  }
   
   /**
    * 编辑事件
diff --git a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
index deac248..fec62a5 100644
--- a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
+++ b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
@@ -40,10 +40,10 @@
                 <span class="tbClass"><img src="../../../../assets/iot/a14.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">预览</span>
               </span>
-              <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handlePicConfig(item)">
+              <!-- <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handlePicConfig(item)">
                 <span class="tbClass"><img src="../../../../assets/iot/a12.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">画面配置</span>
-              </span>
+              </span> -->
               <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handleBaoxiu(item,'1')" v-if="item.maintainStatus==0">
                 <span class="tbClass"><img src="../../../../assets/iot/a6.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">报修</span>
@@ -62,7 +62,7 @@
                       <div style="font-size: 12px;">抄表时间：{{item.readTime?item.readTime:'未抄表'}}</div>
                 </a-col>
                 <a-col :span="6" style="text-align: center;padding-top: 4px;">
-                  <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
+                  <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'合闸':'拉闸'}}</div>
                 </a-col>
                 <a-col :span="24">
                   <a-divider style="margin: 10px 0 0 0" />
@@ -95,11 +95,11 @@
                 <span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">抄表</span>
               </span>
-              <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handleControlLz(item)">
+              <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handleControlLz(item)" v-if="item.relayState=='1'">
                 <span class="tbClass"><img src="../../../../assets/iot/a5.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">拉闸</span>
               </span>
-              <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handleControlHz(item)">
+              <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handleControlHz(item)" v-if="item.relayState=='0'">
                 <span class="tbClass"><img src="../../../../assets/iot/a2.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">合闸</span>
               </span>
@@ -129,7 +129,7 @@
                       <div style="font-size: 12px;">抄表时间：{{item.readTime?item.readTime:'未抄表'}}</div>
                 </a-col>
                 <a-col :span="6" style="text-align: center;padding-top: 4px;">
-                  <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
+                  <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'开阀':'关阀'}}</div>
                 </a-col>
                 <a-col :span="24">
                   <a-divider style="margin: 10px 0 0 0" />
@@ -162,11 +162,11 @@
                 <span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">抄表</span>
               </span>
-              <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handleSbControlLz(item)">
+              <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handleSbControlLz(item)" v-if="item.relayState=='0'">
                 <span class="tbClass"><img src="../../../../assets/iot/a10.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">开阀</span>
               </span>
-              <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handleSbControlHz(item)">
+              <span style="display:inline-block;margin-left:10px;cursor: pointer;" @click="handleSbControlHz(item)" v-if="item.relayState=='1'">
                 <span class="tbClass"><img src="../../../../assets/iot/a11.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">关阀</span>
               </span>
@@ -467,7 +467,7 @@ function getWsdj(record){
   
   // 水表开阀
   async function handleSbControlLz(record) {
-    if(record.relayState == '0'){
+    if(record.relayState == '1'){
       Modal.info({
         title: '开阀',
         content: h('div', {}, [
@@ -490,7 +490,7 @@ function getWsdj(record){
 
   // 水表关阀
   async function handleSbControlHz(record) {
-    if(record.relayState == '1'){
+    if(record.relayState == '0'){
       Modal.info({
         title: '关阀',
         content: h('div', {}, [
diff --git a/src/views/iot/tplink/camera/components/CameraInfoList.vue b/src/views/iot/tplink/camera/components/CameraInfoList.vue
index f4bbf70..0cc1ded 100644
--- a/src/views/iot/tplink/camera/components/CameraInfoList.vue
+++ b/src/views/iot/tplink/camera/components/CameraInfoList.vue
@@ -50,10 +50,10 @@
                 <span class="tbClass"><img src="../../../../../assets/iot/a13.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">编辑</span>
               </span>
-              <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handlePicConfig(item)">
+              <!-- <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handlePicConfig(item)">
                 <span class="tbClass"><img src="../../../../../assets/iot/a12.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">画面配置</span>
-              </span>
+              </span> -->
             </p>
               
             <a-divider  />
diff --git a/src/views/iot/tq/electricity/index.vue b/src/views/iot/tq/electricity/index.vue
index 05b45ff..7c1d114 100644
--- a/src/views/iot/tq/electricity/index.vue
+++ b/src/views/iot/tq/electricity/index.vue
@@ -33,7 +33,7 @@
                       <div style="font-size: 12px;">抄表时间：{{item.readTime?item.readTime:'未抄表'}}</div>
                 </a-col>
                 <a-col :span="6" style="text-align: center;padding-top: 4px;">
-                  <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
+                  <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'合闸':'拉闸'}}</div>
                 </a-col>
                 <a-col :span="24">
                   <a-divider style="margin: 10px 0 0 0" />
@@ -59,11 +59,11 @@
                 <span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">抄表</span>
               </span>
-              <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlLz(item)">
+              <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlLz(item)" v-if="item.relayState=='1'">
                 <span class="tbClass"><img src="../../../../assets/iot/a5.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">拉闸</span>
               </span>
-              <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlHz(item)">
+              <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlHz(item)" v-if="item.relayState=='0'">
                 <span class="tbClass"><img src="../../../../assets/iot/a2.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">合闸</span>
               </span>
diff --git a/src/views/iot/tq/water/index.vue b/src/views/iot/tq/water/index.vue
index d09d52d..e5cac80 100644
--- a/src/views/iot/tq/water/index.vue
+++ b/src/views/iot/tq/water/index.vue
@@ -33,7 +33,7 @@
                       <div style="font-size: 12px;">抄表时间：{{item.readTime?item.readTime:'未抄表'}}</div>
                 </a-col>
                 <a-col :span="6" style="text-align: center;padding-top: 4px;">
-                  <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
+                  <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'开阀':'关阀'}}</div>
                 </a-col>
                 <a-col :span="24">
                   <a-divider style="margin: 10px 0 0 0" />
@@ -59,11 +59,11 @@
                 <span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">抄表</span>
               </span>
-              <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlLz(item)">
+              <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlLz(item)" v-if="item.relayState=='0'">
                 <span class="tbClass"><img src="../../../../assets/iot/a10.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">开阀</span>
               </span>
-              <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlHz(item)">
+              <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlHz(item)" v-if="item.relayState=='1'">
                 <span class="tbClass"><img src="../../../../assets/iot/a11.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">关阀</span>
               </span>
@@ -148,7 +148,7 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
   
   // 水表开阀
   async function handleControlLz(record) {
-    if(record.relayState == '0'){
+    if(record.relayState == '1'){
       Modal.info({
         title: '开阀',
         content: h('div', {}, [
@@ -171,7 +171,7 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
 
   // 水表关阀
   async function handleControlHz(record) {
-    if(record.relayState == '1'){
+    if(record.relayState == '0'){
       Modal.info({
         title: '关阀',
         content: h('div', {}, [
diff --git a/src/views/iot/yiweilian/index.vue b/src/views/iot/yiweilian/index.vue
index 9e5cba6..7c29d13 100644
--- a/src/views/iot/yiweilian/index.vue
+++ b/src/views/iot/yiweilian/index.vue
@@ -69,10 +69,10 @@
                 <span class="tbClass"><img src="../../../assets/iot/a7.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">抄表</span>
               </span>
-              <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleEdit(item)">
+              <!-- <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleEdit(item)">
                 <span class="tbClass"><img src="../../../assets/iot/a6.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">配置</span>
-              </span>
+              </span> -->
               <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="showApiLog(item)">
                 <span class="tbClass"><img src="../../../assets/iot/a4.png" style="width:20px;" /></span><br/>
                 <span class="antTitle">日志</span>