From da2126d874ae1e052f912ce5e320937dee4785aa Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Tue, 28 Mar 2023 15:01:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20bug#11122=E3=80=8111120=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=BD=91=E7=BB=9C=E7=BB=84=E4=BB=B6=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/link/Type/Detail/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue index 0be2e4a6..336cc907 100644 --- a/src/views/link/Type/Detail/index.vue +++ b/src/views/link/Type/Detail/index.vue @@ -1021,7 +1021,9 @@ type="primary" @click="saveData" :loading="loading" - :hasPermission="`link/Type:${id ? 'update' : 'add'}`" + :hasPermission="`link/Type:${ + id !== ':id' ? 'update' : 'add' + }`" > 保存 @@ -1219,7 +1221,9 @@ const saveData = async () => { loading.value = true; const resp: any = - id === ':id' ? await save(params) : await update({ ...params, id }); + id === ':id' + ? await save(params).catch(() => {}) + : await update({ ...params, id }).catch(() => {}); loading.value = false; if (resp?.status === 200) { onlyMessage('操作成功', 'success'); From b1fbdcf30e41023a965d133b7134a9bcf9ada0ee Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Tue, 28 Mar 2023 15:39:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=87=87=E9=9B=86=E5=99=A8=20?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataCollect/Collector/Point/index.vue | 6 +++--- .../DataCollect/Collector/Tree/index.vue | 19 +++++++++++++++---- src/views/DataCollect/Collector/data.ts | 2 ++ src/views/DataCollect/Collector/index.vue | 4 ++-- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue index 44351f32..0af577a7 100644 --- a/src/views/DataCollect/Collector/Point/index.vue +++ b/src/views/DataCollect/Collector/Point/index.vue @@ -99,8 +99,8 @@ @click="handleClick" :active="_selectedRowKeys.includes(slotProps.id)" class="card-box" - :status="getState(slotProps).value" - :statusText="getState(slotProps)?.text" + :status="slotProps?.runningState?.value" + :statusText="slotProps?.runningState?.text" :statusNames="Object.fromEntries(colorMap.entries())" >