From 2fbc6ea5e74296e362477f46ec9602683defe019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Thu, 16 Nov 2023 08:50:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                    |  6 ++--
 src/permission.js                           |  9 ++++--
 src/router/index.js                         |  2 +-
 src/views/OperationalOverview/AGVBoard.vue  | 32 ++++++++++-----------
 src/views/OperationalOverview/coldBoard.vue |  2 +-
 src/views/base/custom/index.vue             | 30 ++++++++-----------
 6 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/.env.dev b/.env.dev
index 29069178..1f2ee240 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-15 09:09:12
+ # @LastEditTime: 2023-11-15 17:16:51
  # @LastEditors: zhp
  # @Description:
 ###
@@ -13,12 +13,12 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48080'
-VUE_APP_BASE_API = 'http://192.168.4.159:48080'
+# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.56:48080'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # 路由懒加载
diff --git a/src/permission.js b/src/permission.js
index 7125eeaa..03b66576 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request'
 NProgress.configure({ showSpinner: false })
 
 // 增加三方登陆 update by 芋艿
-const whiteList = ['/login', '/social-login',  '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
+const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee', '/AGVBoard', '/coldBoard', '/processingBoard']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
@@ -19,7 +19,12 @@ router.beforeEach((to, from, next) => {
     if (to.path === '/login') {
       next({ path: '/' })
       NProgress.done()
-    } else {
+    }
+    // else if (to.path === '/AGVBoard') {
+    //   next({ path: '/AGVBoard' })
+    //   NProgress.done()
+    // }
+    else {
       if (store.getters.roles.length === 0) {
         isRelogin.show = true
         // 获取字典数据 add by 芋艿
diff --git a/src/router/index.js b/src/router/index.js
index b7ea83f8..40189532 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -91,7 +91,7 @@ export const constantRoutes = [
   {
     path: '/AGVBoard',
     name: 'AGVBoard',
-    component: Layout,
+    // component: Layout,
     // route level code-splitting
     // this generates a separate chunk (about.[hash].js) for this route
     // which is lazy-loaded when the route is visited.
diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue
index 5dfda096..ee4d8b81 100644
--- a/src/views/OperationalOverview/AGVBoard.vue
+++ b/src/views/OperationalOverview/AGVBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-14 10:46:52
+ * @LastEditTime: 2023-11-15 16:04:06
  * @Description:
 -->
 <template>
@@ -727,21 +727,21 @@ export default {
     }
   },
 
-  watch: {
-    clientWidth(val) {
-      if (!this.timer) {
-        this.clientWidth = val
-        this.beilv2 = this.clientWidth / 1920
-        this.timer = true
-        let _this = this
-        setTimeout(function () {
-          _this.timer = false
-        }, 500)
-      }
-      // 这里可以添加修改时的方法
-      this.windowWidth(val);
-    }
-  },
+  // watch: {
+  //   clientWidth(val) {
+  //     if (!this.timer) {
+  //       this.clientWidth = val
+  //       this.beilv2 = this.clientWidth / 1920
+  //       this.timer = true
+  //       let _this = this
+  //       setTimeout(function () {
+  //         _this.timer = false
+  //       }, 500)
+  //     }
+  //     // 这里可以添加修改时的方法
+  //     this.windowWidth(val);
+  //   }
+  // },
   created() {
     // this.fetchList('exception-alarm')
     // this.fetchList('inAndOutOfEachLine')
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index f23f4c4a..fac204ca 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1021,7 +1021,7 @@ export default {
    top: 2em;
  }
   .container-main {
-    // padding: 10px;
+    padding: 6px;
   }
 }
 
diff --git a/src/views/base/custom/index.vue b/src/views/base/custom/index.vue
index ab412ea9..4f5ffd56 100644
--- a/src/views/base/custom/index.vue
+++ b/src/views/base/custom/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-drawer :visible.sync="drawer" :append-to-body="true" size="80%">
+  <el-drawer :visible.sync="drawer" :append-to-body="true" size="80%" >
     <small-title slot="title" :no-padding="true">
       <!-- <template v-for="demo in demoList"> -->
       <!-- <el-button :key="demo.name" :type="demo.name === curDemo ? 'primary' : ' '" @click="curDemo = demo.name"> -->
@@ -29,24 +29,13 @@
         <el-col :span="20">
           <!-- 纸张设置 -->
           <el-button-group style="margin:0 10px">
-            <el-button
-              v-for="(value,type) in paperTypes"
-              :key="type"
-              :type="curPaperType === type ? 'primary' : ' '"
-              @click="setPaper(type,value)"
-            >
+            <el-button v-for="(value,type) in paperTypes" :key="type" :type="curPaperType === type ? 'primary' : ' '"
+              @click="setPaper(type,value)">
               {{ type }}
             </el-button>
           </el-button-group>
-          <el-input-number
-            style="margin:0 10px"
-            :value="scaleValue "
-            :precision="2"
-            :step="0.1"
-            :min="scaleMin"
-            :max="scaleMax"
-            @change="changeScale"
-          />
+          <el-input-number style="margin:0 10px" :value="scaleValue " :precision="2" :step="0.1" :min="scaleMin"
+            :max="scaleMax" @change="changeScale" />
           <el-popover v-model="paperPopVisible" placement="bottom" width="300" title="设置纸张宽高(mm)">
             <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 10px">
               <el-input v-model="paperWidth" type="number" style=" width: 100px; text-align: center" place="宽（mm）" />~
@@ -212,7 +201,7 @@ export default {
       return type
     }
   },
-  mounted() {
+  created() {
     this.init()
     // console.log('aaaaaa')
     // this.otherPaper()
@@ -224,6 +213,9 @@ export default {
     // handleClose() {
     //   $('.hiprintEpContainer').empty()
     // },
+    closed() {
+      $('.hiprintEpContainer').empty()
+    },
     init(data) {
       this.drawer = true
       this.modelData = data
@@ -264,6 +256,7 @@ export default {
       // console.log(this.modelData)
       // console.log($('#hiprint-printTemplate').empty())
       if (this.modelData) {
+        // console.log(this.modelData);
         $('.hiprintEpContainer').empty()
         hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
         $('.hiprint-printTemplate').empty()
@@ -278,7 +271,7 @@ export default {
         $('.hiprint-printTemplate').empty()
         // const templates = this.$ls.get('KEY_TEMPLATES', {})
         const template = provider.value
-        console.log(template)
+        // console.log(template)
         hiprintTemplate = new hiprint.PrintTemplate({
           template: template,
           settingContainer: '#PrintElementOptionSetting',
@@ -287,6 +280,7 @@ export default {
       }
       // hiprintTemplate.design('#hiprint-printTemplate')
       // console.log(hiprintTemplate)
+      console.log(hiprintTemplate);
       hiprintTemplate.design('#hiprint-printTemplate', { grid: true })
       // 获取当前放大比例, 当zoom时传true 才会有
       this.scaleValue = hiprintTemplate.editingPanel.scale || 1

From bbdf0a75f032c4503e7a2f7a708045a5ab943e07 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 16 Nov 2023 13:47:18 +0800
Subject: [PATCH 2/2] update system

---
 public/static/videos/login.webm            |  Bin 9255816 -> 9255816 bytes
 src/assets/styles/index.scss               |    1 +
 src/assets/styles/login.scss               |   73 +-
 src/views/login.vue                        |   27 +-
 src/views/system/area/index.vue            |    2 +-
 src/views/system/errorCode/index.vue       |    2 +-
 src/views/system/loginlog/index.vue        |    2 +-
 src/views/system/mail/account/index.vue    |    2 +-
 src/views/system/mail/log/index.vue        |    2 +-
 src/views/system/mail/template/index.vue   |    2 +-
 src/views/system/menu/index.vue            |    4 +-
 src/views/system/notify/message/index.vue  |    2 +-
 src/views/system/notify/my/index.vue       |    2 +-
 src/views/system/notify/template/index.vue |    2 +-
 src/views/system/oauth2/client/index.vue   |    2 +-
 src/views/system/oauth2/token/index.vue    |    4 +-
 src/views/system/operatelog/index.vue      |    2 +-
 src/views/system/role/index.vue            |    4 +-
 src/views/system/sensitiveWord/index.vue   |    2 +-
 src/views/system/sms/channel/index.vue     |    2 +-
 src/views/system/sms/log/index.vue         |    2 +-
 src/views/system/sms/template/index.vue    |    2 +-
 src/views/system/tenant/index.vue          |    2 +-
 src/views/system/tenantPackage/index.vue   |    2 +-
 src/views/system/user/index.vue            | 1472 +++++++++++---------
 25 files changed, 923 insertions(+), 696 deletions(-)

diff --git a/public/static/videos/login.webm b/public/static/videos/login.webm
index 4ac1bdd21a5d114b187026898c3a08cb1b747c7d..43e188f66e9ae93aedcb968622211e85f86b6a63 100644
GIT binary patch
delta 10690
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

delta 10690
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
H;G+Kn>{yCH

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 3180e79f..707d79e4 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -6,6 +6,7 @@
 @import './btn.scss';
 
 body {
+	// min-height: 1024px;
 	height: 100%;
 	-moz-osx-font-smoothing: grayscale;
 	-webkit-font-smoothing: antialiased;
diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss
index db9f3a47..55889fcb 100644
--- a/src/assets/styles/login.scss
+++ b/src/assets/styles/login.scss
@@ -114,40 +114,61 @@ $buttonHeight: $buttonH * 1px;
 			}
 		}
 		.field {
-			// background: #ccc3;
 			position: relative;
-			padding-top: 196px;
+			margin-top: 8%;
 			flex: 1;
 			display: flex;
 			flex-direction: column;
-			// justify-content: center;
 			align-items: center;
+
 			.pc-title {
 				width: 100%;
 				text-align: center;
 				clear: both;
 				position: relative;
 				top: -36px;
+				height: 128px;
 
-				// h3.title {
-				// 	position: relative;
-
-				// 	&::before {
-				// 		content: '';
-				// 		background: url($cnbmLogo) 100% / 100% no-repeat;
-				// 		height: 48px;
-				// 		width: 48px;
-				// 		position: absolute;
-				// 		left: 0px;
-				// 		top: 4px;
-				// 		display: inline-block;
-				// 	}
-				// }
+				.title {
+					margin: 0;
+					margin-left: 32px;
+					font-weight: 400;
+					user-select: none;
+					color: #000;
+					font-size: 36px;
+					line-height: 54px;
+					letter-spacing: 2px;
+				}
 			}
+
 			.mobile-title,
 			.mobile-switch {
 				display: none;
 			}
+
+			.form-cont {
+				// height: 560px;
+				flex: 1;
+				overflow: hidden;
+			}
+
+			.footer {
+				user-select: none;
+				// 元素
+				margin: 12px 0;
+				height: 16px;
+				line-height: 16px;
+				font-size: 12px;
+				color: #8c8c8c;
+
+				a,
+				a:hover,
+				a:active {
+					color: inherit;
+					text-decoration: none;
+				}
+			}
+
 			.form {
 				margin-top: 32px;
 				box-sizing: border-box;
@@ -283,24 +304,6 @@ $buttonHeight: $buttonH * 1px;
 			line-height: 14px;
 		}
 	}
-
-	.footer {
-		user-select: none;
-		// 元素
-		height: 16px;
-		line-height: 16px;
-		font-size: 12px;
-		color: #8c8c8c;
-		// 定位
-		position: absolute;
-		bottom: 30px;
-		a,
-		a:hover,
-		a:active {
-			color: inherit;
-			text-decoration: none;
-		}
-	}
 }
 
 // - - - - - PC 最小尺寸设置
diff --git a/src/views/login.vue b/src/views/login.vue
index ae2ff139..2bc0c033 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -44,7 +44,7 @@
 								border-radius: 100%;
 								background: #26b9de;
 							"></span>
-						产线生产监控系统
+						MES
 					</p>
 				</div>
 				<video
@@ -67,18 +67,7 @@
 					<h3 class="title">中建材智能自动化研究院有限公司</h3>
 				</h2>
 				<h2 class="pc-title" style="">
-					<h3
-						class="title"
-						style="
-							margin: 0;
-							margin-left: 32px;
-							font-weight: 400;
-							user-select: none;
-							color: #000;
-							font-size: 36px;
-							line-height: 54px;
-							letter-spacing: 2px;
-						">
+					<h3 class="title" style="">
 						<img
 							src="../assets/logo/cnbm.png"
 							alt="cnbm_logo"
@@ -103,7 +92,7 @@
 							line-height: 54px;
 							letter-spacing: 2px;
 						">
-						产线生产监控系统
+						MES
 					</h3>
 				</h2>
 
@@ -219,12 +208,14 @@
 							</div>
 
 							<!-- 下方的登录按钮 -->
-							<el-form-item id="button-form-item" style="width: 100%; margin-top: 32px">
+							<el-form-item
+								id="button-form-item"
+								style="width: 100%; margin-top: 32px">
 								<el-button
 									:loading="loading"
 									size="medium"
 									type="primary"
-									style="width: 100%; height: 66px; font-size: 18px;"
+									style="width: 100%; height: 66px; font-size: 18px"
 									@click.native.prevent="getCode">
 									<span v-if="!loading">登 录</span>
 									<span v-else>登 录 中...</span>
@@ -358,6 +349,7 @@ export default {
 		};
 	},
 	created() {
+		document.body.style['min-height'] = '1024px';
 		// 租户开关
 		this.tenantEnable = getTenantEnable();
 		if (this.tenantEnable) {
@@ -377,6 +369,9 @@ export default {
 			: undefined;
 		this.getCookie();
 	},
+	destroyed() {
+		document.body.style['min-height'] = 'unset';
+	},
 	methods: {
 		getCode() {
 			// 情况一，未开启：则直接登录
diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
index 7890d1a8..cfd96799 100644
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="地区 & IP" url="https://doc.iocoder.cn/area-and-ip/" />
+    <!-- <doc-alert title="地区 & IP" url="https://doc.iocoder.cn/area-and-ip/" /> -->
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
diff --git a/src/views/system/errorCode/index.vue b/src/views/system/errorCode/index.vue
index 8d6858dd..8f441486 100644
--- a/src/views/system/errorCode/index.vue
+++ b/src/views/system/errorCode/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="异常处理（错误码）" url="https://doc.iocoder.cn/exception/" />
+    <!-- <doc-alert title="异常处理（错误码）" url="https://doc.iocoder.cn/exception/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="错误码类型" prop="type">
diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue
index 53b7d712..5df529ce 100644
--- a/src/views/system/loginlog/index.vue
+++ b/src/views/system/loginlog/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" />
+    <!-- <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="登录地址" prop="userIp">
diff --git a/src/views/system/mail/account/index.vue b/src/views/system/mail/account/index.vue
index c5ade917..b6d69d0b 100644
--- a/src/views/system/mail/account/index.vue
+++ b/src/views/system/mail/account/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" />
+    <!-- <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" /> -->
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/src/views/system/mail/log/index.vue b/src/views/system/mail/log/index.vue
index e1ef53c8..dffcce9d 100644
--- a/src/views/system/mail/log/index.vue
+++ b/src/views/system/mail/log/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" />
+    <!-- <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" /> -->
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/src/views/system/mail/template/index.vue b/src/views/system/mail/template/index.vue
index e90d4076..6a125390 100644
--- a/src/views/system/mail/template/index.vue
+++ b/src/views/system/mail/template/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" />
+    <!-- <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" /> -->
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 81ca0e82..efb4df49 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
-    <doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" />
+    <!-- <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
+    <doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="菜单名称" prop="name">
diff --git a/src/views/system/notify/message/index.vue b/src/views/system/notify/message/index.vue
index dedc5509..b628cd54 100644
--- a/src/views/system/notify/message/index.vue
+++ b/src/views/system/notify/message/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" />
+    <!-- <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="用户编号" prop="userId">
diff --git a/src/views/system/notify/my/index.vue b/src/views/system/notify/my/index.vue
index 9c13e699..084d3a2c 100644
--- a/src/views/system/notify/my/index.vue
+++ b/src/views/system/notify/my/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" />
+    <!-- <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" /> -->
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/src/views/system/notify/template/index.vue b/src/views/system/notify/template/index.vue
index f6973a15..22b9a54d 100644
--- a/src/views/system/notify/template/index.vue
+++ b/src/views/system/notify/template/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" />
+    <!-- <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" /> -->
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/src/views/system/oauth2/client/index.vue b/src/views/system/oauth2/client/index.vue
index 39b6297f..4f99de5d 100644
--- a/src/views/system/oauth2/client/index.vue
+++ b/src/views/system/oauth2/client/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" />
+    <!-- <doc-alert title="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" /> -->
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/src/views/system/oauth2/token/index.vue b/src/views/system/oauth2/token/index.vue
index 7c2f64e4..f3f68745 100644
--- a/src/views/system/oauth2/token/index.vue
+++ b/src/views/system/oauth2/token/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <doc-alert title="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" />
-    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
+    <!-- <doc-alert title="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" />
+    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" /> -->
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue
index 3869343c..f5fdbc41 100644
--- a/src/views/system/operatelog/index.vue
+++ b/src/views/system/operatelog/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" />
+    <!-- <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="系统模块" prop="title">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 0cc9fb5b..ed6cb080 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
-    <doc-alert title="数据权限" url="https://doc.iocoder.cn/data-permission" />
+    <!-- <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
+    <doc-alert title="数据权限" url="https://doc.iocoder.cn/data-permission" /> -->
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
       <el-form-item label="角色名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入角色名称" clearable size="small" style="width: 240px"
diff --git a/src/views/system/sensitiveWord/index.vue b/src/views/system/sensitiveWord/index.vue
index acc681c6..d69167cf 100644
--- a/src/views/system/sensitiveWord/index.vue
+++ b/src/views/system/sensitiveWord/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="敏感词" url="https://doc.iocoder.cn/sensitive-word" />
+    <!-- <doc-alert title="敏感词" url="https://doc.iocoder.cn/sensitive-word" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="敏感词" prop="name">
diff --git a/src/views/system/sms/channel/index.vue b/src/views/system/sms/channel/index.vue
index 8687666a..f50bb28a 100644
--- a/src/views/system/sms/channel/index.vue
+++ b/src/views/system/sms/channel/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" />
+    <!-- <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="短信签名" prop="signature">
diff --git a/src/views/system/sms/log/index.vue b/src/views/system/sms/log/index.vue
index 07ac763c..8a1ce8da 100644
--- a/src/views/system/sms/log/index.vue
+++ b/src/views/system/sms/log/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" />
+    <!-- <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="手机号" prop="mobile">
diff --git a/src/views/system/sms/template/index.vue b/src/views/system/sms/template/index.vue
index 1f8747a4..e783c477 100644
--- a/src/views/system/sms/template/index.vue
+++ b/src/views/system/sms/template/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" />
+    <!-- <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
       <el-form-item label="短信类型" prop="type">
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 99c5f211..b84b0df9 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" />
+    <!-- <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="租户名" prop="name">
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index 0f8c17c0..05ab08c9 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" />
+    <!-- <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" /> -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="套餐名" prop="name">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1ad89961..d18f3da6 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,641 +1,869 @@
 <template>
-  <div class="app-container">
-    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
-    <doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" />
-    <doc-alert title="Excel 导入导出" url="https://doc.iocoder.cn/excel-import-and-export/" />
-    <!-- 搜索工作栏 -->
-    <el-row :gutter="20">
-      <!--部门数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px"/>
-        </div>
-        <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode"
-                   ref="tree" default-expand-all highlight-current @node-click="handleNodeClick"/>
-        </div>
-      </el-col>
-      <!--用户数据-->
-      <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="username">
-            <el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable style="width: 240px"
-                      @keyup.enter.native="handleQuery"/>
-          </el-form-item>
-          <el-form-item label="手机号码" prop="mobile">
-            <el-input v-model="queryParams.mobile" placeholder="请输入手机号码" clearable style="width: 240px"
-                      @keyup.enter.native="handleQuery"/>
-          </el-form-item>
-          <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-              <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="创建时间" prop="createTime">
-            <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
+	<div style="display: flex; gap: 16px; flex: 1; background: #eff1f6">
+		<div
+			class="app-container"
+			style="background: white; width: 280px; border-radius: 8px">
+			<div class="head-container">
+				<el-input
+					v-model="deptName"
+					placeholder="请输入部门名称"
+					clearable
+					size="small"
+					prefix-icon="el-icon-search"
+					style="margin-bottom: 20px" />
+			</div>
+			<div class="head-container">
+				<el-tree
+					:data="deptOptions"
+					:props="defaultProps"
+					:expand-on-click-node="false"
+					:filter-node-method="filterNode"
+					ref="tree"
+					default-expand-all
+					highlight-current
+					@node-click="handleNodeClick" />
+			</div>
+		</div>
 
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                       v-hasPermi="['system:user:create']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"
-                       v-hasPermi="['system:user:import']">导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                       v-hasPermi="['system:user:export']">导出</el-button>
-          </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
+		<div
+			class="app-container"
+			style="background: #fff; border-radius: 8px; width: 1px; flex: 1">
+			<el-form
+				:model="queryParams"
+				ref="queryForm"
+				size="small"
+				:inline="true"
+				v-show="showSearch"
+				label-width="68px">
+				<el-form-item label="用户名称" prop="username">
+					<el-input
+						v-model="queryParams.username"
+						placeholder="请输入用户名称"
+						clearable
+						style="width: 240px"
+						@keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="手机号码" prop="mobile">
+					<el-input
+						v-model="queryParams.mobile"
+						placeholder="请输入手机号码"
+						clearable
+						style="width: 240px"
+						@keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="状态" prop="status">
+					<el-select
+						v-model="queryParams.status"
+						placeholder="用户状态"
+						clearable
+						style="width: 240px">
+						<el-option
+							v-for="dict in statusDictDatas"
+							:key="parseInt(dict.value)"
+							:label="dict.label"
+							:value="parseInt(dict.value)" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="创建时间" prop="createTime">
+					<el-date-picker
+						v-model="queryParams.createTime"
+						style="width: 240px"
+						value-format="yyyy-MM-dd HH:mm:ss"
+						type="daterange"
+						range-separator="-"
+						start-placeholder="开始日期"
+						end-placeholder="结束日期"
+						:default-time="['00:00:00', '23:59:59']" />
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" icon="el-icon-search" @click="handleQuery">
+						搜索
+					</el-button>
+					<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+				</el-form-item>
+			</el-form>
 
-        <el-table v-loading="loading" :data="userList">
-          <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickname" prop="nickname" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.name" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" key="status" v-if="columns[5].visible" align="center">
-            <template v-slot="scope">
-              <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
-            </template>
-          </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-            <template v-slot="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-            <template v-slot="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                         v-hasPermi="['system:user:update']">修改</el-button>
-              <el-dropdown  @command="(command) => handleCommand(command, scope.$index, scope.row)"
-                            v-hasPermi="['system:user:delete', 'system:user:update-password', 'system:permission:assign-user-role']">
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleDelete" v-if="scope.row.id !== 1" size="mini" type="text" icon="el-icon-delete"
-                                    v-hasPermi="['system:user:delete']">删除</el-dropdown-item>
-                  <el-dropdown-item command="handleResetPwd" size="mini" type="text" icon="el-icon-key"
-                                    v-hasPermi="['system:user:update-password']">重置密码</el-dropdown-item>
-                  <el-dropdown-item command="handleRole" size="mini" type="text" icon="el-icon-circle-check"
-                                    v-hasPermi="['system:permission:assign-user-role']">分配角色</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </template>
-          </el-table-column>
-        </el-table>
+			<el-row :gutter="10" class="mb8">
+				<el-col :span="1.5">
+					<el-button
+						type="primary"
+						plain
+						icon="el-icon-plus"
+						size="mini"
+						@click="handleAdd"
+						v-hasPermi="['system:user:create']">
+						新增
+					</el-button>
+				</el-col>
+				<el-col :span="1.5">
+					<el-button
+						type="info"
+						icon="el-icon-upload2"
+						size="mini"
+						@click="handleImport"
+						v-hasPermi="['system:user:import']">
+						导入
+					</el-button>
+				</el-col>
+				<el-col :span="1.5">
+					<el-button
+						type="warning"
+						icon="el-icon-download"
+						size="mini"
+						@click="handleExport"
+						:loading="exportLoading"
+						v-hasPermi="['system:user:export']">
+						导出
+					</el-button>
+				</el-col>
+				<right-toolbar
+					:showSearch.sync="showSearch"
+					@queryTable="getList"
+					:columns="columns"></right-toolbar>
+			</el-row>
 
-        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                    @pagination="getList"/>
-      </el-col>
-    </el-row>
+			<el-table v-loading="loading" :data="userList">
+				<el-table-column
+					label="用户编号"
+					align="center"
+					key="id"
+					prop="id"
+					v-if="columns[0].visible" />
+				<el-table-column
+					label="用户名称"
+					align="center"
+					key="username"
+					prop="username"
+					v-if="columns[1].visible"
+					:show-overflow-tooltip="true" />
+				<el-table-column
+					label="用户昵称"
+					align="center"
+					key="nickname"
+					prop="nickname"
+					v-if="columns[2].visible"
+					:show-overflow-tooltip="true" />
+				<el-table-column
+					label="部门"
+					align="center"
+					key="deptName"
+					prop="dept.name"
+					v-if="columns[3].visible"
+					:show-overflow-tooltip="true" />
+				<el-table-column
+					label="手机号码"
+					align="center"
+					key="mobile"
+					prop="mobile"
+					v-if="columns[4].visible"
+					width="120" />
+				<el-table-column
+					label="状态"
+					key="status"
+					v-if="columns[5].visible"
+					align="center">
+					<template v-slot="scope">
+						<el-switch
+							v-model="scope.row.status"
+							:active-value="0"
+							:inactive-value="1"
+							@change="handleStatusChange(scope.row)" />
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="创建时间"
+					align="center"
+					prop="createTime"
+					v-if="columns[6].visible"
+					width="160">
+					<template v-slot="scope">
+						<span>{{ parseTime(scope.row.createTime) }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="操作"
+					align="center"
+					width="160"
+					class-name="small-padding fixed-width">
+					<template v-slot="scope">
+						<el-button
+							size="mini"
+							type="text"
+							icon="el-icon-edit"
+							@click="handleUpdate(scope.row)"
+							v-hasPermi="['system:user:update']">
+							修改
+						</el-button>
+						<el-dropdown
+							@command="
+								(command) => handleCommand(command, scope.$index, scope.row)
+							"
+							v-hasPermi="[
+								'system:user:delete',
+								'system:user:update-password',
+								'system:permission:assign-user-role',
+							]">
+							<el-button size="mini" type="text" icon="el-icon-d-arrow-right">
+								更多
+							</el-button>
+							<el-dropdown-menu slot="dropdown">
+								<el-dropdown-item
+									command="handleDelete"
+									v-if="scope.row.id !== 1"
+									size="mini"
+									type="text"
+									icon="el-icon-delete"
+									v-hasPermi="['system:user:delete']">
+									删除
+								</el-dropdown-item>
+								<el-dropdown-item
+									command="handleResetPwd"
+									size="mini"
+									type="text"
+									icon="el-icon-key"
+									v-hasPermi="['system:user:update-password']">
+									重置密码
+								</el-dropdown-item>
+								<el-dropdown-item
+									command="handleRole"
+									size="mini"
+									type="text"
+									icon="el-icon-circle-check"
+									v-hasPermi="['system:permission:assign-user-role']">
+									分配角色
+								</el-dropdown-item>
+							</el-dropdown-menu>
+						</el-dropdown>
+					</template>
+				</el-table-column>
+			</el-table>
 
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickname">
-              <el-input v-model="form.nickname" placeholder="请输入用户昵称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :clearable="false"
-                          placeholder="请选择归属部门" :normalizer="normalizer"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码" prop="mobile">
-              <el-input v-model="form.mobile" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.id === undefined" label="用户名称" prop="username">
-              <el-input v-model="form.username" placeholder="请输入用户名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.id === undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sexDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option
-                    v-for="item in postOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+			<pagination
+				v-show="total > 0"
+				:total="total"
+				:page.sync="queryParams.pageNo"
+				:limit.sync="queryParams.pageSize"
+				@pagination="getList" />
 
-    <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-          </div>
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
-        </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
-      </div>
-    </el-dialog>
+			<!-- 添加或修改参数配置对话框 -->
+			<el-dialog
+				:title="title"
+				:visible.sync="open"
+				width="600px"
+				append-to-body>
+				<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+					<el-row>
+						<el-col :span="12">
+							<el-form-item label="用户昵称" prop="nickname">
+								<el-input
+									v-model="form.nickname"
+									placeholder="请输入用户昵称" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="归属部门" prop="deptId">
+								<treeselect
+									v-model="form.deptId"
+									:options="deptOptions"
+									:show-count="true"
+									:clearable="false"
+									placeholder="请选择归属部门"
+									:normalizer="normalizer" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="12">
+							<el-form-item label="手机号码" prop="mobile">
+								<el-input
+									v-model="form.mobile"
+									placeholder="请输入手机号码"
+									maxlength="11" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="邮箱" prop="email">
+								<el-input
+									v-model="form.email"
+									placeholder="请输入邮箱"
+									maxlength="50" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="12">
+							<el-form-item
+								v-if="form.id === undefined"
+								label="用户名称"
+								prop="username">
+								<el-input
+									v-model="form.username"
+									placeholder="请输入用户名称" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item
+								v-if="form.id === undefined"
+								label="用户密码"
+								prop="password">
+								<el-input
+									v-model="form.password"
+									placeholder="请输入用户密码"
+									type="password"
+									show-password />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="12">
+							<el-form-item label="用户性别">
+								<el-select v-model="form.sex" placeholder="请选择">
+									<el-option
+										v-for="dict in sexDictDatas"
+										:key="parseInt(dict.value)"
+										:label="dict.label"
+										:value="parseInt(dict.value)" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="岗位">
+								<el-select v-model="form.postIds" multiple placeholder="请选择">
+									<el-option
+										v-for="item in postOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="24">
+							<el-form-item label="备注">
+								<el-input
+									v-model="form.remark"
+									type="textarea"
+									placeholder="请输入内容"></el-input>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<div slot="footer" class="dialog-footer">
+					<el-button type="primary" @click="submitForm">确 定</el-button>
+					<el-button @click="cancel">取 消</el-button>
+				</div>
+			</el-dialog>
 
-    <!-- 分配角色 -->
-    <el-dialog title="分配角色" :visible.sync="openRole" width="500px" append-to-body>
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="用户名称">
-          <el-input v-model="form.username" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="用户昵称">
-          <el-input v-model="form.nickname" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="角色">
-          <el-select v-model="form.roleIds" multiple placeholder="请选择">
-            <el-option
-                v-for="item in roleOptions"
-                :key="parseInt(item.id)"
-                :label="item.name"
-                :value="parseInt(item.id)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitRole">确 定</el-button>
-        <el-button @click="cancelRole">取 消</el-button>
-      </div>
-    </el-dialog>
+			<!-- 用户导入对话框 -->
+			<el-dialog
+				:title="upload.title"
+				:visible.sync="upload.open"
+				width="400px"
+				append-to-body>
+				<el-upload
+					ref="upload"
+					:limit="1"
+					accept=".xlsx, .xls"
+					:headers="upload.headers"
+					:action="upload.url + '?updateSupport=' + upload.updateSupport"
+					:disabled="upload.isUploading"
+					:on-progress="handleFileUploadProgress"
+					:on-success="handleFileSuccess"
+					:auto-upload="false"
+					drag>
+					<i class="el-icon-upload"></i>
+					<div class="el-upload__text">
+						将文件拖到此处，或
+						<em>点击上传</em>
+					</div>
+					<div class="el-upload__tip text-center" slot="tip">
+						<div class="el-upload__tip" slot="tip">
+							<el-checkbox v-model="upload.updateSupport" />
+							是否更新已经存在的用户数据
+						</div>
+						<span>仅允许导入xls、xlsx格式文件。</span>
+						<el-link
+							type="primary"
+							:underline="false"
+							style="font-size: 12px; vertical-align: baseline"
+							@click="importTemplate">
+							下载模板
+						</el-link>
+					</div>
+				</el-upload>
+				<div slot="footer" class="dialog-footer">
+					<el-button type="primary" @click="submitFileForm">确 定</el-button>
+					<el-button @click="upload.open = false">取 消</el-button>
+				</div>
+			</el-dialog>
 
-  </div>
+			<!-- 分配角色 -->
+			<el-dialog
+				title="分配角色"
+				:visible.sync="openRole"
+				width="500px"
+				append-to-body>
+				<el-form :model="form" label-width="80px">
+					<el-form-item label="用户名称">
+						<el-input v-model="form.username" :disabled="true" />
+					</el-form-item>
+					<el-form-item label="用户昵称">
+						<el-input v-model="form.nickname" :disabled="true" />
+					</el-form-item>
+					<el-form-item label="角色">
+						<el-select v-model="form.roleIds" multiple placeholder="请选择">
+							<el-option
+								v-for="item in roleOptions"
+								:key="parseInt(item.id)"
+								:label="item.name"
+								:value="parseInt(item.id)"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-form>
+				<div slot="footer" class="dialog-footer">
+					<el-button type="primary" @click="submitRole">确 定</el-button>
+					<el-button @click="cancelRole">取 消</el-button>
+				</div>
+			</el-dialog>
+		</div>
+	</div>
 </template>
 
 <script>
 import {
-  addUser,
-  changeUserStatus,
-  delUser,
-  exportUser,
-  getUser,
-  importTemplate,
-  listUser,
-  resetUserPwd,
-  updateUser
-} from "@/api/system/user";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+	addUser,
+	changeUserStatus,
+	delUser,
+	exportUser,
+	getUser,
+	importTemplate,
+	listUser,
+	resetUserPwd,
+	updateUser,
+} from '@/api/system/user';
+import Treeselect from '@riophae/vue-treeselect';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css';
 
-import {listSimpleDepts} from "@/api/system/dept";
-import {listSimplePosts} from "@/api/system/post";
+import { listSimpleDepts } from '@/api/system/dept';
+import { listSimplePosts } from '@/api/system/post';
 
-import {CommonStatusEnum} from "@/utils/constants";
-import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-import {assignUserRole, listUserRoles} from "@/api/system/permission";
-import {listSimpleRoles} from "@/api/system/role";
-import {getBaseHeader} from "@/utils/request";
+import { CommonStatusEnum } from '@/utils/constants';
+import { DICT_TYPE, getDictDatas } from '@/utils/dict';
+import { assignUserRole, listUserRoles } from '@/api/system/permission';
+import { listSimpleRoles } from '@/api/system/role';
+import { getBaseHeader } from '@/utils/request';
 
 export default {
-  name: "SystemUser",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: null,
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      // 是否显示弹出层
-      open: false,
-      // 部门名称
-      deptName: undefined,
-      // 默认密码
-      initPassword: undefined,
-      // 性别状态字典
-      sexOptions: [],
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: "children",
-        label: "name"
-      },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: getBaseHeader(),
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + '/admin-api/system/user/import'
-      },
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        username: undefined,
-        mobile: undefined,
-        status: undefined,
-        deptId: undefined,
-        createTime: []
-      },
-      // 列信息
-      columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
-        { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
-      ],
-      // 表单校验
-      rules: {
-        username: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" }
-        ],
-        nickname: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
-        ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "'请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        mobile: [
-          {
-            pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      },
-      // 是否显示弹出层（角色权限）
-      openRole: false,
+	name: 'SystemUser',
+	components: { Treeselect },
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 导出遮罩层
+			exportLoading: false,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 用户表格数据
+			userList: null,
+			// 弹出层标题
+			title: '',
+			// 部门树选项
+			deptOptions: undefined,
+			// 是否显示弹出层
+			open: false,
+			// 部门名称
+			deptName: undefined,
+			// 默认密码
+			initPassword: undefined,
+			// 性别状态字典
+			sexOptions: [],
+			// 岗位选项
+			postOptions: [],
+			// 角色选项
+			roleOptions: [],
+			// 表单参数
+			form: {},
+			defaultProps: {
+				children: 'children',
+				label: 'name',
+			},
+			// 用户导入参数
+			upload: {
+				// 是否显示弹出层（用户导入）
+				open: false,
+				// 弹出层标题（用户导入）
+				title: '',
+				// 是否禁用上传
+				isUploading: false,
+				// 是否更新已经存在的用户数据
+				updateSupport: 0,
+				// 设置上传的请求头部
+				headers: getBaseHeader(),
+				// 上传的地址
+				url: process.env.VUE_APP_BASE_API + '/admin-api/system/user/import',
+			},
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				username: undefined,
+				mobile: undefined,
+				status: undefined,
+				deptId: undefined,
+				createTime: [],
+			},
+			// 列信息
+			columns: [
+				{ key: 0, label: `用户编号`, visible: true },
+				{ key: 1, label: `用户名称`, visible: true },
+				{ key: 2, label: `用户昵称`, visible: true },
+				{ key: 3, label: `部门`, visible: true },
+				{ key: 4, label: `手机号码`, visible: true },
+				{ key: 5, label: `状态`, visible: true },
+				{ key: 6, label: `创建时间`, visible: true },
+			],
+			// 表单校验
+			rules: {
+				username: [
+					{ required: true, message: '用户名称不能为空', trigger: 'blur' },
+				],
+				nickname: [
+					{ required: true, message: '用户昵称不能为空', trigger: 'blur' },
+				],
+				password: [
+					{ required: true, message: '用户密码不能为空', trigger: 'blur' },
+				],
+				email: [
+					{
+						type: 'email',
+						message: "'请输入正确的邮箱地址",
+						trigger: ['blur', 'change'],
+					},
+				],
+				mobile: [
+					{
+						pattern:
+							/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
+						message: '请输入正确的手机号码',
+						trigger: 'blur',
+					},
+				],
+			},
+			// 是否显示弹出层（角色权限）
+			openRole: false,
 
-      // 枚举
-      SysCommonStatusEnum: CommonStatusEnum,
-      // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
-      sexDictDatas: getDictDatas(DICT_TYPE.SYSTEM_USER_SEX),
-    };
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    }
-  },
-  created() {
-    this.getList();
-    this.getTreeselect();
-    // this.getConfigKey("sys.user.init-password").then(response => {
-    //   this.initPassword = response.msg;
-    // });
-  },
-  methods: {
-    // 更多操作
-    handleCommand(command, index, row) {
-      switch (command) {
-        case 'handleUpdate':
-          this.handleUpdate(row);//修改客户信息
-          break;
-        case 'handleDelete':
-          this.handleDelete(row);//红号变更
-          break;
-        case 'handleResetPwd':
-          this.handleResetPwd(row);
-          break;
-        case 'handleRole':
-          this.handleRole(row);
-          break;
-        default:
-          break;
-      }
-    },
-    /** 查询用户列表 */
-    getList() {
-      this.loading = true;
-      listUser(this.queryParams).then(response => {
-          this.userList = response.data.list;
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
-    },
-    /** 查询部门下拉树结构 + 岗位下拉 */
-    getTreeselect() {
-      listSimpleDepts().then(response => {
-        // 处理 deptOptions 参数
-        this.deptOptions = [];
-        this.deptOptions.push(...this.handleTree(response.data, "id"));
-      });
-      listSimplePosts().then(response => {
-        // 处理 postOptions 参数
-        this.postOptions = [];
-        this.postOptions.push(...response.data);
-      });
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.name.indexOf(value) !== -1;
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id;
-      this.getList();
-    },
-    // 用户状态修改
-    handleStatusChange(row) {
-      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.username + '"用户吗?').then(function() {
-          return changeUserStatus(row.id, row.status);
-        }).then(() => {
-          this.$modal.msgSuccess(text + "成功");
-        }).catch(function() {
-          row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
-              : CommonStatusEnum.ENABLE;
-        });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 取消按钮（角色权限）
-    cancelRole() {
-      this.openRole = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        deptId: undefined,
-        username: undefined,
-        nickname: undefined,
-        password: undefined,
-        mobile: undefined,
-        email: undefined,
-        sex: undefined,
-        status: "0",
-        remark: undefined,
-        postIds: [],
-        roleIds: []
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      // 获得下拉数据
-      this.getTreeselect();
-      // 打开表单，并设置初始化
-      this.open = true;
-      this.title = "添加用户";
-      this.form.password = this.initPassword;
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.getTreeselect();
-      const id = row.id;
-      getUser(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改用户";
-        this.form.password = "";
-      });
-    },
-    /** 重置密码按钮操作 */
-    handleResetPwd(row) {
-      this.$prompt('请输入"' + row.username + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消"
-      }).then(({ value }) => {
-          resetUserPwd(row.id, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          });
-        }).catch(() => {});
-    },
-    /** 分配用户角色操作 */
-    handleRole(row) {
-      this.reset();
-      const id = row.id
-      // 处理了 form 的用户 username 和 nickname 的展示
-      this.form.id = id;
-      this.form.username = row.username;
-      this.form.nickname = row.nickname;
-      // 打开弹窗
-      this.openRole = true;
-      // 获得角色列表
-      listSimpleRoles().then(response => {
-        // 处理 roleOptions 参数
-        this.roleOptions = [];
-        this.roleOptions.push(...response.data);
-      });
-      // 获得角色拥有的菜单集合
-      listUserRoles(id).then(response => {
-        // 设置选中
-        this.form.roleIds = response.data;
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id !== undefined) {
-            updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addUser(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 提交按钮（角色权限） */
-    submitRole: function() {
-      if (this.form.id !== undefined) {
-        assignUserRole({
-          userId: this.form.id,
-          roleIds: this.form.roleIds,
-        }).then(response => {
-          this.$modal.msgSuccess("分配角色成功");
-          this.openRole = false;
-          this.getList();
-        });
-      }
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function() {
-          return delUser(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
-          // 处理查询参数
-          let params = {...this.queryParams};
-          params.pageNo = undefined;
-          params.pageSize = undefined;
-          this.exportLoading = true;
-          return exportUser(params);
-        }).then(response => {
-          this.$download.excel(response, '用户数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.title = "用户导入";
-      this.upload.open = true;
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      importTemplate().then(response => {
-        this.$download.excel(response, '用户导入模板.xls');
-      });
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      if (response.code !== 0) {
-        this.$modal.msgError(response.msg)
-        return;
-      }
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      // 拼接提示语
-      let data = response.data;
-      let text = '创建成功数量：' + data.createUsernames.length;
-      for (const username of data.createUsernames) {
-        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
-      }
-      text += '<br />更新成功数量：' + data.updateUsernames.length;
-      for (const username of data.updateUsernames) {
-        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
-      }
-      text += '<br />更新失败数量：' + Object.keys(data.failureUsernames).length;
-      for (const username in data.failureUsernames) {
-        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username + '：' + data.failureUsernames[username];
-      }
-      this.$alert(text, "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    // 格式化部门的下拉框
-    normalizer(node) {
-      return {
-        id: node.id,
-        label: node.name,
-        children: node.children
-      }
-    }
-  }
+			// 枚举
+			SysCommonStatusEnum: CommonStatusEnum,
+			// 数据字典
+			statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
+			sexDictDatas: getDictDatas(DICT_TYPE.SYSTEM_USER_SEX),
+		};
+	},
+	watch: {
+		// 根据名称筛选部门树
+		deptName(val) {
+			this.$refs.tree.filter(val);
+		},
+	},
+	created() {
+		this.getList();
+		this.getTreeselect();
+		// this.getConfigKey("sys.user.init-password").then(response => {
+		//   this.initPassword = response.msg;
+		// });
+	},
+	methods: {
+		// 更多操作
+		handleCommand(command, index, row) {
+			switch (command) {
+				case 'handleUpdate':
+					this.handleUpdate(row); //修改客户信息
+					break;
+				case 'handleDelete':
+					this.handleDelete(row); //红号变更
+					break;
+				case 'handleResetPwd':
+					this.handleResetPwd(row);
+					break;
+				case 'handleRole':
+					this.handleRole(row);
+					break;
+				default:
+					break;
+			}
+		},
+		/** 查询用户列表 */
+		getList() {
+			this.loading = true;
+			listUser(this.queryParams).then((response) => {
+				this.userList = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 查询部门下拉树结构 + 岗位下拉 */
+		getTreeselect() {
+			listSimpleDepts().then((response) => {
+				// 处理 deptOptions 参数
+				this.deptOptions = [];
+				this.deptOptions.push(...this.handleTree(response.data, 'id'));
+			});
+			listSimplePosts().then((response) => {
+				// 处理 postOptions 参数
+				this.postOptions = [];
+				this.postOptions.push(...response.data);
+			});
+		},
+		// 筛选节点
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		// 节点单击事件
+		handleNodeClick(data) {
+			this.queryParams.deptId = data.id;
+			this.getList();
+		},
+		// 用户状态修改
+		handleStatusChange(row) {
+			let text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用';
+			this.$modal
+				.confirm('确认要"' + text + '""' + row.username + '"用户吗?')
+				.then(function () {
+					return changeUserStatus(row.id, row.status);
+				})
+				.then(() => {
+					this.$modal.msgSuccess(text + '成功');
+				})
+				.catch(function () {
+					row.status =
+						row.status === CommonStatusEnum.ENABLE
+							? CommonStatusEnum.DISABLE
+							: CommonStatusEnum.ENABLE;
+				});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 取消按钮（角色权限）
+		cancelRole() {
+			this.openRole = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				id: undefined,
+				deptId: undefined,
+				username: undefined,
+				nickname: undefined,
+				password: undefined,
+				mobile: undefined,
+				email: undefined,
+				sex: undefined,
+				status: '0',
+				remark: undefined,
+				postIds: [],
+				roleIds: [],
+			};
+			this.resetForm('form');
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			// 获得下拉数据
+			this.getTreeselect();
+			// 打开表单，并设置初始化
+			this.open = true;
+			this.title = '添加用户';
+			this.form.password = this.initPassword;
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			this.getTreeselect();
+			const id = row.id;
+			getUser(id).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改用户';
+				this.form.password = '';
+			});
+		},
+		/** 重置密码按钮操作 */
+		handleResetPwd(row) {
+			this.$prompt('请输入"' + row.username + '"的新密码', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+			})
+				.then(({ value }) => {
+					resetUserPwd(row.id, value).then((response) => {
+						this.$modal.msgSuccess('修改成功，新密码是：' + value);
+					});
+				})
+				.catch(() => {});
+		},
+		/** 分配用户角色操作 */
+		handleRole(row) {
+			this.reset();
+			const id = row.id;
+			// 处理了 form 的用户 username 和 nickname 的展示
+			this.form.id = id;
+			this.form.username = row.username;
+			this.form.nickname = row.nickname;
+			// 打开弹窗
+			this.openRole = true;
+			// 获得角色列表
+			listSimpleRoles().then((response) => {
+				// 处理 roleOptions 参数
+				this.roleOptions = [];
+				this.roleOptions.push(...response.data);
+			});
+			// 获得角色拥有的菜单集合
+			listUserRoles(id).then((response) => {
+				// 设置选中
+				this.form.roleIds = response.data;
+			});
+		},
+		/** 提交按钮 */
+		submitForm: function () {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					if (this.form.id !== undefined) {
+						updateUser(this.form).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addUser(this.form).then((response) => {
+							this.$modal.msgSuccess('新增成功');
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 提交按钮（角色权限） */
+		submitRole: function () {
+			if (this.form.id !== undefined) {
+				assignUserRole({
+					userId: this.form.id,
+					roleIds: this.form.roleIds,
+				}).then((response) => {
+					this.$modal.msgSuccess('分配角色成功');
+					this.openRole = false;
+					this.getList();
+				});
+			}
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const ids = row.id || this.ids;
+			this.$modal
+				.confirm('是否确认删除用户编号为"' + ids + '"的数据项?')
+				.then(function () {
+					return delUser(ids);
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.$modal
+				.confirm('是否确认导出所有用户数据项?')
+				.then(() => {
+					// 处理查询参数
+					let params = { ...this.queryParams };
+					params.pageNo = undefined;
+					params.pageSize = undefined;
+					this.exportLoading = true;
+					return exportUser(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '用户数据.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+		/** 导入按钮操作 */
+		handleImport() {
+			this.upload.title = '用户导入';
+			this.upload.open = true;
+		},
+		/** 下载模板操作 */
+		importTemplate() {
+			importTemplate().then((response) => {
+				this.$download.excel(response, '用户导入模板.xls');
+			});
+		},
+		// 文件上传中处理
+		handleFileUploadProgress(event, file, fileList) {
+			this.upload.isUploading = true;
+		},
+		// 文件上传成功处理
+		handleFileSuccess(response, file, fileList) {
+			if (response.code !== 0) {
+				this.$modal.msgError(response.msg);
+				return;
+			}
+			this.upload.open = false;
+			this.upload.isUploading = false;
+			this.$refs.upload.clearFiles();
+			// 拼接提示语
+			let data = response.data;
+			let text = '创建成功数量：' + data.createUsernames.length;
+			for (const username of data.createUsernames) {
+				text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
+			}
+			text += '<br />更新成功数量：' + data.updateUsernames.length;
+			for (const username of data.updateUsernames) {
+				text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
+			}
+			text +=
+				'<br />更新失败数量：' + Object.keys(data.failureUsernames).length;
+			for (const username in data.failureUsernames) {
+				text +=
+					'<br />&nbsp;&nbsp;&nbsp;&nbsp;' +
+					username +
+					'：' +
+					data.failureUsernames[username];
+			}
+			this.$alert(text, '导入结果', { dangerouslyUseHTMLString: true });
+			this.getList();
+		},
+		// 提交上传文件
+		submitFileForm() {
+			this.$refs.upload.submit();
+		},
+		// 格式化部门的下拉框
+		normalizer(node) {
+			return {
+				id: node.id,
+				label: node.name,
+				children: node.children,
+			};
+		},
+	},
 };
 </script>