From 2f40e809684c60cfce76768f7672287cf8d91056 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 5 Aug 2025 14:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=BD=E5=B1=89=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/tplink/camera/camera.data.ts            |  5 +++++
 .../synchronization/nuBaseInfo/NuBaseInfoSyncList.vue | 11 ++++++++---
 .../nuBaseInfo/components/NuBaseInfoModal.vue         | 10 +++++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/views/iot/tplink/camera/camera.data.ts b/src/views/iot/tplink/camera/camera.data.ts
index 3336fe4..566098b 100644
--- a/src/views/iot/tplink/camera/camera.data.ts
+++ b/src/views/iot/tplink/camera/camera.data.ts
@@ -64,6 +64,11 @@ export const columns: BasicColumn[] = [
   //   align: "center",
   //   dataIndex: 'nuName'
   // },
+  {
+    title: 'MAC地址',
+    align: "center",
+    dataIndex: 'mac'
+  },
   {
     title: 'FTP地址',
     align: "center",
diff --git a/src/views/synchronization/nuBaseInfo/NuBaseInfoSyncList.vue b/src/views/synchronization/nuBaseInfo/NuBaseInfoSyncList.vue
index 6cc60ea..b01889a 100644
--- a/src/views/synchronization/nuBaseInfo/NuBaseInfoSyncList.vue
+++ b/src/views/synchronization/nuBaseInfo/NuBaseInfoSyncList.vue
@@ -18,15 +18,20 @@
     <!-- 表单区域 -->
     <NuBaseInfoModal ref="registerModal" :orgCode="orgCode" @success="handleSuccess"></NuBaseInfoModal>
     <!-- 批量新增 -->
-    <a-modal v-model:open="batchAddOpen" title="批量新增" :ok-text="'确认'" :cancel-text="'取消'" @ok="handleOk">
-      <a-form layout="horizontal" :label-col="{ span: 8 }" :wrapper-col="{ span: 12 }" style="margin-top: 20px;">
+  <a-drawer :title="`批量新增`" :width="`800`"  v-model:visible="batchAddOpen" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    <a-form layout="horizontal" :label-col="{ span: 8 }" :wrapper-col="{ span: 12 }" style="margin-top: 20px;">
         <template v-for="item in nuTypeOptions" :key="item.value">
           <a-form-item :label="item.text || item.label">
             <a-input-number v-model:value="numberValues[item.value]" :min="0" style="width: 100%" />
           </a-form-item>
         </template>
       </a-form>
-    </a-modal>
+    <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>
+    </template>
+  </a-drawer>
   </div>
 </template>
 
diff --git a/src/views/synchronization/nuBaseInfo/components/NuBaseInfoModal.vue b/src/views/synchronization/nuBaseInfo/components/NuBaseInfoModal.vue
index 16540b1..bb6d508 100644
--- a/src/views/synchronization/nuBaseInfo/components/NuBaseInfoModal.vue
+++ b/src/views/synchronization/nuBaseInfo/components/NuBaseInfoModal.vue
@@ -1,9 +1,13 @@
 <template>
-  <j-modal :title="title" :width="width" :maxHeight="`200px`" :visible="visible" @ok="handleOk"
-    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" okText="保存" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <NuBaseInfoForm ref="registerForm" @ok="submitCallback" :orgCode="orgCode" :formDisabled="disableSubmit"
       :formBpm="false"></NuBaseInfoForm>
-  </j-modal>
+    <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>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>