flx：合并冲突

flx：提交作业管控模块
中水北方需求
2025-07-14 17:12:07 +08:00 · 2025-07-14 14:41:33 +08:00 · 2025-07-11 17:03:21 +08:00 · 2025-07-07 17:53:28 +08:00 · 2025-06-24 11:54:06 +08:00 · 2025-06-17 11:36:12 +08:00
263 changed files with 21654 additions and 2941 deletions
--- a/.env.development
+++ b/.env.development
@ -3,8 +3,9 @@ NODE_ENV = 'development'

 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
+# VITE_API_URL = 'http://192.168.34.155:28890'  #彭杰鞍钢本地
 # VITE_API_URL = 'http://192.168.34.155:19111'
-# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
+VITE_API_URL = 'http://192.168.34.221:8111' #雄哥本地
 # VITE_API_URL = 'http://192.168.34.221:19112' #雄哥本地
 # VITE_API_URL = 'http://192.168.34.221:28890' #雄哥本地
 # VITE_API_URL = 'http://182.90.224.237:51234'  #雄哥远程
@ -33,16 +34,18 @@ NODE_ENV = 'development'
 # 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'
 # 中科佳成
-VITE_API_URL = 'http://1.13.185.209:8089'
+# VITE_API_URL = 'http://1.13.185.209:8089'
 # 九柱
 # VITE_API_URL = 'http://jxjzw.zhgdyun.com:11111'
 # 四川网诚
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:34568'
+# 新能源智慧基建管理平台|中新建电力集团(外网)
+# VITE_API_URL = 'http://117.146.73.156:9820'
 # 九柱集团
 # VITE_API_URL = 'http://218.95.151.122:31004'
 # 包头化工
--- a/.env.production
+++ b/.env.production
@ -10,7 +10,7 @@ NODE_ENV = "production"
 # 沈阳合盈线上
 # VITE_API_URL = "http://101.43.164.214:45022"
 # 嘉兴王江泾公用码头
-VITE_API_URL = "http://183.249.224.118:9003"
+# VITE_API_URL = "http://183.249.224.118:9003"

 # 百色  新项目通用地址
 # VITE_API_URL = 'http://101.43.164.214:11111'
@ -29,7 +29,7 @@ VITE_API_URL = "http://183.249.224.118:9003"
 # 中科安信
 # VITE_API_URL = 'http://8.136.222.164:8808'
 # 中科佳成
-VITE_API_URL = 'http://1.13.185.209:8089'
+# VITE_API_URL = 'http://1.13.185.209:8089'
 # 合肥启程(乌丹)
 # VITE_API_URL = 'http://192.168.100.4:9809'
 # 九柱
@ -54,5 +54,6 @@ VITE_API_URL = 'http://1.13.185.209:8089'
 # VITE_API_URL = 'http://121.37.106.37:9820'
 # VITE_API_URL = 'http://121.37.106.37:9809'
 # 打包
+VITE_API_URL =''
 VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='

--- a/index.html
+++ b/index.html
@ -8,6 +8,8 @@
    <title>
        <%- title %>
    </title>
+    <!-- <script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script> -->
+    <script src="/hls.min.js"></script>
 </head>

 <body>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -40,13 +40,14 @@
 		"element-china-area-data": "^5.0.2",
 		"element-plus": "^2.2.30",
 		"ezuikit-js": "^7.7.8",
+		"hls.js": "^1.6.7",
 		"jquery": "^3.7.1",
 		"jquery-ui": "^1.13.2",
 		"jquery-ui-dist": "^1.13.2",
 		"js-base64": "^3.7.5",
 		"js-md5": "^0.7.3",
-		"mars3d": "^3.5.6",
-		"mars3d-cesium": "^1.105.0",
+		"mars3d": "^3.9.10",
+		"mars3d-cesium": "^1.129.0",
 		"mitt": "^3.0.0",
 		"moment": "^2.29.4",
 		"mqtt": "^4.2.6",
