From f12c46b1be892c16dcd958ae07a75b527dec2560 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期一, 25 十一月 2024 20:40:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/process/deployManagement.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/process/deployManagement.vue b/src/views/process/deployManagement.vue
index cb20cb5..82c1048 100644
--- a/src/views/process/deployManagement.vue
+++ b/src/views/process/deployManagement.vue
@@ -12,8 +12,8 @@
<div>
<label>鐗堟湰</label>
<el-select v-model="searchParams.latest" size="small">
- <el-option label="鍙湅鏂扮増鏈�" value="true"></el-option>
- <el-option label="鍏ㄩ儴鐗堟湰" value="false"></el-option>
+ <el-option label="鍙湅鏂扮増鏈�" :value="true"></el-option>
+ <el-option label="鍏ㄩ儴鐗堟湰" :value="false"></el-option>
</el-select>
</div>
<div>
@@ -153,7 +153,7 @@
searchParams: {
key: "",
name: "",
- latest: "true",
+ latest: true,
orderByColumn: "processSort",
isAsc: "asc",
pageNum: 1,
@@ -199,19 +199,20 @@
reset() {
this.searchParams.key = "";
this.searchParams.name = "";
- this.searchParams.latest = "true";
+ this.searchParams.latest = true;
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;
--
Gitblit v1.8.0