diff --git a/.env.development b/.env.development index 64850b1..eeec5b4 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ 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://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/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/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/config/config.ts b/src/config/config.ts index cda4664..ea5f7be 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -31,6 +31,7 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // 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 7918a9d..17a43a5 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -28,6 +28,8 @@ export const staticRouter: RouteRecordRaw[] = [ // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 // component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏 + // component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 + // component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏 // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ @@ -284,9 +286,9 @@ export const staticRouter: RouteRecordRaw[] = [ component: () => import("@/views/agjtProjectKanban/comprehensiveManage/projectOverview/index.vue") }, { - path: "/overviewScreen", - name: "大屏总览", - component: () => import("@/views/overviewScreen/commandCenter/index.vue") + path: "/agjtLiveScreen", + name: "鞍钢现场大屏", + component: () => import("@/views/agjtLiveScreen/liveScreen/index.vue") } ], meta: { 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 => { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 69a7cd1..d02a841 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -134,6 +134,7 @@ const login = (formEl: FormInstance | undefined) => { // router.push("/commandScreen"); router.push("/agjtLiveScreen"); } 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 @@