前端性能行以及样式细节调整

3 years ago · b998589e09
9 changed files with 21 additions and 22 deletions
--- 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" />
--- 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
  `)
-}
+}
--- 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 {
--- 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 => {
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>