diff --git a/.env.development b/.env.development index 69ce185..74915dd 100644 --- a/.env.development +++ b/.env.development @@ -13,9 +13,9 @@ NODE_ENV = 'development' # 沈阳合盈线上 # VITE_API_URL = "http://101.43.164.214:45022" # 演示平台 -VITE_API_URL = 'http://jxj.zhgdyun.com:9809' +# VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 百色七参数线上地址 -# VITE_API_URL = 'http://101.43.164.214:11111' +VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(测试平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:15551' # 七参数标准版(测试平台) diff --git a/.env.production b/.env.production index d830490..de78426 100644 --- a/.env.production +++ b/.env.production @@ -12,7 +12,7 @@ NODE_ENV = "production" # VITE_API_URL = "http://183.249.224.118:9003" # 百色 新项目通用地址 -# VITE_API_URL = 'http://101.43.164.214:11111' +VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(演示平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' @@ -21,7 +21,7 @@ NODE_ENV = "production" # 七参数标准版(测试平台) # VITE_API_URL = 'http://182.90.224.237:15551' # agjt -VITE_API_URL = 'http://47.93.215.234:9809' +# VITE_API_URL = 'http://47.93.215.234:9809' # 苏立信 # VITE_API_URL = 'http://101.43.164.214:11111' diff --git a/src/config/config.ts b/src/config/config.ts index 8338c67..dc9212f 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -26,9 +26,9 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = ""; //标准版 // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 -export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 +// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "slx"; //苏立信项目 -// export const COMPANY: string = "hfqc"; //合肥启程项目 +export const COMPANY: string = "hfqc"; //合肥启程项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目 // export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页) // export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页) diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 617fd45..93a541c 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/large", name: "大屏", - // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 + component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 + // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ { diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue index c94921f..0638f57 100644 --- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue +++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue @@ -165,7 +165,7 @@
-
+
@@ -1980,7 +1980,7 @@ function echoPersonMarker(item) { height: 100%; // background-color: black; display: flex; - justify-content: end; + justify-content: flex-end; align-items: center; .closeDetail { cursor: pointer; @@ -2462,7 +2462,7 @@ function echoPersonMarker(item) { } .bottom-data { margin-top: 1%; - height: 40.8%; + height: 38%; :deep(.h-card) { .content { margin-top: 4% !important; @@ -2471,7 +2471,7 @@ function echoPersonMarker(item) { .left-content { height: 100%; width: 100%; - + // background-color: #fff; .tab-list { display: flex; align-items: center; @@ -2672,7 +2672,7 @@ function echoPersonMarker(item) { display: flex; justify-content: space-between; align-items: center; - height: 41%; + height: 38%; .hat-bottom { width: 23%; margin-top: 20px; @@ -2727,13 +2727,22 @@ function echoPersonMarker(item) { } .week-bottom { width: 48.75%; + // margin-top: 20px; + // // height: 90%; + // // position: relative; + // :deep(.content) { + // margin-top: 2.1% !important; + // } + // div { + // } + // width: 50%; margin-top: 20px; height: 100%; - // position: relative; - :deep(.content) { - margin-top: 2.1% !important; - } - div { + position: relative; + :deep(.h-card) { + .content { + margin-top: 2.1% !important; + } } } diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index d4fe750..36777c9 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -686,7 +686,7 @@ function jumpBgd() { font-size: 14px; font-family: none; background: url("@/assets/images/subTabImg.gif") no-repeat; - background-size: 100% 100%; + background-size: 100% 35%; .scrollItem { width: 73%; height: max-content;