From ed66231d19ec5b0614b05c0ab8953e5d767dd9f1 Mon Sep 17 00:00:00 2001
From: dap <dap@qq.com>
Date: 星期三, 15 五月 2024 11:35:02 +0800
Subject: [PATCH] Merge branch 'dev' of https://gitee.com/JavaLionLi/plus-ui into dev
---
src/views/workflow/processDefinition/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 8f1096c..6f13d32 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -25,10 +25,10 @@
<el-card shadow="hover">
<el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="120px">
<el-form-item label="娴佺▼瀹氫箟鍚嶇О" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ユ祦绋嬪畾涔夊悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ユ祦绋嬪畾涔夊悕绉�" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="娴佺▼瀹氫箟KEY" prop="key">
- <el-input v-model="queryParams.key" placeholder="璇疯緭鍏ユ祦绋嬪畾涔塊EY" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.key" placeholder="璇疯緭鍏ユ祦绋嬪畾涔塊EY" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
@@ -274,7 +274,7 @@
const previewRef = ref<InstanceType<typeof ProcessPreview>>();
const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>();
-const definitionConfigForm = ref<DefinitionConfigForm>();
+const definitionConfigForm = ref<DefinitionConfigForm>({});
type CategoryOption = {
categoryCode: string;
@@ -403,10 +403,10 @@
//棰勮鍥剧墖
const clickPreviewImg = async (id: string) => {
loading.value = true;
- const resp = await definitionImage(id);
+ const resp = await definitionXml(id);
if (previewRef.value) {
url.value = [];
- url.value.push('data:image/png;base64,' + resp.data);
+ url.value = resp.data.xml;
loading.value = false;
previewRef.value.openDialog(url.value, 'png');
}
--
Gitblit v1.9.3