From d27e93a595fb2af60883d0d060d1447fdbae9dca Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Mon, 23 Jun 2025 17:03:24 +0800
Subject: [PATCH] 2025/6/23

---
 .../modules/eam/com_eam_object_add_update.vue    | 16 ++++++++--------
 src/views/modules/eam/eam_device_list.vue        |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/eam/com_eam_object_add_update.vue b/src/views/modules/eam/com_eam_object_add_update.vue
index f92ee40..df366b5 100644
--- a/src/views/modules/eam/com_eam_object_add_update.vue
+++ b/src/views/modules/eam/com_eam_object_add_update.vue
@@ -86,22 +86,22 @@
           <el-input-number :controls="false" :step="0" min="0" v-model="pageData.timeOutResponseDuration" style="width: 137px;"></el-input-number>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px">
+      <el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px;">
         <el-form-item label="在用" prop="active" :rules="rules.activeType">
           <el-select v-model="pageData.active" style="width: 120px;">
             <el-option label="是" value="Y"></el-option>
             <el-option label="否" value="N"></el-option>
           </el-select >
         </el-form-item>
+        <el-form-item label="购入日期" style="margin-left: 40px; ">
+          <el-date-picker v-model="pageData.purchessDate" value-format="yyyy-MM-dd HH:mm:ss"
+                          style="width: 138px;"></el-date-picker>
+        </el-form-item>
         <el-form-item label=" " prop="publicFacilitiesFlag">
           <el-checkbox v-model="pageData.publicFacilitiesFlag" :true-label="'Y'" :false-label="'N'"
-                       style="margin-left: 10px;">公共设施
+                       style="margin-left: 33px; margin-right: 24px">公共设施
           </el-checkbox>
         </el-form-item>
-        <el-form-item label="购入日期">
-          <el-date-picker v-model="pageData.purchessDate" value-format="yyyy-MM-dd HH:mm:ss"
-                          style="width: 225px;"></el-date-picker>
-        </el-form-item>
         <el-form-item label="循环时间(m)">
           <el-input-number :controls="false" :step="0" min="0" v-model="pageData.cycleTimeSend" style="width: 152px;"></el-input-number>
         </el-form-item>
@@ -172,7 +172,7 @@ export default {
         seqNo: '',
         purchessDate: '',
         active: 'Y',
-        publicFacilitiesFlag: 'Y',
+        publicFacilitiesFlag: 'N',
         addFlag: 'Y',
         checkFlag: 'Y',
         updateBy:'',
@@ -324,7 +324,7 @@ export default {
             return false
           }
         }
-        
+
       }
       // 判断是否是新增标签自定义
       if (this.pageData.addFlag === 'Y') {
diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue
index 6d13058..3fe50f8 100644
--- a/src/views/modules/eam/eam_device_list.vue
+++ b/src/views/modules/eam/eam_device_list.vue
@@ -3728,7 +3728,7 @@
           seqNo: '',
           purchessDate: '',
           active: 'Y',
-          publicFacilitiesFlag: 'Y',
+          publicFacilitiesFlag: 'N',
           addFlag: 'Y',
           deptID: '',
           assetNo: '',