From a68ba1749991285e226868922f90d80c30855f8b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 25 十一月 2024 15:41:02 +0800
Subject: [PATCH] 模型、部署管理bug修改

---
 src/views/process/deployManagement.vue |    9 +++++----
 src/utils/common.js                    |    6 +++---
 src/views/process/modelManagement.vue  |    2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/utils/common.js b/src/utils/common.js
index 121e277..950fcfd 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -18,7 +18,7 @@
     return queryStr.slice(1);
 }
 function openWindow(path) {
-    const prefix = process.env.VUE_APP_TAB_URL_PREFIX;
+    const prefix = process.env.VUE_APP_FLOWABLE_PREFIX;
     window.open(prefix + "" + path);
 }
 
@@ -53,7 +53,7 @@
 
 function normalizeDateTimeString(rawDatatimeStr) {
     function genNumStr(num) {
-        return Number(num) < 10 ? "0" + num : ("" + num) 
+        return Number(num) < 10 ? "0" + num : ("" + num)
     }
     if (rawDatatimeStr) {
         const dateObj = new Date(rawDatatimeStr);
@@ -76,4 +76,4 @@
     openWindow,
     listToTree,
     normalizeDateTimeString
-};
\ No newline at end of file
+};
diff --git a/src/views/process/deployManagement.vue b/src/views/process/deployManagement.vue
index 9121b5e..82c1048 100644
--- a/src/views/process/deployManagement.vue
+++ b/src/views/process/deployManagement.vue
@@ -203,15 +203,16 @@
             this.getListAndRenderByParams(this.searchParams)
         },
         handleDefinition(index, row) {
-            const {deploymentId, resourceName} = row;
-            const path = `/flow/manage/showProcessDefinition/${deploymentId}/${resourceName}`
+            let {deploymentId, resourceName} = row;
+            resourceName = encodeURIComponent(resourceName)
+            const path = `/flow/manage/showProcessDefinition/${deploymentId}?resource=${resourceName}`
             commonHelper.openWindow(path);
         },
         handleProcess(index, row) {
             const {id} = row;
             console.log("id鏄灏�", id);
-            const path = `/flow/manage/showresource?pdid=${id}`;
-            commonHelper.openWindow(path);
+            const path = process.env.VUE_APP_FLOWABLE_PREFIX + `/flow/manage/showresource?pdid=${id}`;
+            window.open(path)
         },
         handleExchange(index, row) {
             const {id} = row;
diff --git a/src/views/process/modelManagement.vue b/src/views/process/modelManagement.vue
index c67b284..adabcb9 100644
--- a/src/views/process/modelManagement.vue
+++ b/src/views/process/modelManagement.vue
@@ -171,7 +171,7 @@
     },
     handleDesign(index, row) {
       // flowable鏀瑰彉璁捐鐨勮矾寰�
-      const path = process.env.VUE_APP_FLOWABLE_PREFIX + "/designer/index.html#/editor/" + row.id;
+      const path = process.env.VUE_APP_FLOWABLE_PREFIX  + "/designer/index.html#/editor/" + row.id;
       // const path = "/editor?modelId=" + row.id;
       window.open(path, '')
     },

--
Gitblit v1.8.0