From cf2391a86bdea88196d49cd33949570f74c0985d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 22 九月 2025 18:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
frontWuhu/src/components/business/ProjectItem.vue | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/frontWuhu/src/components/business/ProjectItem.vue b/frontWuhu/src/components/business/ProjectItem.vue
index e6b161c..6a4f1db 100644
--- a/frontWuhu/src/components/business/ProjectItem.vue
+++ b/frontWuhu/src/components/business/ProjectItem.vue
@@ -86,13 +86,9 @@
methods: {
// 璺宠浆澶у睆
jumpDP() {
-<<<<<<< .mine
- window.open(`http://106.14.20.42/screen/#/zhfw/declaration?projectId=${this.id}`)
-||||||| .r53257
- window.open(`${process.env.VUE_APP_SCREENURL1}?projectId=${this.id}`)
-=======
+ // window.open(`http://106.14.20.42/screen/#/zhfw/declaration?projectId=${this.id}`)
+ // window.open(`${process.env.VUE_APP_SCREENURL1}?projectId=${this.id}`)
window.open(`${process.env.VUE_APP_SCREENURL1}?projectId=${this.id}&title=${this.projectName}`)
->>>>>>> .r53404
},
// 灞曠ず浼佷笟&
showCompany() {
--
Gitblit v1.9.3