src/assets/styles/index.scss

@@ -6,7 +6,6 @@
 @import './btn.scss';
 
 body {
-	// min-height: 1024px;
 	height: 100%;
 	-moz-osx-font-smoothing: grayscale;
 	-webkit-font-smoothing: antialiased;

src/assets/styles/login.scss

@@ -114,61 +114,40 @@ $buttonHeight: $buttonH * 1px;
 			}
 		}
 		.field {
+			// background: #ccc3;
 			position: relative;
-			margin-top: 8%;
+			padding-top: 196px;
 			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;
 
-				.title {
+				// h3.title {
-					margin: 0;
+				// 	position: relative;
-					margin-left: 32px;
-					font-weight: 400;
-					user-select: none;
-					color: #000;
-					font-size: 36px;
-					line-height: 54px;
-					letter-spacing: 2px;
-				}
-			}
 
+				// 	&::before {
+				// 		content: '';
+				// 		background: url($cnbmLogo) 100% / 100% no-repeat;
+				// 		height: 48px;
+				// 		width: 48px;
+				// 		position: absolute;
+				// 		left: 0px;
+				// 		top: 4px;
+				// 		display: inline-block;
+				// 	}
+				// }
+			}
 			.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;
@@ -304,6 +283,24 @@ $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 最小尺寸设置

src/views/login.vue

@@ -44,7 +44,7 @@
 								border-radius: 100%;
 								background: #26b9de;
 							"></span>
-						MES
+						产线生产监控系统
 					</p>
 				</div>
 				<video
@@ -67,7 +67,18 @@
 					<h3 class="title">中建材智能自动化研究院有限公司</h3>
 				</h2>
 				<h2 class="pc-title" style="">
-					<h3 class="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;
+						">
 						<img
 							src="../assets/logo/cnbm.png"
 							alt="cnbm_logo"
@@ -92,7 +103,7 @@
 							line-height: 54px;
 							letter-spacing: 2px;
 						">
-						MES
+						产线生产监控系统
 					</h3>
 				</h2>
 
@@ -208,14 +219,12 @@
 							</div>
 
 							<!-- 下方的登录按钮 -->
