diff --git a/src/main/resources/templates/admin/month_statistics.ftl b/src/main/resources/templates/admin/month_statistics.ftl index ab722b0..0b4c9ff 100644 --- a/src/main/resources/templates/admin/month_statistics.ftl +++ b/src/main/resources/templates/admin/month_statistics.ftl @@ -10,13 +10,12 @@ border-right: 1px solid; } .cal-table-left { - display: block; - float: left; + display: inline-block; } table { display: block; border-collapse: collapse; - width: 100%; + width: 200px; overflow-x: scroll; } @@ -37,8 +36,9 @@
- - +
+
+ @@ -55,12 +55,12 @@ - + <#if (primaryIndicatorList)?exists && (primaryIndicatorList?size>0)> <#list primaryIndicatorList as list> - @@ -76,14 +76,15 @@
类别 收入--设备类
${list.title!}${(list.incomeDevice!0)?string("0.##")} + ${(list.incomeDevice!0)?string("0.##")} ${(list.incomeEngineer!0)?string("0.##")} ${(list.incomeService!0)?string("0.##")} ${(list.costPurchaseDevice!0)?string("0.##")}
+
- - +
+ @@ -102,7 +103,7 @@ - + <#if (profitAndLossList)?exists && (profitAndLossList?size>0)> <#list profitAndLossList as list> @@ -130,8 +131,8 @@
-
/ 营业收入
- +
+ @@ -150,7 +151,7 @@ - + <#if (cashFlowList)?exists && (cashFlowList?size>0)> <#list cashFlowList as list> diff --git a/src/main/resources/templates/admin/project_statistics.ftl b/src/main/resources/templates/admin/project_statistics.ftl index a1796e0..3f004b2 100644 --- a/src/main/resources/templates/admin/project_statistics.ftl +++ b/src/main/resources/templates/admin/project_statistics.ftl @@ -10,13 +10,12 @@ border-right: 1px solid; } .cal-table-left { - display: block; - float: left; + display: inline-block; } table { display: block; border-collapse: collapse; - width: 100%; + width: 200px; overflow-x: scroll; } @@ -48,8 +47,8 @@
-
/ 销售商品、提供劳务收到的现金货币资金净增加额
- +
+ @@ -66,7 +65,7 @@ - + <#if (pager)?exists> <#list pager as list> @@ -95,8 +94,8 @@
-
项目名称 收入--设备类
- +
+ @@ -115,7 +114,7 @@ - + <#if (pager)?exists> <#list pager as list> @@ -145,8 +144,8 @@
-
项目名称 营业收入
- +
+ @@ -166,7 +165,7 @@ - + <#if (pager)?exists> <#list pager as list>
项目名称 销售商品、提供劳务收到的现金