From 878cbd066c2582480b6629f186da0c63583c4a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Wed, 7 Jun 2023 14:52:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Administration=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A6=81=E6=AD=A2=E5=8B=BE=E9=80=89=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9Cadmin=E7=AD=89=E8=B4=A6=E5=8F=B7=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97=E4=B8=AD=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../table/administration/OperationLogTable.vue       | 12 ++++--------
 src/components/table/administration/UserTable.vue    |  7 ++++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/table/administration/OperationLogTable.vue b/src/components/table/administration/OperationLogTable.vue
index fd5a338b..2cebacac 100644
--- a/src/components/table/administration/OperationLogTable.vue
+++ b/src/components/table/administration/OperationLogTable.vue
@@ -10,13 +10,9 @@
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
+    :cell-style="{paddingLeft: '20px'}"
+    :header-cell-style="{paddingLeft: '20px'}"
   >
-    <el-table-column
-      :resizable="false"
-      align="center"
-      type="selection"
-      width="55">
-    </el-table-column>
     <el-table-column
       v-for="(item, index) in customTableTitles"
       :key="item.prop+index"
@@ -39,10 +35,10 @@
                 {{scope.row[item.prop]}}ms
               </span>
         <span v-else-if="item.prop === 'state'">
-          <template v-if="scope.row[item.prop]==operationLogStateMapping.success">
+          <template v-if="scope.row[item.prop]===operationLogStateMapping.success">
             {{$t('operationLog.state.success')}}
           </template>
-          <template v-else-if="scope.row[item.prop]==operationLogStateMapping.fail">
+          <template v-else-if="scope.row[item.prop]===operationLogStateMapping.fail">
             {{$t('operationLog.state.fail')}}
           </template>
           <template v-else>
diff --git a/src/components/table/administration/UserTable.vue b/src/components/table/administration/UserTable.vue
index cea8a368..eb2e33f1 100644
--- a/src/components/table/administration/UserTable.vue
+++ b/src/components/table/administration/UserTable.vue
@@ -14,6 +14,7 @@
       :resizable="false"
       align="center"
       type="selection"
+      :selectable="checkSelectable"
       width="55">
     </el-table-column>
     <el-table-column
@@ -54,7 +55,7 @@
               v-if="scope.row.id"
               v-model="scope.row.status"
               active-value="1"
-              :disabled="(scope.row.username === loginName) || (scope.row.username==='admin' && scope.row.id==1) "
+              :disabled="(scope.row.username === loginName) || (scope.row.username==='admin' && scope.row.id===1) "
               inactive-value="0"
               @change="()=>{statusChange(scope.row)}">
           </el-switch>
@@ -144,6 +145,10 @@ export default {
         }
         this.$emit('reload')
       })
+    },
+    // 禁止勾选buildIn为1的项，即禁止修改、删除admin的账号
+    checkSelectable (row) {
+      return row.buildIn !== 1
     }
   }
 }