合并冲突

.env.development

@@ -46,6 +46,9 @@ VITE_API_URL = 'http://192.168.34.155:19111'
 # VITE_API_URL = 'http://218.95.151.122:31004'
 # 包头化工
 # VITE_API_URL = 'http://jxj.zhgdyun.com:18000'
+# 大连金笔
+VITE_API_URL = 'http://101.43.164.214:11126'
+
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
 

.env.production

@@ -41,6 +41,8 @@ VITE_API_URL = 'http://192.168.9.249:9820'
 # VITE_API_URL = 'http://218.95.151.122:31004'
 # 包头化工
 # VITE_API_URL = 'http://jxj.zhgdyun.com:18000'
+# 大连金笔
+VITE_API_URL = 'http://101.43.164.214:11126'
 # 打包
 VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='
 

src/config/config.ts

@@ -30,6 +30,7 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
 // export const COMPANY: string = "agjt"; //鞍钢集团
 // export const COMPANY: string = "tj"; // 同济项目
 export const COMPANY: string = "scwc"; // 四川网诚项目
+// export const COMPANY: string = "dljb"; // 大连金笔项目
 // export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
 // export const COMPANY: string = "bthg"; //包头化工
 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏

src/config/staticMenu.ts

@@ -1778,3 +1778,37 @@ export const JZJTMenu: Array<any> = [
 		modulePath: "/foundationPitMonitor"
 	}
 ]; //九柱集团
+export const DLJBMenu: Array<any> = [
+	{
+		moduleName: "工程概况",
+		modulePath: "/projectOverview"
+	},
+	{
+		moduleName: "视频管理",
+		modulePath: "/videoManagement"
+	},
+	{
+		moduleName: "劳务管理",
+		modulePath: "/laborManagement"
+	},
+	{
+		moduleName: "安全管理",
+		modulePath: "/securityManagement"
+	},
+	{
+		moduleName: "质量管理",
+		modulePath: "/qualityManagement"
+	},
+	{
+		moduleName: "进度计划",
+		modulePath: "/schedulePlan"
+	},
+	{
+		moduleName: "扬尘噪声",
+		modulePath: "/headNoise"
+	},
+	{
+		moduleName: "塔吊监测",
+		modulePath: "/towerCraneMonitoring"
+	}
+]; //大连金笔

src/views/sevenLargeScreen/indexL.vue

@@ -125,7 +125,8 @@ import {
 	TJMenu,
 	SCWCMenu,
 	JZJTMenu,
-	BTHGMenu
+	BTHGMenu,
+	DLJBMenu
 } from "@/config/staticMenu";
 import { COMPANY } from "@/config/config";
 
@@ -584,6 +585,9 @@ onMounted(async () => {
 	if (COMPANY === "bthg") {
 		menuList.value = BTHGMenu;
 	}
+	if (COMPANY === "dljb") {
+		menuList.value = DLJBMenu;
+	}
 	console.log("配置菜单", menuList.value);
 	console.log("当前跳转的路由", router.currentRoute.value);
 	// await getAllModelMenu();