From a1c3eddc6f7e7cf9bdf1538bc68822d802e360ab Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Mon, 25 Mar 2024 20:11:36 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=BF=AE=E6=94=B9=E6=BC=94=E7=A4=BA?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=9C=BA=E6=A2=B0=E8=AE=BE=E5=A4=87=E6=99=BA?=
 =?UTF-8?q?=E8=83=BD=E5=AE=89=E5=85=A8=E5=B8=BD=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/carPosition/equipment2.png  | Bin 0 -> 2393 bytes
 .../images/carPosition/equipmentPosition2.png | Bin 2393 -> 2069 bytes
 .../images/carPosition/equipmentPosition3.png | Bin 0 -> 1946 bytes
 .../equipmentPosition/index.vue               | 179 +++++++++++------
 .../smartSafeHat/index.vue                    | 183 ++++++++++++------
 5 files changed, 236 insertions(+), 126 deletions(-)
 create mode 100644 src/assets/images/carPosition/equipment2.png
 create mode 100644 src/assets/images/carPosition/equipmentPosition3.png

diff --git a/src/assets/images/carPosition/equipment2.png b/src/assets/images/carPosition/equipment2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a75dd4518d1279a4069e4359ad1fdf43aaac8bc3
GIT binary patch
literal 2393
zcmV-f38wamP)<h;3K|Lk000e1NJLTq001Ze000yS1^@s6|3-hi000RfNkl<ZNQups
zd2C$O8O6_i>+BxSjK}*HFY$s`5<8AfRzgBZ1hmkgLMaurpte+1CEAJ<kf0H*)X-20
zqL8LE2ozcZG%-+u(=5aei8DAu98Y48SG<j9JTvy}Z@bk@TJm32Rjt(b*VXrQbbt4J
z?|kp#|NS9pzO#SW-g@@ZbW>|FeUDV#ADU)w0<Q)@KtU;>fq*3pC{+Op$bt>dxj&&~
z=`?Ic1`6T9a0aNL84aVP!0OCUl`xb<5{zg8qql-47C|WsA_5F=g0>U^WjRna0;013
zsTdeV0vIl1TkgXyFzJQMGre624Zk=QH9r$#>k4=p{r7w&<bUpe22hSp+NF3>AJVV-
zo@TC{A!>{Q#6v+2gOHyPU^9Tc>oN*L2q<AeI2{Npf-pQl*#A0o#!HPdahU>oR@_h2
z_yQQV0~BijQUl;C={;$>w;2FBO9b<Yn8ccxz>tNqc|9u8jX=m61Sd>WN+MtcFuVa8
z5&)wBg!zxbGk{VuQopvzgsx84ch9F*%TsDD^kgYbE+j>J31x+5Mz6H146UKza4W}~
z@73fexJV3=FuGBpfXe9rMv!>DX@YV_cPiy~YnnVlHD(OF;R*;FO*;+nAUp-(^#F<g
zGY0<}P?yti;0x2%C;G!H<cS~)VlpDZi%<zKIU_DFBPYD#nD%zr+!%bf-h<)jBx?+w
z`#xV-(9Ceu$w={9KDkuRs7Zkl)oMyp)kMSHU_>P2OJL((N${%^Dq$w$x)qn$lz4>-
zk#SJs0b`sY5WomVP+0=i;t)6v980bPzIi6E=jN_uU1{Mo3RM^Mrg|6>EQ%M8!7}>^
zB!3XW3zZ0*Nd2WE<l9xavOgI~$<L#x9xRDMHP*8uBUdN0a&6D&Dwo}mVjC4v*J@&7
zrGltfy?#S3^rh8;fvvWM-CI)HwT?5Q5ny$bgcGh9q`7ekhI2Yo-fL<qf@mU<0nA`N
z{SE&3s(SmTs)l-^&;%x?97uTrDC35qGYCSdID0?~z&PQ?9eKq#WnO`qBxin0=7l42
zb_p~t7jDbW@=5287TwbLL|5$H&kEJ!@Fy6!mRGm=WNYv8&R=o1z!dH{UixX==8UQ;
zt<{oCg)Ehz;|NY%<xp2u<f~Y{Ht)B`{5W!+N8jo9uQ`}wHS~SxHb;-m6o6NkVACv^
z9Sy^m_k;YcHv|tk68qNmuYU^0I|Ymd==vt_J{0Ri3!1_l(b#ElHXdWVFdmFyyxd{B
zmk+vMNL(3w`*QvBFI`d!U&*Vk<&yP)bW($f=btnecYG|V8q{dOsjzIje`4@e8xzmX
zbC`c|&f{vH@EH<}P;&Ll7WYhVczM9%OC;GDbl4f#jb7;6zO!LVdt>*`OSc)jJ5FGx
zc?0w+5Gn#n#}1)b3IrIN2*w-6n?3U|t?Ng-IfA<N<~MR>GVDH|wHH?pJlAC{Mrx)N
zj(1Ej`n}+E^dLKTYC)iy0#*pAU^QMBwO7?BfIRWQ#29{EWU~CO_Qu2`XL|kt=qxB(
zuH(#{xa`A962^STj~{B?y6M%s-Y>xi&HLfMVFL<$fGPqs4scWgSg4U)CkzJ^Jkb}%
zqs6`WVa+R0d$&SL<@J|uShcP(KKc;jbN>pS?ks2kYyd3CgB-p#Qx$+^0E;C(N&uvm
zn;6O=DH&68Sh*gOr9>*ym=%XLJ`ASio;@qK-1PYEf33jZR_?`E`-8B?ftU?2v4EUb
z5IzkUoAR5=>Q@#`tQe9pI-LO4m4VG)1J-{Yv8&^FxVL!!x3^X8Z)=+TBSJ}?Z#s5M
zbWyW%43n9S>0fA4Auw{vY)QWSK{8Bt>Uoo|qO|;DQI{qgxdyncqaI(asfM&z0PFM%
z_u<GdaklVlxNy^tU{`>AX%e>M&ti6F6g4I*YV+rC=B%)5h3))rUNcnoo)S#&oq2DH
z)ChTNh3es@tmP@k{_f!AkB3r$!vp$YSDo!7n^f7$3y!r3iCP%~NV1&Cr~(c=%Y>^e
zOQ$~i`WJUwqOrujetrMV?fC%ut^pcMR{VL!jKzTEE@pODc0=qKBug!p?ZBGBUZ~G?
z;i*r6ktkr-1EE`aL?yAap-h42v#Cxw?Ci|V&&M0C5C#stg&Qj!Q1k`2<>W7emn9tS
z@j^5jpkpLRsRZ<T14L0oGMR*4Cn6Y?>rPJ#uX9ogF-d73n9`1|YAxFcAjqZxt&Utw
zcs+<kLf`VTt2T-{73;|da0Z9KAAMYV=tKL2TPe;q7>$@$ZFqOMaKY#(jo;TYX<THQ
z5GuSC&DHtnC?$T2%^s-C<$|)tWotqXR5=c-S%g4jG&eP1=Z@PlkfC4zMuQ%jrlO&t
z0e9`X8{0}QBC0v?X}mF)OU@kdcsz@l%Yrk<fx^N<m`x_1lgwgXD;dq<wSDUsUg_x`
zHSL*H3g54^B++(bGpdWM5J+q+m=s=yAGl}dX8in_J-Gjo$ME1<$4jqoAKUSC+uUQR
zgu4HWdH=Z4Xhcg(3j{$xB9V~l>guNE=jY*YIMCG8l(}@w`4(lnPMLyDL%u%cSC)O4
znVs+YG9(u-UWB43(CKt9Hn+4Mj8JDFZe6R1A*!EdsyQb9xyw;mnSPJF`~r9<rq_gm
zfddEQ_fE;j7mr$3pZk4IP8MTU7dV|1PU$SRner0n-s3~VceK=$WOOw(HR$W>o8P^A
z_cm2khiYqUGxd^^5_~@7z3|aH2X|Dfn=kky(kD)SVUH$SuBX`N^QBLRoSd8lVfloK
zB`}jHXe6F!YhMFzm^tKj^*)hyVRUp9PMi5^L(A%S_MQ%$2>Cp*O|#tGqYpm-kt6|_
zd6?}Zn>Tmi!^_EDx7&StV`C!*1_sit>}_gl@*F;Vczkehu)MUiG*iE2%jTm+WmUnS
z9`$UuSxtOZS>^C@IFtd*v^f32>h*f?JP%4KG%Y=}G{_18Ys|*Yn>IXIQBm<Tm&<ih
z)3n#y+B?=6^twfp;`ioR*g1_dP_(oneO@X<1zfJn$Z^{5%+Ai<*WcfN(quC4>+bIU
zW@l$-+Kf(~=if}%YinzFZ@FdLv(cp>oWk;z95Hc;=QwB-0D!*(bS)A`wmQJm00000
LNkvXXu0mjfVaIw}

literal 0
HcmV?d00001

diff --git a/src/assets/images/carPosition/equipmentPosition2.png b/src/assets/images/carPosition/equipmentPosition2.png
index a75dd4518d1279a4069e4359ad1fdf43aaac8bc3..ae1aa3beb308a21bc74f0b36cfa3941a248e1a47 100644
GIT binary patch
delta 2057
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

delta 2383
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
BfGq$3

diff --git a/src/assets/images/carPosition/equipmentPosition3.png b/src/assets/images/carPosition/equipmentPosition3.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd4e1eda560fa079bb96846d41ace11c6ba9f38a
GIT binary patch
literal 1946
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

literal 0
HcmV?d00001

diff --git a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
index 8fc9101..aa9204c 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
@@ -158,7 +158,7 @@
 										</el-checkbox-group>
 									</el-scrollbar>
 								</div>
-								<div v-else style="text-align: center; margin-top: 100px; color: #fff">暂无围栏</div>
+								<div v-else style="text-align: center; margin-top: 65px; color: #fff">暂无围栏</div>
 							</div>
 							<!-- 创建围栏弹窗 -->
 							<div class="fenceCreate" v-if="fenceCreateShow">
@@ -168,7 +168,7 @@
 									</div>
 									<!-- <div class="fence-title">创建围栏</div> -->
 									<el-form size="medium" :model="addForm" ref="addFormRef" label-width="80px" :rules="formFenceRules">
-										<div class="bigFormBox">
+										<!-- <div class="bigFormBox">
 											<div class="itemBox1">
 												<div>围栏名称</div>
 												<div><el-input v-model="addForm.fenceName" placeholder="请输入"></el-input></div>
@@ -201,40 +201,40 @@
 											<div class="itemBox4" v-if="addForm.rangeType === 2">
 												<div>围栏形状</div>
 												<div>
-													<!-- <div class="fence-shape">多边形</div> -->
 													<div class="">多边形</div>
 												</div>
 											</div>
+										</div> -->
+
+										<div style="margin-top: 15%">
+											<el-form-item class="el-form-item__label" label="围栏名称" prop="fenceName">
+												<el-input v-model="addForm.fenceName" placeholder="请输入"></el-input>
+											</el-form-item>
+											<el-form-item label="范围类型" prop="rangeType">
+												<el-radio-group
+													v-model="addForm.rangeType"
+													style="display: flex; justify-content: space-between; padding-top: 0px; padding-right: 0px"
+													@change="changeAreaType"
+												>
+													<el-radio :label="1">标准区域</el-radio>
+													<el-radio :label="2">自定义</el-radio>
+												</el-radio-group>
+											</el-form-item>
+											<el-form-item label="区域半径" prop="areaRadius" v-if="addForm.rangeType === 1">
+												<el-input
+													type="number"
+													v-model="addForm.areaRadius"
+													placeholder="请输入"
+													:maxlength="5"
+													@input="areaRadiusChange"
+												></el-input>
+											</el-form-item>
+											<el-form-item label="围栏形状" prop="fenceShape" v-if="addForm.rangeType === 2">
+												<div class="fence-shape">多边形</div>
+											</el-form-item>
 										</div>
-
-										<!-- <el-form-item class="el-form-item__label" label="围栏名称" prop="fenceName">
-											<el-input v-model="addForm.fenceName" placeholder="请输入"></el-input>
-										</el-form-item>
-
-										<el-form-item label="范围类型" prop="rangeType">
-											<el-radio-group
-												v-model="addForm.rangeType"
-												style="display: flex; justify-content: space-between; padding-top: 10px; padding-right: 10px"
-												@change="changeAreaType"
-											>
-												<el-radio :label="1">标准区域</el-radio>
-												<el-radio :label="2">自定义</el-radio>
-											</el-radio-group>
-										</el-form-item>
-										<el-form-item label="区域半径" prop="areaRadius" v-if="addForm.rangeType === 1">
-											<el-input
-												type="number"
-												v-model="addForm.areaRadius"
-												placeholder="请输入"
-												:maxlength="5"
-												@input="areaRadiusChange"
-											></el-input>
-										</el-form-item>
-										<el-form-item label="围栏形状" prop="fenceShape" v-if="addForm.rangeType === 2">
-											<div class="fence-shape">多边形</div>
-										</el-form-item> -->
 										<div class="cFooter">
-											<div class="tool tool1" @click="handleCancel">取消</div>
+											<div class="tool tool1" @click="closeFenceCreate">取消</div>
 											<div class="tool tool2" @click="submitFence(addFormRef)">保存</div>
 										</div>
 									</el-form>
@@ -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,
@@ -314,7 +302,8 @@ import personOff from "@/assets/images/carPosition/personOff.png";
 import startIcon from "@/assets/images/carPosition/startIcon.png";
 import endIcon from "@/assets/images/carPosition/endIcon.png";
 import personOn from "@/assets/images/carPosition/personOn.png";
-import equipmentPosition from "@/assets/images/carPosition/equipmentPosition2.png";
+import equipmentPosition2 from "@/assets/images/carPosition/equipmentPosition2.png";
+import equipmentPosition3 from "@/assets/images/carPosition/equipmentPosition3.png";
 import { GlobalStore } from "@/stores";
 import { ElMessage, ElMessageBox } from "element-plus";
 import type { FormInstance, FormRules } from "element-plus";
@@ -366,6 +355,23 @@ let addForm = ref({
 	projectSn: "",
 	enterpriseId: ""
 });
+let formFenceRules = ref({
+	fenceName: [
+		{
+			required: true,
+			message: "必填",
+			trigger: "blur"
+		},
+		{ min: 1, max: 20, message: "长度在 1 到 20 个字符", trigger: "blur" }
+	], //
+	areaRadius: [
+		{
+			required: true,
+			message: "必填",
+			trigger: "change"
+		}
+	]
+});
 let pagInfo = ref({
 	pageNo: 1, //页数
 	pageSize: 10, //条数
@@ -399,7 +405,7 @@ let addEditForm = ref({
 	driver: ""
 });
 onMounted(() => {
-	// choiceMonth.value = formatMonthTime(dayValue.value);
+	choiceMonth.value = formatMonthTime(dayValue.value);
 	// console.log("当前月份", choiceMonth.value);
 	initMap();
 	getProgressListData();
@@ -431,6 +437,24 @@ watch(choiceMonth, newVal => {
 });
 function handleCancel() {
 	fenceCreateShow.value = false;
+	addForm.value = {
+		areaRadius: 100, //区域半径
+		fenceName: "", //围栏名称
+		addr: "",
+		rangeType: 1,
+		locationList: [
+			{
+				fenceId: 0,
+				id: 0,
+				latitude: "",
+				longitude: "",
+				sortNum: 0
+			}
+		],
+		projectSn: "",
+		enterpriseId: ""
+	};
+	exitEditFn();
 	clearFn();
 }
 
@@ -507,7 +531,7 @@ function deleteFenceInfo(idGroups) {
 	});
 }
 const submitFence = async (formEL: FormInstance | undefined) => {
-	if (locationList.value.length == 0) {
+	if (locationList.value.length === 0) {
 		ElMessage({
 			showClose: true,
 			message: "未设置围栏区域!",
@@ -607,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);
 	});
@@ -710,20 +734,21 @@ function openFenceCreate() {
 // 关闭创建围栏弹窗
 function closeFenceCreate() {
 	fenceCreateShow.value = false;
+	let tempArr = [
+		{
+			fenceId: 0,
+			id: 0,
+			latitude: "",
+			longitude: "",
+			sortNum: 0
+		}
+	];
 	addForm.value = {
 		areaRadius: 100, //区域半径
 		fenceName: "", //围栏名称
 		addr: "",
 		rangeType: 1,
-		locationList: [
-			{
-				fenceId: 0,
-				id: 0,
-				latitude: "",
-				longitude: "",
-				sortNum: 0
-			}
-		],
+		locationList: tempArr,
 		projectSn: "",
 		enterpriseId: ""
 	};
@@ -1037,7 +1062,8 @@ function trackMapInit(path: any, item: any) {
 			map: map,
 			position: path[0],
 			// icon: "https://webapi.amap.com/images/car.png",
-			icon: "src/assets/images/carPosition/equipmentPosition2.png",
+			// icon: "src/assets/images/equipmentPosition2.png",
+			icon: equipmentPosition3,
 			offset: new AMap.Pixel(-26, -13),
 			autoRotation: true,
 			angle: -90
@@ -1077,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("") //使用默认信息窗体框样式，显示信息内容
@@ -1358,7 +1385,8 @@ function echoCarMarker(item) {
 				position: lnglats[i],
 				map: map,
 				// icon: "https://webapi.amap.com/images/car.png" // 自定义图标
-				icon: "src/assets/images/carPosition/equipmentPosition2.png"
+				// icon: "src/assets/images/equipmentPosition2.png"
+				icon: equipmentPosition2
 			});
 			// marker.content = '我是第' + (i + 1) + '个Marker';
 			marker.on("click", markerClick);
@@ -1412,13 +1440,14 @@ function echoPersonMarker(item) {
 				position: lnglats[i],
 				map: map,
 				// icon: personOn // 自定义图标
-				icon: "src/assets/images/carPosition/equipmentPosition2.png" // 自定义图标
+				// icon: "src/assets/images/equipmentPosition2.png" // 自定义图标
+				icon: equipmentPosition2 // 自定义图标
 			});
 			marker.on("click", markerClick);
 			marker.emit("click", { target: marker });
 		}
 	}
-	let address = "未知";
+	let address = "<text style='color: darkred;font-weight:bolder'>未知</text>";
 	AMap.plugin("AMap.Geocoder", function () {
 		let geocoder = new AMap.Geocoder();
 
@@ -1447,6 +1476,7 @@ function echoPersonMarker(item) {
 		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),
@@ -1533,7 +1563,7 @@ function echoPersonMarker(item) {
 	background-size: 100% 100%;
 	box-sizing: border-box;
 	padding: 25px;
-	width: 330px;
+	width: 360px;
 	height: 380px;
 	left: 40px;
 	top: 40px;
@@ -1560,6 +1590,12 @@ function echoPersonMarker(item) {
 			color: rgba(255, 255, 255, 0.6);
 			font-size: 18px;
 		}
+		:deep(.el-form-item__label) {
+			color: #fff;
+		}
+		:deep(.el-radio__label) {
+			color: #fff;
+		}
 		.cFooter {
 			width: 70%;
 			display: flex;
@@ -1902,6 +1938,16 @@ function echoPersonMarker(item) {
 					margin-top: 1% !important;
 				}
 			}
+
+			:deep(.titltText) {
+				margin: 0 0 0 0;
+				height: 100%;
+				margin-left: 0.08rem;
+				margin-top: -0.03rem;
+				display: flex;
+				align-items: center;
+				letter-spacing: 0.01rem;
+			}
 			.wei-lan {
 				.icon-off {
 					position: absolute;
@@ -1961,9 +2007,18 @@ function echoPersonMarker(item) {
 			position: relative;
 			:deep(.h-card) {
 				.content {
-					margin-top: 1% !important;
+					margin-top: 1.25% !important;
 				}
 			}
+			:deep(.titltText) {
+				margin: 0 0 0 0;
+				height: 100%;
+				margin-left: 0.08rem;
+				margin-top: -0.025rem;
+				display: flex;
+				align-items: center;
+				letter-spacing: 0.01rem;
+			}
 			.bottom-left {
 				width: 100%;
 				height: 100%;
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index d9c57c3..4c24d0e 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
@@ -17,7 +17,12 @@
 								<el-form :inline="true" size="medium" :model="queryInfo" class="demo-form-inline" style="margin-left: 15px">
 									<el-form-item>
 										<el-select filterable v-model="queryInfo.devSn" placeholder="请选择或搜索" @change="devChange">
-											<el-option v-for="(item, index) in nameOptions" :key="index" :label="item.label" :value="item.value"></el-option>
+											<el-option
+												v-for="(item, index) in nameOptions"
+												:key="index"
+												:label="item.label"
+												:value="item.value"
+											></el-option>
 											<!-- <el-option v-for="(item, index) in devList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option> -->
 										</el-select>
 									</el-form-item>
@@ -70,7 +75,12 @@
 									<el-form-item>
 										<span style="color: #fff; margin-left: 25px; margin-right: 10px">人员名称</span>
 										<el-select filterable v-model="queryInfo.devSn" placeholder="请选择或搜索" @change="devChange" clearable>
-											<el-option v-for="(item, index) in nameOptions" :key="index" :label="item.label" :value="item.value"></el-option>
+											<el-option
+												v-for="(item, index) in nameOptions"
+												:key="index"
+												:label="item.label"
+												:value="item.value"
+											></el-option>
 											<!-- <el-option v-for="(item, index) in devList" :key="index" :label="item.workerName" :value="item.workerInfoId" ></el-option> -->
 										</el-select>
 									</el-form-item>
@@ -106,7 +116,7 @@
 								<div style="width: 50%">{{ item.fenceName }}</div>
 								<div style="width: 50%">{{ item.workerNum }}</div>
 							</div>
-							<div class="not-data" v-if="fenceList.length == 0">
+							<div class="not-data" style="top: 20%" v-if="fenceList.length == 0">
 								<img src="@/assets/images/noData.png" alt="" />
 								<p>暂无数据</p>
 							</div>
@@ -167,7 +177,7 @@
 										</el-checkbox-group>
 									</el-scrollbar>
 								</div>
-								<div v-else style="text-align: center; margin-top: 100px; color: #fff">暂无围栏</div>
+								<div v-else style="text-align: center; margin-top: 65px; color: #fff">暂无围栏</div>
 							</div>
 
 							<!-- 创建围栏弹窗 -->
@@ -178,7 +188,7 @@
 									</div>
 									<!-- <div class="fence-title">创建围栏</div> -->
 									<el-form size="medium" :model="addForm" ref="addFormRef" label-width="80px" :rules="formFenceRules">
-										<div class="bigFormBox">
+										<!-- <div class="bigFormBox">
 											<div class="itemBox1">
 												<div>围栏名称</div>
 												<div><el-input v-model="addForm.fenceName" placeholder="请输入"></el-input></div>
@@ -211,38 +221,40 @@
 											<div class="itemBox4" v-if="addForm.rangeType === 2">
 												<div>围栏形状</div>
 												<div>
-													<!-- <div class="fence-shape">多边形</div> -->
 													<div class="">多边形</div>
 												</div>
 											</div>
-										</div>
-										<!-- <el-form-item label="围栏名称" prop="fenceName">
-											<el-input v-model="addForm.fenceName" placeholder="请输入"></el-input>
-										</el-form-item>
+										</div> -->
+										<div style="margin-top: 15%">
+											<el-form-item label="围栏名称" prop="fenceName">
+												<el-input v-model="addForm.fenceName" placeholder="请输入"></el-input>
+											</el-form-item>
 
-										<el-form-item label="范围类型" prop="rangeType">
-											<el-radio-group
-												v-model="addForm.rangeType"
-												style="display: flex; justify-content: space-between; padding-top: 10px; padding-right: 10px"
-												@change="changeAreaType"
-											>
-												<el-radio :label="1">标准区域</el-radio>
-												<el-radio :label="2">自定义</el-radio>
-											</el-radio-group>
-										</el-form-item>
-										<el-form-item label="区域半径" prop="areaRadius" v-if="addForm.rangeType === 1">
-											<el-input
-												type="number"
-												v-model="addForm.areaRadius"
-												placeholder="请输入"
-												:maxlength="5"
-												@input="areaRadiusChange"
-											></el-input>
-										</el-form-item>
-										<el-form-item label="围栏形状" prop="fenceShape" v-if="addForm.rangeType === 2">
-											<div class="fence-shape">多边形</div>
-										</el-form-item>
-										<div class="create-footer">
+											<el-form-item label="范围类型" prop="rangeType">
+												<el-radio-group
+													v-model="addForm.rangeType"
+													style="display: flex; justify-content: space-between; padding-top: 0px; padding-right: 0px"
+													@change="changeAreaType"
+												>
+													<el-radio :label="1">标准区域</el-radio>
+													<el-radio :label="2">自定义</el-radio>
+												</el-radio-group>
+											</el-form-item>
+											<el-form-item label="区域半径" prop="areaRadius" v-if="addForm.rangeType === 1">
+												<el-input
+													type="number"
+													v-model="addForm.areaRadius"
+													placeholder="请输入"
+													:maxlength="5"
+													@input="areaRadiusChange"
+												></el-input>
+											</el-form-item>
+											<el-form-item label="围栏形状" prop="fenceShape" v-if="addForm.rangeType === 2">
+												<div class="fence-shape">多边形</div>
+											</el-form-item>
+										</div>
+
+										<!-- <div class="create-footer">
 											<el-button class="cancleBtn" @click="fenceCreateShow = false" icon="el-icon-circle-close" size="medium"
 												>取消
 											</el-button>
@@ -250,9 +262,9 @@
 												>保存
 											</el-button>
 										</div> -->
-										
+
 										<div class="cFooter">
-											<div class="tool tool1" @click="handleCancel">取消</div>
+											<div class="tool tool1" @click="closeFenceCreate">取消</div>
 											<div class="tool tool2" @click="submitFence(addFormRef)">保存</div>
 										</div>
 									</el-form>
@@ -289,18 +301,18 @@
 						<div class="bottom-left">
 							<div class="left-content">
 								<div class="tab-list">
-									<div style="width: 5%">序号</div>
+									<div style="width: 10%">序号</div>
 									<div style="width: 15%">人员名称</div>
 									<div style="width: 15%">设备序号</div>
-									<div style="width: 25%">报警时间</div>
+									<div style="width: 20%">报警时间</div>
 									<div style="width: 40%">报警信息</div>
 								</div>
 								<el-scrollbar class="list-box">
 									<div v-for="(item, index) in listData" class="list-style" :key="item.id">
-										<div style="width: 5%">{{ index + 1 }}</div>
+										<div style="width: 10%">{{ index + 1 }}</div>
 										<div style="width: 15%">{{ item.workerName }}</div>
 										<div style="width: 15%">{{ item.devSn }}</div>
-										<div style="width: 25%">{{ item.createTime }}</div>
+										<div style="width: 20%">{{ item.createTime }}</div>
 										<div style="width: 40%">{{ item.alarmInfo }}</div>
 									</div>
 									<div class="not-data" v-if="listData.length == 0">
@@ -382,7 +394,12 @@ let isIndeterminateFence = ref(true);
 let checked = ref(1);
 let devName = ref("");
 let locationList = ref([]);
+interface RuleForm {
+	// fenceName: string
+	// areaRadius: number
+}
 let addFormRef = ref<FormInstance>();
+// const addForm = reactive<RuleForm>({
 let addForm = ref({
 	areaRadius: 100, //区域半径
 	fenceName: "", //围栏名称
@@ -432,6 +449,7 @@ let addEditForm = ref({
 	type: 1,
 	driver: ""
 });
+// const formFenceRules = 	reactive<FormRules<RuleForm>({
 let formFenceRules = ref({
 	fenceName: [
 		{
@@ -501,7 +519,7 @@ watch(choiceMonth, newVal => {
 	}
 });
 
-function handleCancel(){
+function handleCancel() {
 	fenceCreateShow.value = false;
 	clearFn();
 }
@@ -600,7 +618,7 @@ function deleteFenceInfo(idGroups) {
 	});
 }
 const submitFence = async (formEL: FormInstance | undefined) => {
-	if (locationList.value.length == 0) {
+	if (locationList.value.length === 0) {
 		ElMessage({
 			showClose: true,
 			message: "未设置围栏区域!",
@@ -1069,7 +1087,7 @@ function getCrewListData() {
 			// });
 			// nameOptions.value = nameOption.concat(carOption);
 			nameOptions.value = nameOption.concat([]);
-			
+
 			devList.value = res.result;
 		} else {
 			ElMessage.error(res.message);
@@ -1324,7 +1342,8 @@ function trackMapInit(path: any, item: any) {
 			map: map,
 			position: path[0],
 			// icon: "https://webapi.amap.com/images/car.png",
-			icon: "src/assets/images/smartSafeHat.png", // 自定义图标
+			// icon: "src/assets/images/smartSafeHat.png", // 自定义图标
+			icon: smartSafeHat, // 自定义图标
 			// icon: "@/assets/images/carPosition/carIcon.png", // 自定义图标
 			// icon: "src/assets/images/carPosition/carIcon.png", // 自定义图标
 			offset: new AMap.Pixel(-26, -13),
@@ -1367,6 +1386,7 @@ function trackMapInit(path: any, item: any) {
 		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;">位置: ' + address + "</p>");
 		var infoWindow = new AMap.InfoWindow({
 			offset: new AMap.Pixel(30, -30),
 			content: info.join("") //使用默认信息窗体框样式，显示信息内容
@@ -1396,11 +1416,15 @@ function initMap() {
 	var autoOptions = {
 		input: "tipinput"
 	};
-	let auto = new AMap.Autocomplete(autoOptions);
-	placeSearch = new AMap.PlaceSearch({
-		map: map
-	}); //构造地点查询类
-	AMap.event.addListener(auto, "select", select); //注册监听，当选中某条记录时会触发
+	// >>>>>>>>>>>>>>>>>此部分代码会导致大屏页面跳转时产生窗口抖动<<<<<<<<<<<<<<<<<<<
+
+	// let auto = new AMap.Autocomplete(autoOptions);
+	// placeSearch = new AMap.PlaceSearch({
+	// 	map: map
+	// }); //构造地点查询类
+	// AMap.event.addListener(auto, "select", select); //注册监听，当选中某条记录时会触发
+
+	// >>>>>>>>>>>>>>>>>此部分代码会导致大屏页面跳转时产生窗口抖动<<<<<<<<<<<<<<<<<<<
 	mouseTool = new AMap.MouseTool(map);
 	mouseTool.on("draw", function (event) {
 		// event.obj 为绘制出来的覆盖物对象
@@ -1660,7 +1684,8 @@ function echoCarMarker(item) {
 				position: lnglats[i],
 				map: map,
 				// icon: "https://webapi.amap.com/images/car.png" // 自定义图标
-				icon: "src/assets/images/smartSafeHat.png" // 自定义图标
+				// icon: "src/assets/images/smartSafeHat.png" // 自定义图标
+				icon: smartSafeHat // 自定义图标
 				// icon: "@/assets/images/carPosition/carIcon.png" // 自定义图标
 				// icon: "src/assets/images/carPosition/carIcon.png" // 自定义图标
 			});
@@ -1716,13 +1741,14 @@ function echoPersonMarker(item) {
 				// position: lnglats[i],
 				position: lnglats[0],
 				map: map,
-				icon: personOn // 自定义图标
+				// icon: personOn // 自定义图标
+				icon: smartSafeHat2 // 自定义图标
 			});
 			marker.on("click", markerClick);
 			marker.emit("click", { target: marker });
 		}
 	}
-	let address = "未知";
+	let address = "<text style='color: darkred;font-weight:bolder'>未知</text>";
 	AMap.plugin("AMap.Geocoder", function () {
 		let geocoder = new AMap.Geocoder();
 
@@ -1754,6 +1780,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>");
 
 		var infoWindow = new AMap.InfoWindow({
 			offset: new AMap.Pixel(10, -30),
@@ -1838,7 +1865,7 @@ function echoPersonMarker(item) {
 	background-size: 100% 100%;
 	box-sizing: border-box;
 	padding: 25px;
-	width: 330px;
+	width: 360px;
 	height: 380px;
 	left: 40px;
 	top: 40px;
@@ -1856,8 +1883,7 @@ function echoPersonMarker(item) {
 		.create-footer {
 			margin: 100px 0 0 50px;
 		}
-	}
-	.close-icon {
+		.close-icon {
 			position: absolute;
 			right: 0%;
 			top: 0%;
@@ -1865,6 +1891,12 @@ function echoPersonMarker(item) {
 			color: rgba(255, 255, 255, 0.6);
 			font-size: 18px;
 		}
+		:deep(.el-form-item__label) {
+			color: #fff;
+		}
+		:deep(.el-radio__label) {
+			color: #fff;
+		}
 		.cFooter {
 			width: 70%;
 			display: flex;
@@ -1898,7 +1930,6 @@ function echoPersonMarker(item) {
 				background-size: 100% 100%;
 			}
 		}
-
 		.bigFormBox {
 			width: 100%;
 			display: flex;
@@ -1988,6 +2019,7 @@ function echoPersonMarker(item) {
 				}
 			}
 		}
+	}
 }
 .fence-box {
 	position: relative;
@@ -2188,14 +2220,20 @@ function echoPersonMarker(item) {
 		}
 		.bottom-data {
 			margin-top: 1%;
-			height: 40%;
-
+			height: 40.8%;
+			:deep(.h-card) {
+					.content {
+						margin-top: 4% !important;
+					}
+				}
 			.left-content {
 				height: 100%;
 				width: 100%;
+				
 				.tab-list {
 					display: flex;
 					align-items: center;
+					justify-content: center;
 					width: 100%;
 					height: 10%;
 					background: url("@/assets/images/vehicleManagement/ListTitleImg.png") no-repeat;
@@ -2265,6 +2303,15 @@ function echoPersonMarker(item) {
 					margin-top: 1% !important;
 				}
 			}
+			:deep(.titltText) {
+				margin: 0 0 0 0;
+				height: 100%;
+				margin-left: 0.08rem;
+				margin-top: -0.03rem;
+				display: flex;
+				align-items: center;
+				letter-spacing: 0.01rem;
+			}
 			.wei-lan {
 				.icon-off {
 					position: absolute;
@@ -2331,7 +2378,8 @@ function echoPersonMarker(item) {
 				position: relative;
 				:deep(.h-card) {
 					.content {
-						margin-top: 1% !important;
+						margin-top: 4.65% !important;
+						// margin-top: 0;
 					}
 				}
 				.hat-container {
@@ -2380,10 +2428,8 @@ function echoPersonMarker(item) {
 				margin-top: 20px;
 				height: 100%;
 				position: relative;
-				:deep(.h-card) {
-					.content {
-						margin-top: 1% !important;
-					}
+				:deep(.content) {
+						margin-top: 4.2% !important;
 				}
 				div {
 				}
@@ -2396,14 +2442,23 @@ function echoPersonMarker(item) {
 				position: relative;
 				:deep(.h-card) {
 					.content {
-						margin-top: 1% !important;
+						margin-top: 2.1% !important;
 					}
 				}
+				:deep(.titltText) {
+					// margin: 0 0 0 0;
+					// height: 100%;
+					// margin-left: 0.08rem;
+					// margin-top: -0.025rem;
+					// display: flex;
+					// align-items: center;
+					// letter-spacing: 0.01rem;
+				}
 				.bottom-left {
 					width: 100%;
 					height: 100%;
 					box-sizing: border-box;
-					padding: 2%;
+					// padding: 0 2%;
 					.left-content {
 						height: 100%;
 						width: 100%;