Merge branch 'rongtu_cjw' into rongtu_dev

src/api/modules/equipmentPosition.ts

@@ -0,0 +1,36 @@
+import http from "@/api";
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 机械设备定位--分类查询设备列表
+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/routers/modules/staticRouter.ts

@@ -52,6 +52,11 @@ export const staticRouter: RouteRecordRaw[] = [
 				name: "车辆管理",
 				component: () => import("@/views/sevenLargeScreen/vehicleManagement/index.vue")
 			},
+			{
+				path: "/vehicleManagement",
+				name: "车辆管理",
+				component: () => import("@/views/sevenLargeScreen/vehicleManagement/index.vue")
+			},
 			{
 				path: "/towerCraneMonitoring",
 				name: "塔吊监测",
@@ -248,6 +253,16 @@ export const staticRouter: RouteRecordRaw[] = [
 				name: "工程概览",
 				component: () => import("@/views/sevenLargeScreen/newProjectOverView/index.vue")
 				// component: () => import("@/views/sevenLargeScreen/safeRisk/newProjectOverView.vue")
+			},
+			{
+				path: "/positionManagement",
+				name: "机械设备定位",
+				component: () => import("@/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue")
+			},
+			{
+				path: "/smartSafeHat",
+				name: "智能安全帽",
+				component: () => import("@/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue")
 			}
 		],
 		meta: {

src/views/sevenLargeScreen/indexL.vue

@@ -170,6 +170,20 @@ let menuList = ref([
 			}
 		]
 	},
+	{
+		moduleName: "设备定位",
+		modulePath: "/positionManagement",
+		menuList: [
+			{
+				menuName: "机械设备定位",
+				companyPath: "/positionManagement"
+			},
+			{
+				menuName: "智能安全帽",
+				companyPath: "/smartSafeHat"
+			}
+		]
+	},
 	{
 		moduleName: "进度管控",
 		modulePath: "/schedulePlan",

src/views/sevenLargeScreen/newProjectOverView/leftBottom.vue

@@ -14,14 +14,14 @@
 				<div>今日工作票</div>
 			</div>
 		</div>
-		<workTicketDialog ref="workTicketRef"></workTicketDialog>
+		<workTicketDialog @call-parent-function="getWorkeTicketData" ref="workTicketRef"></workTicketDialog>
 	</Card>
 </template>
 
 <script lang="ts" setup>
 import { GlobalStore } from "@/stores";
 import { getWorkTicket } from "@/api/modules/headNoise";
-import { onMounted, ref } from "vue";
+import { onMounted, ref, defineComponent, defineEmits} from "vue";
 import Card from "@/components/card.vue";
 import workTicketDialog from "../safeRisk/riskManage/work-ticket-dialog.vue";
 const store = GlobalStore();

src/views/sevenLargeScreen/safeRisk/riskManage/middle.vue

@@ -21,7 +21,7 @@
 			</Card>
 		</div>
 		<div class="middle-bottom">
-			<Card title="今日报警统计">
+			<Card title="历史报警统计">
 				<div class="today-warning-list">
 					<div class="list-content">
 						<div class="tab-list">

src/views/sevenLargeScreen/safeRisk/riskManage/work-ticket-dialog.vue

@@ -244,7 +244,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, watch } from "vue";
+import { ref, onMounted, watch, defineEmits } from "vue";
 import { GlobalStore } from "@/stores";
 import { getWorkTicketDetail, editWorkTicketDetail } from "@/api/modules/headNoise";
 import firstIcon from "@/assets/images/smartPartyBuilding/contentBox.png";
@@ -258,6 +258,8 @@ const store = GlobalStore();
 const selectTitle = ref("" as any);
 let showDialog = ref(false as any);
 const postData = ref({} as any);
+
+const emit = defineEmits(['call-parent-function']);
 // 保存操作
 const saveOperate = async () => {
 	const res: any = await editWorkTicketDetail({ ...detailData.value });
@@ -268,6 +270,7 @@ const saveOperate = async () => {
 			type: "success"
 		});
 		isEdit.value = false;
+		emit('call-parent-function')
 	}
 };
 // 编辑操作

src/views/sevenLargeScreen/videoManagement/index.vue

@@ -129,6 +129,7 @@ let videoType = ref("") as any;
 let ysyParams = ref({} as any);
 
 let shipinList = ref([] as any);
+let tempList = ref([] as any);
 const store = GlobalStore();
 const playWndBox = ref(null);
 let cameraIndexCode = ref<Array<string>>([]);
@@ -140,6 +141,12 @@ const selectFn = (index: any) => {
 };
 const changeShowType = (type: any) => {
 	showType.value = type;
+	// videoList.value = []
+	for(let i = 0; i < type;i++){
+		if(shipinList.value[i] !== undefined && shipinList.value[i] !== null && shipinList.value[i] !== ""){
+			videoList.value[i] = shipinList.value[i]
+		}
+	}
 };
 const goToSafeHelmet = async () => {
 	const res: any = await getSafeHatSessionApi({ projectSn: store.sn });