Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/upgrade' into upgrade

Browse Source
This commit is contained in:
java_cuibaocheng@163.com 2024-01-08 18:21:53 +08:00
commit ef7a49a4f2
3 changed files with 970 additions and 609 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/cm/population/utils/AreaUtils.java
View File

@ -33,11 +33,11 @@ public class AreaUtils {
public void init() {
new Thread(() -> {
PopulationInfoStaticService = PopulationInfoService;
initArea0();
/*initArea0();
initArea1();
initArea2();
initArea3();
initArea4();
initArea4();*/
aree.put(0, area0);
aree.put(1, area1);
aree.put(2, area2);

1566
src/main/resources/templates/house/list-myself.html
View File

File diff suppressed because it is too large Load Diff

9
src/main/resources/templates/house/list.html
View File

@ -36,7 +36,7 @@
}
.layui-form-pane .layui-form-selected .layui-edge {
margin-top: 2px;
margin-top: 8px;
}
.layui-form-pane .layui-form-select dl {
@ -187,6 +187,11 @@
#contentBody .center .main .floor .unit .house .info .option {
display: none;
}
.layui-form-select .layui-input {
height: 30px;
margin-top: 7px;
}
</style>
</head>
<body>
@ -226,7 +231,6 @@
<div class="layui-card">
<div class="layui-card-body">
<div class="test-table-reload-btn" style="margin-bottom: 10px;">
<form class="layui-form layui-form-pane" lay-filter="dataForm">
<div class="layui-inline">
<div class="layui-input-block layui-form" style="width: 120px;margin-left: 0px;">
<select name="isSelf" id="isSelf" lay-filter="isSelf">
@ -262,7 +266,6 @@
<button type="button" id="excel" class="layui-btn layui-btn-sm layui-btn-normal">
<i class="fa fa-lg fa-download"></i> 导出
</button>
</form>
</div>
<table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
<!-- 表头按钮组 -->