From 0c9ae46268cfab0833b8c1ef6133e9aae4bc5db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 15 Apr 2026 18:00:12 +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

---
 .../integration/components/HumidForm.vue      |  7 +-
 .../manager/components/log/DeviceLogList.vue  | 91 ++++++++++++++++++-
 .../device/manager/components/log/log.data.ts |  6 ++
 .../preview/AddDepartPreviewForm.vue          |  7 +-
 .../components/preview/AddNuPreviewForm.vue   |  6 +-
 5 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/src/views/device/manager/components/integration/components/HumidForm.vue b/src/views/device/manager/components/integration/components/HumidForm.vue
index 9ee31bc..cb75a6f 100644
--- a/src/views/device/manager/components/integration/components/HumidForm.vue
+++ b/src/views/device/manager/components/integration/components/HumidForm.vue
@@ -209,7 +209,6 @@ function getInfo(record){
   getDeviceInfo({
     "sn":record.sn
   }).then(res=> {
-    console.log(res);
     nextTick(() => {
       resetFields();
       //赋值
@@ -230,10 +229,10 @@ function getInfo(record){
  * @param record
  */
 function readParameters(sn){
+  confirmLoading.value = true;
   getDeviceParameters({
     "sn":sn
   }).then(res=> {
-    console.log(res);
     nextTick(() => {
       resetFields();
       //赋值
@@ -246,7 +245,9 @@ function readParameters(sn){
       //赋值
       Object.assign(formData, tmpData);
     });
-  })
+  }).finally(() => {
+    confirmLoading.value = false;
+  });
 }
 
 
diff --git a/src/views/device/manager/components/log/DeviceLogList.vue b/src/views/device/manager/components/log/DeviceLogList.vue
index 433fa82..499cc9b 100644
--- a/src/views/device/manager/components/log/DeviceLogList.vue
+++ b/src/views/device/manager/components/log/DeviceLogList.vue
@@ -1,5 +1,42 @@
 <template>
   <div>
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
+              :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="deviceName">
+              <template #label><span title="设备名称">设备名称</span></template>
+              <a-input v-model:value="queryParam.deviceName" placeholder="请输入设备名称" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="dimension">
+              <template #label><span title="设备维度">设备维度</span></template>
+              <a-select v-model:value="queryParam.dimension" placeholder="请选择设备维度" allow-clear>
+                <a-select-option value="机构维度">机构维度</a-select-option>
+                <a-select-option value="区域维度">区域维度</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="deviceType">
+              <template #label><span title="设备类型">设备类型</span></template>
+              <j-dict-select-tag v-model:value="queryParam.deviceType" :showLabel="false" dictCode="tplink_device_type" placeholder="请选择设备类型"  allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <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-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
     <!--引用表格-->
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
@@ -20,6 +57,9 @@ import {onMounted, reactive, ref} from 'vue';
   import { list } from './log.api';
   import { columns} from './log.data';
   import { useDrawer } from "@/components/Drawer";
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+
+  const formRef = ref();
   const [registerDrawer, { openDrawer }] = useDrawer();
   const queryParam = reactive<any>({});
   const selectedRows = ref<any[]>([]);
@@ -48,8 +88,34 @@ import {onMounted, reactive, ref} from 'vue';
     },
   })
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+  const labelCol = reactive({
+    xs:24,
+    sm:8,
+    xl:8,
+    xxl:8
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
 
   /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    //刷新数据
+    reload();
+  }
+
+/**
    * 成功回调
    */
   function handleSuccess() {
@@ -78,11 +144,28 @@ defineExpose({
 </script>
 
 <style lang="less" scoped>
-:deep(.selected-row) {
-  background-color: #e6f7ff !important;
 
-  &:hover td {
-    background-color: #e6f7ff !important;
+.jeecg-basic-table-form-container {
+  padding: 0;
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+  .query-group-cust{
+    min-width: 100px !important;
+  }
+  .query-group-split-cust{
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+  .ant-form-item:not(.ant-form-item-with-help){
+    margin-bottom: 16px;
+    height: 32px;
+  }
+  :deep(.ant-picker),:deep(.ant-input-number){
+    width: 100%;
   }
 }
 </style>
diff --git a/src/views/device/manager/components/log/log.data.ts b/src/views/device/manager/components/log/log.data.ts
index 5ff23f9..11bab0d 100644
--- a/src/views/device/manager/components/log/log.data.ts
+++ b/src/views/device/manager/components/log/log.data.ts
@@ -34,6 +34,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'dimension',
     width: 100
   },
+  {
+    title: '设备名称',
+    align: "center",
+    dataIndex: 'deviceName',
+    width: 100
+  },
   {
     title: '设备类型',
     align: "center",
diff --git a/src/views/device/manager/components/preview/AddDepartPreviewForm.vue b/src/views/device/manager/components/preview/AddDepartPreviewForm.vue
index bf369d6..1e88109 100644
--- a/src/views/device/manager/components/preview/AddDepartPreviewForm.vue
+++ b/src/views/device/manager/components/preview/AddDepartPreviewForm.vue
@@ -97,7 +97,7 @@ const validatorRules = {
   deviceName: [{ required: true, message: '请选择设备!'},],
   purchaseQuantity: [{ required: true, message: '请输入采购数量!'},],
 };
-const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 
 // 表单禁用
 const disabled = computed(()=>{
@@ -114,7 +114,7 @@ const disabled = computed(()=>{
 /**
  * 新增
  */
-function add(record) {
+async function add(record) {
   getDeviceConfig();
   orgCode.value = record.orgCode;
   batchNo.value = record.batchNo;
@@ -126,7 +126,7 @@ function add(record) {
 /**
  * 编辑
  */
-function edit(record) {
+async function edit(record) {
   getDeviceConfig();
   orgCode.value = record.orgCode;
   batchNo.value = record.batchNo;
@@ -142,6 +142,7 @@ function edit(record) {
     })
     //赋值
     Object.assign(formData, tmpData);
+
   });
 }
 
diff --git a/src/views/device/manager/components/preview/AddNuPreviewForm.vue b/src/views/device/manager/components/preview/AddNuPreviewForm.vue
index e827c4e..191a4c8 100644
--- a/src/views/device/manager/components/preview/AddNuPreviewForm.vue
+++ b/src/views/device/manager/components/preview/AddNuPreviewForm.vue
@@ -110,7 +110,7 @@ const validatorRules = {
   deviceName: [{ required: true, message: '请选择设备!'},],
   purchaseQuantity: [{ required: true, message: '请输入采购数量!'},],
 };
-const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 
 // 表单禁用
 const disabled = computed(()=>{
@@ -127,7 +127,7 @@ const disabled = computed(()=>{
 /**
  * 新增
  */
-function add(record) {
+async function add(record) {
   getNuInfos(record);
   getDeviceConfig();
   orgCode.value = record.orgCode;
@@ -140,7 +140,7 @@ function add(record) {
 /**
  * 编辑
  */
-function edit(record) {
+async function edit(record) {
   getNuInfos(record);
   getDeviceConfig();
   orgCode.value = record.orgCode;