Merge pull request #3026 from dataease/pr@dev_station_msg

Pr@dev station msg

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

frontend/src/views/system/log/filterUser.vue

@@ -211,7 +211,6 @@ export default {
         this.filterTextMap.push([
           "usersValue",
           "activeUser",
-          "users",
           "userCahe",
         ]);
       }

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>

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,
           ""

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