From ed4f559922a4801421987be707ed5329caa513c4 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Mon, 25 Mar 2024 16:15:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=A2=B0?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AE=9A=E4=BD=8D=E5=92=8C=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=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

---
 .env.development                              |   4 +-
 src/api/modules/equipmentPosition.ts          |  58 ------------------
 src/assets/images/equipmentPosition2.png      | Bin 2393 -> 2069 bytes
 src/assets/images/equipmentPosition3.png      | Bin 0 -> 1946 bytes
 .../equipmentPosition/index.vue               |  20 ++----
 .../smartSafeHat/index.vue                    |   2 +-
 .../newProjectOverView/leftBottom.vue         |   4 +-
 .../riskManage/work-ticket-dialog.vue         |   5 +-
 .../videoManagement/index.vue                 |   7 +++
 9 files changed, 21 insertions(+), 79 deletions(-)
 create mode 100644 src/assets/images/equipmentPosition3.png

diff --git a/.env.development b/.env.development
index 79e3eed..80325f8 100644
--- a/.env.development
+++ b/.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='
diff --git a/src/api/modules/equipmentPosition.ts b/src/api/modules/equipmentPosition.ts
index d0af8fb..9ee6fd6 100644
--- a/src/api/modules/equipmentPosition.ts
+++ b/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);
diff --git a/src/assets/images/equipmentPosition2.png b/src/assets/images/equipmentPosition2.png
index a75dd4518d1279a4069e4359ad1fdf43aaac8bc3..ae1aa3beb308a21bc74f0b36cfa3941a248e1a47 100644
GIT binary patch
delta 2057
zcmV+k2=@2c5|t2;BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D2dYU#K~zXf%~X3(ROb~xd-v|$U3PiwgV)MydF`seW_?A13IxHC
zRzOQ@t=6h-Vn?k`N~<-t)kc!Ef0?OCN2#WhHns_96h=eTL4OPiK>`GV3J5N;vh16E
zaQA)p-hR8;(6nkY)9Fn8&78U4J@<Fd{oQkZ-^XGY2A*bMk?T_f%I6f_>AA4oWxc;B
zbpKQd^!mKAzH6tBUVeMWTf+lwm7(1KMWEN`OEOw4Wh3|RAL#1sJ=gki$MD&UElg{#
zUU%#6<Zh4M#(#I&CL|&5|J;L2z#ScQnNkAQ(LBbk$(b2yS*??O&q=40kyib9smJS+
zAy$O_1u!<-BNfGT$0ufeVjb^DX#4Ybe^S2r=xaq)zdrO|3uFQwVZe4@8FXqhgU*LJ
zLCalLz|g1innyF307)>E7jPDU&k8V@y%WfS13>sErhg@}<bDw^YD5whb4x7b4+waK
z7Q--qq%0~-ajv{B@;jp|nrnY{uI3vB(k}Bn%K2bE<(QNQEMrPce?6aZJV^IB9%lH1
z7{QB<MI;|ENDM3B1={8UnvK4bkUzmqQVj!FYMK=<9Y|fe=}i`k6^xYqTG*_He4BAp
zp1Gj7<$n=@p3(E$Xk+iQ9*agEFpnrH`&c^db3us4MUI^js=)6?-|<XBc3P|vV$<wC
zLG~n1r06HoR<%23%qq=|clSNJyD1%5*uM#40s)?;cIW$9&2LvnQjdkl?Gm#v+{@!}
z-H!;o^Ttxc(BNQVse%G8#Xyin04`DL_z5|~9Dl1$crN$-<ulSWh`aPls&?zHB2kjO
zC-N#-9poZs0Lw_?Q=jn#F%ywAQ1?EpVhx?y=o-<@o4WdOapsnq3v8*tg|GX|4i=m9
zukl9E`iEr3!W3Nl;jb>2&Fx~Neo{f2N1l<F?fbnLW5Fz*V@&?h%_@1FAu;WzgDLSF
z&VQE2lpX!8pP|9K5WTQ?JKoqa-arR~T<^_eFBw1F(@FaM^X1a0556ic1h%2Abb9Q{
z4>}a(#nvOQ!gaB##yNOqb8F+tt2R5C9HGr&3a@EV=CA4st>-$}`j3Mr^tb-Bb6a8F
zAfxS4k-(#(l~wI5hQh#Y5&=Ww!5MABHGjM^$rYase3AsNsULjyhma*szLE378+8z^
z_%vMXKhgc_p`niV>YFwUfk=Qxh&(!P;5t<HR>DQqN3P-pncvQor(BP)!R~O1>0p2_
z7E5$^B!@OW?!y>2V7e|95CE}+7l+Bla-bsw1e^m<VQ&D?pqo(d6Js6B)|0<r<$rEG
z6(&3h7(0kFeuyIhVo*Ji55SyP0v)d7@co`*!P$6iyU9NG!g6&^xDJl98Jx>?hSuyO
zM~;N9fDDOy^_sj?AqH&qmiKg1WRlK~MUz1RI0I4O@bkgy<^d&;*`rD}wZPKSK2~+x
za+V~oKV0Am2$1>=wqsmw(R{XcSbx0>VuS!L9)Q3DpqDQKl8k|ho+{|f*jwcs=^@fH
zv#${Z>JE;Fy*W4H8JjI}w4t_HEx4`h$ZXj2+8@sxymN1S0S**;$^gOP0F9{fl%%QO
z)V=sS7J&y1GagK@wTMM*qf{X>Eu^Id7Wc$J>_|}A#c(Bz!gHxcZEGsBh<{df79@OL
z)U1CV3ATf5UKY%(JO~ej>0m|2Q$@>0DAY9qqf}^FTSwBvf+7eDbh|y`;thM+56Ipr
zsL2Te=an?zas40`asZwDsJlGy`F!B<xPjpE!Ale1bGbnlFN6TvG?}s(z&#e|8@GTu
zM+6T^5lrd*u)oX%FPHe?Z-0YPAS8Tnyfpw;)VUng#g|s1@%{WJT*)hf)#r`?(R&I;
zCF^EaZ{EKnH%optqVJ0lo6Y9bch6s~-?GpKsi`=S^Y;NO=s^dj38MHs2vUAf<YvSA
znrdJp?~yhmNRiud90N)GJdj0GuwqfRCO22<T&YS4L?!15BspsMR)4k!mZVO@sR!le
zlb<HK3|_VX7sSF)Kn9ao)<lKvc&vifu$0s1;Rf{_eBv+SCU8luQmMQe(Ffs8(%0X=
zf^r%`CJ~rH?2ONt6=*M6?8)fl=crUF&}cMZFc@IjvSr%7zP=>n5kjq2!`RpuU<5Jo
ze8u{<-QQW#%8_Q@bALS?tnKlu5A(%oP&keJ-Ps34<+UfqXD*h{3T6{hQq$n>?a$$v
z((RXg3&B>-xm*}rvhB97o3}2(I-MmED~w@f5rjuPH8qusjuE)m`N1K-@!rbkw!gk)
zeeI@;UYDaVH8mAkzzyBq-O$<DxuCkb`lB=iu~-a7qY-Y8n|~~WU6)oS;pSK%VrFP6
zAa+M(P!vVe!#A6MtQ)?y4$myE-~QsRh82a&KqwS~R;vXoNskS5w=L#zFbZ&<2kF4j
zccdH+XBPcGGC~9)fnUbBW-|Z&gjN|^H#IdL<n#GVNl6JKm&=*Oix+D``NM|~|2-})
zjwvlIWh4>_vwvgv{tI(8f_~228imnhPM(~a&Yqo}l~k0MkD#9o*AoZ?%!$+Qyz*7<
zlj5<-FXQy-(=V@Cv!=bSuI`LpuTPHTImoxi)~;RKUSD5-jHc=E6uv1O4oAY?y?g&!
nSy|cM(9m$`ahykkfqw#XND01cvPZc90000<MNUMnLIPldjd1u}

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

diff --git a/src/assets/images/equipmentPosition3.png b/src/assets/images/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 2eab1f4..be48c8e 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
+++ b/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("") //使用默认信息窗体框样式，显示信息内容
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index 984b713..2f49d6d 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/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),
diff --git a/src/views/sevenLargeScreen/newProjectOverView/leftBottom.vue b/src/views/sevenLargeScreen/newProjectOverView/leftBottom.vue
index 2bef127..a1174b6 100644
--- a/src/views/sevenLargeScreen/newProjectOverView/leftBottom.vue
+++ b/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();
diff --git a/src/views/sevenLargeScreen/safeRisk/riskManage/work-ticket-dialog.vue b/src/views/sevenLargeScreen/safeRisk/riskManage/work-ticket-dialog.vue
index 684e81d..0623b32 100644
--- a/src/views/sevenLargeScreen/safeRisk/riskManage/work-ticket-dialog.vue
+++ b/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')
 	}
 };
 // 编辑操作
diff --git a/src/views/sevenLargeScreen/videoManagement/index.vue b/src/views/sevenLargeScreen/videoManagement/index.vue
index 2985bc7..d184ae7 100644
--- a/src/views/sevenLargeScreen/videoManagement/index.vue
+++ b/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 });