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/.env.production b/.env.production index de78426..112d3c9 100644 --- a/.env.production +++ b/.env.production @@ -12,10 +12,10 @@ 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' +VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 七参数标准版(测试平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:15551' # 七参数标准版(测试平台) diff --git a/src/assets/images/commandScreen/card-center-bottom.png b/src/assets/images/commandScreen/card-center-bottom.png new file mode 100644 index 0000000..124c47b Binary files /dev/null and b/src/assets/images/commandScreen/card-center-bottom.png differ diff --git a/src/assets/images/commandScreen/card-left-bottom.png b/src/assets/images/commandScreen/card-left-bottom.png new file mode 100644 index 0000000..a9455f4 Binary files /dev/null and b/src/assets/images/commandScreen/card-left-bottom.png differ diff --git a/src/assets/images/commandScreen/card-bg.png b/src/assets/images/commandScreen/card-left-top.png similarity index 100% rename from src/assets/images/commandScreen/card-bg.png rename to src/assets/images/commandScreen/card-left-top.png diff --git a/src/assets/images/commandScreen/card-right-all.png b/src/assets/images/commandScreen/card-right-all.png new file mode 100644 index 0000000..1111df4 Binary files /dev/null and b/src/assets/images/commandScreen/card-right-all.png differ diff --git a/src/config/config.ts b/src/config/config.ts index dc9212f..8338c67 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 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/centerBottom.vue b/src/views/commandScreen/commandCenter/centerBottom.vue index 6da5fa1..6b643ed 100644 --- a/src/views/commandScreen/commandCenter/centerBottom.vue +++ b/src/views/commandScreen/commandCenter/centerBottom.vue @@ -1,66 +1,6 @@ @@ -153,126 +93,9 @@ onMounted( async () => { diff --git a/src/views/commandScreen/commandCenter/centerTop.vue b/src/views/commandScreen/commandCenter/centerTop.vue index da6649d..9604329 100644 --- a/src/views/commandScreen/commandCenter/centerTop.vue +++ b/src/views/commandScreen/commandCenter/centerTop.vue @@ -1,73 +1,6 @@ @@ -296,87 +229,7 @@ onMounted(async () => { diff --git a/src/views/commandScreen/commandCenter/index.vue b/src/views/commandScreen/commandCenter/index.vue index f8ef7b3..2cec046 100644 --- a/src/views/commandScreen/commandCenter/index.vue +++ b/src/views/commandScreen/commandCenter/index.vue @@ -1,25 +1,23 @@ diff --git a/src/views/commandScreen/commandCenter/leftCenter.vue b/src/views/commandScreen/commandCenter/leftCenter.vue deleted file mode 100644 index acad0e9..0000000 --- a/src/views/commandScreen/commandCenter/leftCenter.vue +++ /dev/null @@ -1,224 +0,0 @@ - - - - - diff --git a/src/views/commandScreen/commandCenter/leftTop.vue b/src/views/commandScreen/commandCenter/leftTop.vue index 1fcbe82..d89fc11 100644 --- a/src/views/commandScreen/commandCenter/leftTop.vue +++ b/src/views/commandScreen/commandCenter/leftTop.vue @@ -1,31 +1,17 @@ - diff --git a/src/views/commandScreen/components/commandCard.vue b/src/views/commandScreen/components/commandCard.vue index e2a6e64..a43f9ce 100644 --- a/src/views/commandScreen/components/commandCard.vue +++ b/src/views/commandScreen/components/commandCard.vue @@ -25,7 +25,11 @@ export default { .h-card { width: 100%; height: 100%; - background: url("@/assets/images/commandScreen/card-bg.png") no-repeat; + // background: url("@/assets/images/commandScreen/card-bg.png") no-repeat; + // background-size: contain; + // background-size: 100% 100%; + + .title { // background: url("@/assets/images/titleImg.png") no-repeat; background-size: 100% 100%;