From b998589e09b749cbddfd9b58c5a1b98222972067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E5=90=89=E5=85=86?= <303176530@qq.com>
Date: Tue, 21 Sep 2021 17:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=80=A7=E8=83=BD=E8=A1=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=A0=B7=E5=BC=8F=E7=BB=86=E8=8A=82=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/template/web/table.vue.tpl                | 3 ++-
 web/src/core/gin-vue-admin.js                             | 6 +++---
 web/src/view/example/customer/customer.vue                | 7 +++++--
 web/src/view/superAdmin/api/api.vue                       | 8 +-------
 web/src/view/superAdmin/dictionary/sysDictionary.vue      | 3 ++-
 .../view/superAdmin/dictionary/sysDictionaryDetail.vue    | 3 ++-
 web/src/view/superAdmin/operation/sysOperationRecord.vue  | 5 +++--
 web/src/view/superAdmin/user/user.vue                     | 6 ++----
 web/src/view/systemTools/autoCode/index.vue               | 2 +-
 9 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/server/resource/template/web/table.vue.tpl b/server/resource/template/web/table.vue.tpl
index d76b3e56..5ceb06bf 100644
--- a/server/resource/template/web/table.vue.tpl
+++ b/server/resource/template/web/table.vue.tpl
@@ -32,7 +32,7 @@
             <el-button size="mini" type="primary" icon="el-icon-plus" @click="openDialog">新增</el-button>
             <el-popover v-model:visible="deleteVisible" placement="top" width="160">
             <p>确定要删除吗？</p>
-            <div style="text-align: right; margin: 0">
+            <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
                 <el-button size="mini" type="primary" @click="onDelete">确定</el-button>
             </div>
@@ -46,6 +46,7 @@
         style="width: 100%"
         tooltip-effect="dark"
         :data="tableData"
+        row-key="ID"
         @selection-change="handleSelectionChange"
         >
         <el-table-column type="selection" width="55" />
