fix: 修改智能安全帽和机械设备定位模块bug

.env.development

@@ -3,7 +3,7 @@ NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
-VITE_API_URL = 'http://192.168.34.221:9111'
+# VITE_API_URL = 'http://192.168.34.221:9111'
 # VITE_API_URL = 'http://192.168.34.221:28888'
 # VITE_API_URL = 'http://121.196.214.246/api'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
@@ -15,7 +15,7 @@ VITE_API_URL = 'http://192.168.34.221:9111'
 # 演示平台
 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
 # 百色七参数线上地址
-# VITE_API_URL = 'http://101.43.164.214:11111'
+VITE_API_URL = 'http://101.43.164.214:11111'
 
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

src/api/modules/equipmentPosition.ts

@@ -0,0 +1,94 @@
+import http from "@/api";
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 分页列表查询车辆（人员）定位- 报警记录信息
+export const getAlarmRecordInfo = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionAlarm/list`, params);
+};
+
+// 分页列表查询车辆（人员）定位- 实时数据信息
+export const getRealtimeRecordInfo = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionData/page`, params);
+};
+
+// 列表查询车辆（人员）定位- 实时数据信息
+export const getRealtimeRecordList = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionData/list`, params);
+};
+
+// 车辆定位-设备中台
+export const getstandardDevListApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionDev/page`, params);
+};
+export const addstandardDevApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionDev/add`, params);
+};
+export const editstandardDevApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionDev/edit`, params);
+};
+export const deletestandardDevApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionDev/delete`, params);
+};
+
+export const getVehiclePositionFence = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionFence/list`, params);
+};
+export const addVehiclePositionFence = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionFence/add`, params);
+};
+export const editVehiclePositionFence = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionFence/edit`, params);
+};
+export const deleteVehiclePositionFence = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionFence/delete`, params);
+};
+
+// 获取设备中台所有数据
+export const getCarDevOption = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionDev/list`, params);
+};
+
+// 查询设备状态总数
+export const getFenceTypeTotal = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionDev/countVehiclePositionDev`, params);
+};
+
+// 查询车辆日行数据
+export const getVehiclePositionDayRecord = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionDayRecord/list`, params);
+};
+
+
+// 机械设备定位--分类查询设备列表
+export const getEpDevOptionApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/mechanicalEquipmentPositionDev/list`, params);
+};
+// 机械设备定位--查询设备状态总数
+export const getEpTypeTotalApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/mechanicalEquipmentPositionDev/countDev`, params);
+};
+// 机械设备定位--查询围栏信息
+export const getEpSuroundInfoApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/mechanicalEquipmentPositionFence/list`, params);
+};
+// 机械设备定位--查询报警信息
+export const getEpAlarmRecordInfoApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/mechanicalEquipmentPositionAlarm/list`, params);
+};
+// 机械设备定位--查询实时数据信息
+export const getEpRealtimeDataApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/mechanicalEquipmentPositionData/list`, params);
+};
+// 机械设备定位--查询机械设备日行数据
+export const getEpDayRecordApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/mechanicalEquipmentPositionDayRecord/list`, params);
+};
+
+// 机械设备定位--删除围栏
+export const deleteEpFence = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/mechanicalEquipmentPositionFence/deleteBatch`, params);
+};
+// 机械设备定位--添加围栏
+export const addEpPositionFence = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/mechanicalEquipmentPositionFence/add`, params);
+};

src/api/modules/smartSafeHat.ts

@@ -0,0 +1,81 @@
+import http from "@/api";
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 分页列表查询车辆（人员）定位- 实时数据信息
+export const getRealtimeRecordInfo = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionData/page`, params);
+};
+
+// 列表查询车辆（人员）定位- 实时数据信息
+export const getRealtimeRecordList = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionData/list`, params);
+};
+
+// 车辆定位-设备中台
+export const getstandardDevListApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionDev/page`, params);
+};
+export const addstandardDevApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionDev/add`, params);
+};
+export const editstandardDevApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionDev/edit`, params);
+};
+export const deletestandardDevApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionDev/delete`, params);
+};
+
+export const getVehiclePositionFence = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionFence/list`, params);
+};
+export const addVehiclePositionFence = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionFence/add`, params);
+};
+export const editVehiclePositionFence = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionFence/edit`, params);
+};
+export const deleteVehiclePositionFence = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/vehiclePositionFence/delete`, params);
+};
+
+// 查询车辆日行数据
+export const getVehiclePositionDayRecord = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/vehiclePositionDayRecord/list`, params);
+};
+
+// 智能安全帽--分类查询设备列表
+export const getHatDevOptionApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/safetyHatDev/list`, params);
+};
+// 智能安全帽--查询设备状态总数
+export const getSafeHatTypeTotalApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/safetyHatDev/countSafetyHatDev`, params);
+};
+// 智能安全帽--查询周报警数据
+export const getWeekAlarmDataApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/safetyHatAlarm/getRecentWeekAlarm`, params);
+};
+// 智能安全帽--查询围栏信息
+export const getSuroundInfoApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/safetyHatFence/list`, params);
+};
+// 智能安全帽--查询报警信息
+export const getAlarmRecordInfoApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/safetyHatAlarm/list`, params);
+};
+// 智能安全帽--查询实时数据信息
+export const getRealtimeDataApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/safetyHatData/list`, params);
+};
+// 智能安全帽--查询安全帽日行数据
+export const getSafeHatDayRecordApi = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/safetyHatData/list`, params);
+};
+// 智能安全帽--删除围栏
+export const deleteSafehatFence = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/safetyHatFence/deleteBatch`, params);
+};
+// 智能安全帽--添加围栏
+export const addSafeHatPositionFence = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/safetyHatFence/add`, params);
+};

src/config/staticMenu.ts

@@ -45,6 +45,14 @@ export const commonMenu: Array<any> = [
 			{
 				menuName: "车辆定位",
 				companyPath: "/carPosition"
+			},
+			{
+				menuName: "机械设备定位",
+				companyPath: "/equipmentPosition"
+			},
+			{
+				menuName: "智能安全帽",
+				companyPath: "/smartSafeHat"
 			}
 		]
 	},

src/routers/modules/staticRouter.ts

@@ -102,6 +102,18 @@ export const staticRouter: RouteRecordRaw[] = [
 				name: "车辆定位",
 				component: () => import("@/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue")
 			},
+			{
+				path: "/equipmentPosition",
+				// path: "/carPosition",
+				name: "机械设备定位",
+				component: () => import("@/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue")
+			},
+			{
+				path: "/smartSafeHat",
+				// path: "/carPosition",
+				name: "智能安全帽",
+				component: () => import("@/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue")
+			},
 			{
 				path: "/edgeProtection",
 				name: "临边防护",

src/views/sevenLargeScreen/indexL.vue

@@ -212,6 +212,14 @@ let menuList = ref([
 			{
 				menuName: "车辆定位",
 				companyPath: "/carPosition"
+			},
+			{
+				menuName: "机械设备定位",
+				companyPath: "/equipmentPosition"
+			},
+			{
+				menuName: "智能安全帽",
+				companyPath: "/smartSafeHat"
 			}
 		]
 	},

src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightTop.vue

@@ -7,7 +7,7 @@
 			</div>
 			<div class="concrete-alarm">
 				<div class="text">正在告警</div>
-				<div class="num">{{ realTimeTotal.alarmNum || 0 }}</div>
+				<div class="num">{{ realTimeTotal.alarmPositionNum || 0 }}</div>
 			</div>
 		</div>
 	</Card>