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 @@ />
- +