tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent 02265f5c10 cf36d44474
commit 14cd43bc98
4 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File

13
admin-console/src/main/java/com/ibeetl/admin/console/web/UserConsoleController.java
Unescape Escape View File

@ -121,19 +121,6 @@ public class UserConsoleController {
return view;
}
/**
*@author 姚丹
*@data 2022/11/28
* 用户中心
*/
@GetMapping(MODEL + "/userCenter.do")
@Function("user.query")
public ModelAndView userCenter() {
ModelAndView view = new ModelAndView("/other/userCenter.html");
view.addObject("search", UserQuery.class.getName());
return view;
}
/* Json */
@PostMapping(MODEL + "/delete.json")

14
web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.validate.ValidateConfig;
import com.ibeetl.admin.console.web.query.UserQuery;
import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.file.FileService;
@ -256,4 +257,17 @@ public class UniversitiesCollegesController{
public JsonResult info(@SCoreUser CoreUser coreUser) {
return JsonResult.success(universitiesCollegesService.userCenter());
}
/**
*@author 姚丹
*@data 2022/11/28
* 用户中心
*/
@GetMapping(MODEL + "/userCenter.do")
@Function("user.query")
public ModelAndView userCenter() {
ModelAndView view = new ModelAndView("/other/userCenter.html");
view.addObject("search", UserQuery.class.getName());
return view;
}
}

10
web/src/main/resources/templates/jlw/universitiesColleges/add.html
Unescape Escape View File

@ -105,21 +105,15 @@
<div class="layui-form-mid" >${universitiesColleges.universitiesCollegesDefaultAdminUserInfo.code!''}</div>
</div>
<!--#}-->
</div>
<!--#if(isEmpty(universitiesColleges.universitiesCollegesId)){-->
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>密码：</label>
<!--#if(isEmpty(universitiesColleges.universitiesCollegesId)){-->
<div class="layui-input-inline">
<input type="text" name="password" value="" placeholder="不填写，默认初始密码" class="layui-input" >
</div>
<!--#}else{-->
<div class="layui-input-inline">
<div class="layui-form-mid" >${universitiesColleges.universitiesCollegesDefaultAdminUserInfo.password!''}</div>
</div>
<!--#}-->
</div>
<!--#}-->
</div>
</div>
<input type="hidden" name="universitiesCollegesId" value="${universitiesColleges.universitiesCollegesId}" />

88
web/src/main/resources/templates/other/userCenter.html
Unescape Escape View File

