From c3bfcbad63d15d755967b2e321a59e346d8ff7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E4=BB=AA=E5=BC=8F?= <854085467@qq.com>
Date: Wed, 12 Aug 2020 00:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=B8=83=E5=B1=80=E9=80=82?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/system/deptment.html |  49 ++---
 view/system/person.html   |   1 -
 view/system/power.html    |  59 +++---
 view/system/role.html     |  49 ++---
 view/system/user.html     | 417 ++++++++++++++++++++++----------------
 5 files changed, 322 insertions(+), 253 deletions(-)

diff --git a/view/system/deptment.html b/view/system/deptment.html
index 303cc6b..5a89496 100644
--- a/view/system/deptment.html
+++ b/view/system/deptment.html
@@ -20,33 +20,34 @@
 			<div class="layui-card-body">
 				<form class="layui-form" action="">
 					<div class="layui-form-item">
-						<label class="layui-form-label">用户名</label>
-						<div class="layui-input-inline">
-							<input type="text" name="realName" placeholder="" class="layui-input">
+						<div class="layui-form-item layui-inline">
+							<label class="layui-form-label">用户名</label>
+							<div class="layui-input-inline">
+								<input type="text" name="realName" placeholder="" class="layui-input">
+							</div>
 						</div>
-						<label class="layui-form-label">账号</label>
-						<div class="layui-input-inline">
-							<input type="text" name="organizationname" placeholder="" class="layui-input">
+						<div class="layui-form-item layui-inline">
+							<label class="layui-form-label">性别</label>
+							<div class="layui-input-inline">
+								<input type="text" name="realName" placeholder="" class="layui-input">
+							</div>
 						</div>
-						<label class="layui-form-label">地点</label>
-						<div class="layui-input-inline">
-							<select name="city" lay-verify="required">
-								<option value=""></option>
-								<option value="0">北京</option>
-								<option value="1">上海</option>
-								<option value="2">广州</option>
-								<option value="3">深圳</option>
-								<option value="4">杭州</option>
-							</select>
+						<div class="layui-form-item layui-inline">
+							<label class="layui-form-label">邮箱</label>
+							<div class="layui-input-inline">
+								<input type="text" name="realName" placeholder="" class="layui-input">
+							</div>
+						</div>
+						<div class="layui-form-item layui-inline">
+							<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="user-query">
+								<i class="layui-icon layui-icon-search"></i>
+								查询
+							</button>
+							<button type="reset" class="pear-btn pear-btn-md">
+								<i class="layui-icon layui-icon-refresh"></i>
+								重置
+							</button>
 						</div>
-						<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="organization-query">
-							<i class="layui-icon layui-icon-search"></i>
-							查询
-						</button>
-						<button type="reset" class="pear-btn pear-btn-md">
-							<i class="layui-icon layui-icon-refresh"></i>
-							重置
-						</button>
 					</div>
 				</form>
 			</div>
diff --git a/view/system/person.html b/view/system/person.html
index 144ada5..055868f 100644
--- a/view/system/person.html
+++ b/view/system/person.html
@@ -51,7 +51,6 @@
 						<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
 							<div class="layui-tab-content">
 								<div class="layui-tab-item layui-show">
-
 									<div class="layui-row layui-col-space10" style="margin: 15px;">
 										<div class="layui-col-md1">
 											<img src="../../admin/images/act.jpg" style="width: 100%;height: 100%;border-radius: 5px;" />
diff --git a/view/system/power.html b/view/system/power.html
index 47ee9a4..68a546a 100644
--- a/view/system/power.html
+++ b/view/system/power.html
@@ -9,35 +9,36 @@
 <div class="layui-card">
     <div class="layui-card-body">
         <form class="layui-form" action="">
