From e67692e10bd18b95e0320540d0e91bd537acbae8 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期五, 07 六月 2024 11:00:51 +0800
Subject: [PATCH] 调整周期报表

---
 HTML/views/StatisticalReport/PeriodicReport.html |   59 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/HTML/views/StatisticalReport/PeriodicReport.html b/HTML/views/StatisticalReport/PeriodicReport.html
index 62d9d06..15e6823 100644
--- a/HTML/views/StatisticalReport/PeriodicReport.html
+++ b/HTML/views/StatisticalReport/PeriodicReport.html
@@ -69,37 +69,35 @@
 
 							<div class="layui-tab-content"> 
 								<!-- 鍗曟嵁鎬昏〃 -->
-								<div class="layui-tab-item layui-show">
-									<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
-										<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+								<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
+									<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
 
-										<!-- #region 鑷畾涔夎〃澶� -->
-										<div class="headerSetIcon">
-											<button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
-												<i class="layui-icon">&#xe610;</i>
-											</button>
-										</div>
-										<!-- #endregion -->
-
-										<script type="text/html" id="SituationButton">
-											{{#  if(d.IsQualified=='0'){ }}
-												<p>婊¤冻</p>
-											{{#  } else if(d.IsQualified=='1'){ }}
-												<p>涓嶆弧瓒�</p>
-											{{#  } }}
-										</script>
-										<script type="text/html" id="CreateTimeButton">
-											{{# console.log(d.CreateTime);
-													return formatDate(d.CreateTime);
-											}}
-										</script>
-										<script type="text/html" id="UpdateTimeButton">
-											{{# console.log(d.CreateTime);
-													return formatDate(d.CreateTime);
-											}}
-										</script>
-
+									<!-- #region 鑷畾涔夎〃澶� -->
+									<div class="headerSetIcon">
+										<button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
+											<i class="layui-icon">&#xe610;</i>
+										</button>
 									</div>
+									<!-- #endregion -->
+
+									<script type="text/html" id="SituationButton">
+										{{#  if(d.IsQualified=='0'){ }}
+											<p>婊¤冻</p>
+										{{#  } else if(d.IsQualified=='1'){ }}
+											<p>涓嶆弧瓒�</p>
+										{{#  } }}
+									</script>
+									<script type="text/html" id="CreateTimeButton">
+										{{# console.log(d.CreateTime);
+												return formatDate(d.CreateTime);
+										}}
+									</script>
+									<script type="text/html" id="UpdateTimeButton">
+										{{# console.log(d.CreateTime);
+												return formatDate(d.CreateTime);
+										}}
+									</script>
+
 								</div>
 							</div>
 						</div>
@@ -177,7 +175,7 @@
 				var $ = layui.$;
 
 				
-				var h1 = GetTableTabHeight();
+				var h1 = GetTableHeight();
 				refreshTable("",);
                 //鑾峰彇鍑哄叆搴撴�婚噺
                 function refreshTable(StartTime,EndTime) {
@@ -196,6 +194,7 @@
 						}else{
 							colsJson=TotalColsArr
 						}
+						console.log('h1:',h1)
 						infoOptions = {
 							elem: '#LAY-app-content-list',
 							height: h1,

--
Gitblit v1.8.0