From b8212145b46bd55d44c2190df05c3805b59e6816 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 30 六月 2020 15:17:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TestScheduler.java | 2 +-
src/main/webapp/views/user/user.html | 4 ++++
src/main/webapp/views/user/user_detail.html | 27 ++++++++-------------------
src/main/webapp/static/js/user/user.js | 12 +++++++++---
4 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TestScheduler.java b/src/main/java/com/zy/asrs/task/TestScheduler.java
index 0bc15e1..2ac9d37 100644
--- a/src/main/java/com/zy/asrs/task/TestScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TestScheduler.java
@@ -15,7 +15,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
public void test(){
- logger.info("=====");
+// logger.info("=====");
}
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index 0d07fcf..dbadde7 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -26,7 +26,7 @@
,{field: 'password', align: 'center',title: '瀵嗙爜'}
,{field: 'roleName', align: 'center',title: '瑙掕壊'}
// ,{field: 'createTime$', align: 'center',title: '娉ㄥ唽鏃堕棿'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��', templet: '#statusTpl', width: 120, unresize: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
@@ -53,6 +53,12 @@
limit();
}
});
+
+ // 淇敼鐘舵��
+ form.on('switch(statusSwitch)', function (obj) {
+ layer.tips(this.value + ' ' + this.name + '锛�'+ obj.elem.checked, obj.othis);
+ layer.msg("鎿嶄綔鎴愬姛")
+ })
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(user)', function (obj) {
@@ -86,7 +92,7 @@
type: 2,
title: '鏂板',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['30%', top.detailHeight],
shadeClose: true,
content: 'user_detail.html',
success: function(layero, index){
@@ -202,7 +208,7 @@
type: 2,
title: '淇敼',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['30%', top.detailHeight],
shadeClose: true,
content: 'user_detail.html',
success: function(layero, index){
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index b5603f8..e50b9b5 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -58,6 +58,10 @@
<a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
</script>
+<script type="text/html" id="statusTpl">
+ <input type="checkbox" name="status" value="{{d.status}}" lay-skin="switch" lay-text="姝ｅ父|绂佺敤" lay-filter="statusSwitch" {{ d.id == 1 ? 'checked' : '' }}>
+</script>
+
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/user/user_detail.html b/src/main/webapp/views/user/user_detail.html
index b84be1b..f161bb0 100644
--- a/src/main/webapp/views/user/user_detail.html
+++ b/src/main/webapp/views/user/user_detail.html
@@ -14,7 +14,7 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
- <form id="detail" class="layui-form">
+ <form id="detail" class="layui-form" style="text-align: center">
<div class="layui-inline" style="display: none">
<label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
<div class="layui-input-inline">
@@ -33,25 +33,25 @@
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<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" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<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" >
+ <input id="username" class="layui-input" type="text" placeholder="鍚嶇О" lay-verify="required" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label">瀵嗐��銆�鐮侊細</label>
<div class="layui-input-inline">
- <input id="password" class="layui-input" type="text" placeholder="瀵嗙爜">
+ <input id="password" class="layui-input" type="text" placeholder="瀵嗙爜" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label"><span class="not-null">*</span>瑙掋��銆�鑹诧細</label>
<div class="layui-input-inline cool-auto-complete">
<input id="roleId" class="layui-input" type="text" placeholder="瑙掕壊" lay-verify="required" style="display: none">
@@ -63,17 +63,6 @@
</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">
- <select id="status" lay-verify="required">
- <option value="" style="display: none"></option>
- <option value="1">鍚敤</option>
- <option value="3">鍒犻櫎</option>
- </select>
- </div>
- </div>
-
<hr class="layui-bg-gray">
--
Gitblit v1.9.1