From 465bae26315b619e30a2d59b10296c0013c560ec Mon Sep 17 00:00:00 2001
From: 朱浩东 <1359924757@qq.com>
Date: 星期五, 20 六月 2025 18:05:19 +0800
Subject: [PATCH] 修改适配屏幕和正常1080p的页面
---
new_board_upgrade/upgrade/app.tgz | 0
local/www/clock/clock.html | 41 +++++---
local/version | 2
local/www/clock/style.css | 17 +++
local/www/css/page/record-his.css | 73 ++++++++++++++
upgrade/app.tgz | 0
local/www/record-his.html | 12 +-
local/www/warn-list.html | 58 +++++++----
local/www/css/page/warn-list.css | 63 ++++++++++++
9 files changed, 219 insertions(+), 47 deletions(-)
diff --git a/local/version b/local/version
index b5ff656..63a19d8 100644
--- a/local/version
+++ b/local/version
@@ -1,3 +1,3 @@
-2025-06-14-v001
+2025-06-20-v001
type=1
IGD3000
diff --git a/local/www/clock/clock.html b/local/www/clock/clock.html
index 769147b..2077ba7 100644
--- a/local/www/clock/clock.html
+++ b/local/www/clock/clock.html
@@ -9,22 +9,7 @@
<link rel="stylesheet" href="style.css">
<style>
- @media only screen and (max-width:1280px){
- .clock{
- margin-top: 28px;
- }
- .clock .divider {
- font-size: 24px;
- line-height: 35px;
- }
- .clock .flip{
- width: 24px;
- height: 35px;
- font-size: 24px;
- position: relative;
- line-height: 35px;
- }
- }
+
</style>
</head>
<body>
@@ -59,6 +44,30 @@
</div>
<script src="script.js"></script>
+<script inline="javascript">
+ if(screen.width == 1280){
+ var clock = document.getElementsByClassName("clock");
+ for(var i=0;i<clock.length;i++){
+ clock[i].style.marginTop = "28px";
+ }
+
+ var divider = document.getElementsByClassName("divider");
+ for(var i=0;i<divider.length;i++){
+ divider[i].style.fontSize = "24px";
+ divider[i].style.lineHeight = "35px";
+ }
+
+
+ var flip = document.getElementsByClassName("flip");
+ for(var i=0;i<flip.length;i++){
+ flip[i].style.width = "24px";
+ flip[i].style.height = "35px";
+ flip[i].style.position = "relative";
+ flip[i].style.fontSize = "24px";
+ flip[i].style.lineHeight = "35px";
+ }
+ }
+</script>
</body>
</html>
\ No newline at end of file
diff --git a/local/www/clock/style.css b/local/www/clock/style.css
index af33325..2b4d87f 100644
--- a/local/www/clock/style.css
+++ b/local/www/clock/style.css
@@ -119,5 +119,20 @@
}
}
-
+@media only screen and (max-width:1280px) and (min-width:1275px) {
+ .clock{
+ margin-top: 28px;
+ }
+ .clock .divider {
+ font-size: 24px;
+ line-height: 35px;
+ }
+ .clock .flip{
+ width: 24px;
+ height: 35px;
+ font-size: 24px;
+ position: relative;
+ line-height: 35px;
+ }
+}
diff --git a/local/www/css/page/record-his.css b/local/www/css/page/record-his.css
index 688cfaf..79c1281 100644
--- a/local/www/css/page/record-his.css
+++ b/local/www/css/page/record-his.css
@@ -307,6 +307,9 @@
padding: 0 10px;
margin-top: 5px;
}
+.popCon-div{
+ height: 455px;
+}
.popCon .popTable{
padding: 0 40px;
@@ -337,7 +340,7 @@
.table-tbody{
- height: 250px;
+ height: 540px;
overflow-y: scroll;
}
/** 闅愯棌鍒楄〃涓嬫媺婊氬姩鏉� **/
@@ -374,6 +377,11 @@
scrollbar-width: none;
}
+ .layui-col-md4 {
+ margin-top: 3px;
+ width: 50%;
+ }
+
.layui-form-label {
padding: 9px 0px 9px 0px;
color: #ffffff;
@@ -388,4 +396,67 @@
}
}
+@media only screen and (max-width:1080px) and (max-height: 1920px){
+ .i-container {
+ min-width: 845px;
+ height: 100%;
+ overflow-y: scroll;
+ }
+ /** 闅愯棌鍒楄〃涓嬫媺婊氬姩鏉� **/
+ .div-body::-webkit-scrollbar {
+ display: none;
+ }
+ /*IE 10+ ----闅愯棌婊氬姩鏉�*/
+ .div-body {
+ -ms-overflow-style: none;
+ }
+ /*Firefox ----闅愯棌婊氬姩鏉�*/
+ .div-body {
+ scrollbar-width: none;
+ }
+ .layui-col-md4{
+ float: left;
+ width: 50%;
+ }
+ .layui-form-label {
+ padding: 9px 0px 9px 0px;
+ color: #ffffff;
+ font-size: 16px;
+ }
+ .layui-input-block {
+ margin-left: 80px;
+ min-height: 36px;
+ }
+ .layui-inline{
+ margin: 3px;
+ }
+
+ #recordList{
+ height: 1430px;
+ overflow-y: scroll;
+ }
+ #recordList tr{
+ height: 142px;
+ }
+ #recordList tr td{
+ height: 140px;
+ overflow-wrap: break-word; /* 鍏煎鎬ц緝濂斤紝鎺ㄨ崘浣跨敤 */
+ word-wrap: break-word; /* 鏃х増娴忚鍣ㄦ敮鎸� */
+ white-space: normal; /* 鍏佽鏂囨湰鎹㈣ */
+ overflow-y: auto;
+ }
+
+
+ .popCon-div{
+ height: 855px;
+ }
+ /*鍙充晶鐩戞帶灞炴�у垪琛ㄤ笅鎷�*/
+ /*table 绾靛悜婊氬姩鏄剧ず骞堕殣钘忔粴鍔ㄦ潯*/
+ .popCon .table-tbody {
+ height: 800px;
+ overflow-y: scroll;
+ }
+
+}
+
diff --git a/local/www/css/page/warn-list.css b/local/www/css/page/warn-list.css
index 30d873a..ea12346 100644
--- a/local/www/css/page/warn-list.css
+++ b/local/www/css/page/warn-list.css
@@ -491,6 +491,10 @@
.div-body {
scrollbar-width: none;
}
+ .layui-col-md4 {
+ margin-top: 3px;
+ width: 50%;
+ }
.layui-form-label {
padding: 9px 0px 9px 0px;
@@ -506,8 +510,65 @@
}
.table-tbody{
- height: 250px;
+ height: 380px;
overflow-y: scroll;
}
}
+@media only screen and (max-width:1080px) and (max-height: 1920px){
+ .i-container {
+ min-width: 845px;
+ height: 100%;
+ overflow-y: scroll;
+ }
+ /** 闅愯棌鍒楄〃涓嬫媺婊氬姩鏉� **/
+ .div-body::-webkit-scrollbar {
+ display: none;
+ }
+ /*IE 10+ ----闅愯棌婊氬姩鏉�*/
+ .div-body {
+ -ms-overflow-style: none;
+ }
+ /*Firefox ----闅愯棌婊氬姩鏉�*/
+ .div-body {
+ scrollbar-width: none;
+ }
+ .layui-col-md4{
+ float: left;
+ width: 50%;
+ }
+ .layui-form-label {
+ padding: 9px 0px 9px 0px;
+ color: #ffffff;
+ font-size: 16px;
+ }
+ .layui-input-block {
+ margin-left: 80px;
+ min-height: 36px;
+ }
+ .layui-inline{
+ margin: 3px;
+ }
+
+ .table-tbody{
+ height: 1430px;
+ overflow-y: scroll;
+ }
+ .table-tbody tr{
+ height: 142px;
+ }
+ .table-tbody tr td{
+ height: 140px;
+ overflow-wrap: break-word; /* 鍏煎鎬ц緝濂斤紝鎺ㄨ崘浣跨敤 */
+ word-wrap: break-word; /* 鏃х増娴忚鍣ㄦ敮鎸� */
+ white-space: normal; /* 鍏佽鏂囨湰鎹㈣ */
+ overflow-y: auto;
+ }
+
+ .pop-item{
+ width: 100%;
+ float: left;
+ }
+}
+
+
diff --git a/local/www/record-his.html b/local/www/record-his.html
index 288aeda..5e838f6 100644
--- a/local/www/record-his.html
+++ b/local/www/record-his.html
@@ -23,7 +23,7 @@
<form class="layui-form" id="form-param" lay-filter="form-param"
action="">
<div style="margin: 0 20px;">
- <div class="layui-col-md6">
+ <div class="layui-col-md4">
<div class="layui-inline">
<label class="layui-form-label">璁惧鍚嶇О锛�</label>
<div class="layui-input-block">
@@ -37,7 +37,7 @@
</div>
</div>
</div>
- <div class="layui-col-md6">
+ <div class="layui-col-md4">
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫椂闂达細</label>
<div class="layui-input-block">
@@ -47,7 +47,7 @@
</div>
</div>
- <div class="layui-col-md6">
+ <div class="layui-col-md4">
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃堕棿锛�</label>
<div class="layui-input-block">
@@ -56,7 +56,7 @@
</div>
</div>
</div>
- <div class="layui-col-md6">
+ <div class="layui-col-md4">
<div class="layui-inline">
<div class="layui-input-block btns" style="margin-left: 15px">
<button class="layui-btn layui-btn-normal"
@@ -87,7 +87,7 @@
<th style="width: 120px;">鏁版嵁</th>
</tr>
</thead>
- <tbody id="recordList">
+ <tbody class="table-tbody" id="recordList">
</tbody>
</table>
</div>
@@ -129,7 +129,7 @@
</div>
<div class="popCon">
- <div style="height: 455px;">
+ <div class="popCon-div" style="">
<div id="popTable" class="popTable">
<div class="table-thead">
<table class="layui-table pdgxq-table1 poptable" lay-skin="nob">
diff --git a/local/www/warn-list.html b/local/www/warn-list.html
index 8446055..36e6a98 100644
--- a/local/www/warn-list.html
+++ b/local/www/warn-list.html
@@ -23,7 +23,7 @@
<form class="layui-form" id="form-param" lay-filter="form-param"
action="">
<div class="layui-row" style="margin: 0 20px;" >
- <div class="layui-col-md6 " >
+ <div class="layui-col-md4 " >
<div class="layui-inline">
<label class="layui-form-label">璁惧鍚嶇О锛�</label>
<div class="layui-input-block">
@@ -37,7 +37,7 @@
</div>
</div>
</div>
- <div class="layui-col-md6">
+ <div class="layui-col-md4">
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫椂闂达細</label>
<div class="layui-input-block">
@@ -47,7 +47,7 @@
</div>
</div>
- <div class="layui-col-md6">
+ <div class="layui-col-md4">
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃堕棿锛�</label>
<div class="layui-input-block">
@@ -56,7 +56,7 @@
</div>
</div>
</div>
- <div class="layui-col-md6" style="display: none;" id="param-btn">
+ <div class="layui-col-md4" style="" id="param-btn">
<div class="layui-inline">
<div class="layui-input-block btns" style="margin-left: 15px">
<button class="layui-btn layui-btn-normal"
@@ -92,7 +92,7 @@
</colgroup>
<thead>
<tr>
- <th>搴忓彿</th>
+ <th></th>
<th>璁惧鍚嶇О</th>
<th>璁惧ID</th>
<th>璀﹀憡鏃堕棿</th>
@@ -115,22 +115,38 @@
<col width="16%">
</colgroup>
<tbody id="warnList">
- <tr>
- <td>1</td>
- <td>璁惧1</td>
- <td>10010001</td>
- <td>2021-02-18 16:46:46</td>
- <td>鏈鐞�</td>
- <td>UPS鎶ヨ锛岀數閲忎华鎶ヨ锛岀┖璋冩姤璀︼紝1鍙锋俯婀垮害鎶ヨ</td>
- <td>
- <button style="height: 29px;line-height: 29px;"
- class="layui-btn layui-btn-normal" lay-event="edit">澶勭悊
- </button>
- <button style="height: 29px;line-height: 29px;"
- class="layui-btn layui-btn-normal" onclick="warnTodo()" lay-event="detail">鏌ョ湅
- </button>
- </td>
- </tr>
+<!-- <tr>-->
+<!-- <td>1</td>-->
+<!-- <td>璁惧1</td>-->
+<!-- <td>10010001</td>-->
+<!-- <td>2021-02-18 16:46:46</td>-->
+<!-- <td>鏈鐞�</td>-->
+<!-- <td>UPS鎶ヨ锛岀數閲忎华鎶ヨ锛岀┖璋冩姤璀︼紝1鍙锋俯婀垮害鎶ヨ</td>-->
+<!-- <td>-->
+<!-- <button style="height: 29px;line-height: 29px;"-->
+<!-- class="layui-btn layui-btn-normal" lay-event="edit">澶勭悊-->
+<!-- </button>-->
+<!-- <button style="height: 29px;line-height: 29px;"-->
+<!-- class="layui-btn layui-btn-normal" onclick="warnTodo()" lay-event="detail">鏌ョ湅-->
+<!-- </button>-->
+<!-- </td>-->
+<!-- </tr>-->
+<!-- <tr>-->
+<!-- <td>1</td>-->
+<!-- <td>璁惧1</td>-->
+<!-- <td>10010001</td>-->
+<!-- <td>2021-02-18 16:46:46</td>-->
+<!-- <td>鏈鐞�</td>-->
+<!-- <td>UPS鎶ヨ锛岀數閲忎华鎶ヨ锛岀┖璋冩姤璀︼紝1鍙锋俯婀垮害鎶ヨ</td>-->
+<!-- <td>-->
+<!-- <button style="height: 29px;line-height: 29px;"-->
+<!-- class="layui-btn layui-btn-normal" lay-event="edit">澶勭悊-->
+<!-- </button>-->
+<!-- <button style="height: 29px;line-height: 29px;"-->
+<!-- class="layui-btn layui-btn-normal" onclick="warnTodo()" lay-event="detail">鏌ョ湅-->
+<!-- </button>-->
+<!-- </td>-->
+<!-- </tr>-->
</tbody>
diff --git a/new_board_upgrade/upgrade/app.tgz b/new_board_upgrade/upgrade/app.tgz
index 34add2f..5d31559 100644
--- a/new_board_upgrade/upgrade/app.tgz
+++ b/new_board_upgrade/upgrade/app.tgz
Binary files differ
diff --git a/upgrade/app.tgz b/upgrade/app.tgz
index 34add2f..5d31559 100644
--- a/upgrade/app.tgz
+++ b/upgrade/app.tgz
Binary files differ
--
Gitblit v1.9.3