merge test

Reviewed-on: #86

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-15 17:25:58
+ # @LastEditTime: 2023-11-16 14:07:34
  # @LastEditors: DY
  # @Description:
 ###
@@ -18,7 +18,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # 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.0.33:48082'
+# 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'
 # 路由懒加载

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;

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 {
+				.title {
-				// 	position: relative;
+					margin: 0;
-
+					margin-left: 32px;
-				// 	&::before {
+					font-weight: 400;
-				// 		content: '';
+					user-select: none;
-				// 		background: url($cnbmLogo) 100% / 100% no-repeat;
+					color: #000;
-				// 		height: 48px;
+					font-size: 36px;
-				// 		width: 48px;
+					line-height: 54px;
-				// 		position: absolute;
+					letter-spacing: 2px;
-				// 		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;
@@ -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 最小尺寸设置

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 芋艿

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.

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: {
+  // watch: {
-    clientWidth(val) {
+  //   clientWidth(val) {
-      if (!this.timer) {
+  //     if (!this.timer) {
-        this.clientWidth = val
+  //       this.clientWidth = val
-        this.beilv2 = this.clientWidth / 1920
+  //       this.beilv2 = this.clientWidth / 1920
-        this.timer = true
+  //       this.timer = true
-        let _this = this
+  //       let _this = this
-        setTimeout(function () {
+  //       setTimeout(function () {
-          _this.timer = false
+  //         _this.timer = false
-        }, 500)
+  //       }, 500)
-      }
+  //     }
-      // 这里可以添加修改时的方法
+  //     // 这里可以添加修改时的方法
-      this.windowWidth(val);
+  //     this.windowWidth(val);
-    }
+  //   }
-  },
+  // },
   created() {
     // this.fetchList('exception-alarm')
     // this.fetchList('inAndOutOfEachLine')

src/views/OperationalOverview/coldBoard.vue

@@ -1021,7 +1021,7 @@ export default {
    top: 2em;
  }
   .container-main {
-    // padding: 10px;
+    padding: 6px;
   }
 }
 

src/views/base/coreProductionLine/index.vue

@@ -140,8 +140,8 @@ export default {
     getDataList() {
       this.dataListLoading = true;
       this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        // this.tableData = response.data.list;
+        this.tableData = response.data.list;
-				this.getStatus(response.data.list)
+				// this.getStatus(response.data.list)
         this.listQuery.total = response.data.total;
         this.dataListLoading = false;
       });
@@ -150,6 +150,7 @@ export default {
 			const ids = list.map((i) => {
 				return i.id;
 			});
+			console.log('111', ids)
 			getStatus(ids).then((response) => {
 				response.forEach((a) => {
 					list.forEach((b) => {

src/views/base/coreWorkOrder/allocation.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-15 17:45:04
+ * @LastEditTime: 2023-11-16 09:14:35
  * @Description:
 -->
 <template>
@@ -41,12 +41,12 @@
 					<el-table-column prop="priority" label="优先级" />
 					<el-table-column prop="planAssignmentQuantity" label="计划分配数量" >
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.planAssignmentQuantity"></el-input>
+							<el-input v-model="scope.row.planAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column prop="actualAssignmentQuantity" label="实际分配数量">
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.actualAssignmentQuantity"></el-input>
+							<el-input v-model="scope.row.actualAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column label="操作">

src/views/base/coreWorkOrder/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-15 14:18:38
+ * @LastEditTime: 2023-11-16 13:45:13
  * @Description:
 -->
 <template>
@@ -64,15 +64,15 @@
 			<div class="formContent">
 				<el-row :gutter="20">
 					<el-col :span="8">订单创建时间:
-						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: normal">{{ item.createTime }}</span>
+						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: pre-wrap">{{ parseTime(item.createTime) }}</span>
 					</el-col>
-					<el-col :span="8">计划开始时间:{{ dataForm.planStartTime }}</el-col>
+					<el-col :span="8">计划开始时间:{{ parseTime(dataForm.planStartTime) }}</el-col>
-					<el-col :span="8">计划完成时间:{{ dataForm.planFinishTime }}</el-col>
+					<el-col :span="8">计划完成时间:{{ parseTime(dataForm.planFinishTime) }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
-					<el-col :span="8">预计结束时间:{{ dataForm.computeFinishTime }}</el-col>
+					<el-col :span="8">预计结束时间:{{ parseTime(dataForm.computeFinishTime) }}</el-col>
-					<el-col :span="8">实际开始时间:{{ dataForm.startProduceTime }}</el-col>
+					<el-col :span="8">实际开始时间:{{ parseTime(dataForm.startProduceTime) }}</el-col>
-					<el-col :span="8">实际完成时间:{{ dataForm.finishProduceTime }}</el-col>
+					<el-col :span="8">实际完成时间:{{ parseTime(dataForm.finishProduceTime) }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
 					<el-col :span="8">工单状态:{{ fitlerS(dataForm.status) }}</el-col>
@@ -147,6 +147,7 @@ import { orderList } from "@/api/base/orderManage";
 import { getProcessFlowList } from '@/api/base/orderManage'
 import SmallTitle from './SmallTitle';
 import { publicFormatter } from "@/utils/dict";
+import { parseTime } from '@/utils/ruoyi'
 
 const tableBtn = [
 	{
@@ -233,7 +234,7 @@ export default {
 		this.getDict()
 	},
 	mounted() {
-		if (this.$route.query.woIdString) {
+		if (this.$route.query.woIdString && this.$route.query.woIdString !== 'undefined') {
 			const idList = this.$route.query.woIdString.split(',')
 			getCoreWOListById(idList).then(res => {
 				this.workOrderButton = res.data.map(work => {

src/views/base/coreWorkOrder/index.vue

@@ -348,20 +348,25 @@ export default {
 					id: val.data.id,
 					status: undefined
 				}
+				let opration = ''
 				if (val.type === 'active') {
 					param.status = 2
+					opration = '激活'
 				}
 				if (val.type === 'pause') {
 					param.status = 3
+					opration = '暂停'
 				}
 				if (val.type === 'nullify') {
 					param.status = 9
+					opration = '报废'
 				}
 				if (val.type === 'finish') {
 					param.status = 4
+					opration = '完成'
 				}
 				console.log('22',val)
-				this.$confirm(`确定对${'[工单名称=' + val.data.name + ']'}进行${val.type}操作?`, "提示", {
+				this.$confirm(`确定${opration}${'"工单' + val.data.name + '"'}?`, "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",
 					type: "warning",
@@ -369,7 +374,7 @@ export default {
         .then(() => {
 					statusChange(param).then(({ data }) => {
 						this.$message({
-							message: '操作成功！',
+							message: '操作成功！工单状态稍后将会更新！',
 							type: 'success',
 							duration: 1500,
 							onClose: () => {

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
+            <el-button v-for="(value,type) in paperTypes" :key="type" :type="curPaperType === type ? 'primary' : ' '"
-              v-for="(value,type) in paperTypes"
+              @click="setPaper(type,value)">
-              :key="type"
-              :type="curPaperType === type ? 'primary' : ' '"
-              @click="setPaper(type,value)"
-            >
               {{ type }}
             </el-button>
           </el-button-group>
-          <el-input-number
+          <el-input-number style="margin:0 10px" :value="scaleValue " :precision="2" :step="0.1" :min="scaleMin"
-            style="margin:0 10px"
+            :max="scaleMax" @change="changeScale" />
-            :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

src/views/core/analysis/yieldAnalysis/index.vue

@@ -80,7 +80,7 @@ export default {
 					type: 'datePicker',
 					label: '时间',
 					dateType: 'month',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',

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
+					<h3 class="title" style="">
-						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"
@@ -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() {
 			// 情况一，未开启：则直接登录

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,140 +1,316 @@
 <template>
-  <div class="app-container">
+	<div style="display: flex; gap: 16px; flex: 1; background: #eff1f6">
-    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
+		<div
-    <doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" />
+			class="app-container"
-    <doc-alert title="Excel 导入导出" url="https://doc.iocoder.cn/excel-import-and-export/" />
+			style="background: white; width: 280px; border-radius: 8px">
-    <!-- 搜索工作栏 -->
-    <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"/>
+				<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"
+				<el-tree
-                   ref="tree" default-expand-all highlight-current @node-click="handleNodeClick"/>
+					: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>
+		</div>
-      <!--用户数据-->
+
-      <el-col :span="20" :xs="24">
+		<div
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+			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"
+					<el-input
-                      @keyup.enter.native="handleQuery"/>
+						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"
+					<el-input
-                      @keyup.enter.native="handleQuery"/>
+						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-select
-              <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+						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"
+					<el-date-picker
-              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+						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 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-row :gutter="10" class="mb8">
 				<el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+					<el-button
-                       v-hasPermi="['system:user:create']">新增</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"
+					<el-button
-                       v-hasPermi="['system:user:import']">导入</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"
+					<el-button
-                       v-hasPermi="['system:user:export']">导出</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>
+				<right-toolbar
+					:showSearch.sync="showSearch"
+					@queryTable="getList"
+					:columns="columns"></right-toolbar>
 			</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
-          <el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+					label="用户编号"
-          <el-table-column label="用户昵称" align="center" key="nickname" prop="nickname" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+					align="center"
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.name" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+					key="id"
-          <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
+					prop="id"
-          <el-table-column label="状态" key="status" v-if="columns[5].visible" align="center">
+					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)" />
+						<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">
+				<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">
+				<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)"
+						<el-button
-                         v-hasPermi="['system:user:update']">修改</el-button>
+							size="mini"
-              <el-dropdown  @command="(command) => handleCommand(command, scope.$index, scope.row)"
+							type="text"
-                            v-hasPermi="['system:user:delete', 'system:user:update-password', 'system:permission:assign-user-role']">
+							icon="el-icon-edit"
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+							@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"
+								<el-dropdown-item
-                                    v-hasPermi="['system:user:delete']">删除</el-dropdown-item>
+									command="handleDelete"
-                  <el-dropdown-item command="handleResetPwd" size="mini" type="text" icon="el-icon-key"
+									v-if="scope.row.id !== 1"
-                                    v-hasPermi="['system:user:update-password']">重置密码</el-dropdown-item>
+									size="mini"
-                  <el-dropdown-item command="handleRole" size="mini" type="text" icon="el-icon-circle-check"
+									type="text"
-                                    v-hasPermi="['system:permission:assign-user-role']">分配角色</el-dropdown-item>
+									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>
 
-        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+			<pagination
-                    @pagination="getList"/>
+				v-show="total > 0"
-      </el-col>
+				:total="total"
-    </el-row>
+				:page.sync="queryParams.pageNo"
+				:limit.sync="queryParams.pageSize"
+				@pagination="getList" />
 
 			<!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+			<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-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"
+								<treeselect
-                          placeholder="请选择归属部门" :normalizer="normalizer"/>
+									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-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-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-form-item
-              <el-input v-model="form.username" placeholder="请输入用户名称" />
+								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-form-item
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password />
+								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>
@@ -142,7 +318,11 @@
 						<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-option
+										v-for="dict in sexDictDatas"
+										:key="parseInt(dict.value)"
+										:label="dict.label"
+										:value="parseInt(dict.value)" />
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -153,8 +333,7 @@
 										v-for="item in postOptions"
 										:key="item.id"
 										:label="item.name"
-                    :value="item.id"
+										:value="item.id"></el-option>
-                ></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -162,7 +341,10 @@
 					<el-row>
 						<el-col :span="24">
 							<el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+								<el-input
+									v-model="form.remark"
+									type="textarea"
+									placeholder="请输入内容"></el-input>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -174,18 +356,40 @@
 			</el-dialog>
 
 			<!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+			<el-dialog
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+				:title="upload.title"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+				:visible.sync="upload.open"
-        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+				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__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" /> 是否更新已经存在的用户数据
+							<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>
+						<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">
@@ -195,7 +399,11 @@
 			</el-dialog>
 
 			<!-- 分配角色 -->
-    <el-dialog title="分配角色" :visible.sync="openRole" width="500px" append-to-body>
+			<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" />
@@ -209,8 +417,7 @@
 								v-for="item in roleOptions"
 								:key="parseInt(item.id)"
 								:label="item.name"
-                :value="parseInt(item.id)"
+								:value="parseInt(item.id)"></el-option>
-            ></el-option>
 						</el-select>
 					</el-form-item>
 				</el-form>
@@ -219,7 +426,7 @@
 					<el-button @click="cancelRole">取 消</el-button>
 				</div>
 			</el-dialog>
-
+		</div>
 	</div>
 </template>
 
@@ -233,22 +440,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 {
@@ -263,7 +470,7 @@ export default {
 			// 用户表格数据
 			userList: null,
 			// 弹出层标题
-      title: "",
+			title: '',
 			// 部门树选项
 			deptOptions: undefined,
 			// 是否显示弹出层
@@ -281,15 +488,15 @@ export default {
 			// 表单参数
 			form: {},
 			defaultProps: {
-        children: "children",
+				children: 'children',
-        label: "name"
+				label: 'name',
 			},
 			// 用户导入参数
 			upload: {
 				// 是否显示弹出层（用户导入）
 				open: false,
 				// 弹出层标题（用户导入）
-        title: "",
+				title: '',
 				// 是否禁用上传
 				isUploading: false,
 				// 是否更新已经存在的用户数据
@@ -297,7 +504,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: {
@@ -307,7 +514,7 @@ export default {
 				mobile: undefined,
 				status: undefined,
 				deptId: undefined,
-        createTime: []
+				createTime: [],
 			},
 			// 列信息
 			columns: [
@@ -317,33 +524,34 @@ 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: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
+						pattern:
-            message: "请输入正确的手机号码",
+							/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
-            trigger: "blur"
+						message: '请输入正确的手机号码',
-          }
+						trigger: 'blur',
-        ]
+					},
+				],
 			},
 			// 是否显示弹出层（角色权限）
 			openRole: false,
@@ -359,7 +567,7 @@ export default {
 		// 根据名称筛选部门树
 		deptName(val) {
 			this.$refs.tree.filter(val);
-    }
+		},
 	},
 	created() {
 		this.getList();
@@ -373,10 +581,10 @@ export default {
 		handleCommand(command, index, row) {
 			switch (command) {
 				case 'handleUpdate':
-          this.handleUpdate(row);//修改客户信息
+					this.handleUpdate(row); //修改客户信息
 					break;
 				case 'handleDelete':
-          this.handleDelete(row);//红号变更
+					this.handleDelete(row); //红号变更
 					break;
 				case 'handleResetPwd':
 					this.handleResetPwd(row);
@@ -391,21 +599,20 @@ 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);
@@ -423,13 +630,19 @@ export default {
 		},
 		// 用户状态修改
 		handleStatusChange(row) {
-      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
+			let text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用';
-      this.$modal.confirm('确认要"' + text + '""' + row.username + '"用户吗?').then(function() {
+			this.$modal
+				.confirm('确认要"' + text + '""' + row.username + '"用户吗?')
+				.then(function () {
 					return changeUserStatus(row.id, row.status);
-        }).then(() => {
+				})
-          this.$modal.msgSuccess(text + "成功");
+				.then(() => {
-        }).catch(function() {
+					this.$modal.msgSuccess(text + '成功');
-          row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+				})
+				.catch(function () {
+					row.status =
+						row.status === CommonStatusEnum.ENABLE
+							? CommonStatusEnum.DISABLE
 							: CommonStatusEnum.ENABLE;
 				});
 		},
@@ -454,12 +667,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() {
@@ -468,7 +681,7 @@ export default {
 		},
 		/** 重置按钮操作 */
 		resetQuery() {
-      this.resetForm("queryForm");
+			this.resetForm('queryForm');
 			this.handleQuery();
 		},
 		/** 新增按钮操作 */
@@ -478,7 +691,7 @@ export default {
 			this.getTreeselect();
 			// 打开表单，并设置初始化
 			this.open = true;
-      this.title = "添加用户";
+			this.title = '添加用户';
 			this.form.password = this.initPassword;
 		},
 		/** 修改按钮操作 */
@@ -486,28 +699,30 @@ 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 }) => {
+			})
-          resetUserPwd(row.id, value).then(response => {
+				.then(({ value }) => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+					resetUserPwd(row.id, value).then((response) => {
+						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;
@@ -515,30 +730,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() {
+		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();
 						});
@@ -547,13 +762,13 @@ export default {
 			});
 		},
 		/** 提交按钮（角色权限） */
-    submitRole: function() {
+		submitRole: function () {
 			if (this.form.id !== undefined) {
 				assignUserRole({
 					userId: this.form.id,
 					roleIds: this.form.roleIds,
-        }).then(response => {
+				}).then((response) => {
-          this.$modal.msgSuccess("分配角色成功");
+					this.$modal.msgSuccess('分配角色成功');
 					this.openRole = false;
 					this.getList();
 				});
@@ -562,35 +777,43 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function() {
+			this.$modal
+				.confirm('是否确认删除用户编号为"' + ids + '"的数据项?')
+				.then(function () {
 					return delUser(ids);
-        }).then(() => {
+				})
+				.then(() => {
 					this.getList();
-          this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-      }).catch(() => {});
+				})
+				.catch(() => {});
 		},
 		/** 导出按钮操作 */
 		handleExport() {
-      this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
+			this.$modal
+				.confirm('是否确认导出所有用户数据项?')
+				.then(() => {
 					// 处理查询参数
-          let params = {...this.queryParams};
+					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');
 			});
 		},
@@ -601,7 +824,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;
@@ -617,11 +840,16 @@ export default {
 			for (const username of data.updateUsernames) {
 				text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
 			}
-      text += '<br />更新失败数量：' + Object.keys(data.failureUsernames).length;
+			text +=
+				'<br />更新失败数量：' + Object.keys(data.failureUsernames).length;
 			for (const username in data.failureUsernames) {
-        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username + '：' + data.failureUsernames[username];
+				text +=
+					'<br />&nbsp;&nbsp;&nbsp;&nbsp;' +
+					username +
+					'：' +
+					data.failureUsernames[username];
 			}
-      this.$alert(text, "导入结果", { dangerouslyUseHTMLString: true });
+			this.$alert(text, '导入结果', { dangerouslyUseHTMLString: true });
 			this.getList();
 		},
 		// 提交上传文件
@@ -633,9 +861,9 @@ export default {
 			return {
 				id: node.id,
 				label: node.name,
-        children: node.children
+				children: node.children,
-      }
+			};
-    }
+		},
-  }
+	},
 };
 </script>