From a7c8452ad33ae2f9fa6de326ee85054f60bad8c0 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 01 三月 2024 16:18:52 +0800
Subject: [PATCH] 解决冲突
---
HTML/views/SOSetting/ComBoxInfo.html | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/HTML/views/SOSetting/ComBoxInfo.html b/HTML/views/SOSetting/ComBoxInfo.html
index 1156189..66afe34 100644
--- a/HTML/views/SOSetting/ComBoxInfo.html
+++ b/HTML/views/SOSetting/ComBoxInfo.html
@@ -8,11 +8,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
</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" >
@@ -30,6 +30,8 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
<div class="layui-card-body">
@@ -54,6 +56,7 @@
var $ = layui.$,
form = layui.form,
layer = layui.layer;
+ var h1 = GetTableHeight();
var boxNo = getQueryString('BoxNo');
if (!boxNo)
{
@@ -94,7 +97,7 @@
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-98',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
--
Gitblit v1.8.0