--- a/public/hls.min.js
+++ b/public/hls.min.js
--- a/src/api/modules/config.ts
+++ b/src/api/modules/config.ts
@ -0,0 +1,17 @@
+import http from "@/api";
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 今日大屏自定义配置
+export const addLargeScreenConfig = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/largeScreenConfig/add`, params);
+};
+
+// 查询大屏自定义配置
+export const queryByProject = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/largeScreenConfig/queryByProject`, params);
+};
+
+// 更新大屏自定义配置
+export const updateLargeScreenConfig = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/largeScreenConfig/edit`, params);
+};
--- a/src/api/modules/labor.ts
+++ b/src/api/modules/labor.ts
@ -21,6 +21,10 @@ export const getRealTimeDataApi = (params: {}) => {
 export const getMemberInfoList = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/workerInfo/selectWorkerInfoList`, params);
 };
+// 一键出场
+export const outMember = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/workerAttendance/reissueAttendanceCard`, params);
+};
 //查询所属企业
 export const getCompanyDataList = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/enterpriseInfo/list`, params);
@ -63,3 +67,18 @@ export const getworkerAttendanceTrendApi = (params: {}) => {
 export const getComapnyWorkTotalListApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/workerInfo/selectProjectComapnyWorkTotalList`, params, { headers: { noLoading: true } });
 };
+
+// 获取闸机列表
+export const getUfaceDevListApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/ufaceDev/list`, params, { headers: { noLoading: true } });
+};
+
+// 获取闸机分组列表
+export const getUfaceDevGroupListApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/ufaceDevGroup/list`, params, { headers: { noLoading: true } });
+};
+
+// 获取人员分布
+export const getPresentByRegionApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/workerAttendance/getPresentByRegion`, params, { headers: { noLoading: true } });
+};
--- a/src/api/modules/mapConfig.ts
+++ b/src/api/modules/mapConfig.ts
@ -0,0 +1,72 @@
+// 项目展示
+import http from "@/api";
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 查询系统配置
+export const getSystemConfig = (params: any) => {
+	return http.post(BASEURL + `/xmgl/systemConfig/queryByKey`, params);
+};
+
+// 新增系统配置
+export const addSystemConfig = (params: any) => {
+	return http.post(BASEURL + `/xmgl/systemConfig/add`, params);
+};
+
+// 修改系统配置
+export const updateSystemConfig = (params: any) => {
+	return http.post(BASEURL + `/xmgl/systemConfig/edit`, params);
+};
+
+// 底图图层列表
+export const baseMapList = (params: any) => {
+	return http.post(BASEURL + `/xmgl/baseMap/list`, params);
+};
+
+// 模型gltr列表
+export const gltfModelList = (params: any) => {
+	return http.post(BASEURL + `/xmgl/gltfModel/list`, params);
+};
+
+export const getDevList = (params: any) => {
+	return http.post(BASEURL + `/xmgl/monitorDev/getDevList`, params);
+};
+
+export const getStationStat = (params: any) => {
+	return http.post(BASEURL + `/xmgl/monitorDev/getStationStat`, params);
+};
+
+export const getTopStat = (params: any) => {
+	return http.post(BASEURL + `/xmgl/reviewIndex/topStat`, params);
+};
+
+export const getWorkerStat = (params: any) => {
+	return http.post(BASEURL + `/xmgl/reviewIndex/workerStat`, params);
+};
+
+export const getAlarmList = (params: any) => {
+	return http.post(BASEURL + `/xmgl/reviewIndex/alarmList`, params);
+};
+
+export const getAlarmNumStat = (params: any) => {
+	return http.post(BASEURL + `/xmgl/reviewIndex/alarmNumStat`, params);
+};
+
+// 车辆类型统计
+export const getVehicleStat = (params: any) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionDev/countVehiclePositionDevCarType`, params);
+};
+
+// 车辆列表
+export const getVehicleList = (params: any) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionDev/list`, params);
+};
+
+// 机械设备统计
+export const getMachineryStat = (params: any) => {
+	return http.post(BASEURL + `/xmgl/reviewIndex/machineryStat`, params);
+};
+
+// 获取视频设备信息
+export const getVideoItemInfo = (params: any) => {
+	return http.post(BASEURL + `/xmgl/videoItem/getVideoItemInfo`, params);
+};
--- a/src/api/modules/shieldMachine.ts
+++ b/src/api/modules/shieldMachine.ts
@ -0,0 +1,23 @@
+// 盾构机接口API
+import http from "@/api";
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 大屏数据统计
+export const getShieldMachineData = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/tunnelBoringMachineCurrentData/getStatData`, params, { headers: { noLoading: true } });
+};
+
+// 盾构机报警信息
+export const getShieldMachineAlarm = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/tunnelBoringMachineAlarm/getNewAlarm`, params, { headers: { noLoading: true } });
+};
+
+// 盾构机详情
+export const getShieldMachineDetail = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/tunnelBoringMachine/queryById`, params, { headers: { noLoading: true } });
+};
+
+// 盾构机列表
+export const getShieldMachineList = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/tunnelBoringMachine/list`, params, { headers: { noLoading: true } });
+};
--- a/src/api/modules/smartSafeHat.ts
+++ b/src/api/modules/smartSafeHat.ts
@ -49,7 +49,11 @@ export const getVehiclePositionDayRecord = (params: {}) => {

 // 智能安全帽--分类查询设备列表
 export const getHatDevOptionApi = (params: {}) => {
-	return http.get(BASEURL + `/xmgl/safetyHatDev/list`, params);
+	return http.get(BASEURL + `/xmgl/safetyHatDev/list`, params, { headers: { noLoading: true } });
+};
+// 智能安全帽--分类查询设备列表-分页
+export const getHatDevOptionPageApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/safetyHatDev/page`, params);
 };
 // 智能安全帽--分类查询设备树
 export const getEnterpriseTreeApi = (params: {}) => {
@ -61,11 +65,11 @@ export const getSafeHatTypeTotalApi = (params: {}) => {
 };
 // 智能安全帽--查询周报警数据
 export const getWeekAlarmDataApi = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/safetyHatAlarm/getRecentWeekAlarm`, params);
