From 0c9d469fa247665eaa37908b811ae5f183da7a3e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 27 二月 2024 16:02:00 +0800
Subject: [PATCH] Merge branch 'master' into wxw

---
 HTML/views/BaseSetting/LogOperation.html |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/HTML/views/BaseSetting/LogOperation.html b/HTML/views/BaseSetting/LogOperation.html
index cd26c83..a0dc58b 100644
--- a/HTML/views/BaseSetting/LogOperation.html
+++ b/HTML/views/BaseSetting/LogOperation.html
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta charset="utf-8">
-		<title>鐢ㄦ埛淇℃伅鍒楄〃</title>
+		<title>鎿嶄綔鏃ュ織</title>
 		<meta name="renderer" content="webkit">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -17,10 +17,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" style="border-bottom:1px solid #CCC">
+				<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
 					<div class="layui-form-item" >
 						<div class="layui-inline">
 							<label class="layui-form-label">鑿滃崟鍙�</label>
@@ -55,6 +55,9 @@
 						</div>
 					</div>
 				</div>
+
+				<div id="center"></div>
+
 				<div class="layui-card-body">
 					<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
 				</div>
@@ -75,6 +78,7 @@
 					laypage = layui.laypage,
 					layer = layui.layer;
 
+					var h1 = GetTableHeight();
 					refreshTable("", "", "", "","");
 					var tableIns;
 
@@ -162,7 +166,7 @@
 				}
 				var infoOptions = {
 					elem: '#LAY-app-content-list',
-					height: 'full-94',
+					height: h1,
 					id: 'LAY-app-content-list',
 					page: true,
 					limit: pageCnt,

--
Gitblit v1.8.0