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

.env.development

@@ -2,7 +2,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:28889'
 # VITE_API_URL = 'http://121.196.214.246/api'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
@@ -12,7 +12,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:11113'
+VITE_API_URL = 'http://101.43.164.214:11113'
 
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

src/api/modules/equipmentPosition.ts

@@ -1,64 +1,6 @@
 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);

src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue

@@ -281,20 +281,8 @@
 </template>
 
 <script setup lang="ts">
-// import { getWorkerInfoList } from "@/assets/js/api/laborPerson";
-import {
-	getAlarmRecordInfo,
-	getCarDevOption,
-	addstandardDevApi,
-	getRealtimeRecordInfo,
-	getRealtimeRecordList,
-	getVehiclePositionDayRecord
-} from "@/api/modules/equipmentPosition";
 
 import {
-	getFenceTypeTotal,
-	getVehiclePositionFence,
-	addVehiclePositionFence,
 	getEpDevOptionApi,
 	getEpTypeTotalApi,
 	getEpSuroundInfoApi,
@@ -315,6 +303,7 @@ import startIcon from "@/assets/images/startIcon.png";
 import endIcon from "@/assets/images/endIcon.png";
 import personOn from "@/assets/images/personOn.png";
 import equipmentPosition2 from "@/assets/images/equipmentPosition2.png";
+import equipmentPosition3 from "@/assets/images/equipmentPosition3.png";
 import { GlobalStore } from "@/stores";
 import { ElMessage, ElMessageBox } from "element-plus";
 import type { FormInstance, FormRules } from "element-plus";
@@ -416,7 +405,7 @@ let addEditForm = ref({
 	driver: ""
 });
 onMounted(() => {
-	// choiceMonth.value = formatMonthTime(dayValue.value);
+	choiceMonth.value = formatMonthTime(dayValue.value);
 	// console.log("当前月份", choiceMonth.value);
 	initMap();
 	getProgressListData();
@@ -642,7 +631,7 @@ function getTodayTrack(day) {
 				const element = res.result[index];
 				path.unshift([element.longitude, element.latitude]);
 			}
-			trackMapInit(path, currentData);
+			if(checked.value == 2) trackMapInit(path, currentData);
 		}
 		console.log("当前数据", path, currentData);
 	});
@@ -1074,7 +1063,7 @@ function trackMapInit(path: any, item: any) {
 			position: path[0],
 			// icon: "https://webapi.amap.com/images/car.png",
 			// icon: "src/assets/images/equipmentPosition2.png",
-			icon: equipmentPosition2,
+			icon: equipmentPosition3,
 			offset: new AMap.Pixel(-26, -13),
 			autoRotation: true,
 			angle: -90
@@ -1114,6 +1103,7 @@ function trackMapInit(path: any, item: any) {
 		info.push('<p style="padding:7px;">设备名称: ' + item.equipmentName + "</p>");
 		info.push('<p style="padding:7px;">最后更新时间: ' + item.updateTime + "</p>");
 		info.push('<p style="padding:7px;">位置: ' + address + "</p>");
+		info.push('<p style="padding:7px;">经纬度: ' + item.longitude + "|" + item.latitude + "</p>");
 		var infoWindow = new AMap.InfoWindow({
 			offset: new AMap.Pixel(10, -30),
 			content: info.join("") //使用默认信息窗体框样式，显示信息内容

src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue

@@ -1782,7 +1782,7 @@ function echoPersonMarker(item) {
 		info.push('<p style="padding:7px;">人员名称: ' + item.workerName + "</p>");
 		info.push('<p style="padding:7px;">最后更新时间: ' + item.updateTime + "</p>");
 		info.push('<p style="padding:7px;">位置: ' + address + "</p>");
-		info.push('<p style="padding:7px;">经纬度: ' + item.longitude + "  |  " + item.latitude + "</p>");
+		info.push('<p style="padding:7px;">经纬度: ' + item.longitude + "|" + item.latitude + "</p>");
 
 		var infoWindow = new AMap.InfoWindow({
 			offset: new AMap.Pixel(10, -30),

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