From 6488e0982096ae16cf60de29fd2840b7212eb515 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Tue, 19 Aug 2025 16:51:26 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E8=B7=AF=E7=94=B1=E5=B5=8C=E5=85=A5=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +++-
 .../dynamicAllocation/iframe.vue              | 22 +++++++++++++------
 src/views/sevenLargeScreen/indexL.vue         | 19 +++++++++++++++-
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/.env.development b/.env.development
index 9776b17..979c415 100644
--- a/.env.development
+++ b/.env.development
@@ -10,6 +10,7 @@ VITE_API_URL = 'http://192.168.34.221:8111' #雄哥本地
 # VITE_API_URL = 'http://192.168.34.221:28890' #雄哥本地
 # VITE_API_URL = 'http://182.90.224.237:51234'  #雄哥远程
 # VITE_API_URL = 'http://192.168.34.221:28889'
+# VITE_API_URL = 'http://192.168.34.221:28887'
 # VITE_API_URL = 'http://121.196.214.246/api'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
 # VITE_API_URL = 'http://192.168.34.221:12360'
@@ -54,7 +55,8 @@ VITE_API_URL = 'http://192.168.34.221:8111' #雄哥本地
 # VITE_API_URL = 'http://101.43.164.214:11126'
 # 测试
 # VITE_API_URL = 'http://jxj.zhgdyun.com:9500'
-VITE_API_URL = 'http://192.168.34.221:19112'
+# VITE_API_URL = 'http://192.168.34.221:19112'
+# VITE_API_URL = 'https://125.72.229.30:19098'
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
 
diff --git a/src/views/sevenLargeScreen/dynamicAllocation/iframe.vue b/src/views/sevenLargeScreen/dynamicAllocation/iframe.vue
index b9688c8..e12d1f6 100644
--- a/src/views/sevenLargeScreen/dynamicAllocation/iframe.vue
+++ b/src/views/sevenLargeScreen/dynamicAllocation/iframe.vue
@@ -1,18 +1,26 @@
 <template>
 	<div class="iframe">
-		<iframe :src="url" width="100%" height="100%" frameborder="0"></iframe>
+		<iframe :src="url" :key="ikey" width="100%" height="100%" frameborder="0"></iframe>
 	</div>
 </template>
 
 <script setup>
-import { useRoute } from 'vue-router';
-import { onMounted, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { onMounted, ref, watch } from 'vue';
 const route = useRoute();
+const router = useRouter()
 const url = ref("");
-onMounted(() => {
-	console.log(route.query); // 获取路由参数
-    url.value = route.query.url; // 获取路由参数中的url值
-});
+const ikey = ref(0);
+watch(router.currentRoute, (newValue) => {
+	// console.log(11334455, newValue.query.url, route.query.url); // 获取路由参数
+	url.value = newValue.query.url; // 获取路由参数中的url值
+	ikey.value = new Date().getTime(); // 刷新iframe
+	// console.log(url.value);
+}, { immediate: true, deep: true });
+// onMounted(() => {
+// 	console.log(444555, route.query); // 获取路由参数
+//     // url.value = route.query.url; // 获取路由参数中的url值
+// });
 </script>
 
 <style scoped>
diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue
index 580c220..64c88c4 100644
--- a/src/views/sevenLargeScreen/indexL.vue
+++ b/src/views/sevenLargeScreen/indexL.vue
@@ -557,7 +557,7 @@ let menuList = ref([]);
 // ]);
 const itemList = ref([]);
 const activeTab = ref(0);
-const activeTab2 = ref(0);
+const activeTab2 = ref('');
 const router = useRouter();
 const getAspectRatioStyle = computed(() => ({
 	width: `${contentWidth.value}px`,
@@ -581,6 +581,23 @@ const navigateTo = (path, type) => {
 		activeTab.value = path.modulePath;
 		activeTab2.value = path.menuList.length ? path.menuList[0].companyPath : path.modulePath;
 		itemList.value = path.menuList;
+		let index = activeTab2.value.indexOf("?");
+		console.log("获取到的参数----", index);
+		if (index > -1) {
+			let result = activeTab2.value.substring(index);
+			const uIndex = result.indexOf("url=");
+			if (uIndex > -1) {
+				const url = result.substring(uIndex + 4);
+				console.log("获取到的参数----", url);
+				router.push({
+					path: activeTab2.value,
+					query: {
+						url,
+					}
+				});
+				return;
+			}
+		}
 		router.push({
 			path: activeTab2.value
 		});