From a2ee519a22c52537335817f8a59a5b1ec1e5e55a Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Mon, 15 Sep 2025 09:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                 | 6 +++---
 src/views/controlCenter/controlPanel/index.vue   | 4 ++++
 src/views/controlCenter/delivery/index.vue       | 3 +++
 src/views/controlCenter/historyjectory/index.vue | 3 +++
 src/views/equipmentAlarmRecord/index.vue         | 3 +++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index def479c..c6f3ed1 100644
--- a/.env.development
+++ b/.env.development
@@ -5,11 +5,11 @@ VITE_APP_TITLE = 云平台管理系统
 VITE_APP_ENV = 'development'
 
 # 开发环境
-# VITE_APP_BASE_API = 'http://47.120.79.150/backend'
-# VITE_APP_BASE_API = 'http://192.168.110.54:8000'
+ VITE_APP_BASE_API = 'http://47.120.79.150/backend'
+ #VITE_APP_BASE_API = 'http://192.168.2.23:8000'
 
 #代永飞接口
-VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689'
+#VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689'   
 
 
 # 应用访问路径 例如使用前缀 /admin/
diff --git a/src/views/controlCenter/controlPanel/index.vue b/src/views/controlCenter/controlPanel/index.vue
index 0d957a6..e3950c4 100644
--- a/src/views/controlCenter/controlPanel/index.vue
+++ b/src/views/controlCenter/controlPanel/index.vue
@@ -66,6 +66,7 @@
                       <el-select v-model="queryParams.communicationMode" placeholder="请选择通信方式" clearable>
                         <el-option label="4G" value="0"></el-option>
                         <el-option label="蓝牙" value="1"></el-option>
+                        <el-option label="4G&蓝牙" value="2"></el-option>
                       </el-select>
                     </el-form-item>
                     <el-form-item>
@@ -483,6 +484,9 @@ const forceAlarm = async () => {
 
 </script>
 <style lang="scss" scoped>
+:deep .el-collapse{
+  border-top:none
+}
 :deep .el-collapse-item__header {
   display: none;
 }
diff --git a/src/views/controlCenter/delivery/index.vue b/src/views/controlCenter/delivery/index.vue
index 9a4ecdb..79608a6 100644
--- a/src/views/controlCenter/delivery/index.vue
+++ b/src/views/controlCenter/delivery/index.vue
@@ -244,6 +244,9 @@ const handleExport = () => {
 
 </script>
 <style lang="scss" scoped>
+:deep .el-collapse{
+  border-top:none
+}
 :deep .el-collapse-item__header {
   display: none;
 }
diff --git a/src/views/controlCenter/historyjectory/index.vue b/src/views/controlCenter/historyjectory/index.vue
index 494da29..f55af50 100644
--- a/src/views/controlCenter/historyjectory/index.vue
+++ b/src/views/controlCenter/historyjectory/index.vue
@@ -257,6 +257,9 @@ const historyjectory = (row: any) => {
 
 </script>
 <style lang="scss" scoped>
+:deep .el-collapse{
+  border-top:none
+}
 :deep .el-collapse-item__header {
   display: none;
 }
diff --git a/src/views/equipmentAlarmRecord/index.vue b/src/views/equipmentAlarmRecord/index.vue
index b2e7445..16b34b5 100644
--- a/src/views/equipmentAlarmRecord/index.vue
+++ b/src/views/equipmentAlarmRecord/index.vue
@@ -272,6 +272,9 @@ onMounted(() => {
 });
 </script>
 <style lang="scss" scoped>
+:deep .el-collapse{
+  border-top:none
+}
 :deep .el-collapse-item__header {
   display: none;
 }