-            <div class="layui-form-item">
-                <label class="layui-form-label">权限名称</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="realName" placeholder="" class="layui-input">
-                </div>
-                <label class="layui-form-label">权限标识</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="username" placeholder="" class="layui-input">
-                </div>
-				<label class="layui-form-label">地点</label>
-				<div class="layui-input-inline">
-					<select name="city" lay-verify="required">
-					        <option value=""></option>
-					        <option value="0">北京</option>
-					        <option value="1">上海</option>
-					        <option value="2">广州</option>
-					        <option value="3">深圳</option>
-					        <option value="4">杭州</option>
-					      </select>
-				</div>
-                <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="user-query">
-                    <i class="layui-icon layui-icon-search"></i>
-                    查询
-                </button>
-                <button type="reset" class="pear-btn pear-btn-md">
-                    <i class="layui-icon layui-icon-refresh"></i>
-                    重置
-                </button>
-            </div>
+        	<div class="layui-form-item">
+        		<div class="layui-form-item layui-inline">
+        			<label class="layui-form-label">用户名</label>
+        			<div class="layui-input-inline">
+        				<input type="text" name="realName" placeholder="" class="layui-input">
+        			</div>
+        		</div>
+        		<div class="layui-form-item layui-inline">
+        			<label class="layui-form-label">性别</label>
+        			<div class="layui-input-inline">
+        				<input type="text" name="realName" placeholder="" class="layui-input">
+        			</div>
+        		</div>
+        		<div class="layui-form-item layui-inline">
+        			<label class="layui-form-label">邮箱</label>
+        			<div class="layui-input-inline">
+        				<input type="text" name="realName" placeholder="" class="layui-input">
+        			</div>
+        		</div>
+        		<div class="layui-form-item layui-inline">
+        			<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="user-query">
+        				<i class="layui-icon layui-icon-search"></i>
+        				查询
+        			</button>
+        			<button type="reset" class="pear-btn pear-btn-md">
+        				<i class="layui-icon layui-icon-refresh"></i>
+        				重置
+        			</button>
+        		</div>
+        	</div>
         </form>
     </div>
 </div>
diff --git a/view/system/role.html b/view/system/role.html
index 18acb21..e0d4b05 100644
--- a/view/system/role.html
+++ b/view/system/role.html
@@ -10,33 +10,34 @@
 			<div class="layui-card-body">
 				<form class="layui-form" action="">
 					<div class="layui-form-item">
-						<label class="layui-form-label">角色名称</label>
-						<div class="layui-input-inline">
-							<input type="text" name="realName" placeholder="" class="layui-input">
+						<div class="layui-form-item layui-inline">
+							<label class="layui-form-label">用户名</label>
+							<div class="layui-input-inline">
+								<input type="text" name="realName" placeholder="" class="layui-input">
+							</div>
 						</div>
-						<label class="layui-form-label">角色标识</label>
-						<div class="layui-input-inline">
-							<input type="text" name="username" placeholder="" class="layui-input">
+						<div class="layui-form-item layui-inline">
+							<label class="layui-form-label">性别</label>
+							<div class="layui-input-inline">
+								<input type="text" name="realName" placeholder="" class="layui-input">
+							</div>
 						</div>
-						<label class="layui-form-label">地点</label>
-						<div class="layui-input-inline">
-							<select name="city" lay-verify="required">
-							        <option value=""></option>
-							        <option value="0">北京</option>
-							        <option value="1">上海</option>
-							        <option value="2">广州</option>
-							        <option value="3">深圳</option>
-							        <option value="4">杭州</option>
-							      </select>
+						<div class="layui-form-item layui-inline">
+							<label class="layui-form-label">邮箱</label>
+							<div class="layui-input-inline">
+								<input type="text" name="realName" placeholder="" class="layui-input">
+							</div>
+						</div>
+						<div class="layui-form-item layui-inline">
+							<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="user-query">
+								<i class="layui-icon layui-icon-search"></i>
+								查询
+							</button>
+							<button type="reset" class="pear-btn pear-btn-md">
+								<i class="layui-icon layui-icon-refresh"></i>
+								重置
+							</button>
 						</div>
-						<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="role-query">
-							<i class="layui-icon layui-icon-search"></i>
-							查询
-						</button>
-						<button type="reset" class="pear-btn pear-btn-md">
-							<i class="layui-icon layui-icon-refresh"></i>
-							重置
-						</button>
 					</div>
 				</form>
 			</div>
diff --git a/view/system/user.html b/view/system/user.html
index cc9a3e6..e5ce4c9 100644
--- a/view/system/user.html
+++ b/view/system/user.html
@@ -4,39 +4,43 @@
 		<meta charset="utf-8">
 		<title>用户管理</title>
 		<link rel="stylesheet" href="../../component/pear/css/pear.css" />
+		<style>
+
+		</style>
 	</head>
 	<body class="pear-container">
 		<div class="layui-card">
 			<div class="layui-card-body">
 				<form class="layui-form" action="">
 					<div class="layui-form-item">
-						<label class="layui-form-label">用户名</label>
-						<div class="layui-input-inline">
-							<input type="text" name="realName" placeholder="" class="layui-input">
+						<div class="layui-form-item layui-inline">
+							<label class="layui-form-label">用户名</label>
+							<div class="layui-input-inline">
+								<input type="text" name="realName" placeholder="" class="layui-input">
+							</div>
 						</div>
-						<label class="layui-form-label">账号</label>
-						<div class="layui-input-inline">
-							<input type="text" name="username" placeholder="" class="layui-input">
+						<div class="layui-form-item layui-inline">
+							<label class="layui-form-label">性别</label>
+							<div class="layui-input-inline">
+								<input type="text" name="realName" placeholder="" class="layui-input">
+							</div>
 						</div>
-						<label class="layui-form-label">地点</label>
-						<div class="layui-input-inline">
-							<select name="city" lay-verify="required">
-							        <option value=""></option>
-							        <option value="0">北京</option>
-							        <option value="1">上海</option>
-							        <option value="2">广州</option>
-							        <option value="3">深圳</option>
-							        <option value="4">杭州</option>
-							      </select>
+						<div class="layui-form-item layui-inline">
+							<label class="layui-form-label">邮箱</label>
+							<div class="layui-input-inline">
+								<input type="text" name="realName" placeholder="" class="layui-input">
+							</div>
+						</div>
+						<div class="layui-form-item layui-inline">
+							<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="user-query">
+								<i class="layui-icon layui-icon-search"></i>
+								查询
+							</button>
+							<button type="reset" class="pear-btn pear-btn-md">
+								<i class="layui-icon layui-icon-refresh"></i>
+								重置
+							</button>
 						</div>
-						<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="user-query">
-							<i class="layui-icon layui-icon-search"></i>
-							查询
-						</button>
-						<button type="reset" class="pear-btn pear-btn-md">
-							<i class="layui-icon layui-icon-refresh"></i>
-							重置
-						</button>
 					</div>
 				</form>
 			</div>
@@ -48,7 +52,7 @@
 		</div>
 
 		<script type="text/html" id="user-toolbar">
-		    <button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add">
+			<button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add">
 		        <i class="layui-icon layui-icon-add-1"></i>
 		        新增
 		    </button>
@@ -57,178 +61,241 @@
 		        删除
 		    </button>
 		</script>
-		
+
 		<script type="text/html" id="user-bar">
-		    <button class="pear-btn pear-btn-primary pear-btn-sm" lay-event="edit"><i class="layui-icon layui-icon-edit"></i></button>
+			<button class="pear-btn pear-btn-primary pear-btn-sm" lay-event="edit"><i class="layui-icon layui-icon-edit"></i></button>
 		    <button class="pear-btn pear-btn-danger pear-btn-sm" lay-event="remove"><i class="layui-icon layui-icon-delete"></i></button>
 		</script>
-		
+
 		<script type="text/html" id="user-enable">
-		    <input type="checkbox" name="enable" value="{{d.id}}" lay-skin="switch" lay-text="启用|禁用" lay-filter="user-enable" checked = "{{ d.enable == 0 ? 'true' : 'false' }}">
+			<input type="checkbox" name="enable" value="{{d.id}}" lay-skin="switch" lay-text="启用|禁用" lay-filter="user-enable" checked = "{{ d.enable == 0 ? 'true' : 'false' }}">
 		</script>
-		
+
 		<script type="text/html" id="user-sex">
