diff --git a/.env.development b/.env.development index 57b613a..bea64cc 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 -VITE_API_URL = 'http://192.168.34.155:19111' +# VITE_API_URL = 'http://192.168.34.155: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:28889' @@ -26,8 +26,8 @@ VITE_API_URL = 'http://192.168.34.155:19111' # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 # 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' +# 苏立信/重庆市南岸区 +VITE_API_URL = 'http://101.43.164.214:11111' # 中科安信 # VITE_API_URL = 'http://8.136.222.164:8808' # 上传 diff --git a/.env.production b/.env.production index 0eb15ba..5b45782 100644 --- a/.env.production +++ b/.env.production @@ -23,7 +23,7 @@ NODE_ENV = "production" # agjt # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 # VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 -# 苏立信 +# 苏立信/重庆市南岸区 # VITE_API_URL = 'http://101.43.164.214:11111' # 中科安信 VITE_API_URL = 'http://8.136.222.164:8808' diff --git a/src/config/config.ts b/src/config/config.ts index c1a2a08..4c66a0a 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -31,7 +31,8 @@ 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 = "agjtOverviewScreen"; //鞍钢集团项目总览 +export const COMPANY: string = "cqna"; //重庆市南岸区 // export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "hfqc"; //合肥启程项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目 diff --git a/src/config/staticMenu.ts b/src/config/staticMenu.ts index 59b0e7c..b3926ec 100644 --- a/src/config/staticMenu.ts +++ b/src/config/staticMenu.ts @@ -1343,4 +1343,31 @@ export const ZKAXMenu: Array = [ moduleName: "进度计划", modulePath: "/schedulePlan" } -]; //中科安信大屏 \ No newline at end of file +]; //中科安信大屏 + +export const CQNAMenu: Array = [ + { + moduleName: "首页概览", + modulePath: "/projectOverview" + }, + { + moduleName: "绿色施工", + modulePath: "/headNoise", + }, + { + moduleName: "劳务管理", + modulePath: "/laborManagement" + }, + { + moduleName: "质量管理", + modulePath: "/qualityManagement" + }, + { + moduleName: "安全管理", + modulePath: "/securityManagement" + }, + { + moduleName: "进度计划", + modulePath: "/schedulePlan" + } +]; //重庆南岸大屏 \ No newline at end of file diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 083d2fd..de898ea 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -24,10 +24,10 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/large", name: "大屏", - // // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 + component: () => import("@/views/sevenLargeScreen/indexL.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 fba1391..60b4358 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -136,7 +136,7 @@ const login = (formEl: FormInstance | undefined) => { } else if (COMPANY === "agjtOverviewScreen") { router.push("/overviewScreen"); } else { - // router.push("/projectOverview"); + router.push("/projectOverview"); } // router.push(arr.value[result.accountType - 1]); // 4.跳转到首页 diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 28f3320..95d726b 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -97,7 +97,7 @@ import ScaleBox from "vue3-scale-box"; import { ref, reactive, onMounted, onBeforeUnmount, computed } from "vue"; import { getTaskTimeDetail } from "@/api/modules/schedulePlan"; import { jumpLargeUserInfoApi } from "@/api/modules/login"; -import { JSYCMenu, XJNBMenu, AHSAMenu, HFQCMenu,ASMenu,AGJTMenu,SLXMenu,ZSBFMenu,ZHZRFMenu, ZKAXMenu } from "@/config/staticMenu"; +import { JSYCMenu, XJNBMenu, AHSAMenu, HFQCMenu,ASMenu,AGJTMenu,SLXMenu,ZSBFMenu,ZHZRFMenu, ZKAXMenu, CQNAMenu } from "@/config/staticMenu"; import { COMPANY } from "@/config/config"; import { useRouter } from "vue-router"; @@ -495,6 +495,9 @@ onMounted(async () => { if (COMPANY === "zkax") { menuList.value = ZKAXMenu; } + if (COMPANY === "cqna") { + menuList.value = CQNAMenu; + } console.log("配置菜单", menuList.value); console.log("当前跳转的路由", router.currentRoute.value); // await getAllModelMenu();