字体文件优化

.env.development

@@ -3,7 +3,8 @@ NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
-# VITE_API_URL = 'http://192.168.34.155:19111'
+# 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:19112' #雄哥本地
 # VITE_API_URL = 'http://192.168.34.221:28890' #雄哥本地
@@ -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'
 # 包头化工

.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='
 

package.json

@@ -45,8 +45,8 @@
 		"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",

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);
+};

src/api/modules/labor.ts

@@ -63,3 +63,8 @@ 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 } });
+};

src/api/modules/mapConfig.ts

@@ -0,0 +1,28 @@
+// 项目展示
+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);
+};

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 } });
+};

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,27 @@ 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);
+};

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");
+}
+