From d78b7fd15ede48b13000c310fe46c00999216f56 Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Mon, 15 Sep 2025 16:30:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=9C=AA=E9=87=8D=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fys-equipment/geoFence/index.vue | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/fys-equipment/geoFence/index.vue b/src/views/fys-equipment/geoFence/index.vue
index 6c67a93..2879793 100644
--- a/src/views/fys-equipment/geoFence/index.vue
+++ b/src/views/fys-equipment/geoFence/index.vue
@@ -35,7 +35,7 @@
                   <el-option :key="1" :label="'圆形'" :value="1" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="是否激活" prop="isActive" >
+              <el-form-item label="是否激活" prop="isActive">
                 <el-select v-model="queryParams.isActive" clearable placeholder="请选择">
                   <el-option :key="1" :label="'是'" :value="1" />
                   <el-option :key="0" :label="'否'" :value="0" />
@@ -75,9 +75,8 @@
             <div>{{ scope.row.isActive == '1' ? '是' : '否' }}</div>
           </template>
         </el-table-column>
-<el-table-column label="描述" align="center" prop="description"> </el-table-column>
-        
-        
+        <el-table-column label="描述" align="center" prop="description"> </el-table-column>
+
         <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>
@@ -217,7 +216,6 @@ function showSearch() {
   }
 }
 function ShowEdit(item) {
-  
   Status.showEdit = true;
   if (item) {
     let keys = Object.keys(item);
@@ -229,8 +227,16 @@ function ShowEdit(item) {
     if (item.coordinates) {
       cEdit.coordinates = JSON.parse(item.coordinates);
     }
+  } else {
+    cEdit.id = null;
+    cEdit.name = '';
+    cEdit.description = '';
+    cEdit.areaType = null;
+    cEdit.coordinates = [];
+    cEdit.radius = null;
+    cEdit.isActive = null;
   }
-    map.clearOverLays();
+  map.clearOverLays();
   setTimeout(() => {
     map
       .initMap()
@@ -304,7 +310,6 @@ let time = null;
 function refreshOverLayer() {
   clearTimeout(time);
   time = setTimeout(() => {
-    
     if (cEdit.areaType == 1) {
       map.DrawCicle(cEdit.coordinates, cEdit.radius, circleDragEnd);
     } else {
@@ -326,7 +331,6 @@ function ClearPoint() {
 }
 //添加一个点
 function AddPoint(point, i) {
-  
   if (cEdit.areaType == null && !point) {
     alert('请选择围栏类型');
     return;
@@ -338,16 +342,13 @@ function AddPoint(point, i) {
 
   let index = i !== undefined ? i : cEdit.coordinates.length;
   let dragEnd = (evt, lay) => {
-    
     map.removePoy();
-   
-      cEdit.coordinates[index].lng = evt.lnglat.lng;
-      cEdit.coordinates[index].lat = evt.lnglat.lat;
-      refreshOverLayer();
-  
+
+    cEdit.coordinates[index].lng = evt.lnglat.lng;
+    cEdit.coordinates[index].lat = evt.lnglat.lat;
+    refreshOverLayer();
   };
   let pointClick = (evt, lay) => {
-    
     confirm(
       '您确认删除该点吗?',
       () => {
@@ -364,7 +365,9 @@ function AddPoint(point, i) {
     let lon = res.lng;
     let lat = res.lat;
 
-    if(!point){cEdit.coordinates.push({ lng: lon, lat: lat });}
+    if (!point) {
+      cEdit.coordinates.push({ lng: lon, lat: lat });
+    }
     refreshOverLayer();
   });
 }
@@ -443,11 +446,8 @@ function getList() {
 }
 
 function Export() {
-
   let json = {};
-  proxy?.download('/api/equipment/geoFence/export', json, `电子围栏列表_${new Date().getTime()}.xlsx`, 'post').finally(() => {
-    
-  });
+  proxy?.download('/api/equipment/geoFence/export', json, `电子围栏列表_${new Date().getTime()}.xlsx`, 'post').finally(() => {});
 }
 
 //获取已选中的行

From 128e4f4074eb4cc02d49312f25bb036e304ed33a Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Mon, 15 Sep 2025 16:31:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?vite=E7=89=88=E6=9C=AC=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 337738d..0cc63cf 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "unplugin-icons": "22.1.0",
     "unplugin-vue-components": "28.5.0",
     "unplugin-vue-setup-extend-plus": "1.0.1",
-    "vite": "^7.1.3",
+    "vite": "^6.3.6",
     "vite-plugin-compression": "0.5.1",
     "vite-plugin-svg-icons-ng": "^1.4.0",
     "vite-plugin-vue-devtools": "7.7.5",