diff --git a/web/src/core/gin-vue-admin.js b/web/src/core/gin-vue-admin.js
index d1094f20..0a127033 100644
--- a/web/src/core/gin-vue-admin.js
+++ b/web/src/core/gin-vue-admin.js
@@ -6,8 +6,8 @@
 import { register } from './global'
 
 export const run = function(app) {
-    register(app)
-    console.log(`
+  register(app)
+  console.log(`
      欢迎使用 Gin-Vue-Admin
      当前版本:V2.4.5 beta.1
      加群方式:微信：shouzi_1994 QQ群：622360840
@@ -15,4 +15,4 @@ export const run = function(app) {
      默认前端文件运行地址:http://127.0.0.1:${import.meta.env.VITE_CLI_PORT}
      如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.gin-vue-admin.com/docs/coffee
   `)
-}
\ No newline at end of file
+}
diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue
index 2a67f01f..bfaaca5f 100644
--- a/web/src/view/example/customer/customer.vue
+++ b/web/src/view/example/customer/customer.vue
@@ -9,6 +9,7 @@
         :data="tableData"
         style="width: 100%"
         tooltip-effect="dark"
+        row-key="ID"
       >
         <el-table-column type="selection" width="55" />
         <el-table-column align="center" label="接入日期" width="180">
@@ -24,7 +25,7 @@
             <el-button size="small" type="text" icon="el-icon-edit" @click="updateCustomer(scope.row)">变更</el-button>
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除吗？</p>
-              <div style="text-align: right; margin: 0">
+              <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
                 <el-button type="primary" size="mini" @click="deleteCustomer(scope.row)">确定</el-button>
               </div>
@@ -35,6 +36,7 @@
           </template>
         </el-table-column>
       </el-table>
+      <warning-bar style="margin-top:12px;" title="在资源权限中将此角色的资源权限清空 或者不包含创建者的角色 即可屏蔽此客户资源的显示" />
       <div class="gva-pagination">
         <el-pagination
           :current-page="page"
@@ -47,7 +49,6 @@
         />
       </div>
     </div>
-    <div class="tips">在资源权限中将此角色的资源权限清空 或者不包含创建者的角色 即可屏蔽此客户资源的显示</div>
     <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" title="客户">
       <el-form :inline="true" :model="form" label-width="80px">
         <el-form-item label="客户名">
@@ -76,9 +77,11 @@ import {
   getExaCustomerList
 } from '@/api/customer'
 import infoList from '@/mixins/infoList'
+import warningBar from '@/components/warningBar/warningBar.vue'
 
 export default {
   name: 'Customer',
+  components: { warningBar },
   mixins: [infoList],
   data() {
     return {
diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue
index 910b0563..ce5166ed 100644
--- a/web/src/view/superAdmin/api/api.vue
+++ b/web/src/view/superAdmin/api/api.vue
@@ -33,7 +33,7 @@
         <el-button size="mini" type="primary" icon="el-icon-plus" @click="openDialog('addApi')">新增</el-button>
         <el-popover v-model:visible="deleteVisible" placement="top" width="160">
           <p>确定要删除吗？</p>
-          <div style="text-align: right; margin: 0">
+          <div style="text-align: right; margin-top: 8px;">
             <el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
             <el-button size="mini" type="primary" @click="onDelete">确定</el-button>
           </div>
@@ -294,12 +294,6 @@ export default {
             this.getTableData()
           }
         })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
     },
     async enterDialog() {
       this.$refs.apiForm.validate(async valid => {
diff --git a/web/src/view/superAdmin/dictionary/sysDictionary.vue b/web/src/view/superAdmin/dictionary/sysDictionary.vue
index 15662005..78128511 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionary.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionary.vue
@@ -32,6 +32,7 @@
         :data="tableData"
         style="width: 100%"
         tooltip-effect="dark"
+        row-key="ID"
       >
         <el-table-column type="selection" width="55" />
         <el-table-column align="center" label="日期" width="180">
@@ -54,7 +55,7 @@
             <el-button size="mini" icon="el-icon-edit" type="text" @click="updateSysDictionary(scope.row)">变更</el-button>
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除吗？</p>
-              <div style="text-align: right; margin: 0">
+              <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
                 <el-button type="primary" size="mini" @click="deleteSysDictionary(scope.row)">确定</el-button>
               </div>
diff --git a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
index 800c6875..031a71ea 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
@@ -29,6 +29,7 @@
         :data="tableData"
         style="width: 100%"
         tooltip-effect="dark"
+        row-key="ID"
       >
         <el-table-column type="selection" width="55" />
         <el-table-column align="center" label="日期" width="180">
@@ -50,7 +51,7 @@
             <el-button size="small" type="text" icon="el-icon-edit" @click="updateSysDictionaryDetail(scope.row)">变更</el-button>
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除吗？</p>
-              <div style="text-align: right; margin: 0">
+              <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
                 <el-button type="primary" size="mini" @click="deleteSysDictionaryDetail(scope.row)">确定</el-button>
               </div>
diff --git a/web/src/view/superAdmin/operation/sysOperationRecord.vue b/web/src/view/superAdmin/operation/sysOperationRecord.vue
index 2a0733d7..4869be98 100644
--- a/web/src/view/superAdmin/operation/sysOperationRecord.vue
+++ b/web/src/view/superAdmin/operation/sysOperationRecord.vue
@@ -22,7 +22,7 @@
 
         <el-popover v-model:visible="deleteVisible" placement="top" width="160">
           <p>确定要删除吗？</p>
-          <div style="text-align: right; margin: 0">
+          <div style="text-align: right; margin-top: 8px;">
             <el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
             <el-button size="mini" type="primary" @click="onDelete">确定</el-button>
           </div>
@@ -36,6 +36,7 @@
         :data="tableData"
         style="width: 100%"
         tooltip-effect="dark"
+        row-key="ID"
         @selection-change="handleSelectionChange"
       >
         <el-table-column align="center" type="selection" width="55" />
@@ -92,7 +93,7 @@
           <template #default="scope">
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除吗？</p>
-              <div style="text-align: right; margin: 0">
+              <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
                 <el-button size="mini" type="primary" @click="deleteSysOperationRecord(scope.row)">确定</el-button>
               </div>
diff --git a/web/src/view/superAdmin/user/user.vue b/web/src/view/superAdmin/user/user.vue
index 72a7b3d7..c0d9aa1a 100644
--- a/web/src/view/superAdmin/user/user.vue
+++ b/web/src/view/superAdmin/user/user.vue
@@ -7,9 +7,7 @@
       <el-table :data="tableData">
         <el-table-column align="center" label="头像" min-width="50">
           <template #default="scope">
-            <div :style="{'textAlign':'center'}">
-              <CustomPic :pic-src="scope.row.headerImg" />
-            </div>
+            <CustomPic style="margin-top:8px" :pic-src="scope.row.headerImg" />
           </template>
         </el-table-column>
         <el-table-column align="center" label="UUID" min-width="250" prop="uuid" />
@@ -33,7 +31,7 @@
           <template #default="scope">
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除此用户吗</p>
-              <div style="text-align: right; margin: 0">
+              <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
                 <el-button type="primary" size="mini" @click="deleteUser(scope.row)">确定</el-button>
               </div>
diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index a8c38df2..8241bae7 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -118,7 +118,7 @@
             >下移</el-button>
             <el-popover v-model:visible="scope.row.visible" placement="top">
               <p>确定删除吗？</p>
-              <div style="text-align: right; margin: 0">
+              <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
                 <el-button type="primary" size="mini" @click="deleteField(scope.$index)">确定</el-button>
               </div>