diff --git a/src/main/resources/mybatis/mapper/building/building-mapper.xml b/src/main/resources/mybatis/mapper/building/building-mapper.xml index 8882093..d001bbf 100644 --- a/src/main/resources/mybatis/mapper/building/building-mapper.xml +++ b/src/main/resources/mybatis/mapper/building/building-mapper.xml @@ -215,7 +215,8 @@ t1.longitude, t1.latitude, t1.image, - t1.building_id + t1.building_id, + t1.creator FROM house_building t1 WHERE diff --git a/src/main/resources/mybatis/mapper/house/house-mapper.xml b/src/main/resources/mybatis/mapper/house/house-mapper.xml index ded768b..18ff293 100644 --- a/src/main/resources/mybatis/mapper/house/house-mapper.xml +++ b/src/main/resources/mybatis/mapper/house/house-mapper.xml @@ -520,7 +520,8 @@ t1.custodian_document_num, t1.custodian_phone, t1.relationship_homeowner, - t1.house_id + t1.house_id, + t1.creator FROM house_house t1 WHERE diff --git a/src/main/resources/mybatis/mapper/residential/residential-mapper.xml b/src/main/resources/mybatis/mapper/residential/residential-mapper.xml index da78f6c..8156394 100644 --- a/src/main/resources/mybatis/mapper/residential/residential-mapper.xml +++ b/src/main/resources/mybatis/mapper/residential/residential-mapper.xml @@ -188,7 +188,8 @@ t1.longitude, t1.latitude, t1.image, - t1.residential_id + t1.residential_id, + t1.creator FROM house_residential t1 WHERE diff --git a/src/main/resources/templates/building/save.html b/src/main/resources/templates/building/save.html index ae5857a..49ae3cf 100644 --- a/src/main/resources/templates/building/save.html +++ b/src/main/resources/templates/building/save.html @@ -12,7 +12,7 @@ -
+
diff --git a/src/main/resources/templates/building/update.html b/src/main/resources/templates/building/update.html index 8067fed..143c3aa 100644 --- a/src/main/resources/templates/building/update.html +++ b/src/main/resources/templates/building/update.html @@ -12,7 +12,7 @@ -
+
diff --git a/src/main/resources/templates/house/list-popu.html b/src/main/resources/templates/house/list-popu.html index 26348a2..b7c1640 100644 --- a/src/main/resources/templates/house/list-popu.html +++ b/src/main/resources/templates/house/list-popu.html @@ -22,7 +22,7 @@ -
+
@@ -100,7 +100,7 @@ id: 'dataTable', url: top.restAjax.path(tableUrl, []), width: admin.screen() > 1 ? '100%' : '', - height: $win.height() - 90, + height: $win.height() - 60, limit: 20, limits: [20, 40, 60, 80, 100, 200], toolbar: '#headerToolBar', diff --git a/src/main/resources/templates/house/list.html b/src/main/resources/templates/house/list.html index 88fab3b..2d3b246 100644 --- a/src/main/resources/templates/house/list.html +++ b/src/main/resources/templates/house/list.html @@ -391,9 +391,8 @@ top.dialog.open({ url: top.restAjax.path('route/population/list?houseId={houseId}', [data.houseId]), title: "房屋人口", - width: '40%', - height: '98%', - offset: 'r', + width: '60%', + height: '70%', onClose: function() { reloadTable(); } diff --git a/src/main/resources/templates/house/save.html b/src/main/resources/templates/house/save.html index dfe8e7e..d799909 100644 --- a/src/main/resources/templates/house/save.html +++ b/src/main/resources/templates/house/save.html @@ -11,7 +11,7 @@ -
+
diff --git a/src/main/resources/templates/house/update.html b/src/main/resources/templates/house/update.html index 6f4074e..869db04 100644 --- a/src/main/resources/templates/house/update.html +++ b/src/main/resources/templates/house/update.html @@ -11,7 +11,7 @@ -
+
diff --git a/src/main/resources/templates/population/list.html b/src/main/resources/templates/population/list.html index 41acb18..0631733 100644 --- a/src/main/resources/templates/population/list.html +++ b/src/main/resources/templates/population/list.html @@ -11,7 +11,7 @@ -
+
@@ -31,9 +31,6 @@ - @@ -69,7 +66,7 @@ id: 'dataTable', url: top.restAjax.path(tableUrl, [houseId]), width: admin.screen() > 1 ? '100%' : '', - height: $win.height() - 90, + height: $win.height() - 60, limit: 20, limits: [20, 40, 60, 80, 100, 200], toolbar: '#headerToolBar', diff --git a/src/main/resources/templates/population/save.html b/src/main/resources/templates/population/save.html index 0f80b4b..e766fc1 100644 --- a/src/main/resources/templates/population/save.html +++ b/src/main/resources/templates/population/save.html @@ -11,7 +11,7 @@ -
+
diff --git a/src/main/resources/templates/residential/save.html b/src/main/resources/templates/residential/save.html index e0327be..52e0cd7 100644 --- a/src/main/resources/templates/residential/save.html +++ b/src/main/resources/templates/residential/save.html @@ -12,7 +12,7 @@ -
+
diff --git a/src/main/resources/templates/residential/update.html b/src/main/resources/templates/residential/update.html index 5625c80..0816777 100644 --- a/src/main/resources/templates/residential/update.html +++ b/src/main/resources/templates/residential/update.html @@ -12,7 +12,7 @@ -
+