From ff7f47b70d93eace91e7ceda07d590cf26234628 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 13 一月 2026 09:54:38 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/intelligent_manufacture_wuhu
---
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