From d947d70287e4f13da8e809f11d98d7f4ae92ee21 Mon Sep 17 00:00:00 2001
From: jiayu <zheng_jiayu1@163.com>
Date: Sat, 9 Nov 2024 09:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=90=8E=E5=86=8D=E8=8E=B7=E5=8F=96=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goverment/frontLargeScreen/index.vue      | 19 +++++++++++++++---
 src/views/goverment/largeScreen/index.vue     | 20 +++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/views/goverment/frontLargeScreen/index.vue b/src/views/goverment/frontLargeScreen/index.vue
index 5b3ebf1..b44df29 100644
--- a/src/views/goverment/frontLargeScreen/index.vue
+++ b/src/views/goverment/frontLargeScreen/index.vue
@@ -337,6 +337,10 @@ const rollerVal = ref({
 	leftRollerVal: "",
 	rightRollerVal: ""
 });
+import { Global3DStore } from "@/stores";
+const store = Global3DStore();
+
+const BASEURL = import.meta.env.VITE_API_URL;
 
 // const showPerson = ref(false);
 const personId = ref<any>(null); // 保存人员定位id
@@ -519,6 +523,7 @@ onMounted(async () => {
 							url: item.url,
 							scale: item.scale,
 							clampToGround: item.clampToGround,
+							heading: item.heading,
 							label: {
 								text: item.name,
 								visibleDepth: false,
@@ -628,16 +633,24 @@ const getEquipmentList = async (id: any) => {
 			});
 			graphicLayer.addGraphic(graphicImg);
 			videoGraphics.value.push(graphicImg);
-			let urlData: any = "";
+			// let urlData: any = "";
 			if (item.code) {
-				urlData = await equipmentUrlGet({ monitorId: item.monitorId });
+				// urlData = await equipmentUrlGet({ monitorId: item.monitorId });
+				const data = {
+					url: BASEURL + '/base/monitorDev/queryInfo',
+					params: { monitorId: item.monitorId },
+					headers: {
+						Authorization: "Bearer " + store.token,
+						"Content-Type": "application/json"
+					}
+				};
 				graphicImg.bindPopup(
 					(event: any) => {
 						const attr = event.graphic.attr || {};
 						if (!attr) {
 							return;
 						}
-						const dom = initVue3Popup(resStyle?.codeValue, { data: urlData || {} });
+						const dom = initVue3Popup(resStyle?.codeValue, { data });
 						// return mars3d.Util.getTemplateHtml({ title: "矢量图层", template: dom, attr: attr });
 						console.log(dom);
 						return dom;
diff --git a/src/views/goverment/largeScreen/index.vue b/src/views/goverment/largeScreen/index.vue
index fb2bded..3b39116 100644
--- a/src/views/goverment/largeScreen/index.vue
+++ b/src/views/goverment/largeScreen/index.vue
@@ -350,6 +350,10 @@ import { getDicList } from "@/api/modules/jxjview";
 import * as Vue from "vue";
 import { loadModule } from "vue3-sfc-loader";
 import { url } from "inspector";
+import { Global3DStore } from "@/stores";
+const store = Global3DStore();
+
+const BASEURL = import.meta.env.VITE_API_URL;
 const modelLineList = ref([]);
 const equipTypeDictLabel = ref();
 const equipTypeList = ref([]);
@@ -537,6 +541,7 @@ onMounted(async () => {
 							// heading: 270,
 							scale: item.scale,
 							clampToGround: item.clampToGround,
+							heading: item.heading,
 							label: {
 								text: item.name,
 								visibleDepth: false,
@@ -681,17 +686,24 @@ const getEquipmentList = async (id: any) => {
 			});
 			graphicLayer.addGraphic(graphicImg);
 			videoGraphics.value.push(graphicImg);
-			let urlData: any = "";
-			console.log(22222, item.url);
+			// let urlData: any = "";
 			if (item.code) {
-				urlData = await equipmentUrlGet({ monitorId: item.monitorId });
+				// urlData = await equipmentUrlGet({ monitorId: item.monitorId });
+				const data = {
+					url: BASEURL + '/base/monitorDev/queryInfo',
+					params: { monitorId: item.monitorId },
+					headers: {
+						Authorization: "Bearer " + store.token,
+						"Content-Type": "application/json"
+					}
+				};
 				graphicImg.bindPopup(
 					(event: any) => {
 						const attr = event.graphic.attr || {};
 						if (!attr) {
 							return;
 						}
-						const dom = initVue3Popup(resStyle?.codeValue, { data: urlData || {} });
+						const dom = initVue3Popup(resStyle?.codeValue, { data });
 						// return mars3d.Util.getTemplateHtml({ title: "矢量图层", template: dom, attr: attr });
 						console.log(dom);
 						return dom;