From 6d3c05d9a033d2a764e6c84b2c65020c7d1b9058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E8=8F=B2?= <1622041228@qq.com>
Date: Mon, 30 May 2022 15:47:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImgUpload/index.vue |  6 +--
 src/views/system/user/index.vue    | 66 ++--------------------------
 src/views/system/user/table.js     | 69 ++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 67 deletions(-)
 create mode 100644 src/views/system/user/table.js

diff --git a/src/components/ImgUpload/index.vue b/src/components/ImgUpload/index.vue
index 37a7280..129e482 100644
--- a/src/components/ImgUpload/index.vue
+++ b/src/components/ImgUpload/index.vue
@@ -9,7 +9,6 @@
       点击上传
     </n-upload>
     <n-modal
-      v-model:show="showModal"
       preset="card"
       style="width: 600px"
     >
@@ -50,8 +49,8 @@ export default defineComponent({
         }
       }
     })
-    function handleChange(file) {
-      console.log(222, file)
+    function handleChange(res) {
+      console.log('已选择的文件：', res.file.file)
     }
     /**
      * @description: 上传前判断文件是否符合条件
@@ -60,7 +59,6 @@ export default defineComponent({
      */
     function handleBeforeUpload(options) {
       const { file, fileList } = options
-      console.log(11, file, fileList)
       if (props.size) {
         const size = file.file.size
         if (size < props.size * 1024 * 1024) {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ee1330d..61d118f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -38,63 +38,20 @@
 <script>
 import headSearch from '@/components/Search/index.vue'
 import dataTable from '@/components/DataTable/index.vue'
-import TableAction from '@/components/DataTable/tools/Action.vue'
-import TableImage from '@/components/DataTable/tools/Image.vue'
-import TableTags from '@/components/DataTable/tools/Tags.vue'
 import TableSwitch from '@/components/DataTable/tools/Switch.vue'
+import TableAction from '@/components/DataTable/tools/Action.vue'
 import { getUserList, resetPassword, deleteUser, setUserStatus } from '@/api/system/user/index.js'
 import { h, unref, ref, toRefs, reactive } from 'vue'
 import UserModal from './components/UserModal.vue'
 import info from './info.js'
+import table from './table.js'
 export default {
   name: 'MenuPage',
   components: { dataTable, UserModal, headSearch },
   setup() {
     const data = reactive({
       columns: [
-        {
-          type: 'selection'
-        },
-        {
-          title: '用户编号',
-          key: 'code',
-          align: 'center'
-        },
-        {
-          title: '头像',
-          key: 'avatar',
-          align: 'center',
-          render(row) {
-            return h(TableImage, {
-              images: {
-                width: 36,
-                height: 36,
-                src: 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQiKrYt-fEfJ4SZhF9KfLLaX9f15KV6Ve1ptA&usqp=CAU'
-              }
-            })
-          }
-        },
-        {
-          title: '用户账号',
-          key: 'username',
-          align: 'center'
-        },
-        {
-          title: '用户姓名',
-          key: 'realname',
-          align: 'center'
-        },
-        {
-          title: '角色',
-          key: 'roleList',
-          align: 'center',
-          render(row) {
-            return h(TableTags, {
-              data: row.roleList,
-              rowKey: 'name'
-            })
-          }
-        },
+        ...table.columns,
         {
           title: '状态',
           key: 'status',
@@ -110,23 +67,6 @@ export default {
             })
           }
         },
-        {
-          title: '部门',
-          key: 'deptName',
-          align: 'center'
-        },
-        {
-          title: '创建时间',
-          key: 'createTime',
-          align: 'center',
-          width: 160
-        },
-        {
-          title: '更新时间',
-          key: 'updateTime',
-          align: 'center',
-          width: 160
-        },
         {
           title: '操作',
           align: 'center',
diff --git a/src/views/system/user/table.js b/src/views/system/user/table.js
new file mode 100644
index 0000000..f9b23d4
--- /dev/null
+++ b/src/views/system/user/table.js
@@ -0,0 +1,69 @@
+import { h } from 'vue'
+import TableImage from '@/components/DataTable/tools/Image.vue'
+import TableTags from '@/components/DataTable/tools/Tags.vue'
+
+const table = {
+  columns: [
+    {
+      type: 'selection'
+    },
+    {
+      title: '用户编号',
+      key: 'code',
+      align: 'center'
+    },
+    {
+      title: '头像',
+      key: 'avatar',
+      align: 'center',
+      render(row) {
+        return h(TableImage, {
+          images: {
+            width: 36,
+            height: 36,
+            src: row.avatar
+          }
+        })
+      }
+    },
+    {
+      title: '用户账号',
+      key: 'username',
+      align: 'center'
+    },
+    {
+      title: '用户姓名',
+      key: 'realname',
+      align: 'center'
+    },
+    {
+      title: '角色',
+      key: 'roleList',
+      align: 'center',
+      render(row) {
+        return h(TableTags, {
+          data: row.roleList,
+          rowKey: 'name'
+        })
+      }
+    },
+    {
+      title: '部门',
+      key: 'deptName',
+      align: 'center'
+    },
+    {
+      title: '创建时间',
+      key: 'createTime',
+      align: 'center',
+      width: 160
+    },
+    {
+      title: '更新时间',
+      key: 'updateTime',
+      align: 'center',
+      width: 160
+    }
+  ]
+}
+export default table