diff --git a/src/main/java/com/cm/population/pojo/vos/house/HouseVO.java b/src/main/java/com/cm/population/pojo/vos/house/HouseVO.java index aeda2f4..6a28045 100644 --- a/src/main/java/com/cm/population/pojo/vos/house/HouseVO.java +++ b/src/main/java/com/cm/population/pojo/vos/house/HouseVO.java @@ -1,5 +1,6 @@ package com.cm.population.pojo.vos.house; +import com.cm.common.annotation.CheckEmptyAnnotation; import com.cm.common.annotation.CheckNumberAnnotation; import com.cm.population.pojo.vos.population.PopulationVO; import io.swagger.annotations.ApiModel; @@ -37,6 +38,7 @@ public class HouseVO { @CheckNumberAnnotation(name = "所在层/院") private String affiliationFloors; @ApiModelProperty(name = "houseNum", value = "门牌号") + @CheckEmptyAnnotation(name = "门牌号") private String houseNum; @ApiModelProperty(name = "categoryId", value = "房屋类别") private String categoryId; diff --git a/src/main/resources/templates/house/list-summary.html b/src/main/resources/templates/house/list-summary.html index 21bf784..3d6f13a 100644 --- a/src/main/resources/templates/house/list-summary.html +++ b/src/main/resources/templates/house/list-summary.html @@ -32,11 +32,14 @@ #contentBody .center .main {} #contentBody .center .main .floor {height: 100px; box-sizing: border-box; white-space: nowrap;} #contentBody .center .main .floor .unit {display: inline-block; box-sizing: border-box;} - #contentBody .center .main .floor .unit .house {width: 200px; height: 100px; border: 1px solid #e6e6e6; box-sizing: border-box; display: inline-block; font-size: 14px; cursor: pointer; text-align: center; line-height: 100px; user-select:none; transition: background-color .3s, font-weight .3s;} + #contentBody .center .main .floor .unit .house {width: 200px; height: 100px; border: 1px solid #e6e6e6; box-sizing: border-box; display: inline-block; font-size: 14px; cursor: pointer; text-align: center; user-select:none; transition: background-color .3s, font-weight .3s;} #contentBody .center .main .floor .unit .house:hover {font-weight: bold; background-color: #f2f2f2;} - #contentBody .center .main .floor .unit .house .info {display: flex; justify-content: center; align-items: center;} - #contentBody .center .main .floor .unit .house .info .name {} - #contentBody .center .main .floor .unit .house .info .option {display: none;} + #contentBody .center .main .floor .unit .house .info {display: flex; flex-direction: column; justify-content: space-between; align-items: center; height: 100%;} + #contentBody .center .main .floor .unit .house .info .name .num {margin-top: 15px} + #contentBody .center .main .floor .unit .house .info .name .time {scale: 0.8} + #contentBody .center .main .floor .unit .house .info .option {width: 100%;display: flex;justify-content: space-between;} + #contentBody .center .main .floor .unit .house .info .option .tips {padding: 0 5px; scale: 0.8;} + #contentBody .center .main .floor .unit .house .info .option .btns {padding: 0 5px;} @@ -249,6 +252,7 @@ var initBuilding = function() { selectedRelation.buildingId = ''; + var loadLayerIndex; top.restAjax.get(top.restAjax.path('api/building/listpage', []), { page: buildingPager.currentPage, rows: buildingPager.rows, @@ -263,7 +267,11 @@ renderBuilding(); }, function(code, data) { top.dialog.msg(data.msg); - }) + }, function() { + loadLayerIndex = top.dialog.msg('正在加载...', {icon: 16, time: 0, shade: 0.3}); + }, function() { + top.dialog.close(loadLayerIndex); + }); } var initHouse = function() { @@ -406,15 +414,24 @@ data.units[jndex].maxHouseCount = jtem.houses.length; } $.each(jtem.houses, function(kndex, ktem) { + var option = ktem.isCreator === 1 ? ` +
+
+ ${ktem.populationCount} +
+
+ + +
+
`: ''; houses += `
-
${ktem.name}
-
- 编辑 - | - 删除 +
+
${ktem.name}
+
${ktem.gmtCreate}
+ ${option}
`; @@ -444,7 +461,7 @@ }, function(code, data) { top.dialog.msg(data.msg); }, function() { - loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3}); + loadLayerIndex = top.dialog.msg('正在加载...', {icon: 16, time: 0, shade: 0.3}); }, function() { top.dialog.close(loadLayerIndex); }); @@ -537,16 +554,16 @@ $left.css('top', `${50 - scroll.top}px`); $top.css('left', `${100 - scroll.left}px`); }); - $(document).on('mouseover', '#contentBody .center .main .floor .unit .house', function() { - var $this = $(this); - $this.find('.option').show(); - $this.find('.name').hide(); - }); - $(document).on('mouseout', '#contentBody .center .main .floor .unit .house', function() { - var $this = $(this); - $this.find('.option').hide(); - $this.find('.name').show(); - }); + // $(document).on('mouseover', '#contentBody .center .main .floor .unit .house', function() { + // var $this = $(this); + // $this.find('.option').show(); + // $this.find('.name').hide(); + // }); + // $(document).on('mouseout', '#contentBody .center .main .floor .unit .house', function() { + // var $this = $(this); + // $this.find('.option').hide(); + // $this.find('.name').show(); + // }); $(document).on('click', '#contentBody .center .main .floor .unit .house .info .option .house-edit', function() { var houseId = this.dataset.id; layer.open({