diff --git a/.env.development b/.env.development index 74915dd..69ce185 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/src/config/config.ts b/src/config/config.ts index 0a4fb6c..f2bf641 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -24,11 +24,11 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // 项目环境标识配置 部署时需更改对应的项目 // export const COMPANY: string = ""; //标准版 -export const COMPANY: string = "zhzrf"; //中海·臻如府 +// export const COMPANY: string = "zhzrf"; //中海·臻如府 // export const COMPANY: string = "zsbf"; //中水北方 // 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 = "jsyc"; // 江苏盐城项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 93a541c..617fd45 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/commandScreen/commandCenter/centerTop.vue b/src/views/commandScreen/commandCenter/centerTop.vue index 9604329..a3c1a5b 100644 --- a/src/views/commandScreen/commandCenter/centerTop.vue +++ b/src/views/commandScreen/commandCenter/centerTop.vue @@ -230,6 +230,6 @@ onMounted(async () => { diff --git a/src/views/commandScreen/commandCenter/index.vue b/src/views/commandScreen/commandCenter/index.vue index 2cec046..f613cc6 100644 --- a/src/views/commandScreen/commandCenter/index.vue +++ b/src/views/commandScreen/commandCenter/index.vue @@ -9,7 +9,7 @@
- +
@@ -21,9 +21,7 @@ import leftTop from "@/views/commandScreen/commandCenter/leftTop.vue"; import leftBottom from "@/views/commandScreen/commandCenter/leftBottom.vue"; import centerTop from "@/views/commandScreen/commandCenter/centerTop.vue"; import centerBottom from "@/views/commandScreen/commandCenter/centerBottom.vue"; -import rightTop from "@/views/commandScreen/commandCenter/rightTop.vue"; -import rightCenter from "@/views/commandScreen/commandCenter/rightCenter.vue"; -import rightBottom from "@/views/commandScreen/commandCenter/rightBottom.vue"; +import rightAll from "@/views/commandScreen/commandCenter/rightAll.vue"; import { GlobalStore } from "@/stores"; const store = GlobalStore(); import { getWorkerStatisticsCountApi, getProjectDetail } from "@/api/modules/projectOverview"; @@ -63,17 +61,17 @@ const projectData = ref(null as any); } .right { width: 26%; - - .rightTop { - height: 32%; - } - .rightCenter { - height: 33%; - margin: 3% 0 3% 0; - } - .rightBottom { - height: 32%; - } + height: 100%; + // .rightAll { + // height: 32%; + // } + // .rightCenter { + // height: 33%; + // margin: 3% 0 3% 0; + // } + // .rightBottom { + // height: 32%; + // } } } diff --git a/src/views/commandScreen/commandCenter/rightTop.vue b/src/views/commandScreen/commandCenter/rightAll.vue similarity index 96% rename from src/views/commandScreen/commandCenter/rightTop.vue rename to src/views/commandScreen/commandCenter/rightAll.vue index 3276064..73c5edf 100644 --- a/src/views/commandScreen/commandCenter/rightTop.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -1,8 +1,8 @@ @@ -355,10 +355,13 @@ onMounted(async () => { }); - diff --git a/src/views/commandScreen/commandCenter/rightCenter.vue b/src/views/commandScreen/commandCenter/rightCenter.vue deleted file mode 100644 index 28ee866..0000000 --- a/src/views/commandScreen/commandCenter/rightCenter.vue +++ /dev/null @@ -1,324 +0,0 @@ - - - - -