From c7cfa4c1dec1397247decce1872e319140a59812 Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Mon, 22 Sep 2025 17:34:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C=E6=80=A7=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repairRecords/index.ts                    |  12 +-
 .../devices/shareManage.vue                   |  47 +-
 .../repairRecords/index.vue                   | 826 +++++++++---------
 .../fys-equipment/fenceAccessRecord/index.vue |  14 +-
 src/views/fys-equipment/geoFence/index.vue    |  72 +-
 src/views/fys-equipment/group/index.vue       | 641 +++++++-------
 6 files changed, 834 insertions(+), 778 deletions(-)

diff --git a/src/api/equipmentManagement/repairRecords/index.ts b/src/api/equipmentManagement/repairRecords/index.ts
index 60604f5..9af5fdf 100644
--- a/src/api/equipmentManagement/repairRecords/index.ts
+++ b/src/api/equipmentManagement/repairRecords/index.ts
@@ -90,7 +90,7 @@ function getRepairList(data) {
             "repairReason": data.repairReason,
             "repairPerson": data.repairPerson,
             "repairBeginTime": data.repairBeginTime,
-            "repairEndTime": data.repairBeginTime,
+            "repairEndTime": data.repairEndTime,
             "pageNum": data.pageNum,
             "pageSize": data.pageSize
         }
@@ -126,6 +126,13 @@ function getDeviceTypeAll() {
     });
 }
 