+	return http.post(BASEURL + `/xmgl/safetyHatAlarm/getRecentWeekAlarm`, params, { headers: { noLoading: true } });
 };
 // 智能安全帽--查询围栏信息
 export const getSuroundInfoApi = (params: {}) => {
-	return http.get(BASEURL + `/xmgl/safetyHatFence/list`, params);
+	return http.get(BASEURL + `/xmgl/safetyHatFence/list`, params, { headers: { noLoading: true } });
 };
 // 智能安全帽--查询报警信息
 export const getAlarmRecordInfoApi = (params: {}) => {
@ -73,7 +77,7 @@ export const getAlarmRecordInfoApi = (params: {}) => {
 };
 // 智能安全帽--查询报警信息-分页
 export const getAlarmRecordInfoApiPage = (params: {}) => {
-	return http.get(BASEURL + `/xmgl/safetyHatAlarm/page`, params);
+	return http.get(BASEURL + `/xmgl/safetyHatAlarm/page`, params, { headers: { noLoading: true } });
 };

 // 智能安全帽--查询实时数据信息
@ -96,3 +100,40 @@ export const deleteSafehatFence = (params: {}) => {
 export const addSafeHatPositionFence = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/safetyHatFence/add`, params);
 };
+
+// 智能安全帽--查询围栏绑定人员
+export const getHatFenceByIdApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/safetyHatFence/queryById`, params);
+};
+
+// 智能安全帽--绑定人员
+export const bindWorkerApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/safetyHatDev/bind`, params);
+};
+// 智能安全帽--解绑人员
+export const unBindWorkerApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/safetyHatDev/unBind`, params);
+};
+
+// 智能安全帽--查询报警配置
+export const getAlarmConfigApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/safetyHatAlarmConfig/list`, params, { headers: { noLoading: true } });
+};
+
+// 智能安全帽--查询围栏绑定人员
+export const getWorkerListByRegionApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/safetyHatData/getWorkerListByRegion`, params);
+};
+// 智能安全帽--查询围栏绑定人员
+export const getWorkerListByRegionApi1 = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/safetyHatData/getWorkerListByRegion1`, params);
+};
+
+// 智能安全帽--查询围栏绑定车辆
+export const getVehicleListByRegionApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionData/getVehicleListByRegion`, params);
+};
+// 智能安全帽--查询围栏绑定车辆
+export const getVehicleListByRegionApi1 = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionData/getVehicleListByRegion1`, params);
+};
--- a/src/api/modules/workTicket.ts
+++ b/src/api/modules/workTicket.ts
@ -0,0 +1,32 @@
+
+import http from "@/api";
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 统计工作票
+export const getWorkTicketCountWorkTicketApi = (params: {}) => {
+    return http.post(BASEURL + `/xmgl/workTicket/countWorkTicket`, params);
+};
+// 分页列表查询工作票信息
+export const getWorkTicketPageApi = (params: {}) => {
+    return http.get(BASEURL + `/xmgl/workTicket/page`, params);
+};
+// 树形分页列表查询工作票类型信息
+export const getWorkTicketTypeTreePageApi = (params: {}) => {
+    return http.get(BASEURL + `/xmgl/workTicketType/tree/page`, params);
+};
+// 通过id查询工作票信息
+export const getWorkTicketQueryByIdApi = (params: {}) => {
+    return http.get(BASEURL + `/xmgl/workTicket/queryById`, params);
+};
+// 列表查询工作票历史记录信息
+export const getWorkTicketHistoryListApi = (params: {}) => {
+    return http.get(BASEURL + `/xmgl/workTicketHistory/list`, params);
+};
+// 根据itemId查询视频播放url
+export const getVideoItemInfoPoliceCameraItemApi = (params: {}) => {
+    return http.post(BASEURL + `/xmgl/policeCameraItem/getVideoItemInfo`, params);
+};
+// 分页列表查询执法记录仪设备列表信息
+export const getPoliceCameraItemPageApi = (params: {}) => {
+    return http.get(BASEURL + `/xmgl/policeCameraItem/page`, params);
+};
--- a/src/assets/fonts/fonts.scss
+++ b/src/assets/fonts/fonts.scss
@ -64,3 +64,13 @@
 	font-family: YouSheBiaoTiHei;
 	src: url("./screenFonts/YouSheBiaoTiHei-2.ttf");
 }
+@font-face {
+	font-family: AlimamaShuHeiTi;
+	src: url("./screenFonts/AlimamaShuHeiTi.ttf");
+}
+
+@font-face {
+	font-family: AlibabaPuHuiTi;
+	src: url("./screenFonts/AlibabaPuHuiTi.ttf");
+}
+
--- a/src/assets/fonts/screenFonts/AlibabaPuHuiTi.ttf
+++ b/src/assets/fonts/screenFonts/AlibabaPuHuiTi.ttf
--- a/src/assets/fonts/screenFonts/AlimamaShuHeiTi.ttf
+++ b/src/assets/fonts/screenFonts/AlimamaShuHeiTi.ttf
--- a/src/assets/images/Mars3DImg/basemaps/TerrainEllipsoid.png
+++ b/src/assets/images/Mars3DImg/basemaps/TerrainEllipsoid.png
--- a/src/assets/images/Mars3DImg/basemaps/TerrainSTK.png
+++ b/src/assets/images/Mars3DImg/basemaps/TerrainSTK.png
--- a/src/assets/images/Mars3DImg/basemaps/arcgis.png
+++ b/src/assets/images/Mars3DImg/basemaps/arcgis.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-bluish.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-bluish.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-dark.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-dark.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-darkgreen.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-darkgreen.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-googlelite.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-googlelite.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-grassgreen.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-grassgreen.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-grayscale.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-grayscale.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-hardedge.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-hardedge.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-light.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-light.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-midnight.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-midnight.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-pink.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-pink.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-c-redalert.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-c-redalert.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-img.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-img.png
--- a/src/assets/images/Mars3DImg/basemaps/bd-vec.png
+++ b/src/assets/images/Mars3DImg/basemaps/bd-vec.png
--- a/src/assets/images/Mars3DImg/basemaps/bingAerial.png
+++ b/src/assets/images/Mars3DImg/basemaps/bingAerial.png
--- a/src/assets/images/Mars3DImg/basemaps/bingAerialLabels.png
+++ b/src/assets/images/Mars3DImg/basemaps/bingAerialLabels.png
--- a/src/assets/images/Mars3DImg/basemaps/bingRoads.png
+++ b/src/assets/images/Mars3DImg/basemaps/bingRoads.png
--- a/src/assets/images/Mars3DImg/basemaps/bingimage.png
+++ b/src/assets/images/Mars3DImg/basemaps/bingimage.png
--- a/src/assets/images/Mars3DImg/basemaps/bingmap.png
+++ b/src/assets/images/Mars3DImg/basemaps/bingmap.png
--- a/src/assets/images/Mars3DImg/basemaps/blackMarble.png
+++ b/src/assets/images/Mars3DImg/basemaps/blackMarble.png
--- a/src/assets/images/Mars3DImg/basemaps/esriNationalGeographic.png
+++ b/src/assets/images/Mars3DImg/basemaps/esriNationalGeographic.png
--- a/src/assets/images/Mars3DImg/basemaps/esriWorldImagery.png
+++ b/src/assets/images/Mars3DImg/basemaps/esriWorldImagery.png
--- a/src/assets/images/Mars3DImg/basemaps/esriWorldStreetMap.png
+++ b/src/assets/images/Mars3DImg/basemaps/esriWorldStreetMap.png
--- a/src/assets/images/Mars3DImg/basemaps/gaode_img.png
+++ b/src/assets/images/Mars3DImg/basemaps/gaode_img.png
--- a/src/assets/images/Mars3DImg/basemaps/gaode_vec.png
+++ b/src/assets/images/Mars3DImg/basemaps/gaode_vec.png
--- a/src/assets/images/Mars3DImg/basemaps/google_img.png
+++ b/src/assets/images/Mars3DImg/basemaps/google_img.png
--- a/src/assets/images/Mars3DImg/basemaps/google_ter.png
+++ b/src/assets/images/Mars3DImg/basemaps/google_ter.png
--- a/src/assets/images/Mars3DImg/basemaps/google_vec.png
+++ b/src/assets/images/Mars3DImg/basemaps/google_vec.png
--- a/src/assets/images/Mars3DImg/basemaps/mapQuestOpenStreetMap.png
+++ b/src/assets/images/Mars3DImg/basemaps/mapQuestOpenStreetMap.png
--- a/src/assets/images/Mars3DImg/basemaps/mapboxSatellite.png
+++ b/src/assets/images/Mars3DImg/basemaps/mapboxSatellite.png
--- a/src/assets/images/Mars3DImg/basemaps/mapboxStreets.png
+++ b/src/assets/images/Mars3DImg/basemaps/mapboxStreets.png
--- a/src/assets/images/Mars3DImg/basemaps/mapboxTerrain.png
+++ b/src/assets/images/Mars3DImg/basemaps/mapboxTerrain.png
--- a/src/assets/images/Mars3DImg/basemaps/naturalEarthII.png
+++ b/src/assets/images/Mars3DImg/basemaps/naturalEarthII.png
--- a/src/assets/images/Mars3DImg/basemaps/null.png
+++ b/src/assets/images/Mars3DImg/basemaps/null.png
--- a/src/assets/images/Mars3DImg/basemaps/offline.png
+++ b/src/assets/images/Mars3DImg/basemaps/offline.png
--- a/src/assets/images/Mars3DImg/basemaps/osm.png
+++ b/src/assets/images/Mars3DImg/basemaps/osm.png
--- a/src/assets/images/Mars3DImg/basemaps/sea.png
+++ b/src/assets/images/Mars3DImg/basemaps/sea.png
--- a/src/assets/images/Mars3DImg/basemaps/stamenToner.png
+++ b/src/assets/images/Mars3DImg/basemaps/stamenToner.png
--- a/src/assets/images/Mars3DImg/basemaps/stamenWatercolor.png
+++ b/src/assets/images/Mars3DImg/basemaps/stamenWatercolor.png
--- a/src/assets/images/Mars3DImg/basemaps/tdt_img.png
+++ b/src/assets/images/Mars3DImg/basemaps/tdt_img.png
--- a/src/assets/images/Mars3DImg/basemaps/tdt_ter.png
+++ b/src/assets/images/Mars3DImg/basemaps/tdt_ter.png
--- a/src/assets/images/Mars3DImg/basemaps/tdt_vec.png
+++ b/src/assets/images/Mars3DImg/basemaps/tdt_vec.png
--- a/src/assets/images/Mars3DImg/basemaps/tencent_img.png
+++ b/src/assets/images/Mars3DImg/basemaps/tencent_img.png
--- a/src/assets/images/Mars3DImg/basemaps/tencent_vec.png
+++ b/src/assets/images/Mars3DImg/basemaps/tencent_vec.png
--- a/src/assets/images/Mars3DImg/marker/80800.png
+++ b/src/assets/images/Mars3DImg/marker/80800.png
--- a/src/assets/images/Mars3DImg/marker/lace-blue.png
+++ b/src/assets/images/Mars3DImg/marker/lace-blue.png
--- a/src/assets/images/Mars3DImg/marker/lace-red.png
+++ b/src/assets/images/Mars3DImg/marker/lace-red.png
--- a/src/assets/images/Mars3DImg/marker/lace-yellow.png
+++ b/src/assets/images/Mars3DImg/marker/lace-yellow.png
--- a/src/assets/images/Mars3DImg/marker/mark-blue.png
+++ b/src/assets/images/Mars3DImg/marker/mark-blue.png
--- a/src/assets/images/Mars3DImg/marker/mark-green.png
+++ b/src/assets/images/Mars3DImg/marker/mark-green.png
--- a/src/assets/images/Mars3DImg/marker/mark-red.png
+++ b/src/assets/images/Mars3DImg/marker/mark-red.png
--- a/src/assets/images/Mars3DImg/marker/point-orange.png
+++ b/src/assets/images/Mars3DImg/marker/point-orange.png
--- a/src/assets/images/Mars3DImg/marker/point-red.png
+++ b/src/assets/images/Mars3DImg/marker/point-red.png
--- a/src/assets/images/Mars3DImg/marker/point-yellow.png
+++ b/src/assets/images/Mars3DImg/marker/point-yellow.png
--- a/src/assets/images/Mars3DImg/marker/route-end.png
+++ b/src/assets/images/Mars3DImg/marker/route-end.png
--- a/src/assets/images/Mars3DImg/marker/route-start.png
+++ b/src/assets/images/Mars3DImg/marker/route-start.png
--- a/src/assets/images/Mars3DImg/marker/square.png
+++ b/src/assets/images/Mars3DImg/marker/square.png
--- a/src/assets/images/Mars3DImg/marker/street.png
+++ b/src/assets/images/Mars3DImg/marker/street.png
--- a/src/assets/images/Mars3DImg/marker/street2.png
+++ b/src/assets/images/Mars3DImg/marker/street2.png
--- a/src/assets/images/bigImg-bak.png
+++ b/src/assets/images/bigImg-bak.png
--- a/src/assets/images/bigImg.png
+++ b/src/assets/images/bigImg.png
--- a/src/assets/images/bigImg3.gif
+++ b/src/assets/images/bigImg3.gif
--- a/src/assets/images/cardImg1.png
+++ b/src/assets/images/cardImg1.png
--- a/src/assets/images/header/header-bg.png
+++ b/src/assets/images/header/header-bg.png
--- a/src/assets/images/header/sub-header-bg.png
+++ b/src/assets/images/header/sub-header-bg.png
--- a/src/assets/images/header/sub-tab-bg-active.png
+++ b/src/assets/images/header/sub-tab-bg-active.png
--- a/src/assets/images/header/tab-bg-active.png
+++ b/src/assets/images/header/tab-bg-active.png
--- a/src/assets/images/header/tab-bg.png
+++ b/src/assets/images/header/tab-bg.png
--- a/src/assets/images/larborManagement/back-ic.png
+++ b/src/assets/images/larborManagement/back-ic.png
--- a/src/assets/images/larborManagement/xd-bg-warn.png
+++ b/src/assets/images/larborManagement/xd-bg-warn.png
--- a/src/assets/images/larborManagement/xd-bg.png
+++ b/src/assets/images/larborManagement/xd-bg.png
--- a/src/assets/images/larborManagement/xd-ic-warn.png
+++ b/src/assets/images/larborManagement/xd-ic-warn.png
--- a/src/assets/images/larborManagement/xd-ic.png
+++ b/src/assets/images/larborManagement/xd-ic.png
--- a/src/assets/images/login/input-bg-focus.png
+++ b/src/assets/images/login/input-bg-focus.png
--- a/src/assets/images/login/input-bg.png
+++ b/src/assets/images/login/input-bg.png
--- a/src/assets/images/login/login-bg.png
+++ b/src/assets/images/login/login-bg.png
--- a/src/assets/images/login/login-title-adorn.png
+++ b/src/assets/images/login/login-title-adorn.png
--- a/src/assets/images/monitor/close-all-active.png
+++ b/src/assets/images/monitor/close-all-active.png
--- a/src/assets/images/monitor/close-all.png
+++ b/src/assets/images/monitor/close-all.png
--- a/src/assets/images/monitor/monitor-icon.png
+++ b/src/assets/images/monitor/monitor-icon.png
--- a/src/assets/images/monitor/play-all-active.png
+++ b/src/assets/images/monitor/play-all-active.png
--- a/src/assets/images/monitor/play-all.png
+++ b/src/assets/images/monitor/play-all.png
--- a/src/assets/images/monitor/video_1.png
+++ b/src/assets/images/monitor/video_1.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rain_	523e8c3a92	flx：合并冲突	2025-07-14 17:12:07 +08:00
Rain_	9c4a83d943	flx：提交作业管控模块	2025-07-14 14:41:33 +08:00
jiayu	b08169e47e	中水北方需求	2025-07-11 17:03:21 +08:00
Rain_	a90ff18543	flx: 修复首次后台免登录进来报错bug	2025-07-07 17:53:28 +08:00
jiayu	22c9cfd642	修复bug	2025-06-24 11:54:06 +08:00
jiayu	2279a3c5d0	代码优化	2025-06-17 11:36:12 +08:00
jiayu	47db9192bd	中水北方需求	2025-06-16 16:13:26 +08:00
jiayu	0eacffa460	优化代码	2025-06-10 15:51:18 +08:00
jiayu	89e6ae2a59	bug修复	2025-06-09 18:41:31 +08:00
jiayu	7b7fa741d2	基建模块	2025-06-09 09:42:34 +08:00
Rain_	850b1e2676	Merge branch 'shenzhen-dev' of http://192.168.34.160:8023/admin/zhgdlarge into shenzhen-dev	2025-06-06 10:26:43 +08:00
Rain_	d1b231a689	flx:修改数字工地车辆测速样式错位问题大型机械履带吊、汽车吊文字错误问题	2025-06-06 10:19:58 +08:00
dhp	8be9b201ea	字体文件优化	2025-06-04 09:48:09 +08:00
dhp	9a9ea92796	去除字体	2025-06-04 09:39:43 +08:00
jiayu	d99436a392	盾构机模块	2025-06-03 18:50:27 +08:00
dhp	5b0a423804	修改大屏baseurl	2025-06-03 16:36:32 +08:00
jiayu	7b850d3208	修复报错	2025-06-03 14:07:23 +08:00
jiayu	c2e2b0808c	头部样式、梁大屏相关	2025-06-03 13:45:04 +08:00
jiayu	03e49946c1	鞍钢需求	2025-05-21 10:59:40 +08:00
jiayu	02051759ae	版本更新	2025-05-13 15:56:20 +08:00
jiayu	971f74a4f9	修复安全帽bug	2025-04-16 14:33:28 +08:00
jiayu	1275fcd343	Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev	2025-04-14 10:11:20 +08:00
jiayu	f503f3eaff	中水北方需求	2025-04-14 10:11:10 +08:00
Rain_	dc3965d429	flx：修改配置冲突	2025-04-12 10:58:22 +08:00
Rain_	2b5bdaf3be	Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev	2025-04-12 10:57:00 +08:00
Rain_	f8c187e2d1	flx:提交中新建版配置指挥部大屏	2025-04-12 10:56:21 +08:00
jiayu	da60872d01	劳务人员列表样式重构	2025-04-12 09:14:18 +08:00
jiayu	f6ce55acbc	修复水平位移沉降监测bug	2025-04-08 15:01:10 +08:00
jiayu	bd499046e8	盾构机模块	2025-04-02 19:05:24 +08:00
jiayu	11c8b2cd28	盾构机模块	2025-04-02 18:49:37 +08:00