-							<el-form-item
+							<el-form-item id="button-form-item" style="width: 100%; margin-top: 32px">
-								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>
@@ -349,7 +358,6 @@ export default {
 		};
 	},
 	created() {
-		document.body.style['min-height'] = '1024px';
 		// 租户开关
 		this.tenantEnable = getTenantEnable();
 		if (this.tenantEnable) {
@@ -369,9 +377,6 @@ export default {
 			: undefined;
 		this.getCookie();
 	},
-	destroyed() {
-		document.body.style['min-height'] = 'unset';
-	},
 	methods: {
 		getCode() {
 			// 情况一，未开启：则直接登录

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">

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">

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">

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">

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">

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">

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/resource-permission" />
-    <doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" /> -->
+    <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">

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">

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">

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">

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">

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="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" />
-    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" /> -->
+    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">

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">

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/resource-permission" />
-    <doc-alert title="数据权限" url="https://doc.iocoder.cn/data-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"

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">

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">

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">

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">

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">

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">

src/views/system/user/index.vue

@@ -1,316 +1,140 @@
 <template>
-	<div style="display: flex; gap: 16px; flex: 1; background: #eff1f6">
+  <div class="app-container">
-		<div
+    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
-			class="app-container"
+    <doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" />
-			style="background: white; width: 280px; border-radius: 8px">
+    <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
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px"/>
-					v-model="deptName"
-					placeholder="请输入部门名称"
-					clearable
-					size="small"
-					prefix-icon="el-icon-search"
-					style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-				<el-tree
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode"
-					:data="deptOptions"
+                   ref="tree" default-expand-all highlight-current @node-click="handleNodeClick"/>
-					:props="defaultProps"
-					:expand-on-click-node="false"
-					:filter-node-method="filterNode"
-					ref="tree"
-					default-expand-all
-					highlight-current
-					@node-click="handleNodeClick" />
         </div>
-		</div>
+      </el-col>
-
+      <!--用户数据-->
-		<div
+      <el-col :span="20" :xs="24">
-			class="app-container"
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			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
+            <el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable style="width: 240px"
-						v-model="queryParams.username"
-						placeholder="请输入用户名称"
-						clearable
-						style="width: 240px"
                       @keyup.enter.native="handleQuery"/>
           </el-form-item>
           <el-form-item label="手机号码" prop="mobile">
-					<el-input
+            <el-input v-model="queryParams.mobile" placeholder="请输入手机号码" clearable style="width: 240px"
-						v-model="queryParams.mobile"
-						placeholder="请输入手机号码"
-						clearable
-						style="width: 240px"
                       @keyup.enter.native="handleQuery"/>
           </el-form-item>
           <el-form-item label="状态" prop="status">
-					<el-select
+            <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-						v-model="queryParams.status"
+              <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-						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
+            <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-						v-model="queryParams.createTime"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-						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 type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-						搜索
-					</el-button>
             <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-					<el-button
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-						type="primary"
+                       v-hasPermi="['system:user:create']">新增</el-button>
-						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
+            <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"
-						type="info"
+                       v-hasPermi="['system:user:import']">导入</el-button>
-						icon="el-icon-upload2"
-						size="mini"
-						@click="handleImport"
-						v-hasPermi="['system:user:import']">
-						导入
-					</el-button>
           </el-col>
           <el-col :span="1.5">
-					<el-button
+            <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-						type="warning"
+                       v-hasPermi="['system:user:export']">导出</el-button>
-						icon="el-icon-download"
-						size="mini"
-						@click="handleExport"
-						:loading="exportLoading"
-						v-hasPermi="['system:user:export']">
-						导出
-					</el-button>
           </el-col>
-				<right-toolbar
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-					:showSearch.sync="showSearch"
-					@queryTable="getList"
-					:columns="columns"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="userList">
-				<el-table-column
+          <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-					label="用户编号"
+          <el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-					align="center"
+          <el-table-column label="用户昵称" align="center" key="nickname" prop="nickname" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-					key="id"
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.name" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-					prop="id"
+          <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-					v-if="columns[0].visible" />
+          <el-table-column label="状态" key="status" v-if="columns[5].visible" align="center">
-				<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
+              <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
-							v-model="scope.row.status"
-							:active-value="0"
-							:inactive-value="1"
-							@change="handleStatusChange(scope.row)" />
             </template>
           </el-table-column>
-				<el-table-column
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-					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
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-					label="操作"
-					align="center"
-					width="160"
-					class-name="small-padding fixed-width">
             <template v-slot="scope">
-						<el-button
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-							size="mini"
+                         v-hasPermi="['system:user:update']">修改</el-button>
-							type="text"
+              <el-dropdown  @command="(command) => handleCommand(command, scope.$index, scope.row)"
-							icon="el-icon-edit"
+                            v-hasPermi="['system:user:delete', 'system:user:update-password', 'system:permission:assign-user-role']">
-							@click="handleUpdate(scope.row)"
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-							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
+                  <el-dropdown-item command="handleDelete" v-if="scope.row.id !== 1" size="mini" type="text" icon="el-icon-delete"
-									command="handleDelete"
+                                    v-hasPermi="['system:user:delete']">删除</el-dropdown-item>
-									v-if="scope.row.id !== 1"
+                  <el-dropdown-item command="handleResetPwd" size="mini" type="text" icon="el-icon-key"
-									size="mini"
+                                    v-hasPermi="['system:user:update-password']">重置密码</el-dropdown-item>
-									type="text"
+                  <el-dropdown-item command="handleRole" size="mini" type="text" icon="el-icon-circle-check"
-									icon="el-icon-delete"
+                                    v-hasPermi="['system:permission:assign-user-role']">分配角色</el-dropdown-item>
-									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>
 
-			<pagination
+        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-				v-show="total > 0"
-				:total="total"
-				:page.sync="queryParams.pageNo"
-				:limit.sync="queryParams.pageSize"
                     @pagination="getList"/>
+      </el-col>
+    </el-row>
 
     <!-- 添加或修改参数配置对话框 -->
-			<el-dialog
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-				: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
+              <el-input v-model="form.nickname" placeholder="请输入用户昵称" />
-									v-model="form.nickname"
-									placeholder="请输入用户昵称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-								<treeselect
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :clearable="false"
-									v-model="form.deptId"
+                          placeholder="请选择归属部门" :normalizer="normalizer"/>
-									: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
+              <el-input v-model="form.mobile" placeholder="请输入手机号码" maxlength="11" />
-									v-model="form.mobile"
-									placeholder="请输入手机号码"
-									maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-								<el-input
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-									v-model="form.email"
-									placeholder="请输入邮箱"
-									maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-							<el-form-item
+            <el-form-item v-if="form.id === undefined" label="用户名称" prop="username">
-								v-if="form.id === undefined"
+              <el-input v-model="form.username" placeholder="请输入用户名称" />
-								label="用户名称"
-								prop="username">
-								<el-input
-									v-model="form.username"
-									placeholder="请输入用户名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-							<el-form-item
+            <el-form-item v-if="form.id === undefined" label="用户密码" prop="password">
-								v-if="form.id === undefined"
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password />
-								label="用户密码"
-								prop="password">
-								<el-input
-									v-model="form.password"
-									placeholder="请输入用户密码"
-									type="password"
-									show-password />
             </el-form-item>
           </el-col>
         </el-row>
@@ -318,11 +142,7 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-									<el-option
+                <el-option v-for="dict in sexDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-										v-for="dict in sexDictDatas"
-										:key="parseInt(dict.value)"
-										:label="dict.label"
-										:value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -333,7 +153,8 @@
                     v-for="item in postOptions"
                     :key="item.id"
                     :label="item.name"
-										:value="item.id"></el-option>
+                    :value="item.id"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -341,10 +162,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-								<el-input
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-									v-model="form.remark"
-									type="textarea"
-									placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -356,40 +174,18 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-			<el-dialog
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-				:title="upload.title"
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-				:visible.sync="upload.open"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-				width="400px"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-				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">
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-						将文件拖到此处，或
-						<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" />
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-							是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-						<el-link
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</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">
@@ -399,11 +195,7 @@
     </el-dialog>
 
     <!-- 分配角色 -->
-			<el-dialog
+    <el-dialog title="分配角色" :visible.sync="openRole" width="500px" append-to-body>
-				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" />
@@ -417,7 +209,8 @@
                 v-for="item in roleOptions"
                 :key="parseInt(item.id)"
                 :label="item.name"
-								:value="parseInt(item.id)"></el-option>
+                :value="parseInt(item.id)"
+            ></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -426,7 +219,7 @@
         <el-button @click="cancelRole">取 消</el-button>
       </div>
     </el-dialog>
-		</div>
+
   </div>
 </template>
 
@@ -440,22 +233,22 @@ import {
   importTemplate,
   listUser,
   resetUserPwd,
-	updateUser,
+  updateUser
-} from '@/api/system/user';
+} from "@/api/system/user";
-import Treeselect from '@riophae/vue-treeselect';
+import Treeselect from "@riophae/vue-treeselect";
-import '@riophae/vue-treeselect/dist/vue-treeselect.css';
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-import { listSimpleDepts } from '@/api/system/dept';
+import {listSimpleDepts} from "@/api/system/dept";
-import { listSimplePosts } from '@/api/system/post';
+import {listSimplePosts} from "@/api/system/post";
 
-import { CommonStatusEnum } from '@/utils/constants';
+import {CommonStatusEnum} from "@/utils/constants";
-import { DICT_TYPE, getDictDatas } from '@/utils/dict';
+import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-import { assignUserRole, listUserRoles } from '@/api/system/permission';
+import {assignUserRole, listUserRoles} from "@/api/system/permission";
-import { listSimpleRoles } from '@/api/system/role';
+import {listSimpleRoles} from "@/api/system/role";
-import { getBaseHeader } from '@/utils/request';
+import {getBaseHeader} from "@/utils/request";
 
 export default {
-	name: 'SystemUser',
+  name: "SystemUser",
   components: { Treeselect },
   data() {
     return {
@@ -470,7 +263,7 @@ export default {
       // 用户表格数据
       userList: null,
       // 弹出层标题
-			title: '',
+      title: "",
       // 部门树选项
       deptOptions: undefined,
       // 是否显示弹出层
@@ -488,15 +281,15 @@ export default {
       // 表单参数
       form: {},
       defaultProps: {
-				children: 'children',
+        children: "children",
-				label: 'name',
+        label: "name"
       },
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
         open: false,
         // 弹出层标题（用户导入）
-				title: '',
+        title: "",
         // 是否禁用上传
         isUploading: false,
         // 是否更新已经存在的用户数据
@@ -504,7 +297,7 @@ export default {
         // 设置上传的请求头部
         headers: getBaseHeader(),
         // 上传的地址
-				url: process.env.VUE_APP_BASE_API + '/admin-api/system/user/import',
+        url: process.env.VUE_APP_BASE_API + '/admin-api/system/user/import'
       },
       // 查询参数
       queryParams: {
@@ -514,7 +307,7 @@ export default {
         mobile: undefined,
         status: undefined,
         deptId: undefined,
-				createTime: [],
+        createTime: []
       },
       // 列信息
       columns: [
@@ -524,34 +317,33 @@ export default {
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
         { key: 5, label: `状态`, visible: true },
-				{ key: 6, label: `创建时间`, visible: true },
+        { key: 6, label: `创建时间`, visible: true }
       ],
       // 表单校验
       rules: {
         username: [
-					{ required: true, message: '用户名称不能为空', trigger: 'blur' },
+          { required: true, message: "用户名称不能为空", trigger: "blur" }
         ],
         nickname: [
-					{ required: true, message: '用户昵称不能为空', trigger: 'blur' },
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
         password: [
-					{ required: true, message: '用户密码不能为空', trigger: 'blur' },
+          { required: true, message: "用户密码不能为空", trigger: "blur" }
         ],
         email: [
           {
-						type: 'email',
+            type: "email",
             message: "'请输入正确的邮箱地址",
-						trigger: ['blur', 'change'],
+            trigger: ["blur", "change"]
-					},
+          }
         ],
         mobile: [
           {
-						pattern:
+            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}$/,
-							/^(?:(?:\+|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: "请输入正确的手机号码",
-						message: '请输入正确的手机号码',
+            trigger: "blur"
-						trigger: 'blur',
+          }
-					},
+        ]
-				],
       },
       // 是否显示弹出层（角色权限）
       openRole: false,
@@ -567,7 +359,7 @@ export default {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
-		},
+    }
   },
   created() {
     this.getList();
@@ -599,20 +391,21 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-			listUser(this.queryParams).then((response) => {
+      listUser(this.queryParams).then(response => {
           this.userList = response.data.list;
           this.total = response.data.total;
           this.loading = false;
-			});
+        }
+      );
     },
     /** 查询部门下拉树结构 + 岗位下拉 */
     getTreeselect() {
-			listSimpleDepts().then((response) => {
+      listSimpleDepts().then(response => {
         // 处理 deptOptions 参数
         this.deptOptions = [];
-				this.deptOptions.push(...this.handleTree(response.data, 'id'));
+        this.deptOptions.push(...this.handleTree(response.data, "id"));
       });
-			listSimplePosts().then((response) => {
+      listSimplePosts().then(response => {
         // 处理 postOptions 参数
         this.postOptions = [];
         this.postOptions.push(...response.data);
@@ -630,19 +423,13 @@ export default {
     },
     // 用户状态修改
     handleStatusChange(row) {
-			let text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用';
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
-			this.$modal
+      this.$modal.confirm('确认要"' + text + '""' + row.username + '"用户吗?').then(function() {
-				.confirm('确认要"' + text + '""' + row.username + '"用户吗?')
-				.then(function () {
           return changeUserStatus(row.id, row.status);
-				})
+        }).then(() => {
-				.then(() => {
+          this.$modal.msgSuccess(text + "成功");
-					this.$modal.msgSuccess(text + '成功');
+        }).catch(function() {
-				})
+          row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
-				.catch(function () {
-					row.status =
-						row.status === CommonStatusEnum.ENABLE
-							? CommonStatusEnum.DISABLE
               : CommonStatusEnum.ENABLE;
         });
     },
@@ -667,12 +454,12 @@ export default {
         mobile: undefined,
         email: undefined,
         sex: undefined,
-				status: '0',
+        status: "0",
         remark: undefined,
         postIds: [],
-				roleIds: [],
+        roleIds: []
       };
-			this.resetForm('form');
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -681,7 +468,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-			this.resetForm('queryForm');
+      this.resetForm("queryForm");
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -691,7 +478,7 @@ export default {
       this.getTreeselect();
       // 打开表单，并设置初始化
       this.open = true;
-			this.title = '添加用户';
+      this.title = "添加用户";
       this.form.password = this.initPassword;
     },
     /** 修改按钮操作 */
@@ -699,30 +486,28 @@ export default {
       this.reset();
       this.getTreeselect();
       const id = row.id;
-			getUser(id).then((response) => {
+      getUser(id).then(response => {
         this.form = response.data;
         this.open = true;
-				this.title = '修改用户';
+        this.title = "修改用户";
-				this.form.password = '';
+        this.form.password = "";
       });
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
-			this.$prompt('请输入"' + row.username + '"的新密码', '提示', {
+      this.$prompt('请输入"' + row.username + '"的新密码', "提示", {
-				confirmButtonText: '确定',
+        confirmButtonText: "确定",
-				cancelButtonText: '取消',
+        cancelButtonText: "取消"
-			})
+      }).then(({ value }) => {
-				.then(({ value }) => {
+          resetUserPwd(row.id, value).then(response => {
-					resetUserPwd(row.id, value).then((response) => {
+            this.$modal.msgSuccess("修改成功，新密码是：" + value);
-						this.$modal.msgSuccess('修改成功，新密码是：' + value);
           });
-				})
+        }).catch(() => {});
-				.catch(() => {});
     },
     /** 分配用户角色操作 */
     handleRole(row) {
       this.reset();
-			const id = row.id;
+      const id = row.id
       // 处理了 form 的用户 username 和 nickname 的展示
       this.form.id = id;
       this.form.username = row.username;
@@ -730,30 +515,30 @@ export default {
       // 打开弹窗
       this.openRole = true;
       // 获得角色列表
-			listSimpleRoles().then((response) => {
+      listSimpleRoles().then(response => {
         // 处理 roleOptions 参数
         this.roleOptions = [];
         this.roleOptions.push(...response.data);
       });
       // 获得角色拥有的菜单集合
-			listUserRoles(id).then((response) => {
+      listUserRoles(id).then(response => {
         // 设置选中
         this.form.roleIds = response.data;
-			});
+      })
     },
     /** 提交按钮 */
     submitForm: function() {
-			this.$refs['form'].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id !== undefined) {
-						updateUser(this.form).then((response) => {
+            updateUser(this.form).then(response => {
-							this.$modal.msgSuccess('修改成功');
+              this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-						addUser(this.form).then((response) => {
+            addUser(this.form).then(response => {
-							this.$modal.msgSuccess('新增成功');
+              this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -767,8 +552,8 @@ export default {
         assignUserRole({
           userId: this.form.id,
           roleIds: this.form.roleIds,
-				}).then((response) => {
+        }).then(response => {
-					this.$modal.msgSuccess('分配角色成功');
+          this.$modal.msgSuccess("分配角色成功");
           this.openRole = false;
           this.getList();
         });
@@ -777,43 +562,35 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-			this.$modal
+      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function() {
-				.confirm('是否确认删除用户编号为"' + ids + '"的数据项?')
-				.then(function () {
           return delUser(ids);
-				})
+        }).then(() => {
-				.then(() => {
           this.getList();
-					this.$modal.msgSuccess('删除成功');
+          this.$modal.msgSuccess("删除成功");
-				})
+      }).catch(() => {});
-				.catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-			this.$modal
+      this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
-				.confirm('是否确认导出所有用户数据项?')
-				.then(() => {
           // 处理查询参数
           let params = {...this.queryParams};
           params.pageNo = undefined;
           params.pageSize = undefined;
           this.exportLoading = true;
           return exportUser(params);
-				})
+        }).then(response => {
-				.then((response) => {
           this.$download.excel(response, '用户数据.xls');
           this.exportLoading = false;
-				})
+      }).catch(() => {});
-				.catch(() => {});
     },
     /** 导入按钮操作 */
     handleImport() {
-			this.upload.title = '用户导入';
+      this.upload.title = "用户导入";
       this.upload.open = true;
     },
     /** 下载模板操作 */
     importTemplate() {
-			importTemplate().then((response) => {
+      importTemplate().then(response => {
         this.$download.excel(response, '用户导入模板.xls');
       });
     },
@@ -824,7 +601,7 @@ export default {
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       if (response.code !== 0) {
-				this.$modal.msgError(response.msg);
+        this.$modal.msgError(response.msg)
         return;
       }
       this.upload.open = false;
@@ -840,16 +617,11 @@ export default {
       for (const username of data.updateUsernames) {
         text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
       }
-			text +=
+      text += '<br />更新失败数量：' + Object.keys(data.failureUsernames).length;
-				'<br />更新失败数量：' + Object.keys(data.failureUsernames).length;
       for (const username in data.failureUsernames) {
-				text +=
+        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username + '：' + data.failureUsernames[username];
-					'<br />&nbsp;&nbsp;&nbsp;&nbsp;' +
-					username +
-					'：' +
-					data.failureUsernames[username];
       }
-			this.$alert(text, '导入结果', { dangerouslyUseHTMLString: true });
+      this.$alert(text, "导入结果", { dangerouslyUseHTMLString: true });
       this.getList();
     },
     // 提交上传文件
@@ -861,9 +633,9 @@ export default {
       return {
         id: node.id,
         label: node.name,
-				children: node.children,
+        children: node.children
-			};
+      }
-		},
+    }
-	},
+  }
 };
 </script>