From 09c0b80eb1d289162599bc65ace33ae71b5a1f61 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Tue, 2 Jul 2024 16:30:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8C=87?= =?UTF-8?q?=E6=8C=A5=E9=83=A8=E5=A4=A7=E5=B1=8F=E5=BD=B1=E5=93=8D=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E5=9B=A0=E7=B4=A0=E5=9B=BE=E7=89=87=E5=A4=9A=E5=BC=A0?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/config/config.ts | 4 ++-- src/routers/modules/staticRouter.ts | 4 ++-- .../dialogCompnnents/weather-info.vue | 14 ++++++++++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.env.development b/.env.development index ba2b451..b7870ef 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.155:19111' -# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 -VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 +VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 +# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' diff --git a/src/config/config.ts b/src/config/config.ts index 7593b1b..9711206 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -29,8 +29,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 -// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 -export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 +export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 +// export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "zkjc"; //中科佳成项目 // export const COMPANY: string = "cqna"; //重庆南岸项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index a4182a1..e5431c1 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -25,10 +25,10 @@ export const staticRouter: RouteRecordRaw[] = [ path: "/large", name: "大屏", // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 + component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 // component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 // component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏 - component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 + // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ { diff --git a/src/views/commandScreen/dialogCompnnents/weather-info.vue b/src/views/commandScreen/dialogCompnnents/weather-info.vue index 8172075..65a7ae1 100644 --- a/src/views/commandScreen/dialogCompnnents/weather-info.vue +++ b/src/views/commandScreen/dialogCompnnents/weather-info.vue @@ -57,15 +57,21 @@
{{ delayEvent(item.delayEventType) }}
- {{item.delayEventReason}} + {{ item.delayEventReason }}
+