From 2f5a87de029fbb681cd39c1c811ebbfe78c92be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 20 Apr 2026 21:17:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87BUG?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/manager/DeviceManagerList.vue   | 102 +++++++++++++++++-
 .../components/preview/DevicePreviewList.vue  |  11 +-
 src/views/iot/manager/manager.api.ts          |   2 +
 src/views/iot/manager/manager.data.ts         |  16 +++
 4 files changed, 127 insertions(+), 4 deletions(-)

diff --git a/src/views/iot/manager/DeviceManagerList.vue b/src/views/iot/manager/DeviceManagerList.vue
index 471d853..36b0f42 100644
--- a/src/views/iot/manager/DeviceManagerList.vue
+++ b/src/views/iot/manager/DeviceManagerList.vue
@@ -75,6 +75,9 @@
   import { defHttp } from '/@/utils/http/axios';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import CameraPreviewModal from '/@/views/iot/tplink/camera/components/CameraPreviewModal.vue'
+  import { eleControl } from "@/views/iot/tq/electricity/electricity.api";
+  import { eleSbControl } from "@/views/iot/tq/water/water.api";
+  import { updateDeviceRealTime } from '@/views/iot/yiweilian/humid.api';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -155,9 +158,34 @@
     return [
       {
         label: '预览',
-        onClick: handleCameraView.bind(null, record,"预览"),
+        onClick: handleCameraView.bind(null, record),
         ifShow: record.onlineStatus!='待集成' && record.deviceType == 'SURVEILLANCECAMERA'
       },
+      {
+        label: '拉闸',
+        onClick: handleDbLz.bind(null, record),
+        ifShow: record.onlineStatus!='待集成' && record.deviceType == 'db' && record.status == '在线'
+      },
+      {
+        label: '合闸',
+        onClick: handleDbHz.bind(null, record),
+        ifShow: record.onlineStatus!='待集成' && record.deviceType == 'db' && record.status == '离线'
+      },
+      {
+        label: '关阀',
+        onClick: handleSbGz.bind(null, record),
+        ifShow: record.onlineStatus!='待集成' && record.deviceType == 'sb' && record.status == '在线'
+      },
+      {
+        label: '开阀',
+        onClick: handleSbKz.bind(null, record),
+        ifShow: record.onlineStatus!='待集成' && record.deviceType == 'sb' && record.status == '离线'
+      },
+      {
+        label: '抄表',
+        onClick: handleWsdjCb.bind(null, record),
+        ifShow: record.onlineStatus!='待集成' && record.deviceType == 'wsdj'
+      },
       {
         label: '绑定区域',
         onClick: handleDeviceGh.bind(null, record,"绑定"),
@@ -180,12 +208,82 @@
    * 预览
    */
   function handleCameraView(record: Recordable) {
-    console.log(record);
     record.streamType = 1;
     cameraViewRef.value.disableSubmit = true;
     cameraViewRef.value.edit(record);
   }
 
+  /**
+   * 拉闸
+   */
+  async function handleDbLz(record: Recordable) {
+    const params = {
+      'sn' : record.sn,
+      'type': '10'
+    };
+    await eleControl(params);
+    setTimeout(() => {
+      emit("ok");
+    }, 4000);
+  }
+
+  /**
+   * 合闸
+   */
+  async function handleDbHz(record: Recordable) {
+    const params = {
+      'sn' : record.sn,
+      'type': '11',
+    };
+    await eleControl(params);
+    setTimeout(() => {
+      emit("ok");
+    }, 4000);
+  }
+
+  /**
+   * 开阀
+   */
+  async function handleSbKz(record: Recordable) {
+    const params = {
+      'cid': record.sn,
+      'address': record.sn,
+      'type': '43',
+    };
+    await eleSbControl(params);
+    setTimeout(() => {
+      emit("ok");
+    }, 4000);
+  }
+
+  /**
+   * 关阀
+   */
+  async function handleSbGz(record: Recordable) {
+    const params = {
+      'cid': record.sn,
+      'address': record.sn,
+      'type': '53',
+    };
+    await eleSbControl(params);
+    setTimeout(() => {
+      emit("ok");
+    }, 4000);
+  }
+
+  /**
+   * 温湿度计抄表
+   */
+  async function handleWsdjCb(record: Recordable) {
+    const params = {
+      'sn' : record.sn,
+    };
+    await updateDeviceRealTime(params);
+    setTimeout(() => {
+      reload();
+    }, 4000);
+  }
+
   /**
    * 报损
    */
diff --git a/src/views/iot/manager/components/preview/DevicePreviewList.vue b/src/views/iot/manager/components/preview/DevicePreviewList.vue
index 4564cb1..22e9bd6 100644
--- a/src/views/iot/manager/components/preview/DevicePreviewList.vue
+++ b/src/views/iot/manager/components/preview/DevicePreviewList.vue
@@ -26,6 +26,8 @@
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
                           style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsHz" style="margin-left: 8px"> 导出汇总</a-button>
               </a-col>
             </span>
           </a-col>
@@ -36,7 +38,6 @@
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -55,13 +56,15 @@ import {ref, reactive, defineExpose, nextTick, createVNode} from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { previewColumns } from '../../manager.data';
-import { previewList,getExportUrl } from '../../manager.api';
+import { previewList,getExportUrl,exportDeviceHzExcel } from '../../manager.api';
 import { useUserStore } from '/@/store/modules/user';
 import DevicePreviewFormModal from './DevicePreviewFormModal.vue';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 import {Modal} from "ant-design-vue";
 import {ExclamationCircleOutlined} from "@ant-design/icons-vue";
+import {useMethods} from "@/hooks/system/useMethods";
 
+const { handleExportXls} = useMethods();
 const formRef = ref();
 const queryParam = reactive<any>({});
 const formDrawer = ref();
@@ -108,6 +111,10 @@ const wrapperCol = reactive({
   sm: 16,
 });
 
+async function onExportXlsHz() {
+  return handleExportXls('导出设备汇总', exportDeviceHzExcel, {});
+}
+
 /**
  * 成功回调
  */
diff --git a/src/views/iot/manager/manager.api.ts b/src/views/iot/manager/manager.api.ts
index 2be4db8..be578d6 100644
--- a/src/views/iot/manager/manager.api.ts
+++ b/src/views/iot/manager/manager.api.ts
@@ -7,6 +7,7 @@ enum Api {
   edit = '/iot/device/manager/edit',
   delete = '/iot/device/manager/delete',
   exportXls = '/iot/device/manager/exportXls',
+  exportDeviceHzExcel = '/iot/device/manager/exportDeviceHzExcel',
   bingLogList = '/iot/device/manager/bingLogList',
   nuList = '/iot/device/manager/nuList',
   addLog = '/iot/device/manager/addLog',
@@ -17,6 +18,7 @@ enum Api {
  * @param params
  */
 export const getExportUrl = Api.exportXls;
+export const exportDeviceHzExcel = Api.exportDeviceHzExcel;
 /**
  * 列表
  * @param params
diff --git a/src/views/iot/manager/manager.data.ts b/src/views/iot/manager/manager.data.ts
index 2ebd66a..950bd0a 100644
--- a/src/views/iot/manager/manager.data.ts
+++ b/src/views/iot/manager/manager.data.ts
@@ -3,6 +3,11 @@ import {FormSchema} from '/@/components/Table';
 
 //列表数据
 export const columns: BasicColumn[] = [
+  {
+    title: '批次',
+    align: "center",
+    dataIndex: 'batchNo',
+  },
   {
     title: '区域编码',
     align: "center",
@@ -73,6 +78,11 @@ export const columns: BasicColumn[] = [
 
 //列表数据
 export const previewColumns: BasicColumn[] = [
+  {
+    title: '批次',
+    align: "center",
+    dataIndex: 'batchNo',
+  },
   {
     title: '设备名称',
     align: "center",
@@ -187,6 +197,12 @@ export const logColumns: BasicColumn[] = [
     dataIndex: 'optType',
     width: 100
   },
+  {
+    title: '备注',
+    align: "center",
+    dataIndex: 'remarks',
+    width: 200
+  },
 ];
 
 export const searchFormSchema: FormSchema[] = [];