From 220db80e605945ced1b33443020933206b0915db Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 七月 2025 14:56:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'bak/master' into master-lpyun

---
 src/views/dry/common/prodRecordReport.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/dry/common/prodRecordReport.vue b/src/views/dry/common/prodRecordReport.vue
index 5ad030f..649b11a 100644
--- a/src/views/dry/common/prodRecordReport.vue
+++ b/src/views/dry/common/prodRecordReport.vue
@@ -5,9 +5,12 @@
 <script setup lang="ts">
 	import { onMounted, ref } from 'vue'
 	import { router } from '/@/router'
-	console.log(`output->router1`, router)
+  import { getTenantId, getToken } from '/@/utils/auth'
+  const token = getToken()
+	const tenantId = getTenantId()
+	console.log(`output->tenantId`, tenantId )
 	const reportUrl = ref('')
-	reportUrl.value = window._CONFIG['domianURL'] + '/jmreport/view/833110227445567488?batch=' + router.currentRoute.value.query.batch
+	reportUrl.value = window._CONFIG['domianURL'] + '/jmreport/view/833110227445567488?batch=' + router.currentRoute.value.query.batch +'&token=' + token+'&tenantId=' + tenantId
 	//reportUrl.value = 'www.baidu.com'
 	console.log(`output->reportUrl.value`, reportUrl.value)
 	// onMounted(() => {

--
Gitblit v1.9.3