@ -33,12 +33,39 @@
}
</style>
<form class="layui-form" id="addForm">
<div id="user_view"></div>
<!--所在地 编辑-->
<div style="display: none" id="receivingAddress_demo">
<div id="receivingAddress">
<div class="layui-inline layui-form-item">
<label class="layui-form-label">所属省份：</label>
<div class="layui-input-inline">
<select name="universitiesCollegesProvince" class="province" lay-verify="required" lay-search
lay-filter="province">
<option value="">省份</option>
</select>
</div>
</div>
<div class="layui-inline layui-form-item">
<label class="layui-form-label">所属城市：</label>
<div class="layui-input-inline">
<select name="universitiesCollegesCity" class="city" lay-verify="required" lay-search lay-filter="city">
<option value="">地级市</option>
</select>
</div>
</div>
</div>
</div>
</form>
<script type="text/html" id="user_demo">
<div class="layui-row">
<div class="layui-col-xs3">
<div class="grid-demo grid-demo-bg1" style="text-align: center;padding-top: 20%;">
<div class="layui-upload">
<div class="layui-upload-list">
<img class="layui-upload-img" id="demo1" width='200' height='200' style="border:2px solid #cccccc;border-radius:50%; overflow:hidden;"/>
<img class="layui-upload-img" id="demo1" width='200' height='200'
src="{{d.coreUser.headImg}}"
style="border:2px solid #cccccc;border-radius:50%; overflow:hidden;"/>
<p id="demoText"></p>
</div>
<div style="width: 95px;margin-left: 35%;">
@ -56,18 +83,13 @@
<div class="layui-col-xs3">
<div class="grid-demo" style="padding-top: 12%;">
<div class="layui-row" style="margin-bottom:50px;">
<div class="layui-inline"><h2>登录日志</h2></div>
<div class="layui-inline"><h2>账号信息</h2></div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">登录账号:</label>
<div class="layui-form-mid" name="signName">辅助文字</div>
<div class="layui-form-mid">
<a class="edit" title="账号登录" name="signName" style="cursor: pointer;">
<i class="iconfont" style="font-size: 20px;">&#xebd8;</i>
</a>
</div>
<div class="layui-form-mid" name="signName">{{d.coreUser.code}}</div>
</div>
</div>
</div>
@ -77,7 +99,7 @@
<div class="layui-input-inline">
<div class="layui-form-mid" name="pwd">********</div>
<div class="layui-form-mid">
<a style="cursor: pointer;" class="edit" title="登录密码" name="pwd">
<a style="cursor: pointer;" class="edit" title="登录密码" name="password">
<i class="iconfont" style="font-size: 20px;">&#xebd8;</i>
</a>
</div>
@ -88,7 +110,7 @@
<div class="layui-form-item">
<label class="layui-form-label">登录次数:</label>
<div class="layui-input-inline">
<div class="layui-form-mid" name="">登录次数</div>
<div class="layui-form-mid" name="loginCount">{{d.coreUser.loginCount}}</div>
</div>
</div>
</div>
@ -96,7 +118,7 @@
<div class="layui-form-item">
<label class="layui-form-label">最近登录时间:</label>
<div class="layui-input-inline">
<div class="layui-form-mid" name="">2022.07.22 13:01:56</div>
<div class="layui-form-mid" name="">{{d.coreUser.lastLoginTime}}</div>
</div>
</div>
</div>
@ -104,7 +126,7 @@
<div class="layui-form-item">
<label class="layui-form-label">登录天数:</label>
<div class="layui-input-inline">
<div class="layui-form-mid" name="">最近登录时间</div>
<div class="layui-form-mid" name="">{{d.coreUser.loginDays}}</div>
</div>
</div>
</div>
@ -221,40 +243,24 @@
</div>
</div>
</div>
<!--所在地 编辑-->
<div style="display: none" id="receivingAddress_demo">
<div id="receivingAddress">
<div class="layui-inline layui-form-item">
<label class="layui-form-label">所属省份：</label>
<div class="layui-input-inline">
<select name="universitiesCollegesProvince" class="province" lay-verify="required" lay-search
lay-filter="province">
<option value="">省份</option>
</select>
</div>
</div>
<div class="layui-inline layui-form-item">
<label class="layui-form-label">所属城市：</label>
<div class="layui-input-inline">
<select name="universitiesCollegesCity" class="city" lay-verify="required" lay-search lay-filter="city">
<option value="">地级市</option>
</select>
</div>
</div>
</div>
</div>
</form>
</script>
<!--#} -->
<script>
layui.use(['upload', 'element', 'layer','form'], function(){
layui.use(['upload', 'element', 'layer','form','laytpl'], function(){
var upload = layui.upload
,element = layui.element
,layer = layui.layer
,form = layui.form;
,form = layui.form
,laytpl=layui.laytpl;
form.render();
var ret = Common.postAjax("/jlw/universitiesColleges/info.json")
console.log(ret)
var getTpl = user_demo.innerHTML
,view = document.getElementById('user_view');
laytpl(getTpl).render(ret.data, function(html){
view.innerHTML = html;
});
//常规使用 - 普通图片上传
var uploadInst = upload.render({
elem: '#test1'
@ -302,7 +308,7 @@
, content: '<div class="layui-inline" id="addRoom">\n' +
' <label class="layui-form-label">' + title + '</label>\n' +
' <div class="layui-input-inline">\n' +
' <input type="text" id=' + name + ' name=' + name + ' class="layui-input" >\n' +
' <input type="text" id=' + name + ' name=' + name + ' value='+ret.data.coreUser[name]+' class="layui-input" >\n' +
' </div>\n' +
' </div>'
, btn: ['确定', '关闭']
@ -379,7 +385,7 @@
}
});
});
form.render();
});
</script>

Write Preview
Loading…
Cancel
Save