From 9b260f53acd54eab14fd2a866c3485095759970a Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 23:51:35 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E7=AE=A1=E7=90=86=E5=91=98=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 105a40996e..2cc293b79d 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -240,6 +240,7 @@
             <el-button
               v-permission="['user:del']"
               @click="del(scope.row)"
+              v-if="scope.row.id !== 1"
               class="text-btn"
               type="text"
               >{{ $t("commons.delete") }}</el-button

From 950024225ce1108afb7c9ece7d453d8504bf9aa1 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 23:53:31 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E6=9C=AA=E8=AF=BB=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/msg/all.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/views/msg/all.vue b/frontend/src/views/msg/all.vue
index bebc405139..fe53a11a30 100644
--- a/frontend/src/views/msg/all.vue
+++ b/frontend/src/views/msg/all.vue
@@ -19,6 +19,7 @@
               }}</deBtn>
               <deBtn
                 secondary
+                key="mark_readed"
                 :disabled="multipleSelection.length === 0"
                 @click="markReaded"
                 >{{ $t("webmsg.mark_readed") }}</deBtn
@@ -28,6 +29,7 @@
               <deBtn
                 v-if="tabActive === 'readed'"
                 secondary
+                key="delete"
                 :disabled="multipleSelection.length === 0"
                 @click="deleteBatch"
                 >{{ $t("commons.delete") }}</deBtn

From fc0934d2405fbc5396aa221ec670b047aa946683 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 23:53:53 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/log/filterUser.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/views/system/log/filterUser.vue b/frontend/src/views/system/log/filterUser.vue
index 80d759cd13..f18eb05f4a 100644
--- a/frontend/src/views/system/log/filterUser.vue
+++ b/frontend/src/views/system/log/filterUser.vue
@@ -211,7 +211,6 @@ export default {
         this.filterTextMap.push([
           "usersValue",
           "activeUser",
-          "users",
           "userCahe",
         ]);
       }

From bc36300c0689a7a2bd42739d9f04ec5a5a18a606 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 23:54:37 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/task/TaskRecord.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue
index ab8e1e1596..da8f158aea 100644
--- a/frontend/src/views/system/task/TaskRecord.vue
+++ b/frontend/src/views/system/task/TaskRecord.vue
@@ -100,7 +100,7 @@
               v-if="scope.row.status"
               :class="[`de-${scope.row.status}`, 'de-status']"
               >{{ $t(`dataset.${scope.row.status.toLocaleLowerCase()}`) }}
-            <svg-icon style="cursor: pointer;" v-if="scope.row.status === 'Error'"  @click="showErrorMassage(scope.row.msg)" icon-class="icon-maybe" class="field-icon-location" />
+            <svg-icon style="cursor: pointer;" v-if="scope.row.status === 'Error'"  @click="showErrorMassage(scope.row.info)" icon-class="icon-maybe" class="field-icon-location" />
             </span>
             <span v-else>-</span>
           </template>

From eb6ec58cfbc181d8d6a0b98e2d6c557d065a3cd2 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 23:55:04 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/filterUser.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/system/user/filterUser.vue b/frontend/src/views/system/user/filterUser.vue
index af9e1ca03c..ed8ac0d243 100644
--- a/frontend/src/views/system/user/filterUser.vue
+++ b/frontend/src/views/system/user/filterUser.vue
@@ -307,7 +307,7 @@ export default {
       if (this.activeStatus.length) {
         let str = `${this.$t("kettle.status")}:${this.activeStatus.reduce(
           (pre, next) =>
-            (this.status.find((ele) => ele.id === next) || {}).label +
+            this.$t((this.status.find((ele) => ele.id === next) || {}).label) +
             "、" +
             pre,
           ""