+function getDeviceAll(){
+    return request({
+        url:'api/device?pageNum=1&pageSize=99999',
+        method:'get'}
+    );
+}
+
 export default {
     updateRepair: updateRepair,
     addRepir: addRepir,
@@ -133,5 +140,6 @@ export default {
     getRepirDetail: getRepirDetail,
     getRepairList: getRepairList,
     dropRepir: dropRepir,
-    getDeviceTypeAll: getDeviceTypeAll
+    getDeviceTypeAll: getDeviceTypeAll,
+    getDeviceAll:getDeviceAll
 }
\ No newline at end of file
diff --git a/src/views/equipmentManagement/devices/shareManage.vue b/src/views/equipmentManagement/devices/shareManage.vue
index ba3ecf3..7a530a2 100644
--- a/src/views/equipmentManagement/devices/shareManage.vue
+++ b/src/views/equipmentManagement/devices/shareManage.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="content" v-loading="Status.fullLoading">
     <div class="topFilter">
-      <div>
+      <div class="topTool">
         <el-button type="primary" @click="ShowEdit"
           ><el-icon> <Plus /> </el-icon>添加分享</el-button
         >
         <el-button type="danger" @click="DelShare(null, true)" :disabled="selectRows.length === 0">批量删除</el-button>
       </div>
-
+      <br/>
       <el-form :inline="true" :model="filter" class="demo-form-inline">
         <el-form-item label="">
         
@@ -96,7 +96,7 @@
       <div class="form">
         <el-form :model="cEdit" ref="ruleFormRef" style="max-width: 750px" :label-width="'75px'">
           <el-form-item label="分享用户" label-position="right">
-            <el-select v-model="cEdit.phonenumber" filterable placeholder="输入以搜索">
+            <el-select v-model="cEdit.phonenumber" filterable allow-create  default-first-option placeholder="输入以搜索">
               <el-option v-for="item in Usrs" :key="item.phonenumber" :label="item.userName" :value="item.phonenumber" />
             </el-select>
           </el-form-item>
@@ -225,13 +225,30 @@ function ShowEdit() {
 function CloseEdit() {
   Status.ShowEditPop = false;
   Status.ShowPowerSet = false;
+  cEdit.phonenumber="";
+  cEdit.permission= [];
+  cEdit.remark= '';
+  cEdit.smsCode= '';
 }
 
 //添加分享
 
 //保存分享数据
 function SaveFormData(type) {
-  let data = {
+
+  if(!cEdit.phonenumber){
+
+    alert("请输入或选择手机号");
+    return ;
+  }
+
+  let reg=/^1\d{10}$/
+  if(reg.test(cEdit.phonenumber)){
+    alert("手机号格式不正确");
+    return;
+  }
+
+    let data = {
     'deviceId': deviceid,
     'phonenumber': cEdit.phonenumber,
     'permission': cEdit.permission.join(','),
@@ -239,7 +256,6 @@ function SaveFormData(type) {
     'remark': cEdit.remark,
     'smsCode': cEdit.smsCode
   };
-
   Status.fullLoading = true;
   api
     .SaveShare(data, type)
@@ -247,19 +263,13 @@ function SaveFormData(type) {
       if (res.code == 200) {
         getRecordList();
         CloseEdit();
+         Status.fullLoading = false;
       }
       alert(res.msg);
     })
     .catch((ex) => {
       console.log('出现异常', ex);
     })
-    .finally(() => {
-      Status.fullLoading = false;
-      cEdit.phonenumber = '';
-      cEdit.permission = [];
-      cEdit.remark = '';
-      cEdit.smsCode = '';
-    });
 }
 
 function getPower(item) {
@@ -519,7 +529,7 @@ watch(
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-  padding: 30px 12px 12px 12px;
+  padding: 12px 12px 12px 12px;
 }
 .center {
   display: flex;
@@ -541,6 +551,8 @@ watch(
   align-content: center;
   justify-content: space-between;
   align-items: flex-start;
+  
+  
 }
 :deep .pickerContent .el-date-editor {
   border: none !important;
@@ -567,4 +579,13 @@ watch(
 :deep .topFilter .el-input-group__append {
   padding: 0px 10px !important;
 }
+.topTool{
+      display: flex
+;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-content: center;
+    justify-content: flex-start;
+    align-items: center;
+}
 </style>
diff --git a/src/views/equipmentManagement/repairRecords/index.vue b/src/views/equipmentManagement/repairRecords/index.vue
index 1cf5e8f..ab3526b 100644
--- a/src/views/equipmentManagement/repairRecords/index.vue
+++ b/src/views/equipmentManagement/repairRecords/index.vue
@@ -1,33 +1,28 @@
 <template>
   <div class="content" v-loading="Status.fullLoading">
-
     <div class="main">
       <div class="TopTool">
         <div class="button-row">
-
           <el-button type="primary" icon="Plus" @click.stop="ShowEdit(null, true)">新增维修</el-button>
           <el-button type="primary" plain icon="Download" @click.stop="ExportRecord()">导出</el-button>
           <el-button type="danger" plain icon="Delete" @click.stop="DropRecord()">批量删除</el-button>
-
         </div>
 
         <div class="rightSearch">
-
-          <el-input :suffix-icon="'Search'" v-model="advanceSearch.searchValue" class="responsive-input"
-            placeholder="名称" @input="txtSearch">
-
+          <el-input :suffix-icon="'Search'" v-model="advanceSearch.searchValue" class="responsive-input" placeholder="名称" @input="txtSearch">
           </el-input>
 
-          <el-button style="margin-left: 10px;" type="primary" @click.stop="ToggleAdvance()">高级筛选</el-button>
-
-
+          <el-button style="margin-left: 10px" type="primary" @click.stop="ToggleAdvance()">高级筛选</el-button>
         </div>
       </div>
       <div class="advanceSearch" v-show="Status.ShowAdvanceSearch">
         <el-form :inline="true" :model="advanceSearch" class="demo-form-inline">
           <el-form-item label="设备名称">
-            <el-input placeholder="请选择" v-model="selectedRow['deviceName']" :readonly="true"
-              @click.stop="ShowDevice('Search', false)" />
+            <!-- <el-input placeholder="请选择" v-model="selectedRow['deviceName']" :readonly="true" @click.stop="ShowDevice('Search', false)" /> -->
+
+            <el-select v-model="advanceSearch.deviceId" placeholder="选择设备" clearable filterable>
+              <el-option v-for="item in deviceDist" :key="item.deviceId" :label="item.deviceName" :value="item.deviceId" />
+            </el-select>
           </el-form-item>
 
           <el-form-item label="维修人员">
@@ -43,35 +38,40 @@
 
           <el-form-item label="维修时间">
             <el-col :span="7">
-              <el-form-item prop="date1" style="margin-right: 0px;">
-                <el-date-picker v-model="advanceSearch.repairBeginTime" type="date" placeholder="开始日期"
-                  format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%" />
+              <el-form-item prop="date1" style="margin-right: 0px">
+                <el-date-picker
+                  v-model="advanceSearch.repairBeginTime"
+                  type="date"
+                  placeholder="开始日期"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  style="width: 100%"
+                />
               </el-form-item>
-
             </el-col>
             <el-col :span="1">
               <span class="text-gray-500">-</span>
             </el-col>
             <el-col :span="7">
-              <el-form-item prop="date2" style="margin-right: 0px;">
-                <el-date-picker v-model="advanceSearch.repairEndTime" placeholder="结束日期" style="width: 100%" />
+              <el-form-item prop="date2" style="margin-right: 0px">
+                <el-date-picker
+                  v-model="advanceSearch.repairEndTime"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="结束日期"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
             <div>
-              <el-button style="margin-left: 5px;" type="primary" @click.stop="Search()">查询</el-button>
+              <el-button style="margin-left: 5px" type="primary" @click.stop="Search()">查询</el-button>
               <el-button type="primary" @click.stop="Reset()">重置</el-button>
             </div>
           </el-form-item>
-
-
-
-
         </el-form>
-
       </div>
 
       <div class="grid" v-loading="Status.loading">
-
         <el-table ref="grid" height="calc(100vh - 360px)" border :data="List" @selection-change="RowSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="设备名称" align="center" prop="deviceName" />
@@ -80,114 +80,151 @@
           <el-table-column label="损坏原因" align="center" prop="repairReason" />
           <el-table-column label="维修人员" align="center" prop="repairPerson" />
 
-          <el-table-column label="操作" align="center" fixed="right" width="280"
-            class-name="small-padding fixed-width opt">
+          <el-table-column label="操作" align="center" fixed="right" width="280" class-name="small-padding fixed-width opt">
             <template #default="scope">
               <div class="center">
                 <el-text class="mx-1" type="primary" @click.stop="ShowEdit(scope.row, true)">编辑</el-text>
                 <el-text class="mx-1" type="primary" @click.stop="ShowEdit(scope.row, false)">详情</el-text>
                 <el-text class="mx-1" type="danger" @click.stop="DropRecord([scope.row])">删除</el-text>
-
               </div>
-
             </template>
           </el-table-column>
-
-
         </el-table>
-        <pagination v-show="pagin.total > 0" v-model:page="advanceSearch.pageNum" v-model:limit="advanceSearch.pageSize"
-          :total="pagin.total" @pagination="getRecordList" />
+        <pagination
+          v-show="pagin.total > 0"
+          v-model:page="advanceSearch.pageNum"
+          v-model:limit="advanceSearch.pageSize"
+          :total="pagin.total"
+          @pagination="getRecordList"
+        />
       </div>
-
-
-
     </div>
 
-
-
-
     <!-- 新增、编辑弹出层 -->
-    <el-dialog v-model="Status.ShowEditPop" :data-val="Status.ShowEditPop" :title="cEdit.recordId ? '编辑维修' : '新增维修'"
-      width="800" :draggable="true">
-
+    <el-dialog
+      class="editPop"
+      v-model="Status.ShowEditPop"
+      :data-val="Status.ShowEditPop"
+      :title="!cEdit.isEdit ? '维修详情' : cEdit.recordId ? '编辑维修' : '新增维修'"
+      width="800"
+      :draggable="true"
+    >
       <div class="form">
-
         <el-form :model="cEdit" ref="ruleFormRef" style="max-width: 750px" :rules="rules">
-
           <el-form-item label="设备名称" label-position="right">
-            <el-input v-model="selectedRow['deviceName']" :readonly="true" @click.stop="ShowDevice('Edit', true)"
-              placeholder="请选择设备" />
+            <!-- <el-input v-model="selectedRow['deviceName']" :readonly="true" @click.stop="ShowDevice('Edit', true)" placeholder="请选择设备" /> -->
+            <el-select v-model="cEdit.deviceId" placeholder="选择设备" clearable :disabled="!cEdit.isEdit" filterable>
+              <el-option v-for="item in deviceDist" :key="item.deviceId" :label="item.deviceName" :value="item.deviceId"
+            /></el-select>
           </el-form-item>
+
           <el-form-item label="维修人员" label-position="right">
             <el-input v-model="cEdit.repairPerson" :readonly="!cEdit.isEdit" placeholder="请输入姓名" />
           </el-form-item>
           <el-form-item label="维修时间" label-position="right">
-
-            <el-date-picker v-model="cEdit.repairTime" :readonly="!cEdit.isEdit" type="datetime" placeholder="请选择时间"
-              format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-
+            <el-date-picker
+              v-model="cEdit.repairTime"
+              :readonly="!cEdit.isEdit"
+              type="datetime"
+              placeholder="请选择时间"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              style="width: 100%"
+            />
           </el-form-item>
           <el-form-item label="维修部位" label-position="right">
             <el-input v-model="cEdit.repairPart" :readonly="!cEdit.isEdit" placeholder="请输入维修部位" />
           </el-form-item>
           <el-form-item label="维修原因" label-position="right">
-
             <el-input v-model="cEdit.repairReason" :readonly="!cEdit.isEdit" placeholder="请输入维修原因" />
           </el-form-item>
 
           <el-form-item label="损坏照片" label-position="right">
-            <el-upload v-show="cEdit.isEdit" ref="beforeUploadRef" class="upload-demo" action="" :auto-upload="false"
-              :on-change="handleFileChange1" :file-list="beforeFiles" accept=".jpg,.jpeg,.png,.gif.webp" :limit="1"
-              list-type="picture-card">
+            <el-upload
+              :disabled="!cEdit.isEdit"
+              ref="beforeUploadRef"
+              class="upload-demo"
+              action=""
+              :auto-upload="false"
+              :on-change="handleFileChange1"
+              :file-list="beforeFiles"
+              accept=".jpg,.jpeg,.png,.gif.webp"
+              :limit="9"
+              list-type="picture-card"
+            >
               <el-icon>
                 <Plus />
               </el-icon>
+              <template #file="{ file, index }">
+                <!-- 图片预览区域 -->
+                <div class="el-upload-list__item">
+                  <!-- 图片缩略图 -->
+                  <img :src="file.url" class="el-upload-list__item-thumbnail" />
 
-
+               
+                  <!-- 操作按钮组 -->
+                  <div class="el-upload-list__item-actions">
+                    <!-- 自定义删除按钮 -->
+                    <span class="el-upload-list__item-delete" @click.stop="dropImg('before', file, index)">
+                      <el-icon>
+                        <Delete />
+                      </el-icon>
+                    </span>
+                  </div>
+                </div>
+              </template>
             </el-upload>
-            <div class="demo-fit" v-show="!cEdit.isEdit">
-              <div class="block">
-
-                <el-avatar shape="square" :size="100" :fit="'scale-down'" :src="cEdit.beforeImg" />
-              </div>
-            </div>
           </el-form-item>
 
           <el-form-item label="修复照片" label-position="right">
-            <el-upload v-show="cEdit.isEdit" ref="afterUploadRef" class="upload-demo" action="" :auto-upload="false"
-              :on-change="handleFileChange2" :file-list="afterFiles" accept=".jpg,.jpeg,.png,.gif.webp" :limit="1"
-              list-type="picture-card">
+            <el-upload
+              :disabled="!cEdit.isEdit"
+              ref="afterUploadRef"
+              class="upload-demo"
+              action=""
+              :auto-upload="false"
+              :on-change="handleFileChange2"
+              :file-list="afterFiles"
+              accept=".jpg,.jpeg,.png,.gif.webp"
+              :limit="9"
+              list-type="picture-card"
+            >
               <el-icon>
                 <Plus />
               </el-icon>
-
+                 <template #file="{ file, index }">
+                <!-- 图片预览区域 -->
+                <div class="el-upload-list__item">
+                  <!-- 图片缩略图 -->
+                  <img :src="file.url" class="el-upload-list__item-thumbnail" />            
+                  <!-- 操作按钮组 -->
+                  <div class="el-upload-list__item-actions">
+                    <!-- 自定义删除按钮 -->
+                    <span class="el-upload-list__item-delete" @click.stop="dropImg('after', file, index)">
+                      <el-icon>
+                        <Delete />
+                      </el-icon>
+                    </span>
+                  </div>
+                </div>
+              </template>
             </el-upload>
-            <div class="demo-fit" v-show="!cEdit.isEdit">
-              <div class="block">
-
-                <el-avatar shape="square" :size="100" :fit="'scale-down'" :src="cEdit.afterImg" />
-              </div>
-              </div>
-
+          
           </el-form-item>
-
         </el-form>
-
       </div>
-      <div class="center" style="margin-top: 10px;">
-        <el-button type="primary" @click="SaveFormData()">
-          确定
-        </el-button>
-        <el-button @click="CloseEdit()">
-          取消
-        </el-button>
-      </div>
-
-
+      <template #footer>
+        <div class="dialog-footer">
+          <div class="center" style="margin-top: 10px">
+            <el-button type="primary" @click="SaveFormData()"> 确定 </el-button>
+            <el-button @click="CloseEdit()"> 取消 </el-button>
+          </div>
+        </div>
+      </template>
     </el-dialog>
 
     <!-- 选择设备弹出层 -->
-    <el-dialog v-model="Status.ShowCheckDevice" title="选择设备" class="checkDeviceDialog" :draggable="true">
+    <!-- <el-dialog v-model="Status.ShowCheckDevice" title="选择设备" width="90%" class="checkDeviceDialog" :draggable="true">
       <div class="deviceContnet">
         <div class="topSearch">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -206,15 +243,21 @@
               </el-select>
             </el-form-item>
             <el-form-item label="设备状态" prop="deviceStatus">
-              <el-select v-model="queryParams.deviceStatus" placeholder="设备状态" style="margin-left: 10px;">
+              <el-select v-model="queryParams.deviceStatus" placeholder="设备状态" style="margin-left: 10px">
                 <el-option label="正常" value="1" />
                 <el-option label="失效" value="0" />
               </el-select>
             </el-form-item>
             <el-form-item label="创建时间">
-              <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
-                range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"></el-date-picker>
+              <el-date-picker
+                v-model="dateRange"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+              ></el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -223,30 +266,25 @@
           </el-form>
         </div>
         <div class="gridContent">
-
-
-          <el-table ref="deviceGrid" v-loading="Status.devLoading" border :data="deviceDist" height="300"
-            @row-click="handleRadioChange">
-            <!-- <el-table-column type="selection" width="50" align="center" /> -->
-
+          <el-table ref="deviceGrid" v-loading="Status.devLoading" border :data="deviceDist" height="250" @row-click="handleRadioChange">
+        
             <el-table-column label="选择" width="80" align="center">
               <template #default="scope">
-                <el-radio :model-value="selectedRowId" :label="scope.row.deviceId"
-                  @change="handleRadioChange(scope.row)" />
+                <el-radio :model-value="selectedRowId" :label="scope.row.deviceId" @change="handleRadioChange(scope.row)" />
               </template>
             </el-table-column>
 
-
-
             <el-table-column label="设备名称" align="center" prop="deviceName" />
             <el-table-column prop="customerName" label="所属客户" />
             <el-table-column prop="devicePic" label="设备图片">
               <template #default="scope">
                 <el-popover placement="right" trigger="click">
                   <template #reference>
-                    <img :src="scope.row.devicePic"
+                    <img
+                      :src="scope.row.devicePic"
                       style="width: 40px; height: 40px; cursor: pointer; object-fit: contain"
-                      class="hover:opacity-80 transition-opacity" />
+                      class="hover:opacity-80 transition-opacity"
+                    />
                   </template>
                   <img :src="scope.row.devicePic" style="max-width: 600px; max-height: 600px; object-fit: contain" />
                 </el-popover>
@@ -273,42 +311,33 @@
             <el-table-column prop="remark" label="备注" />
             <el-table-column prop="createTime" label="创建日期" width="160" />
             <el-table-column prop="createByName" label="创建人" />
-
-
           </el-table>
-          <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-            :total="total" @pagination="getList" />
-        </div>
-
-
-        <div class="center footerBtn" style="margin-top: 10px;">
-          <el-button type="primary" @click="CheckDeviceOK()">
-            确定
-          </el-button>
-          <el-button @click="CloseDevice()">
-            取消
-          </el-button>
+          <pagination
+            v-show="total > 0"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            :total="total"
+            @pagination="getList"
+          />
         </div>
       </div>
-
-
-
-
-    </el-dialog>
+      <template #footer>
+        <div class="center" >
+          <el-button type="primary" @click="CheckDeviceOK()"> 确定 </el-button>
+          <el-button @click="CloseDevice()"> 取消 </el-button>
+        </div>
+      </template>
+    </el-dialog> -->
 
     <!-- 提示框 -->
-    <el-dialog :width="300" :draggable="true" v-model="Status.confirm.Visible" :title="Status.confirm.title" width="500"
-      center>
+    <el-dialog :width="300" :draggable="true" v-model="Status.confirm.Visible" :title="Status.confirm.title" width="500" center>
       <span>
         {{ Status.confirm.text }}
       </span>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="Status.confirm.OkCallback">
-            确定
-          </el-button>
+          <el-button type="primary" @click="Status.confirm.OkCallback"> 确定 </el-button>
           <el-button v-show="Status.confirm.showCancel" @click="Status.confirm.cancelCallback">取消</el-button>
-
         </div>
       </template>
     </el-dialog>
@@ -316,7 +345,6 @@
 </template>
 
 <script setup lang="ts">
-
 import api from '@/api/equipmentManagement/repairRecords/index';
 import common from '@/utils/common';
 import deviceapi from '@/api/equipmentManagement/device/index';
@@ -329,9 +357,10 @@ var deviceGrid = ref(null);
 
 //全局状态控制
 var Status = reactive({
-  fullLoading: false,//是否显示全屏loading
-  loading: false,//是否显示表格区域loading
-  confirm: {//弹出框的配置
+  fullLoading: false, //是否显示全屏loading
+  loading: false, //是否显示表格区域loading
+  confirm: {
+    //弹出框的配置
     Visible: false,
     title: '',
     text: '',
@@ -339,28 +368,28 @@ var Status = reactive({
     OkCallback: null,
     showCancel: true
   },
-  ShowEditPop: false,//是否显示编辑弹窗
-  ShowAdvanceSearch: false,//是否显示高级筛选
-  ShowCheckDevice: false,//是否显示选择设备的弹窗
+  ShowEditPop: false, //是否显示编辑弹窗
+  ShowAdvanceSearch: false, //是否显示高级筛选
+  ShowCheckDevice: false, //是否显示选择设备的弹窗
   CheckDeviceType: 'Search'
 });
 //高级查询
 var advanceSearch = reactive({
-  "recordId": null,
-  "deviceId": "",
-  "searchValue": "",
-  "search": "",
-  "repairPart": "",
-  "repairReason": "",
-  "repairPerson": "",
-  "repairBeginTime": "",
-  "repairEndTime": "",
+  'recordId': null,
+  'deviceId': '',
+  'searchValue': '',
+  'search': '',
+  'repairPart': '',
+  'repairReason': '',
+  'repairPerson': '',
+  'repairBeginTime': '',
+  'repairEndTime': '',
   pageNum: 1,
   pageSize: 10
 });
 
 //选择设备
-var selectedRowId = ref("");
+var selectedRowId = ref('');
 var selectedRow = ref({});
 function handleRadioChange(row) {
   selectedRowId.value = row.deviceId;
@@ -386,13 +415,9 @@ function clearUploadFiles() {
   afterUploadRef.value?.clearFiles();
 }
 
-
-
-
-
 //页码控件数据
 var pagin = reactive({
-  total: 0,
+  total: 0
 });
 
 //列表数据
@@ -400,38 +425,37 @@ var List = ref<any[]>(null);
 
 //当前正在编辑的数据
 var cEdit = reactive({
-  recordId: null,//维修记录id  
-  deviceId: "",//设备id
-  repairTime: '',//维修时间
-  repairPart: '',//维修部位
-  repairReason: '',//维修原因
-  repairPerson: '',//维修人员
+  recordId: null, //维修记录id
+  deviceId: '', //设备id
+  repairTime: '', //维修时间
+  repairPart: '', //维修部位
+  repairReason: '', //维修原因
+  repairPerson: '', //维修人员
   isEdit: true,
-  beforeImg: "",
-  afterImg: "",
-
-  // beforeFile: '',
-  // afterFile: ''
+  imageIds: []
 });
 
-
 var deviceTypes = reactive([]);
 
 //重置搜索条件
 function Reset() {
   let defVal = {
-    type: '',
-    user: '',
-    mac: '',
-    imei: '',
-    startDate: '',
-    endDate: ''
+    'recordId': null,
+    'deviceId': '',
+    'searchValue': '',
+    'search': '',
+    'repairPart': '',
+    'repairReason': '',
+    'repairPerson': '',
+    'repairBeginTime': '',
+    'repairEndTime': ''
   };
-
+  selectedRow.value.deviceName = '';
   let keys = Object.keys(defVal);
   keys.forEach(function (item, index, array) {
     advanceSearch[item] = defVal[item];
   });
+  Search();
 }
 //查询
 function Search() {
@@ -445,54 +469,50 @@ function txtSearch() {
   // 等待 500ms 无输入后执行查询
   searchIntval = setTimeout(() => {
     Search();
-  }, 500);
+  }, 200);
 }
 
 //获取列表数据
 function getRecordList() {
-
   showloading('loading');
   setTimeout(() => {
-    api.getRepairList(advanceSearch).then(res => {
-
-      if (res.code == 200) {
-
-        List.value = res.rows;
-        pagin.total = res.total;
-
-      } else {
-        alert(res.msg);
-      }
-    }).catch(ex => {
-      alert("出现了未知的异常");
-    }).finally(hideloading);
-
-
-
+    api
+      .getRepairList(advanceSearch)
+      .then((res) => {
+        if (res.code == 200) {
+          List.value = res.rows;
+          pagin.total = res.total;
+        } else {
+          alert(res.msg);
+        }
+      })
+      .finally(hideloading);
   }, 0);
 }
 
-
 //删除
 function DropRecord(arr = undefined) {
-
   if (arr === undefined) {
     arr = getSelectionRows(grid);
   }
   if (arr.length == 0) {
-    alert("请选择需要删除的数据");
+    alert('请选择需要删除的数据');
     return;
   }
 
-
-  confirm("您确认删除" + arr.length + "条记录吗?", () => {
-    showloading('fullLoading');
-    arr = arr.map(item => item.recordId);
-    api.dropRepir(arr);
-    setTimeout(hideloading, 2000);
-    alert("操作成功");
-    Search();
-  }, hideConfirm, '提示');
+  confirm(
+    '您确认删除' + arr.length + '条记录吗?',
+    () => {
+      showloading('fullLoading');
+      arr = arr.map((item) => item.recordId);
+      api.dropRepir(arr);
+      setTimeout(hideloading, 2000);
+      alert('操作成功');
+      Search();
+    },
+    hideConfirm,
+    '提示'
+  );
 }
 
 //高级查询显示隐藏
@@ -502,95 +522,108 @@ function ToggleAdvance() {
 
 //显示编辑
 function ShowEdit(item = undefined, isEdit = true) {
-  
   Status.ShowEditPop = true;
   let def = {
-    recordId: null,//维修记录id
+    recordId: null, //维修记录id
 
-    deviceId: "",//设备id
-    repairTime: '',//维修时间
-    repairPart: '',//维修部位
-    repairReason: '',//维修原因
-    repairPerson: ''//维修人员
-  }
+    deviceId: '', //设备id
+    repairTime: '', //维修时间
+    repairPart: '', //维修部位
+    repairReason: '', //维修原因
+    repairPerson: '', //维修人员,
+    imageIds: []
+  };
 
   let promise1 = new Promise((resolve, reject) => {
     if (item) {
-      api.getRepirDetail(item.recordId).then((res) => {
-        if (res.code == 200) {
-
-          resolve(res.data);
-        }
-        else {
+      api
+        .getRepirDetail(item.recordId)
+        .then((res) => {
+          if (res.code == 200) {
+            resolve(res.data);
+          } else {
+            resolve(item);
+          }
+        })
+        .catch((ex) => {
           resolve(item);
-        }
-      }).catch(ex => {
-        resolve(item);
-      });
+        });
     } else {
       resolve(item);
     }
   });
 
-  promise1.then(res => {
-    item = res;
-    if (!item) {
-       cEdit.isEdit = isEdit;
-      return;
-    }
-    let keys = Object.keys(cEdit);
-    keys.forEach((key, i) => {
-      if (item) {//编辑
-        cEdit[key] = item[key];
-      } else {//新增
-        cEdit[key] = def[key];
+  promise1
+    .then((res) => {
+      debugger;
+      item = res;
+      if (!item) {
+        cEdit.isEdit = isEdit;
+        return;
       }
-    });
-
-    if (item.images && item.images.length) {
-      item.images.filter(v => {
-        if (v.imageType == 'BEFORE') {
-          cEdit.beforeImg = v.imageUrl;
-          return true;
+      let keys = Object.keys(cEdit);
+      keys.forEach((key, i) => {
+        if (item) {
+          //编辑
+          if (item[key] !== undefined) {
+            cEdit[key] = item[key];
+          } else {
+            cEdit[key] = def[key];
+          }
+        } else {
+          //新增
+          cEdit[key] = def[key];
         }
-        if (v.imageType == 'AFTER') {
-          cEdit.beforeImg = v.imageUrl;
-          return true;
-        }
-        return false;
-      })
-    }
-    if (item) {
-      selectedRow.value['deviceName'] = item.deviceName;
-    }
-
-    cEdit.isEdit = isEdit;
-  }).finally(() => {
-
-  });
+      });
+      debugger;
+      if (item.images && item.images.length) {
+        beforeFiles.value = item.images
+          .filter((v) => {
+            if (v.imageType == 'BEFORE') {
+              return true;
+            }
 
+            return false;
+          })
+          .map((v) => {
+            return { name: v.imageId, url: v.imageUrl, id: v.imageId };
+          });
 
+        afterFiles.value = item.images
+          .filter((v) => {
+            if (v.imageType == 'AFTER') {
+              return true;
+            }
+            return false;
+          })
+          .map((v) => {
+            return { name: v.imageId, url: v.imageUrl, id: v.imageId };
+          });
+      }
+      if (item) {
+        selectedRow.value['deviceName'] = item.deviceName;
+      }
 
+      cEdit.isEdit = isEdit;
+    })
+    .finally(() => {});
 }
 
-
 //关闭编辑弹窗
 function CloseEdit() {
-
   Status.ShowEditPop = false;
   ResetFormData();
 }
 
 //显示选择设备的弹窗
 function ShowDevice(type, isvalid) {
-  
   if (isvalid && !cEdit.isEdit) {
     return;
   }
-  
+
   Status.CheckDeviceType = type;
   Status.ShowCheckDevice = true;
-  selectedRowId.value = "";
+  selectedRowId.value = '';
 
   if (total.value === 0) {
     handleQuery();
@@ -604,32 +637,48 @@ function CloseDevice() {
 
 //确认选择某个设备
 function CheckDeviceOK() {
-
-
-
   if (Status.CheckDeviceType == 'Edit') {
     cEdit.deviceId = selectedRowId.value;
   } else {
     advanceSearch.deviceId = selectedRowId.value;
   }
   CloseDevice();
-
 }
 
 function ResetFormData() {
-  cEdit.recordId = null;//维修记录id  
-  cEdit.deviceId = "";//设备id
-  cEdit.repairTime = '';//维修时间
-  cEdit.repairPart = '';//维修部位
-  cEdit.repairReason = '';//维修原因
-  cEdit.repairPerson = '';//维修人员
+  cEdit.recordId = null; //维修记录id
+  cEdit.deviceId = ''; //设备id
+  cEdit.repairTime = ''; //维修时间
+  cEdit.repairPart = ''; //维修部位
+  cEdit.repairReason = ''; //维修原因
+  cEdit.repairPerson = ''; //维修人员
   cEdit.isEdit = false;
-  cEdit.afterImg = "";
-  cEdit.beforeImg = "";
-  selectedRow.value = { deviceName: "", deviceId: "" };
+  cEdit.imageIds = [];
+
+
+  selectedRow.value = { deviceName: '', deviceId: '' };
 
   clearUploadFiles();
 }
+
+var dropImg = (type, file, index) => {
+  
+
+  let runDrop = () => {
+    
+    if (type == 'after') {
+      afterFiles.value.splice(index, 1);
+    }
+    if (type == 'before') {
+      beforeFiles.value.splice(index, 1);    
+    }
+    if(file.id){
+      cEdit.imageIds.push(file.id);
+    }
+     
+  };
+  confirm('您确认删除此记录吗?', runDrop, hideConfirm, '提示');
+};
 //保存表单数据
 function SaveFormData() {
   if (!cEdit.isEdit) {
@@ -638,7 +687,6 @@ function SaveFormData() {
 
   showloading('fullLoading');
   setTimeout(() => {
-
     let promise = null;
 
     let formData = new FormData();
@@ -657,81 +705,79 @@ function SaveFormData() {
 
     // 添加第一个控件的文件
     if (beforeFile.value.length > 0) {
-      formData.append('beforeFile', beforeFile.value[0]);
+      for (let i = 0; i < beforeFile.value.length; i++) {
+        let file = beforeFile.value[i];
+        if(file && !file.id){
+          formData.append('beforeFile', file);
+        }
+        
+      }
+    
     }
 
     if (afterFile.value.length > 0) {
-      formData.append('afterFile', afterFile.value[0]);
+      // formData.append('afterFile', afterFile.value[0]);
+
+      for (let i = 0; i < afterFile.value.length; i++) {
+        let file = afterFile.value[i];
+        if(file && !file.id){
+          formData.append('afterFile', file);
+        }
+        
+      }
     }
 
-
-
-
-
     if (cEdit.recordId) {
       promise = api.updateRepair(formData);
     } else {
       promise = api.addRepir(formData);
     }
 
-    promise.then((res) => {
-      if (res.code == 200) {
-        alert("操作成功");
-        CloseEdit();
-        Search();
-      } else {
-        alert(res.msg);
-      }
-    }).catch(ex => {
-      alert("出现了未知的异常，操作失败");
-    }).finally(() => {
-      ResetFormData();
-      hideloading();
-    })
-
+    promise
+      .then((res) => {
+        if (res.code == 200) {
+          alert('操作成功');
+          CloseEdit();
+          Search();
+        } else {
+          alert(res.msg);
+        }
+      })
+      .finally(() => {
+        ResetFormData();
+        hideloading();
+      });
   }, 0);
-
 }
 
 //导出
 function ExportRecord() {
-  showloading('fullLoading');
-  proxy?.download(
-    '/equipment/repairRecords/export',
-    advanceSearch,
-    `维修记录_${new Date().getTime()}.xlsx`,
-    'post'
-  ).finally(hideloading);
-
+  // showloading('fullLoading');
+  proxy?.download('/equipment/repairRecords/export', advanceSearch, `维修记录_${new Date().getTime()}.xlsx`, 'post').finally(hideloading);
 }
 
-function RowSelectionChange(row) {
-
-}
+function RowSelectionChange(row) {}
 //获取已选中的行
 var getSelectionRows = (gridInstance) => {
-
-  if (gridInstance.value) { // 检查ref是否已正确引用组件实例
+  if (gridInstance.value) {
+    // 检查ref是否已正确引用组件实例
     var selectedRows = gridInstance.value.getSelectionRows(); // 获取选中行数据数组
     return selectedRows;
   }
   return [];
-}
-
-
+};
 
 const handleFileChange1 = (file, fileList) => {
   beforeFiles.value = fileList;
-  beforeFile.value = fileList.map(f => f.raw);
+  beforeFile.value = fileList.map((f) => f.raw);
 };
 
 // 处理第二个上传控件的文件变化
 const handleFileChange2 = (file, fileList) => {
   afterFiles.value = fileList;
-  afterFile.value = fileList.map(f => f.raw);
+  afterFile.value = fileList.map((f) => f.raw);
 };
 
-
 window.confirm = function (text, OK, cancel, title) {
   let Cfg = {
     Visible: true,
@@ -750,13 +796,12 @@ window.confirm = function (text, OK, cancel, title) {
         cancel();
       }
     }
-  }
+  };
 
   Status.confirm = Cfg;
-}
+};
 
 window.alert = function (text, OK, title) {
-
   let Cfg = {
     Visible: true,
     title: title ? title : '提示',
@@ -769,64 +814,56 @@ window.alert = function (text, OK, title) {
     },
     showCancel: false,
     cancelCallback: null
-  }
+  };
 
   Status.confirm = Cfg;
-}
+};
 
 var hideConfirm = function () {
-
   let Cfg = {
     Visible: false,
     title: '提示',
-    text: "",
+    text: '',
     cancelCallback: null,
     OkCallback: null
-  }
+  };
 
   Status.confirm = Cfg;
-}
+};
 
 var showloading = function (type) {
   if (!type) {
-    type = 'loading'
+    type = 'loading';
   }
   let arr = ['fullLoading', 'loading', 'devLoading'];
 
-  arr.forEach(key => {
+  arr.forEach((key) => {
     if (key == type) {
       Status[key] = true;
     } else {
       Status[key] = false;
     }
-
-  })
-
-
-}
+  });
+};
 
 var closeLoading = function () {
   let arr = ['fullLoading', 'loading', 'devLoading'];
 
-  arr.forEach(key => {
+  arr.forEach((key) => {
     Status[key] = false;
-  })
-}
+  });
+};
 var hideloading = closeLoading;
 
-
-
-
 onMounted(() => {
   Search();
-  api.getDeviceTypeAll(res => {
+  getList();
+  api.getDeviceTypeAll((res) => {
     if (res.code == 200) {
-
-      deviceTypes = res.data.map(item => ({
+      deviceTypes = res.data.map((item) => ({
         value: item.deviceTypeId,
         typeName: item.typeName
-      }))
-
+      }));
     }
   });
 });
@@ -839,69 +876,56 @@ var queryParams = ref({
   deviceMac: '',
   deviceImei: '',
   deviceType: '',
-  deviceStatus: '',
-
+  deviceStatus: ''
 });
 const total = ref(0);
 const queryFormRef = ref<ElFormInstance>();
-const deviceDist = ref<deviceVO[]>();
+const deviceDist = ref<any[]>();
 const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
 
 const getList = async () => {
-  showloading('devLoading');
-  const res = await deviceapi.deviceList(proxy?.addDateRange(queryParams.value, dateRange.value));
-  hideloading();
-  deviceDist.value = res.rows;
-  total.value = res.total;
+  // showloading('devLoading');
+  // const res = await deviceapi.deviceList(proxy?.addDateRange(queryParams.value, dateRange.value));
+  // hideloading();
+  // deviceDist.value = res.rows;
+  // total.value = res.total;
+  api.getDeviceAll().then((res) => {
+    deviceDist.value = res.rows;
+  });
 };
 
-
 /** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  dateRange.value = ['', ''];
-  handleQuery()
-};
+// const handleQuery = () => {
+//   queryParams.value.pageNum = 1;
+//   getList();
+// };
+// /** 重置按钮操作 */
+// const resetQuery = () => {
+//   queryFormRef.value?.resetFields();
+//   dateRange.value = ['', ''];
+//   handleQuery();
+// };
 
 interface RuleForm {
-  recordId: Number,//维修记录id
-  createTime: string,
-  updateTime: string,
-  deviceId: string,//设备id
-  repairTime: string,//维修时间
-  repairPart: string,//维修部位
-  repairReason: string,//维修原因
-  repairPerson: string//维修人员
+  recordId: Number; //维修记录id
+  createTime: string;
+  updateTime: string;
+  deviceId: string; //设备id
+  repairTime: string; //维修时间
+  repairPart: string; //维修部位
+  repairReason: string; //维修原因
+  repairPerson: string; //维修人员
 }
 
-
 const rules = reactive<FormRules<RuleForm>>({
-
-  deviceId: [
-    { required: true, message: '请选择设备', trigger: 'blur' },
-  ],
-  repairTime: [
-    { required: true, message: '请选择维修时间', trigger: 'blur' },
-  ],
-  repairPart: [
-    { required: true, message: '请填写维修部位', trigger: 'blur' },
-  ],
-  repairReason: [
-    { required: true, message: '请填写维修原因', trigger: 'blur' },
-  ],
-  repairPerson: [
-    { required: true, message: '请填写维修人员', trigger: 'blur' },
-  ],
-
-})
+  deviceId: [{ required: true, message: '请选择设备', trigger: 'blur' }],
+  repairTime: [{ required: true, message: '请选择维修时间', trigger: 'blur' }],
+  repairPart: [{ required: true, message: '请填写维修部位', trigger: 'blur' }],
+  repairReason: [{ required: true, message: '请填写维修原因', trigger: 'blur' }],
+  repairPerson: [{ required: true, message: '请填写维修人员', trigger: 'blur' }]
+});
 </script>
 
-
 <style lang="scss" scoped>
 :deep .deviceContnet .el-radio__label {
   display: none !important;
@@ -909,7 +933,7 @@ const rules = reactive<FormRules<RuleForm>>({
 
 .deviceContnet {
   position: relative;
-  background-color: #FFFFFF;
+  background-color: #ffffff;
   width: 100%;
   height: 100%;
 }
@@ -918,14 +942,7 @@ const rules = reactive<FormRules<RuleForm>>({
   position: sticky;
   top: 0px;
   z-index: 9;
-  background-color: #FFFFFF;
-}
-
-.deviceContnet .footerBtn {
-  position: sticky;
-  bottom: 0px;
-  z-index: 9;
-  background-color: #FFFFFF;
+  background-color: #ffffff;
 }
 
 .deviceContnet .deviceGrid {
@@ -937,13 +954,22 @@ const rules = reactive<FormRules<RuleForm>>({
   height: 600px;
 }
 
-
 :deep .el-form--inline .el-form-item {
   margin-right: 15px !important;
 }
+:deep .el-dialog__body .form {
+}
+:deep .el-dialog__body,
+.dialog__body {
+  position: relative;
+  padding: 0px !important;
+}
 
-:deep .el-dialog__body {
-  overflow: hidden;
+:deep .el-dialog__body .footerBtn {
+  position: sticky;
+  bottom: 0px;
+  z-index: 9;
+  background-color: #ffffff;
 }
 
 :deep .el-form-item__label {
@@ -968,7 +994,6 @@ const rules = reactive<FormRules<RuleForm>>({
   justify-content: space-between;
 }
 
-
 .TopTool .input-with-Search {
   max-width: 175px;
   margin-right: 15px;
@@ -1046,4 +1071,13 @@ input:focus {
   margin-right: 10px;
   cursor: pointer;
 }
+:deep .el-dialog__footer,
+.el-dialog__footer {
+  padding-top: 0px !important;
+}
+
+:deep .demo-fit .el-avatar--square,
+.demo-fit .el-avatar--square {
+  margin-right: 10px;
+}
 </style>
diff --git a/src/views/fys-equipment/fenceAccessRecord/index.vue b/src/views/fys-equipment/fenceAccessRecord/index.vue
index 56fae95..add4a91 100644
--- a/src/views/fys-equipment/fenceAccessRecord/index.vue
+++ b/src/views/fys-equipment/fenceAccessRecord/index.vue
@@ -3,8 +3,8 @@
     <div class="percent100">
       <div class="topTool">
         <div class="button-row">
-          <el-button type="primary" @click.stop="ShowEdit(null)"
-            ><el-icon><Plus /></el-icon>新增</el-button
+          <!-- <el-button type="primary" @click.stop="ShowEdit(null)"
+            ><el-icon><Plus /></el-icon>新增</el-button -->
           >
           <el-button type="primary" @click.stop="Export()" plain
             ><el-icon><Download /></el-icon>导出</el-button
@@ -16,7 +16,7 @@
         <div>
           <el-form :inline="true" :model="queryParams" class="demo-form-inline" @submit.native.prevent>
             <el-form-item label="" style="margin-right: 15px">
-              <el-input :suffix-icon="'Search'" v-model="queryParams.fenceName" placeholder="名称" clearable @keyup.enter.stop="handleQuery" />
+              <el-input :suffix-icon="'Search'" v-model="queryParams.fenceName" placeholder="名称" clearable @input="handleQuery" />
             </el-form-item>
 
             <el-form-item style="margin-right: 0px">
@@ -76,7 +76,7 @@
         <el-table-column label="围栏名称" align="center" prop="fenceName"> </el-table-column>
 
         <el-table-column label="设备名称" align="center" prop="deviceName"> </el-table-column>
-        <!-- <el-table-column label="人员名称" align="center" prop="userName"> </el-table-column> -->
+        <el-table-column label="事件时间" align="center" prop="eventTime"> </el-table-column>
         <el-table-column label="事件类型" align="center" prop="eventType">
           <template #default="scope">
             <div>{{ scope.row.eventType == '1' ? '闯入' : '离开' }}</div>
@@ -93,7 +93,7 @@
 
         <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="ShowEdit(scope.row)">编辑</el-button>
+            <!-- <el-button link type="primary" @click="ShowEdit(scope.row)">编辑</el-button> -->
             <el-button link type="danger" @click="DropFence(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -280,8 +280,9 @@ function CloseEdit() {
 //响应查询
 var queryTime = null;
 function handleQuery() {
+  debugger;
   clearTimeout(queryTime);
-  queryTime = setTimeout(getList, 500);
+  queryTime = setTimeout(getList, 200);
 }
 
 //重置查询条件
@@ -302,6 +303,7 @@ function resetQuery() {
   keys.forEach((k) => {
     queryParams[k] = cfg[k];
   });
+  handleQuery();
 }
 
 //--------------------------------------
diff --git a/src/views/fys-equipment/geoFence/index.vue b/src/views/fys-equipment/geoFence/index.vue
index 2879793..459dafd 100644
--- a/src/views/fys-equipment/geoFence/index.vue
+++ b/src/views/fys-equipment/geoFence/index.vue
@@ -16,7 +16,8 @@
         <div>
           <el-form :inline="true" :model="queryParams" class="demo-form-inline" @submit.native.prevent>
             <el-form-item label="" style="margin-right: 15px">
-              <el-input :suffix-icon="'Search'" v-model="queryParams.name" placeholder="名称" clearable @keyup.enter.stop="handleQuery" />
+              <el-input :suffix-icon="'Search'" v-model="queryParams.name" placeholder="名称" clearable
+                @input="handleQuery"/>
             </el-form-item>
 
             <el-form-item style="margin-right: 0px">
@@ -107,8 +108,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="半径(米)" :class="cEdit.areaType == 1 ? '' : 'displayNone'">
-            <el-input v-model="cEdit.radius" @keydown="refreshOverLayer" />
+          <el-form-item label="半径(米)">
+            <el-input v-model="cEdit.radius" @keydown="refreshOverLayer" :disabled="cEdit.areaType !== 1" />
           </el-form-item>
 
           <el-form-item label="是否激活">
@@ -118,8 +119,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="备注" style="width: 350px">
-            <el-input v-model="cEdit.description" type="textarea" />
+          <el-form-item label="备注">
+            <el-input v-model="cEdit.description" />
           </el-form-item>
         </el-form>
       </div>
@@ -133,7 +134,7 @@
         >
       </div>
       <div class="map" id="map"></div>
-      <div class="center" style="margin-top: 20px">
+      <div class="center footerBtn" style="margin-top: 20px">
         <el-button type="primary" @click="SaveFormData"> 确定 </el-button>
         <el-button type="primary" plain @click="CloseEdit"> 取消 </el-button>
       </div>
@@ -195,7 +196,7 @@ var cEdit = reactive({
   description: '',
   areaType: null,
   coordinates: [],
-  radius: null,
+  radius: undefined,
   isActive: null
 });
 
@@ -277,7 +278,7 @@ function CloseEdit() {
 var queryTime = null;
 function handleQuery() {
   clearTimeout(queryTime);
-  queryTime = setTimeout(getList, 500);
+  queryTime = setTimeout(getList, 300);
 }
 
 //重置查询条件
@@ -292,12 +293,14 @@ function resetQuery() {
   keys.forEach((k) => {
     queryParams[k] = cfg[k];
   });
+  handleQuery();
 }
 
 //--------------------------------------
 //修改围栏类型时，清空所有坐标
 function areaTypeChange() {
   cEdit.coordinates = [];
+  cEdit.radius = undefined;
   map.clearOverLays();
 }
 //圆大小改变时，更新半径字段
@@ -340,6 +343,10 @@ function AddPoint(point, i) {
     return;
   }
 
+  if (!point && cEdit.areaType == 1 && !cEdit.radius) {
+    cEdit.radius = 1000;
+  }
+
   let index = i !== undefined ? i : cEdit.coordinates.length;
   let dragEnd = (evt, lay) => {
     map.removePoy();
@@ -378,7 +385,7 @@ function SaveFormData() {
     return;
   }
 
-  if (cEdit.areaType == 0 && cEdit.coordinates.length == 0) {
+  if (cEdit.areaType == 1 && cEdit.coordinates.length == 0) {
     alert('圆形的围栏至少需要1个点');
     return;
   }
@@ -419,17 +426,29 @@ function DropFence(item) {
     alert('请选择要删除的数据');
     return;
   }
-  arr = arr
-    .map((v) => {
-      return v.id;
-    })
-    .join(',');
-  api.DelFence(arr).then((res) => {
-    if (res.code == 200) {
-      handleQuery();
-    }
-    alert(res.msg);
-  });
+
+  let execDelete=()=>{
+
+    arr = arr
+      .map((v) => {
+        return v.id;
+      })
+      .join(',');
+    api.DelFence(arr).then((res) => {
+      if (res.code == 200) {
+        handleQuery();
+      }
+      alert(res.msg);
+    });
+  }
+
+   confirm(
+    '删除后不可恢复,您确认?',
+    execDelete,
+    null,
+    '提示'
+  );
+
 }
 
 function getList() {
@@ -590,7 +609,7 @@ onMounted(() => {
 
 .map {
   width: 100%;
-  height: 58vh;
+  height: calc(58vh - 50px);
   box-sizing: border-box;
   border: 1px solid #7371719e;
   border-radius: 8px;
@@ -621,4 +640,15 @@ onMounted(() => {
 :deep .point:hover {
   filter: hue-rotate(169deg);
 }
+:deep .el-dialog__body,
+.el-dialog__body {
+  position: relative;
+}
+:deep .el-dialog__body .footerBtn,
+.el-dialog__body .footerBtn {
+  //  position: absolute;
+  //  bottom: 0px;
+  //  width: 100%;
+  //  left: 0px;
+}
 </style>
diff --git a/src/views/fys-equipment/group/index.vue b/src/views/fys-equipment/group/index.vue
index d15669f..9799273 100644
--- a/src/views/fys-equipment/group/index.vue
+++ b/src/views/fys-equipment/group/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="content" >
+  <div class="content">
     <div class="leftTree fleft">
       <div class="head">
         <div class="title">设备分组</div>
@@ -7,44 +7,36 @@
       </div>
       <div class="Search">
         <input type="text" class="txt" v-model="searchTxt" placeholder="输入分组名称" />
-
       </div>
 
       <div class="treeContent">
         <el-tree :data="treeData" :props="defaultProps" accordion @node-click="handleNodeClick" :highlight-current="true">
           <template #default="{ node, data }">
-
-            <div class="custom-tree-node" >
+            <div class="custom-tree-node">
               <span :class="data.parentId != null ? '' : 'treeBold'">{{ node.label }}</span>
 
               <div class="iconContent">
-
                 <Edit class="icon" @click.stop="editNode(node)" />
                 <Plus class="icon" @click.stop="addNode(node)" />
                 <Delete class="icon red" @click.stop="delNode(node)" />
-
               </div>
             </div>
-
           </template>
         </el-tree>
       </div>
-
-
     </div>
 
-
     <div class="main fleft">
       <div class="toolBar">
         <div class="btnAdd" @click="showDevice">
-          <Plus class="icon" style="width: 14px;height: 14px;" />
+          <Plus class="icon" style="width: 14px; height: 14px" />
           添加设备
         </div>
         <div class="rightSearch">
           <div class="searchContent">
             <div class="center H100">
               <input type="text" class="serchTxt" v-model="GjSearchForm.deviceName" @input="InputSearch()" />
-              <Search class="icon" style="width: 16px;height:16px;" />
+              <Search class="icon" style="width: 16px; height: 16px" />
             </div>
           </div>
 
@@ -53,10 +45,8 @@
       </div>
 
       <div class="searchBar" :class="Status.isGjSearch ? '' : 'displayNone'">
-        <div style="margin-top:20px;">
-          <el-form class="demo-form-inline" :inline="true" :model="GjSearchForm" label-width="auto"
-            style="width: 100%;">
-
+        <div style="margin-top: 20px">
+          <el-form class="demo-form-inline" :inline="true" :model="GjSearchForm" label-width="auto" style="width: 100%">
             <el-form-item label="设备类型">
               <el-select v-model="GjSearchForm.deviceType" placeholder="请选择">
                 <el-option v-for="item in deviceTypes" :key="item.value" :label="item.typeName" :value="item.value" />
@@ -70,33 +60,30 @@
               </el-select>
             </el-form-item>
             <el-form-item>
-
               <div class="btnSearch" @click="getDeviceList()">查询</div>
               <div class="btnReset" @click="ResetQuery()">重置</div>
             </el-form-item>
-
           </el-form>
         </div>
-
       </div>
 
       <div class="grid">
         <el-card shadow="hover">
           <div class="gridTool">
-
-
-
-
             <div class="button-row">
-
               <el-button type="success" @click="showCheckGroup('check')" plain>移动</el-button>
 
               <el-button type="danger" plain @click="groupDelDevice()">删除</el-button>
             </div>
-
           </div>
-          <el-table ref="grid" height="calc(100vh - 320px)" v-loading="Status.loading" border :data="deviceList"
-            @selection-change="RowSelectionChange">
+          <el-table
+            ref="grid"
+            height="calc(100vh - 320px)"
+            v-loading="Status.loading"
+            border
+            :data="deviceList"
+            @selection-change="RowSelectionChange"
+          >
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column label="设备名称" align="center" prop="deviceName" />
 
@@ -104,9 +91,11 @@
               <template #default="scope">
                 <el-popover placement="right" trigger="click">
                   <template #reference>
-                    <img :src="scope.row.devicePic"
+                    <img
+                      :src="scope.row.devicePic"
                       style="width: 40px; height: 40px; cursor: pointer; object-fit: contain"
-                      class="hover:opacity-80 transition-opacity" />
+                      class="hover:opacity-80 transition-opacity"
+                    />
                   </template>
                   <img :src="scope.row.devicePic" style="max-width: 600px; max-height: 600px; object-fit: contain" />
                 </el-popover>
@@ -122,27 +111,28 @@
               </template>
             </el-table-column>
 
-
             <el-table-column label="操作" fixed="right" width="280" class-name="small-padding fixed-width">
               <template #default="scope">
                 <div class="center">
-                  <div class="moveDev" @click="showCheckGroup('item', scope.row)">移动</div>
-                  <div class="delDev" @click="groupDelDevice(scope.row)">删除</div>
+                  <el-button link type="primary" @click="showCheckGroup('item', scope.row)">移动</el-button>
+                  <el-button link type="danger" @click="groupDelDevice(scope.row)">删除</el-button>
                 </div>
-
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="pagin.total > 0" v-model:page="GjSearchForm.pageNum" v-model:limit="GjSearchForm.pageSize"
-            :total="pagin.total" @pagination="getDeviceList" />
+          <pagination
+            v-show="pagin.total > 0"
+            v-model:page="GjSearchForm.pageNum"
+            v-model:limit="GjSearchForm.pageSize"
+            :total="pagin.total"
+            @pagination="getDeviceList"
+          />
         </el-card>
-
       </div>
     </div>
 
     <div class="clear"></div>
 
-
     <!-- 提示框 -->
     <el-dialog :width="300" :draggable="true" v-model="Status.confirm.Visible" :title="Status.confirm.title" width="500" center>
       <span>
@@ -151,58 +141,57 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button v-show="Status.confirm.showCancel" @click="Status.confirm.cancelCallback">取消</el-button>
-          <el-button type="primary" @click="Status.confirm.OkCallback">
-            确定
-          </el-button>
+          <el-button type="primary" @click="Status.confirm.OkCallback"> 确定 </el-button>
         </div>
       </template>
     </el-dialog>
 
     <!-- 选择分组的弹窗 -->
     <el-dialog v-model="Status.dialogGroupVisible" title="选择分组" width="500" :draggable="true">
-
       <el-tree :data="treeData" :props="defaultProps" accordion>
         <template #default="{ node, data }">
-
           <div class="custom-tree-node" @click.stop="CheckGroup(data)">
             <span :class="data.parentId != null ? '' : 'treeBold'">{{ node.label }}</span>
             <span>选择</span>
           </div>
-
         </template>
       </el-tree>
-      <el-button type="primary" @click="OkCheckGroup()">
-        确定
-      </el-button>
-      <el-button type="primary" @click="CancelCheckGroup()">
-        取消
-      </el-button>
+      <el-button type="primary" @click="OkCheckGroup()"> 确定 </el-button>
+      <el-button type="primary" @click="CancelCheckGroup()"> 取消 </el-button>
     </el-dialog>
 
     <!-- 选择设备的穿梭框 -->
     <el-dialog v-model="Status.dialogDeviceVisible" title="选择设备" width="800" :draggable="true">
-
       <el-transfer :titles="['所有设备', '已选择设备']" v-model="transfer.value" :data="transfer.data" :filterable="true" />
 
-      <div class="center" style="margin-top: 10px;">
-        <el-button type="primary" @click="OKCheckDevice()">
-          确定
-        </el-button>
-        <el-button type="info" @click="hideDevice()">
-          取消
-        </el-button>
+      <div class="center" style="margin-top: 10px">
+        <el-button type="primary" @click="OKCheckDevice()"> 确定 </el-button>
+        <el-button type="info" @click="hideDevice()"> 取消 </el-button>
       </div>
-
-
     </el-dialog>
 
+    <!-- 添加节点的弹出框 -->
+    <el-dialog :width="350" :draggable="true" v-model="Status.dialogEditNode" :title="cEdit.id ? '修改分组' :(cEdit.pNode?'新增子节点': '新增根节点')" center>
+      <div>
+        <el-form class="demo-form-inline" :inline="true" :model="cEdit" label-width="auto" style="width: 100%">
+          <el-form-item label="分组名称"> <el-input v-model="cEdit.groupName" placeholder="请输入" /> </el-form-item
+        >
+        <div style="text-indent: 68px;color: #f56c6c;margin-top: -15px;">{{ cEdit.groupName?'':'请输入分组名称' }}</div>
+      </el-form>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button v-show="Status.confirm.showCancel" @click="Status.dialogEditNode = false">取消</el-button>
+          <el-button type="primary" @click="saveNode()"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup lang="ts">
-
 import api from '@/api/equipmentManagement/devicegroup/index';
-import common from '@/utils/common'
+import common from '@/utils/common';
 
 interface Device {
   deviceName: string;
@@ -211,19 +200,18 @@ interface Device {
   bindingStatus: string;
 }
 
-
-var searchTxt = ref('');  //左侧树筛选文本
+var searchTxt = ref(''); //左侧树筛选文本
 var treeDataOrin = ref([]); //树控件的数据源
 var grid = ref(null);
 
-var cEdit = ref({ val: "", txt: "" });//当前正在编辑的节点数据
+var cEdit = ref({ id: '', groupName: '', pNode: null, editNode: null }); //当前正在编辑的节点数据
 
-var checkNode = { val: '' };//记录被选中的节点
+var checkNode = { val: '' }; //记录被选中的节点
 
 //全局状态控制
 var Status = reactive({
-  isEditTreeNode: false,//是否编辑节点
-  isGjSearch: false,//是否显示高级筛选
+  isEditTreeNode: false, //是否编辑节点
+  isGjSearch: false, //是否显示高级筛选
   loading: false,
   confirm: {
     Visible: false,
@@ -233,18 +221,19 @@ var Status = reactive({
     OkCallback: '',
     showCancel: true
   },
-  dialogGroupVisible: false,//是否显示选择分组的弹窗
-  dialogDeviceVisible: false//是否显示选择设备的弹窗
+  dialogGroupVisible: false, //是否显示选择分组的弹窗
+  dialogDeviceVisible: false, //是否显示选择设备的弹窗
+  dialogEditNode: false //是否显示添加节点的弹窗
 });
 //页码控件数据
 var pagin = reactive({
-  total: 0,
+  total: 0
 });
 //右边的筛选条件
 var GjSearchForm = reactive({
   deviceName: '',
-  deviceType: "",
-  netMode: "",
+  deviceType: '',
+  netMode: '',
   pageNum: 1,
   pageSize: 10
 });
@@ -257,7 +246,6 @@ var deviceTypes = reactive([]);
 var transfer = reactive({
   value: [],
   data: []
-
 });
 
 window.confirm = function (text, OK, cancel, title) {
@@ -278,13 +266,12 @@ window.confirm = function (text, OK, cancel, title) {
         cancel();
       }
     }
-  }
+  };
 
   Status.confirm = Cfg;
-}
+};
 
 window.alert = function (text, OK, title) {
-
   let Cfg = {
     Visible: true,
     title: title ? title : '提示',
@@ -297,43 +284,41 @@ window.alert = function (text, OK, title) {
     },
     showCancel: false,
     cancelCallback: null
-  }
+  };
 
   Status.confirm = Cfg;
-}
+};
 
 var hideConfirm = function () {
-
   let Cfg = {
     Visible: false,
     title: '提示',
-    text: "",
+    text: '',
     cancelCallback: null,
     OkCallback: null
-  }
+  };
 
   Status.confirm = Cfg;
-}
+};
 
 var showloading = function () {
   // window.loadingIndex = ElLoading.service({ fullscreen: true })
 
-  Status.loading=true;
-
-}
+  Status.loading = true;
+};
 
 var closeLoading = function () {
   // if (window.loadingIndex) {
   //   window.loadingIndex.close();
   // }
 
-     Status.loading=false;
-}
+  Status.loading = false;
+};
 var hideloading = closeLoading;
 
 function ResetQuery() {
-  GjSearchForm.deviceType = "";
-  GjSearchForm.netMode = "";
+  GjSearchForm.deviceType = '';
+  GjSearchForm.netMode = '';
 }
 //查询某个节点的设备
 var getDeviceList = () => {
@@ -350,29 +335,30 @@ var getDeviceList = () => {
     communicationMode: GjSearchForm.netMode,
     deviceType: GjSearchForm.deviceType,
     deviceName: GjSearchForm.deviceName
-  }
+  };
   showloading();
-  api.getNodeDevice(para).then((res) => {
-    deviceList.value = res.rows;
-    pagin.total = res.total;
-  }).catch((ex) => {
-    console.log("出现了异常", ex);
-  }).finally(() => {
-    hideloading();
-  });
-
-
-}
+  api
+    .getNodeDevice(para)
+    .then((res) => {
+      deviceList.value = res.rows;
+      pagin.total = res.total;
+    })
+    .catch((ex) => {
+      console.log('出现了异常', ex);
+    })
+    .finally(() => {
+      hideloading();
+    });
+};
 //树控件节点点击事件
 var handleNodeClick = (node) => {
-  
   if (checkNode.val == node.id) {
     return;
   }
-  console.log("节点数据：", node.id);
+  console.log('节点数据：', node.id);
   checkNode.val = node.id;
   getDeviceList();
-}
+};
 
 //树控件筛选后显示的数据源
 var treeData = computed(() => {
@@ -383,238 +369,232 @@ var treeData = computed(() => {
 //显示/隐藏高级筛选
 var ToggleGjSearch = function () {
   Status.isGjSearch = !Status.isGjSearch;
-}
+};
 
 //编辑节点
 var editNode = (node) => {
-
-  console.log("编辑节点：", node.data.value);
-  cEdit.value.val = node.data.id;
-  cEdit.value.txt = node.data.groupName;
+  console.log('编辑节点：', node.data.value);
+  cEdit.value.id = node.data.id;
+  cEdit.value.groupName = node.data.groupName;
   Status.isEditTreeNode = true;
-
-
-  ElMessageBox.prompt('请输入名称', '编辑分组', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    inputValue: node.data.groupName
-  })
-    .then(({ value }) => {
-
-      cEdit.value.txt = value;
-      completeEdit(node);
-    });
+  cEdit.value.editNode = node;
+  cEdit.value.pNode = null;
+  Status.dialogEditNode=true;
   //
-}
+};
+
 //完成编辑
 var completeEdit = (node) => {
+  let now = common.DateFormat(new Date(), 'yyyy-MM-dd HH:mm:ss');
 
-
-  let now =common.DateFormat(new Date(), "yyyy-MM-dd HH:mm:ss");
-
-  let newNode =
-  {
-    "createDept": node.data.createDept,//创建部门
-    "createBy": node.data.createBy,//创建者
-    "createTime": now,//创建时间
-    "updateBy": node.data.updateBy,//更新者
-    "updateTime": now,//更新时间
-    "params": {
-      "additionalProp1": "",
-      "additionalProp2": "",
-      "additionalProp3": ""
+  let newNode = {
+    'createDept': node.data.createDept, //创建部门
+    'createBy': node.data.createBy, //创建者
+    'createTime': now, //创建时间
+    'updateBy': node.data.updateBy, //更新者
+    'updateTime': now, //更新时间
+    'params': {
+      'additionalProp1': '',
+      'additionalProp2': '',
+      'additionalProp3': ''
     },
-    "id": node.data.id,//主键ID
-    "groupName": cEdit.value.txt,//分组名称
-    "status": 1,//状态：0-禁用，1-正常
-    "parentId": node.data.parentId,//父分组ID
-    "fullPath": node.data.fullPath,//完整分组路径
-    "isDeleted": 0//删除标记：0-未删除，1-已删除
+    'id': node.data.id, //主键ID
+    'groupName': cEdit.value.groupName, //分组名称
+    'status': 1, //状态：0-禁用，1-正常
+    'parentId': node.data.parentId, //父分组ID
+    'fullPath': node.data.fullPath, //完整分组路径
+    'isDeleted': 0 //删除标记：0-未删除，1-已删除
   };
 
   showloading();
-  api.updateTreeName(treeDataOrin.value, newNode, cEdit.value.txt).then((res) => {
-    if (res.code == 200) {
-      alert("操作成功");
-      RefreshTree();
-    } else {
-      alert(res.msg);
-    }
-  }).finally(() => {
-    hideloading();
-  });
-  Status.isEditTreeNode = false;
-}
-
-//放弃编辑
-var cancelEdit = (node) => {
-  cEdit.value.val = "";
-  cEdit.value.txt = "";
-  Status.isEditTreeNode = false;
-}
-
-//删除节点
-var delNode = (node) => {
-  
-  if (node.data.children && node.data.children.length > 0) {
-    alert("节点包含子节点,不允许删除");
-    return;
-  }
-  confirm("您确认删除’" + node.data.groupName + "’节点吗", () => {
-    
-    hideConfirm();
-
-    api.delTreeNode(treeDataOrin.value, node.data.id).then((res) => {
+  api
+    .updateTreeName(treeDataOrin.value, newNode, cEdit.value.groupName)
+    .then((res) => {
       if (res.code == 200) {
-        alert("操作成功");
+        alert('操作成功');
         RefreshTree();
+        Status.dialogEditNode=false;
       } else {
         alert(res.msg);
       }
+    })
+    .finally(() => {
+      hideloading();
     });
-  }, () => {
-    hideConfirm();
-  });
+  Status.isEditTreeNode = false;
+};
 
+//放弃编辑
+var cancelEdit = (node) => {
+  cEdit.value.id = '';
+  cEdit.value.groupName = '';
+  cEdit.value.pNode = null;
+  cEdit.value.editNode = null;
+  Status.isEditTreeNode = false;
+};
 
+//删除节点
+var delNode = (node) => {
+  if (node.data.children && node.data.children.length > 0) {
+    alert('节点包含子节点,不允许删除');
+    return;
+  }
+  confirm(
+    '您确认删除’' + node.data.groupName + '’节点吗',
+    () => {
+      hideConfirm();
 
-}
+      api.delTreeNode(treeDataOrin.value, node.data.id).then((res) => {
+        if (res.code == 200) {
+          alert('操作成功');
+          RefreshTree();
+        } else {
+          alert(res.msg);
+        }
+      });
+    },
+    () => {
+      hideConfirm();
+    }
+  );
+};
 
 //增加节点
 var addNode = (node) => {
   let title = '';
   if (node) {
-    console.log("给节点新增子节点：", node.data.id);
+    console.log('给节点新增子节点：', node.data.id);
     title = '添加子节点';
+  } else {
+    console.log('新增初级节点');
+    title = '添加根节点';
   }
-  else {
-    console.log("新增初级节点")
-    title = '添加根节点'
+  cEdit.value.pNode = node;
+  cEdit.value.editNode = null;
+  cEdit.value.id = '';
+  cEdit.value.groupName = '';
+  Status.dialogEditNode = true;
+};
+
+var saveNode = () => {
+  if(!cEdit.value.groupName){
+    return;
   }
   let val = new Date().getTime();
   // let newNode = { value: val, txt: '' };
-  let now =common.DateFormat(new Date(), "yyyy-MM-dd HH:mm:ss");
+  let now = common.DateFormat(new Date(), 'yyyy-MM-dd HH:mm:ss');
 
-
-
-  ElMessageBox.prompt('请输入名称', title, {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消'
-
-  })
-    .then(({ value }) => {
-      
-      if (!value) {
-        alert("请输入分组名称");
-        return;
-      }
-      let newNode =
-      {
-        "createDept": 0,//创建部门
-        "createBy": 0,//创建者
-        "createTime": now,//创建时间
-        "updateBy": 0,//更新者
-        "updateTime": now,//更新时间
-        "params": {
-          "additionalProp1": "",
-          "additionalProp2": "",
-          "additionalProp3": ""
-        },
-        "id": null,//主键ID
-        "groupName": value,//分组名称
-        "status": 1,//状态：0-禁用，1-正常
-        "parentId": node ? node.data.id : null,//父分组ID
-        "fullPath": val,//完整分组路径
-        "isDeleted": 0,//删除标记：0-未删除，1-已删除
-
-      };
-      showloading();
-      api.addTreeNode(treeDataOrin.value, newNode, node ? node.data.id : null).then((res) => {
+  showloading();
+  if (cEdit.value.id) {
+    //编辑
+    completeEdit(cEdit.value.editNode);
+  } else {
+    //新增
+    let newNode = {
+      'createDept': 0, //创建部门
+      'createBy': 0, //创建者
+      'createTime': now, //创建时间
+      'updateBy': 0, //更新者
+      'updateTime': now, //更新时间
+      'params': {
+        'additionalProp1': '',
+        'additionalProp2': '',
+        'additionalProp3': ''
+      },
+      'id': null, //主键ID
+      'groupName': cEdit.value.groupName, //分组名称
+      'status': 1, //状态：0-禁用，1-正常
+      'parentId': cEdit.value.pNode ? cEdit.value.pNode.data.id : null, //父分组ID
+      'fullPath': val, //完整分组路径
+      'isDeleted': 0 //删除标记：0-未删除，1-已删除
+    };
+    api
+      .addTreeNode(treeDataOrin.value, newNode, cEdit.value.pNode ? cEdit.value.pNode.data.id : null)
+      .then((res) => {
         if (res.code == 200) {
-          alert("操作成功");
+          alert('操作成功');
           RefreshTree();
+          Status.dialogEditNode = false;
         } else {
           alert(res.msg);
         }
-      }).catch((ex) => {
-        console.log("ex=", ex);
-
-      }).finally(() => {
+      })
+      .catch((ex) => {
+        console.log('ex=', ex);
+      })
+      .finally(() => {
         hideloading();
       });
-    });
-}
-
-
-
+  }
+};
 
 //树控件的自定义属性
 var defaultProps = {
   children: 'children',
   label: 'groupName',
-  parentId: "parentId"
-}
+  parentId: 'parentId'
+};
 
 var RowSelectionChange = (tr) => {
-  
-  console.log("行选中变化", tr);
+  console.log('行选中变化', tr);
   getSelectionRows();
 };
 
-
-
 var getSelectionRows = () => {
-
-  if (grid.value) { // 检查ref是否已正确引用组件实例
+  if (grid.value) {
+    // 检查ref是否已正确引用组件实例
     var selectedRows = grid.value.getSelectionRows(); // 获取选中行数据数组
     return selectedRows;
   }
   return [];
-}
-
+};
 
 var RefreshTree = function () {
   api.getTreeData(searchTxt.value).then((res) => {
     treeDataOrin.value = res;
-
   });
-}
+};
 
 //从分组中删除设备
 var groupDelDevice = (row) => {
-
-  let rows = [];//
+  let rows = []; //
   if (!row) {
     rows = getSelectionRows();
   } else {
     rows = [row];
   }
   if (rows.length == 0) {
-    alert("请选择要删除的设备");
+    alert('请选择要删除的设备');
     return;
   }
 
-
-  confirm("此操作不可逆,您确认要进行吗?", () => {
-    showloading();
-    let ids = rows.map(r => r.deviceId).join(",");
-    api.groupDelDevice(checkNode.val, ids).then((res) => {
-      if (res.code == 200) {
-        alert("操作成功");
-        getDeviceList();
-      } else {
-        alert(res.msg);
-      }
-    }).finally(() => {
-      hideloading();
-    });
-  }, null, "警告");
-
-}
+  confirm(
+    '此操作不可逆,您确认要进行吗?',
+    () => {
+      showloading();
+      let ids = rows.map((r) => r.deviceId).join(',');
+      api
+        .groupDelDevice(checkNode.val, ids)
+        .then((res) => {
+          if (res.code == 200) {
+            alert('操作成功');
+            getDeviceList();
+          } else {
+            alert(res.msg);
+          }
+        })
+        .finally(() => {
+          hideloading();
+        });
+    },
+    null,
+    '警告'
+  );
+};
 
 var showDevice = () => {
-  if(!checkNode.val){
-    alert("请先选择分组");
+  if (!checkNode.val) {
+    alert('请先选择分组');
     return;
   }
   Status.dialogDeviceVisible = true;
@@ -622,7 +602,7 @@ var showDevice = () => {
   let promise1 = api.getNodeDevice({
     pageIndex: 1,
     pageSize: 9999,
-    nodeCode: ""
+    nodeCode: ''
   });
   //获取已选中的
   let promise2 = api.getNodeDevice({
@@ -634,66 +614,51 @@ var showDevice = () => {
   cGroupAndDevice.deviceIds = [];
   transfer.value = [];
 
-  Promise.allSettled([promise1, promise2]).then(res => {
-
+  Promise.allSettled([promise1, promise2]).then((res) => {
     if (res[0].status == 'fulfilled') {
       let res1 = res[0].value;
 
-
       if (res1.code == 200) {
-        let arr = res1.rows.map(item => ({
+        let arr = res1.rows.map((item) => ({
           key: item.deviceId,
-          label: item.deviceName//,
+          label: item.deviceName //,
           // disabled: item.groupId && item.groupId == checkNode.val ? false : item.groupId ? true : false
         }));
 
         transfer.data = arr;
-
       }
-
     }
 
     if (res[1].status == 'fulfilled') {
       let res2 = res[1].value;
       if (res2.code == 200) {
-        
-        let vals = res2.rows.map(item => item.deviceId);
+        let vals = res2.rows.map((item) => item.deviceId);
 
         transfer.value = vals;
-
       }
-
-
     }
   });
-
-
-
-}
+};
 
 //确认选择这些设备
 var OKCheckDevice = () => {
-
-  
-
-  let arr = transfer.value.map(item => ({
+  let arr = transfer.value.map((item) => ({
     deviceId: item
   }));
   if (arr.length == 0) {
-    alert("未选择任何设备");
+    alert('未选择任何设备');
     return;
   }
   hideDevice();
   cGroupAndDevice.deviceIds = arr;
   cGroupAndDevice.groupid = checkNode.val;
   deviceMoveGroup(cGroupAndDevice.groupid, cGroupAndDevice.deviceIds);
-}
+};
 
 //隐藏选择设备
 var hideDevice = () => {
   Status.dialogDeviceVisible = false;
-
-}
+};
 
 var cGroupAndDevice = {
   groupid: '',
@@ -707,37 +672,35 @@ var showCheckGroup = (type, row) => {
   }
 
   if (rows.length == 0) {
-    alert("请选择要移动的设备");
+    alert('请选择要移动的设备');
     return;
   }
   cGroupAndDevice.deviceIds = rows;
   Status.dialogGroupVisible = true;
 
-
-  cGroupAndDevice.groupid = "";
-}
+  cGroupAndDevice.groupid = '';
+};
 //选中了某个分组
 var CheckGroup = (item) => {
-
   cGroupAndDevice.groupid = item.id;
-}
+};
 
 //确定选中某个分组
 var OkCheckGroup = () => {
   if (!cGroupAndDevice.groupid) {
-    alert("请先选择分组");
+    alert('请先选择分组');
     return;
   }
   CancelCheckGroup();
   deviceMoveGroup(cGroupAndDevice.groupid, cGroupAndDevice.deviceIds);
-}
+};
 //隐藏选择分组
 var CancelCheckGroup = () => {
-  Status.dialogGroupVisible = false
-}
+  Status.dialogGroupVisible = false;
+};
 //将设备移动至分组
 var deviceMoveGroup = (groupid, row) => {
-  let rows = [];//
+  let rows = []; //
   if (!row) {
     rows = getSelectionRows();
   } else {
@@ -746,62 +709,60 @@ var deviceMoveGroup = (groupid, row) => {
     } else {
       rows = [row];
     }
-
   }
   if (rows.length == 0) {
-    alert("请选择要移动的设备");
+    alert('请选择要移动的设备');
     return;
   }
 
-
   // confirm("此操作不可逆,您确认要进行吗?", () => {
   showloading();
-  let ids = rows.map(r => r.deviceId).join(",");
-  api.deviceMoveGroup(groupid, ids).then((res) => {
-    if (res.code == 200) {
-      alert("操作成功");
-      getDeviceList();
-    } else {
-      alert(res.msg);
-    }
-  }).finally(() => {
-    hideloading();
-  });
+  let ids = rows.map((r) => r.deviceId).join(',');
+  api
+    .deviceMoveGroup(groupid, ids)
+    .then((res) => {
+      if (res.code == 200) {
+        alert('操作成功');
+        getDeviceList();
+      } else {
+        alert(res.msg);
+      }
+    })
+    .finally(() => {
+      hideloading();
+    });
   // }, null, "警告");
+};
+
+let timer;
+function InputSearch() {
+  clearTimeout(timer);
+  // 等待 500ms 无输入后执行查询
+  timer = setTimeout(() => {
+    getDeviceList();
+  }, 500);
 }
 
-
-  let timer;
-  function InputSearch() {
-    clearTimeout(timer);
-    // 等待 500ms 无输入后执行查询
-    timer = setTimeout(() => {
-      getDeviceList();
-    }, 500);
-  }
-
 onMounted(() => {
   RefreshTree();
   api.getDeviceTypeAll().then((res) => {
     if (res.code == 200) {
-      deviceTypes = res.data.map(item => ({
+      deviceTypes = res.data.map((item) => ({
         value: item.deviceTypeId,
         typeName: item.typeName
-      }))
+      }));
     }
   });
-
 });
 </script>
 
-
 <style lang="scss" scoped>
 .main .searchBar .btnReset {
   width: 76px;
   height: 32px;
   border-radius: 4px;
   background-color: #00000000;
-  color: #027CFB;
+  color: #027cfb;
   text-align: center;
   font-family: Microsoft YaHei;
   font-size: 14px;
@@ -817,8 +778,8 @@ onMounted(() => {
   width: 76px;
   height: 32px;
   border-radius: 4px;
-  background-color: #027CFB;
-  color: #FFFFFF;
+  background-color: #027cfb;
+  color: #ffffff;
   text-align: center;
   font-family: Microsoft YaHei;
   font-size: 14px;
@@ -851,7 +812,6 @@ onMounted(() => {
   align-items: center;
 }
 
-
 .main .toolBar .gjSearch {
   /* 矩形 155 */
   width: 85px;
@@ -880,12 +840,11 @@ onMounted(() => {
   border: none;
   width: 175px;
   height: 100%;
-
 }
 
 .main .toolBar .btnAdd {
-  background-color: #027CFB;
-  color: #FFFFFF;
+  background-color: #027cfb;
+  color: #ffffff;
   width: 105px;
   height: 32px;
   text-align: center;
@@ -920,7 +879,7 @@ onMounted(() => {
 }
 
 .red {
-  color: #FF0000;
+  color: #ff0000;
 }
 
 .green {
@@ -941,10 +900,9 @@ onMounted(() => {
 
 .custom-tree-node.active {
   background: #80bcf966 !important;
-  color: #FFFFFF;
+  color: #ffffff;
 }
 
-
 .custom-tree-node .iconContent {
   width: 60px;
   height: 100%;
@@ -956,7 +914,6 @@ onMounted(() => {
   align-content: center;
   justify-content: space-evenly;
   align-items: center;
-
 }
 
 .custom-tree-node .iconContent .icon {
@@ -1088,7 +1045,7 @@ input:focus {
   width: 100%;
   min-height: calc(100vh - 84px);
   height: calc(100vh - 84px);
-  background-color: #FFFFFF;
+  background-color: #ffffff;
   font-size: 16px;
   box-sizing: border-box;
   padding: 8px 20px;
@@ -1134,7 +1091,6 @@ input:focus {
   font-weight: 400;
 
   letter-spacing: 0px;
-
 }
 
 .gridTool {
@@ -1144,4 +1100,9 @@ input:focus {
 :deep .el-tree-node__content {
   height: auto !important;
 }
+
+:deep .is-link,
+.is-link {
+  cursor: pointer;
+}
 </style>

From 2fc3d4ae67a568db353ef79ffe062808920bfd08 Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Tue, 23 Sep 2025 08:21:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E6=80=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipmentManagement/repairRecords/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/equipmentManagement/repairRecords/index.vue b/src/views/equipmentManagement/repairRecords/index.vue
index ab3526b..9bbf38c 100644
--- a/src/views/equipmentManagement/repairRecords/index.vue
+++ b/src/views/equipmentManagement/repairRecords/index.vue
@@ -709,8 +709,7 @@ function SaveFormData() {
         let file = beforeFile.value[i];
         if(file && !file.id){
           formData.append('beforeFile', file);
-        }
-        
+        }        
       }
     
     }

From 7b0460c4e0dd71cfedc2fd8e32f7b18662927f11 Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Tue, 23 Sep 2025 08:47:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=94=E8=B0=83?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=B8=80=E4=B8=AA=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/debugCenter/debugPanel/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/debugCenter/debugPanel/index.vue b/src/views/debugCenter/debugPanel/index.vue
index cb18422..4abb665 100644
--- a/src/views/debugCenter/debugPanel/index.vue
+++ b/src/views/debugCenter/debugPanel/index.vue
@@ -528,6 +528,7 @@ function SaveMultiData() {
 }
 //上传开机画面
 function updaeLogo(ids, file) {
+  debugger;
   if (!file || !ids) {
     return Promise.resolve({ code: 200, msg: '成功' });
   }
@@ -576,7 +577,7 @@ function SaveItemData() {
   Promise.allSettled([promise1, promise2])
     .then((res) => {
       if (res[0].status == 'fulfilled' && res[1].status == 'fulfilled') {
-        if (res[0].code == 200 && res[1].code == 200) {
+        if (res[0].value.code == 200 && res[1].value.code == 200) {
           CloseSingleEdit();
           alert("操作成功");
           return;