From 200c73e983d5388f9e8b232a01004309c984682a Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 13 Jun 2024 17:08:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E9=9E=8D=E9=92=A2=E9=9B=86=E5=9B=A2?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9C=8B=E6=9D=BF=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/setVideoDialog.vue | 2 +- src/routers/modules/staticRouter.ts | 4 ++-- .../projectOverview/centerTop.vue | 20 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/setVideoDialog.vue b/src/components/setVideoDialog.vue index 4c86ad7..f00f0a1 100644 --- a/src/components/setVideoDialog.vue +++ b/src/components/setVideoDialog.vue @@ -231,7 +231,7 @@ onMounted(async () => {}); font-family: "OPPOSans-Bold"; display: flex; align-items: center; - margin: 0 40px; + margin: 0 20px; padding-top: 10px; .title-time { diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index e5ae589..b17bb60 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/agjtProjectKanban/comprehensiveManage/projectOverview/centerTop.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerTop.vue index 70c22f8..4f983c5 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerTop.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerTop.vue @@ -1,16 +1,8 @@ @@ -42,6 +35,7 @@ import { editProjectInfo, eidtProjectShowConfig, queryBySnData } from "@/api/mod import { selectLiveVideoListApi } from "@/api/modules/video"; import ckplayerComp from "./ckplayerComp.vue"; import { COMPANY } from "@/config/config"; +import setVideoDialog from "@/components/setVideoDialog.vue"; const store = GlobalStore(); const videoList = ref([] as any); @@ -55,7 +49,13 @@ const props = withDefaults(defineProps(), { }); // 项目信息 const projectData = ref({} as any); - +// 弹窗 +const partyBuildRef = ref(); +const openPeopleCountDialog = () => { + partyBuildRef.value.openDialog({ + title: "配置视频" + }); +}; watch( () => props.projectData, newVal => { From 2055f6f3efc7bb2e93744d2558e9b7ed4bab3e0b Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 13 Jun 2024 17:15:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20echarts=E5=9B=BE=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=AE=89=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- src/config/config.ts | 4 ++-- src/routers/modules/staticRouter.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index c7cb05c..76858e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6560,7 +6560,7 @@ }, "node_modules/echarts-liquidfill": { "version": "2.0.6", - "resolved": "https://mirrors.huaweicloud.com/repository/npm/echarts-liquidfill/-/echarts-liquidfill-2.0.6.tgz", + "resolved": "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-2.0.6.tgz", "integrity": "sha512-p+AH0O9/BtwXMQQyhjJbMZo+GwRAgWG/DCyK5r27PQzpS0UWrgXu57MyEFc0A8Ub3sRuqEu08BuxwHICBkSWSQ==", "peerDependencies": { "echarts": "^4.8.0", @@ -21389,7 +21389,7 @@ }, "echarts-liquidfill": { "version": "2.0.6", - "resolved": "https://mirrors.huaweicloud.com/repository/npm/echarts-liquidfill/-/echarts-liquidfill-2.0.6.tgz", + "resolved": "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-2.0.6.tgz", "integrity": "sha512-p+AH0O9/BtwXMQQyhjJbMZo+GwRAgWG/DCyK5r27PQzpS0UWrgXu57MyEFc0A8Ub3sRuqEu08BuxwHICBkSWSQ==", "requires": {} }, diff --git a/src/config/config.ts b/src/config/config.ts index eb4fc23..d22b957 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 = "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 b17bb60..e5ae589 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: [ { From 3f461a201f2df847c3fd4a0990c3d13109cad7a1 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Thu, 13 Jun 2024 18:39:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=80=BB?= =?UTF-8?q?=E8=A7=88=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/config/config.ts | 3 +- src/routers/modules/staticRouter.ts | 4 +- src/views/login/index.vue | 2 +- .../overviewScreen/commandCenter/index.vue | 4 +- .../overviewScreen/commandCenter/rightAll.vue | 345 +++++++++++++----- 6 files changed, 272 insertions(+), 90 deletions(-) diff --git a/.env.development b/.env.development index add0c2f..eeec5b4 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.221:19111' -# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 +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' @@ -24,7 +24,7 @@ NODE_ENV = 'development' # VITE_API_URL = 'http://182.90.224.237:15551' # agjt # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 -VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 +# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 苏立信 # VITE_API_URL = 'http://101.43.164.214:11111' diff --git a/src/config/config.ts b/src/config/config.ts index eb4fc23..c1a2a08 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -30,7 +30,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 -export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 +// export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 +export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // 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 e5ae589..c6e97fc 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -25,9 +25,9 @@ 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/overviewScreen/indexCommand.vue"), //总览大屏 // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 263e743..26b57a0 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -122,7 +122,7 @@ const login = (formEl: FormInstance | undefined) => { } // router.push("/commandScreen"); router.push("/agjtProjectKanban"); - } else if (COMPANY === "agjtOverview") { + } else if (COMPANY === "agjtOverviewScreen") { router.push("/overviewScreen"); } else { // router.push("/projectOverview"); diff --git a/src/views/overviewScreen/commandCenter/index.vue b/src/views/overviewScreen/commandCenter/index.vue index 6c08e84..e5f38d7 100644 --- a/src/views/overviewScreen/commandCenter/index.vue +++ b/src/views/overviewScreen/commandCenter/index.vue @@ -222,8 +222,8 @@ onMounted(() => { .right { width: 26%; - height: 109.2%; - transform: translateY(-70px); + height: 100%; + // transform: translateY(-70px); // .rightAll { // height: 32%; // } diff --git a/src/views/overviewScreen/commandCenter/rightAll.vue b/src/views/overviewScreen/commandCenter/rightAll.vue index 3d34844..bc21ffd 100644 --- a/src/views/overviewScreen/commandCenter/rightAll.vue +++ b/src/views/overviewScreen/commandCenter/rightAll.vue @@ -1,7 +1,7 @@