汪钰 před 3 roky
rodič
revize
8cd41096a7

+ 23 - 21
package-lock.json

@@ -2034,6 +2034,29 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
+      },
+      "dependencies": {
+        "@vue/vue-loader-v15": {
+          "version": "npm:vue-loader@15.10.1",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
+          "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
+          "dev": true,
+          "requires": {
+            "@vue/component-compiler-utils": "^3.1.0",
+            "hash-sum": "^1.0.2",
+            "loader-utils": "^1.1.0",
+            "vue-hot-reload-api": "^2.3.0",
+            "vue-style-loader": "^4.1.0"
+          },
+          "dependencies": {
+            "hash-sum": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+              "dev": true
+            }
+          }
+        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2183,27 +2206,6 @@
         }
       }
     },
-    "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.10.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz",
-      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-          "dev": true
-        }
-      }
-    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",

+ 17 - 4
src/components/header-title/index.vue

@@ -1,8 +1,13 @@
 <template>
   <div class="divider">
     <div class="title">
-      <div class="ele-bg-primary"></div>
-      <span :style="{ 'font-size': size }">{{ title }}</span>
+      <div class="left">
+        <div class="ele-bg-primary box"></div>
+        <span :style="{ 'font-size': size }">{{ title }}</span>
+      </div>
+      <div class="right">
+        <slot />
+      </div>
     </div>
     <div class="ele-bg-primary" style="width: 100%; height: 2px"></div>
   </div>
@@ -17,7 +22,7 @@
       },
       size: {
         typeof: String,
-        default: '16px'
+        default: '20px'
       }
     }
   };
@@ -29,8 +34,16 @@
     .title {
       display: flex;
       align-items: center;
+      justify-content: space-between;
       margin-bottom: 10px;
-      div {
+      .left {
+        display: flex;
+        align-items: center;
+      }
+      .right {
+        margin-right: 20px;
+      }
+      .box {
         width: 8px;
         height: 20px;
         margin-right: 10px;

+ 9 - 2
src/views/system/user/index.vue

@@ -9,6 +9,7 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
+        row-key="id"
         cache-key="systemUserTable"
       >
         <!-- 表头工具栏 -->
@@ -103,7 +104,12 @@
       </ele-pro-table>
     </el-card>
     <!-- 编辑弹窗 -->
-    <user-edit :visible.sync="showEdit" :data="current" @done="reload" ref="userEdit"/>
+    <user-edit
+      :visible.sync="showEdit"
+      :data="current"
+      @done="reload"
+      ref="userEdit"
+    />
     <!-- 导入弹窗 -->
     <user-import :visible.sync="showImport" @done="reload" />
   </div>
@@ -228,7 +234,8 @@
       openEdit(row) {
         this.current = row;
         this.showEdit = true;
-        this.$refs.userEdit.$refs.form && this.$refs.userEdit.$refs.form.clearValidate();
+        this.$refs.userEdit.$refs.form &&
+          this.$refs.userEdit.$refs.form.clearValidate();
       },
       /* 打开导入弹窗 */
       openImport() {

+ 2 - 2
vue.config.js

@@ -34,10 +34,10 @@ module.exports = {
         // target: 'http://192.168.3.51:86', // 测试
 
         // target: 'http://192.168.3.35:8080', // kang杨威
-        // target: 'http://192.168.3.25:8080', // 黄峥嵘
+        target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.33:8080', // 谢一平
-        target: 'http://192.168.3.64:8080', // 粟勋
+        // target: 'http://192.168.3.64:8080', // 粟勋
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {