From 29373a7e62771b7c82714dc8d041c8b56c261293 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 20 六月 2020 10:10:26 +0800
Subject: [PATCH] #
---
src/main/webapp/views/user/user.html | 21 ----------
src/main/webapp/views/user/user_detail.html | 41 ++++++++------------
src/main/java/com/zy/system/entity/User.java | 4 +-
src/main/webapp/static/js/user/user.js | 14 +++---
4 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index 17bcfbc..7d1285f 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -33,12 +33,12 @@
private Long hostId;
/**
- * 璐﹀彿
+ * 鍚嶇О
*/
private String username;
/**
- * 鎵嬫満鍙�
+ * 璐﹀彿
*/
private String mobile;
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index c7f42ca..962c51a 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -20,15 +20,15 @@
cols: [[
{type: 'checkbox'}
,{field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
- ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛'}
- ,{field: 'username', align: 'center',title: '璐﹀彿'}
- ,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
+ // ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛'}
+ ,{field: 'username', align: 'center',title: '鍚嶇О'}
+ ,{field: 'mobile', align: 'center',title: '璐﹀彿'}
,{field: 'password', align: 'center',title: '瀵嗙爜'}
,{field: 'roleName', align: 'center',title: '瑙掕壊'}
- ,{field: 'createTime$', align: 'center',title: '娉ㄥ唽鏃堕棿'}
+ // ,{field: 'createTime$', align: 'center',title: '娉ㄥ唽鏃堕棿'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
request: {
pageName: 'curr',
@@ -87,7 +87,7 @@
title: '鏂板',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
+ shadeClose: true,
content: 'user_detail.html',
success: function(layero, index){
clearFormVal(layer.getChildFrame('#detail', index));
@@ -203,7 +203,7 @@
title: '淇敼',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
+ shadeClose: true,
content: 'user_detail.html',
success: function(layero, index){
setFormVal(layer.getChildFrame('#detail', index), data);
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index 8ae2558..a6ebb5a 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -15,13 +15,7 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
- <label class="layui-form-label">缂栥��銆�鍙凤細</label>
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鎵� 鏈� 鍙凤細</label>
+ <label class="layui-form-label">甯愩��銆�鍙凤細</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="mobile" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
@@ -34,18 +28,6 @@
-
<div class="layui-input-inline">
<input class="layui-input" type="text" id="create_time<" name="create_time<" placeholder="璇疯緭鍏ョ粨鏉熸椂闂�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鎺堟潈鍟嗘埛锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="hostId" class="layui-input" name="host_id" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="hostName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="hostQuery" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="hostQuerySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
</div>
</div>
<div class="layui-inline">
@@ -79,7 +61,6 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
<a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
</script>
diff --git a/src/main/webapp/views/user/user_detail.html b/src/main/webapp/views/user/user_detail.html
index 00bab26..d3c4265 100644
--- a/src/main/webapp/views/user/user_detail.html
+++ b/src/main/webapp/views/user/user_detail.html
@@ -21,28 +21,28 @@
<input id="id" class="layui-input" type="text" placeholder="缂栧彿">
</div>
</div>
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label"><span class="not-null">*</span>鎺堟潈鍟嗘埛锛�</label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="hostId" class="layui-input" type="text" placeholder="鎺堟潈鍟嗘埛" lay-verify="required" style="display: none">-->
+<!-- <input id="hostName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鎺堟潈鍟嗘埛" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="hostQuery" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="hostQuerySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鎺堟潈鍟嗘埛锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="hostId" class="layui-input" type="text" placeholder="鎺堟潈鍟嗘埛" lay-verify="required" style="display: none">
- <input id="hostName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鎺堟潈鍟嗘埛" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="hostQuery" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="hostQuerySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <label class="layui-form-label"><span class="not-null">*</span>鍚嶃��銆�绉帮細</label>
+ <div class="layui-input-inline">
+ <input id="username" class="layui-input" type="text" placeholder="鍚嶇О" lay-verify="required" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>璐︺��銆�鍙凤細</label>
+ <label class="layui-form-label"><span class="not-null">*</span>甯愩��銆�鍙凤細</label>
<div class="layui-input-inline">
- <input id="username" class="layui-input" type="text" placeholder="璐﹀彿" lay-verify="required" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鎵� 鏈� 鍙凤細</label>
- <div class="layui-input-inline">
- <input id="mobile" class="layui-input" type="text" placeholder="鎵嬫満鍙�" lay-verify="required" >
+ <input id="mobile" class="layui-input" type="text" placeholder="璐﹀彿" lay-verify="required" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
@@ -64,18 +64,11 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>娉ㄥ唽鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="createTime$" class="layui-input" type="text" placeholder="娉ㄥ唽鏃堕棿" lay-verify="required" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>鐘躲��銆�鎬侊細</label>
<div class="layui-input-inline">
<select id="status" lay-verify="required">
<option value="" style="display: none"></option>
<option value="1">鍚敤</option>
- <option value="2">鍐荤粨</option>
<option value="3">鍒犻櫎</option>
</select>
</div>
--
Gitblit v1.9.1