From e701bbb0b83037cb945cdd66d7f943b68c88f004 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期四, 07 三月 2024 12:56:37 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/StatisticalReport/BoxInfor.html | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 5fe5cfc..b5bb0b4 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -27,11 +27,10 @@
</script>
</head>
- <body>
-
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item" style="margin-bottom: 0px;">
<div class="layui-inline zongdan" >
<label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
@@ -148,19 +147,20 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>瀵煎嚭
</button>
</div>
-
-
</div>
</div>
-
-
+
<div class="layui-card-body">
<div style="position: relative;">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title">
+ <ul class="layui-tab-title" id="tab">
<li class="layui-this">鎵樼洏鏄庣粏</li>
<li >绠辩爜鏄庣粏</li>
</ul>
+
+ <div id="center">
+ </div>
+
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -280,7 +280,10 @@
element = layui.element;
laydate = layui.laydate;
-
+ var h1 = GetTableTabHeight();
+ // var h1 = GetTkableTopHeight();
+ // console.log(h1)
+
laydate.render({
elem: '#StartTime',
format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
@@ -424,7 +427,7 @@
}
infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-206',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
@@ -587,7 +590,7 @@
}
infoOptions2 = {
elem: '#LAY-app-content-list2',
- height: 'full-206',
+ height: h1,
id: 'LAY-app-content-list2',
page: true,
limit: pageCnt,
--
Gitblit v1.8.0