~zhd/IGD3000-filesystem.git

朱浩东

2025-06-20 465bae26315b619e30a2d59b10296c0013c560ec

修改适配屏幕和正常1080p的页面

已修改9个文件

	local/version	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	local/www/clock/clock.html	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	local/www/clock/style.css	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	local/www/css/page/record-his.css	73 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	local/www/css/page/warn-list.css	63 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	local/www/record-his.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	local/www/warn-list.html	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	new_board_upgrade/upgrade/app.tgz	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	upgrade/app.tgz	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 local/version

@@ -1,3 +1,3 @@
2025-06-14-v001
2025-06-20-v001
type=1
IGD3000

 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>

 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;

    }

}




 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;

    }



}






 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;

    }

}






 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">


 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>


 new_board_upgrade/upgrade/app.tgz

Binary files differ

 upgrade/app.tgz

Binary files differ

			@@ -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>

			@@ -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;
			}
			}

			@@ -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;
			}

			}

			@@ -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;
			}
			}

			@@ -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">