From 15a724a5fe76a1880f3bf03ac8db1b8dd412af43 Mon Sep 17 00:00:00 2001 From: fengsen <2548667232@qq.com> Date: Thu, 21 Aug 2025 18:45:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 -- src/views/largeScreen/components/leftPage.vue | 16 ++++- .../largeScreen/components/optionList.ts | 68 +++++++++++++++++-- 3 files changed, 78 insertions(+), 10 deletions(-) diff --git a/.env.development b/.env.development index ad65c33..b59befd 100644 --- a/.env.development +++ b/.env.development @@ -5,11 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -<<<<<<< HEAD VITE_APP_BASE_API = 'http://192.168.110.180:8899' -======= -VITE_APP_BASE_API = 'http://192.168.110.149:8899' ->>>>>>> aab67593ebb8d9116738d0d867a6119ba61615c8 # 无人机接口地址 diff --git a/src/views/largeScreen/components/leftPage.vue b/src/views/largeScreen/components/leftPage.vue index c664040..683c9a3 100644 --- a/src/views/largeScreen/components/leftPage.vue +++ b/src/views/largeScreen/components/leftPage.vue @@ -33,16 +33,25 @@ />
- +