-		    {{#if (d.sex == 1) { }}
+			{{#if (d.sex == 1) { }}
 		    <span>男</span>
 		    {{# }else if(d.sex == 2){ }}
 		    <span>女</span>
 		    {{# } }}
 		</script>
-		
+
 		<script type="text/html" id="user-login">
-		    {{#if (d.login == 0) { }}
+			{{#if (d.login == 0) { }}
 		    <span>在线</span>
 		    {{# }else if(d.sex == 1){ }}
 		    <span>离线</span>
 		    {{# } }}
 		</script>
-		
+
 		<script type="text/html" id="user-createTime">
-		    {{layui.util.toDateString(d.createTime, 'yyyy-MM-dd')}}
+			{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd')}}
 		</script>
-		
+
 		<script src="../../component/layui/layui.js"></script>
 		<script src="../../component/pear/pear.js"></script>
 		<script>
-		    layui.use(['table','form','jquery'],function () {
-		        let table = layui.table;
-		        let form = layui.form;
-		        let $ = layui.jquery;
-		
-		        let MODULE_PATH = "operate/";
-		
-		        let cols = [
-		            [
-		                {type:'checkbox'},
-		                {title: '账号', field: 'username', align:'center', width:100},
-		                {title: '姓名', field: 'realName', align:'center'},
-		                {title: '性别', field: 'sex', align:'center', width:80, templet:'#user-sex'},
-		                {title: '电话', field: 'phone', align:'center'},
-		                {title: '启用', field: 'enable', align:'center', templet:'#user-enable'},
-		                {title: '登录', field: 'login', align:'center', templet:'#user-login'},
-		                {title: '注册', field: 'createTime', align:'center',templet:'#user-createTime'},
-		                {title: '操作', toolbar: '#user-bar', align:'center', width:130}
-		            ]
-		        ]
-		
-		        table.render({
-		            elem: '#user-table',
-		            url: '../../admin/data/user.json',
-		            page: true ,
-		            cols: cols ,
-		            skin: 'line',
-		            toolbar: '#user-toolbar',
-		            defaultToolbar: [{
-		                layEvent: 'refresh',
-		                icon: 'layui-icon-refresh',
-		            }, 'filter', 'print', 'exports']
-		        });
-		
-		        table.on('tool(user-table)', function(obj){
-		            if(obj.event === 'remove'){
-		                window.remove(obj);
-		            } else if(obj.event === 'edit'){
-		                window .edit(obj);
-		            }
-		        });
-		
-		        table.on('toolbar(user-table)', function(obj){
-		            if(obj.event === 'add'){
-		                window.add();
-		            } else if(obj.event === 'refresh'){
-		                window.refresh();
-		            } else if(obj.event === 'batchRemove'){
-		                window.batchRemove(obj);
-		            }
-		        });
-		
-		        form.on('submit(user-query)', function(data){
-		            table.reload('user-table',{where:data.field})
-		            return false;
-		        });
-		
-		        form.on('switch(user-enable)', function(obj){
-		            layer.tips(this.value + ' ' + this.name + '：'+ obj.elem.checked, obj.othis);
-		        });
-		
-		        window.add = function(){
-		            layer.open({
-		                type: 2,
-		                title: '新增',
-		                shade: 0.1,
-		                area: ['500px', '400px'],
-		                content: MODULE_PATH + 'add.html'
-		            });
-		        }
-		
-		        window.edit = function(obj){
-		            layer.open({
-		                type: 2,
-		                title: '修改',
-		                shade: 0.1,
-		                area: ['500px', '400px'],
-		                content: MODULE_PATH + 'edit.html'
-		            });
-		        }
-		
-		        window.remove = function(obj){
-		            layer.confirm('确定要删除该用户', {icon: 3, title:'提示'}, function(index){
-		                layer.close(index);
-		                let loading = layer.load();
-		                $.ajax({
-		                    url: MODULE_PATH+"remove/"+obj.data['userId'],
-		                    dataType:'json',
-		                    type:'delete',
-		                    success:function(result){
-		                        layer.close(loading);
-		                        if(result.success){
-		                            layer.msg(result.msg,{icon:1,time:1000},function(){
-		                                obj.del();
-		                            });
-		                        }else{
-		                            layer.msg(result.msg,{icon:2,time:1000});
-		                        }
-		                    }
-		                })
-		            });
-		        }
-		
-		        window.batchRemove = function(obj){
-		            let data = table.checkStatus(obj.config.id).data;
-		            if(data.length === 0){
-		                layer.msg("未选中数据",{icon:3,time:1000});
-		                return false;
-		            }
-		            let ids = "";
-		            for(let i = 0;i<data.length;i++){
-		                ids += data[i].userId+",";
-		            }
-		            ids = ids.substr(0,ids.length-1);
-		            layer.confirm('确定要删除这些用户', {icon: 3, title:'提示'}, function(index){
-		                layer.close(index);
-		                let loading = layer.load();
-		                $.ajax({
-		                    url: MODULE_PATH+"batchRemove/"+ids,
-		                    dataType:'json',
-		                    type:'delete',
-		                    success:function(result){
-		                        layer.close(loading);
-		                        if(result.success){
-		                            layer.msg(result.msg,{icon:1,time:1000},function(){
-		                                table.reload('user-table');
-		                            });
-		                        }else{
-		                            layer.msg(result.msg,{icon:2,time:1000});
-		                        }
-		                    }
-		                })
-		            });
-		        }
-		
-		        window.refresh = function(param){
-		            table.reload('user-table');
-		        }
-		    })
+			layui.use(['table', 'form', 'jquery'], function() {
+				let table = layui.table;
+				let form = layui.form;
+				let $ = layui.jquery;
+
+				let MODULE_PATH = "operate/";
+
+				let cols = [
+					[{
+							type: 'checkbox'
+						},
+						{
+							title: '账号',
+							field: 'username',
+							align: 'center',
+							width: 100
+						},
+						{
+							title: '姓名',
+							field: 'realName',
+							align: 'center'
+						},
+						{
+							title: '性别',
+							field: 'sex',
+							align: 'center',
+							width: 80,
+							templet: '#user-sex'
+						},
+						{
+							title: '电话',
+							field: 'phone',
+							align: 'center'
+						},
+						{
+							title: '启用',
+							field: 'enable',
+							align: 'center',
+							templet: '#user-enable'
+						},
+						{
+							title: '登录',
+							field: 'login',
+							align: 'center',
+							templet: '#user-login'
+						},
+						{
+							title: '注册',
+							field: 'createTime',
+							align: 'center',
+							templet: '#user-createTime'
+						},
+						{
+							title: '操作',
+							toolbar: '#user-bar',
+							align: 'center',
+							width: 130
+						}
+					]
+				]
+
+				table.render({
+					elem: '#user-table',
+					url: '../../admin/data/user.json',
+					page: true,
+					cols: cols,
+					skin: 'line',
+					toolbar: '#user-toolbar',
+					defaultToolbar: [{
+						layEvent: 'refresh',
+						icon: 'layui-icon-refresh',
+					}, 'filter', 'print', 'exports']
+				});
+
+				table.on('tool(user-table)', function(obj) {
+					if (obj.event === 'remove') {
+						window.remove(obj);
+					} else if (obj.event === 'edit') {
+						window.edit(obj);
+					}
+				});
+
+				table.on('toolbar(user-table)', function(obj) {
+					if (obj.event === 'add') {
+						window.add();
+					} else if (obj.event === 'refresh') {
+						window.refresh();
+					} else if (obj.event === 'batchRemove') {
+						window.batchRemove(obj);
+					}
+				});
+
+				form.on('submit(user-query)', function(data) {
+					table.reload('user-table', {
+						where: data.field
+					})
+					return false;
+				});
+
+				form.on('switch(user-enable)', function(obj) {
+					layer.tips(this.value + ' ' + this.name + '：' + obj.elem.checked, obj.othis);
+				});
+
+				window.add = function() {
+					layer.open({
+						type: 2,
+						title: '新增',
+						shade: 0.1,
+						area: ['500px', '400px'],
+						content: MODULE_PATH + 'add.html'
+					});
+				}
+
+				window.edit = function(obj) {
+					layer.open({
+						type: 2,
+						title: '修改',
+						shade: 0.1,
+						area: ['500px', '400px'],
+						content: MODULE_PATH + 'edit.html'
+					});
+				}
+
+				window.remove = function(obj) {
+					layer.confirm('确定要删除该用户', {
+						icon: 3,
+						title: '提示'
+					}, function(index) {
+						layer.close(index);
+						let loading = layer.load();
+						$.ajax({
+							url: MODULE_PATH + "remove/" + obj.data['userId'],
+							dataType: 'json',
+							type: 'delete',
+							success: function(result) {
+								layer.close(loading);
+								if (result.success) {
+									layer.msg(result.msg, {
+										icon: 1,
+										time: 1000
+									}, function() {
+										obj.del();
+									});
+								} else {
+									layer.msg(result.msg, {
+										icon: 2,
+										time: 1000
+									});
+								}
+							}
+						})
+					});
+				}
+
+				window.batchRemove = function(obj) {
+					let data = table.checkStatus(obj.config.id).data;
+					if (data.length === 0) {
+						layer.msg("未选中数据", {
+							icon: 3,
+							time: 1000
+						});
+						return false;
+					}
+					let ids = "";
+					for (let i = 0; i < data.length; i++) {
+						ids += data[i].userId + ",";
+					}
+					ids = ids.substr(0, ids.length - 1);
+					layer.confirm('确定要删除这些用户', {
+						icon: 3,
+						title: '提示'
+					}, function(index) {
+						layer.close(index);
+						let loading = layer.load();
+						$.ajax({
+							url: MODULE_PATH + "batchRemove/" + ids,
+							dataType: 'json',
+							type: 'delete',
+							success: function(result) {
+								layer.close(loading);
+								if (result.success) {
+									layer.msg(result.msg, {
+										icon: 1,
+										time: 1000
+									}, function() {
+										table.reload('user-table');
+									});
+								} else {
+									layer.msg(result.msg, {
+										icon: 2,
+										time: 1000
+									});
+								}
+							}
+						})
+					});
+				}
+
+				window.refresh = function(param) {
+					table.reload('user-table');
+				}
+			})
 		</script>
 	</body>
 </html>