From 8ba3128cb901e5f2f6a772159f3fcc7728c439ac Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Mon, 15 Sep 2025 13:42:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BA=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipmentAlarmRecord/index.vue | 11 +++--------
 src/views/index.vue                      |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/views/equipmentAlarmRecord/index.vue b/src/views/equipmentAlarmRecord/index.vue
index 16b34b5..40865a5 100644
--- a/src/views/equipmentAlarmRecord/index.vue
+++ b/src/views/equipmentAlarmRecord/index.vue
@@ -34,9 +34,8 @@
                   <el-select v-model="queryParams.deviceAction">
                     <el-option value="0" label="强制报警"></el-option>
                     <el-option value="1" label="撞击闯入"></el-option>
-                    <el-option value="2" label="手动报警"></el-option>
+                    <el-option value="2" label="自动报警"></el-option>
                     <el-option value="3" label="电子围栏告警"></el-option>
-                    <el-option value="4" label="强制告警"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="报警时间" style="width: 308px">
@@ -95,15 +94,12 @@
                   <template v-else-if="item.deviceAction === 1">撞击闯入
                     <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
                   </template>
-                  <template v-else-if="item.deviceAction === 2">手动报警
+                  <template v-else-if="item.deviceAction === 2">自动报警
                     <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
                   </template>
                   <template v-else-if="item.deviceAction === 3">电子围栏告警
                     <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
                   </template>
-                  <template v-else-if="item.deviceAction === 4">强制告警
-                    <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
-                  </template>
                 </div>
                 <div class="label">报警地点：</div>
                 <div class="alearmADD">
@@ -132,9 +128,8 @@
             <template #default="scope">
               <el-tag type="danger" v-if="scope.row.deviceAction == 0">强制报警</el-tag>
               <el-tag type="danger" v-if="scope.row.deviceAction == 1">撞击闯入</el-tag>
-              <el-tag type="danger" v-if="scope.row.deviceAction == 2">手动报警</el-tag>
+              <el-tag type="danger" v-if="scope.row.deviceAction == 2">自动报警</el-tag>
               <el-tag type="danger" v-if="scope.row.deviceAction == 3">电子围栏告警</el-tag>
-              <el-tag type="danger" v-if="scope.row.deviceAction == 4">强制告警</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="报警持续时间" align="center" prop="durationTime" width="180">
diff --git a/src/views/index.vue b/src/views/index.vue
index 33ab712..a338bad 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -368,7 +368,7 @@ const initAlarmBarChart = () => {
   const alarmTypeMap = [
     { name: '强制报警', field: 'alarmForced' },         // alarmForced 
     { name: '撞击闯入', field: 'intrusionImpact' },     // intrusionImpact 
-    { name: '手动报警', field: 'alarmManual' },          // alarmManual 
+    { name: '自动报警', field: 'alarmManual' },          // alarmManual 
     { name: '电子围栏', field: 'fenceElectronic' }       // fenceElectronic 
   ];
 

From 065397496972f5e9a7c5694c905a6e8eba576d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E5=BE=AE=E4=B8=80=E7=AC=91?= <709648985@qq.com>
Date: Mon, 15 Sep 2025 14:58:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                   | 10 +++++-----
 src/api/FenceManager/mapOpt.ts |  1 -
 uno.config.ts                  |  5 ++++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 337738d..ca5fd88 100644
--- a/package.json
+++ b/package.json
@@ -56,9 +56,9 @@
     "@types/js-cookie": "3.0.6",
     "@types/node": "^22.13.4",
     "@types/nprogress": "0.2.3",
-    "@unocss/preset-attributify": "66.0.0",
-    "@unocss/preset-icons": "66.0.0",
-    "@unocss/preset-uno": "66.0.0",
+    "@unocss/preset-attributify": "^66.0.0",
+    "@unocss/preset-icons": "^66.0.0",
+    "@unocss/preset-uno": "^66.0.0",
     "@vitejs/plugin-vue": "5.2.3",
     "@vue/compiler-sfc": "3.5.13",
     "@vue/eslint-config-prettier": "10.2.0",
@@ -72,12 +72,12 @@
     "sass": "1.87.0",
     "terser": "^5.43.1",
     "typescript": "~5.8.3",
-    "unocss": "66.0.0",
+    "unocss": "^66.0.0",
     "unplugin-auto-import": "19.1.2",
     "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",
diff --git a/src/api/FenceManager/mapOpt.ts b/src/api/FenceManager/mapOpt.ts
index 6cf9e22..d0b595b 100644
--- a/src/api/FenceManager/mapOpt.ts
+++ b/src/api/FenceManager/mapOpt.ts
@@ -145,7 +145,6 @@ function DrawCicle(points, raduis, dragEnd) {
         radius: raduis ? raduis : 1000, //半径
         borderWeight: 3,
         strokeColor: "#FF33FF",
-        strokeOpacity: 1,
         strokeWeight: 6,
         strokeOpacity: 0.2,
         fillOpacity: 0.4,
diff --git a/uno.config.ts b/uno.config.ts
index 0c60a22..109d822 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -29,5 +29,8 @@ export default defineConfig({
       fonts: {}
     })
   ],
-  transformers: [transformerDirectives(), transformerVariantGroup()]
+  transformers: [
+    transformerDirectives(),
+    transformerVariantGroup()
+  ]
 });