From eea897aeac44a75e93fdc90939261f1b44711087 Mon Sep 17 00:00:00 2001
From: lgq <1015864684@qq.com>
Date: 星期二, 08 七月 2025 18:11:31 +0800
Subject: [PATCH] 1.同步最新文件
---
local/www/css/page/detail-dcz.css | 84 +
local/www/detail-xfj.html | 10
local/www/css/page/detail-ty.css | 60
local/www/css/page/detail-wsd.css | 76 +
local/www/clock/clock.html | 33
local/version | 2
local/www/css/page/record-his.css | 126 +
local/www/detail-video.html | 67
local/www/single.html | 4
local/www/detail-video-pop.html | 2
local/www/images/wsd-single/wsd-single/dz2.png | 0
local/www/js/page/warn-list.js | 195 --
local/www/warn-list.html | 163 --
local/www/cgi-bin/sys-network/save | 1
local/www/detail-jmkt.html | 55
local/www/detail-mj.html | 148 -
local/www/home.html | 28
local/www/js/page/device-common.js | 11
local/www/css/page/detail-pd.css | 90 +
local/www/css/page/detail-yghwls.css | 76 +
local/www/css/page/single/single.css | 16
local/www/images/wsd-single/wsd-single/dz1.png | 0
local/www/js/page/record-his.js | 75
local/www/clock/style.css | 20
local/www/css/page/query-state.css | 25
local/www/css/page/sys-password.css | 25
local/www/js/page/three-img.js | 464 ++++---
local/www/css/page/detail-mj.css | 52
local/www/detail-wsd.html | 6
local/www/detail-wsd-single2.html | 125 +
local/www/css/page/detail-video.css | 132 ++
local/www/css/page/device-common.css | 37
local/www/js/page/sys-set.js | 1
local/www/state-device.html | 4
local/www/cgi-bin/action/open-door | 2
local/www/detail-ls.html | 104 -
local/www/css/page/three-img.css | 46
local/www/detail-yg.html | 93 -
local/www/css/page/login.css | 20
local/www/detail-ups.html | 143 ++
local/bin/snmp_cfg | 0
local/www/detail-dcz.html | 4
local/www/js/page/index.js | 6
local/www/detail-ty.html | 6
local/www/device-common.html | 12
local/www/index.html | 2
local/bin/db | 0
local/www/login.html | 2
local/www/detail-xf.html | 78 -
upgrade/app.tgz | 0
local/app/NetModule | 0
local/www/css/page/detail-ups.css | 80 +
local/www/css/page/warn-list.css | 117 +
local/www/three-img.html | 76
local/www/state-network.html | 9
local/www/state-platform.html | 4
local/www/css/page/sys-network.css | 44
local/www/record-his.html | 26
local/www/css/page/detail-jmkt.css | 75 +
local/www/detail-pd.html | 16
local/www/css/page/detail-wsd-single2.css | 239 +++
local/www/images/wsd-single/wsd-single/icn2.png | 0
local/www/css/page/state-device.css | 26
local/www/sys-debug.html | 24
local/www/detail-hw.html | 106 -
local/www/js/page/device-net.js | 11
local/www/images/wsd-single/wsd-single/icn1.png | 0
local/www/query-state.html | 2
local/www/detail-wg.html | 92 -
local/app/MainControl | 0
local/www/detail-fl.html | 106 -
local/www/sys-password.html | 2
local/www/device-expand.html | 8
73 files changed, 2,517 insertions(+), 1,277 deletions(-)
diff --git a/local/app/MainControl b/local/app/MainControl
index 95adeaf..f75a368 100755
--- a/local/app/MainControl
+++ b/local/app/MainControl
Binary files differ
diff --git a/local/app/NetModule b/local/app/NetModule
index fd4faca..ffb579a 100755
--- a/local/app/NetModule
+++ b/local/app/NetModule
Binary files differ
diff --git a/local/bin/db b/local/bin/db
index 997da7a..193872d 100755
--- a/local/bin/db
+++ b/local/bin/db
Binary files differ
diff --git a/local/bin/snmp_cfg b/local/bin/snmp_cfg
index 74b3fbd..195883a 100755
--- a/local/bin/snmp_cfg
+++ b/local/bin/snmp_cfg
Binary files differ
diff --git a/local/version b/local/version
index 7f74ba5..f0afde5 100644
--- a/local/version
+++ b/local/version
@@ -1,3 +1,3 @@
-2025-06-13-v001
+2025-07-07-v001
type=1
IGD5300
diff --git a/local/www/cgi-bin/action/open-door b/local/www/cgi-bin/action/open-door
index 36982c8..95f35c7 100755
--- a/local/www/cgi-bin/action/open-door
+++ b/local/www/cgi-bin/action/open-door
@@ -1,5 +1,5 @@
#!/bin/sh
-# 绔彛閰嶇疆-淇濆瓨
+# 寮�闂�
#
echo -en "Content-type: text/html; charset=utf-8\n\n"
#*****************************************************
diff --git a/local/www/cgi-bin/sys-network/save b/local/www/cgi-bin/sys-network/save
index 3b7b6da..b1a1c48 100755
--- a/local/www/cgi-bin/sys-network/save
+++ b/local/www/cgi-bin/sys-network/save
@@ -16,5 +16,6 @@
echo "{\"code\": \"error\"}"
fi
+#/usr/local/script/set_net
#echo "QUERY_STRING: '$REQUEST_METHOD' " > ./log
#echo $content >> log
diff --git a/local/www/clock/clock.html b/local/www/clock/clock.html
index da3a7ac..2077ba7 100644
--- a/local/www/clock/clock.html
+++ b/local/www/clock/clock.html
@@ -1,11 +1,16 @@
<!DOCTYPE html>
-<html lang="zh-CN">
+<html lang="zh-cn">
<head>
- <meta charset="UTF-8">
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="renderer" content="webkit">
<title>Flip Card Clock</title>
<link rel="stylesheet" href="style.css">
+ <style>
+ </style>
</head>
<body>
@@ -39,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 9325ba0..2b4d87f 100644
--- a/local/www/clock/style.css
+++ b/local/www/clock/style.css
@@ -117,4 +117,22 @@
-webkit-transform: rotateX(0);
transform: rotateX(0);
}
-}
\ No newline at end of file
+}
+
+@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/detail-dcz.css b/local/www/css/page/detail-dcz.css
index ce52ab4..8cacce2 100644
--- a/local/www/css/page/detail-dcz.css
+++ b/local/www/css/page/detail-dcz.css
@@ -56,7 +56,12 @@
width: 100%;
height: 540px;
}
-
+.pdgxq-m1-left {
+ height: 730px;
+}
+.pdgxq-m1-right {
+ height: 540px;
+}
.pdgxq-m1-box {
background: #2f3740;
@@ -413,3 +418,80 @@
font-size: 14px;
}
+
+.battery img{
+ width: 100%;
+ height: 100%;
+}
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+
+ .pdgxq-group {
+ overflow: hidden;
+ height: 48px;
+ width: 325px;
+ margin: 22px 20px 0 20px;
+ background-image: url(../../images/jmkt-chuli.png);
+ background-size: 100% 100%;
+ }
+ .jmkt-chuli {
+ padding: 0 7px 0 15px;
+ }
+ .jmkt-yichuli {
+ padding: 0 5px 0 37px;
+ }
+ .pdgxq-group-item {
+ width: 120px;
+ }
+ .lsyg-jkxx-box {
+ margin: 25px 4px 20px 4px;
+ height: 360px;
+ overflow: hidden;
+ position: relative;
+ }
+
+
+ .pdgxq-m1-left {
+ height: 650px;
+ }
+ .pdgxq-m1-right {
+ height: 460px;
+ }
+ .table-tbody {
+ height: 420px;
+ overflow-y: scroll;
+ }
+
+ .battery .battery-text {
+ font-size: 10px;
+ }
+ .battery .battery-info {
+ line-height: 14px;
+ position: absolute;
+ top: 24%;
+ left: 20%;
+ }
+ .scroll {
+ height: 360px;
+ overflow-y: scroll;
+ }
+
+}
diff --git a/local/www/css/page/detail-jmkt.css b/local/www/css/page/detail-jmkt.css
index 4e9802a..7b03caf 100644
--- a/local/www/css/page/detail-jmkt.css
+++ b/local/www/css/page/detail-jmkt.css
@@ -55,6 +55,12 @@
.pdgxq-m1-box {
height: 540px;
}
+.pdgxq-m1-left {
+ height: 730px;
+}
+.pdgxq-m1-right {
+ height: 540px;
+}
.pdgxq-m1-box {
@@ -690,3 +696,72 @@
}
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+
+ .pdgxq-group {
+ overflow: hidden;
+ height: 48px;
+ width: 325px;
+ margin: 22px 20px 0 20px;
+ background-image: url(../../images/jmkt-chuli.png);
+ background-size: 100% 100%;
+ }
+ .jmkt-chuli {
+ padding: 0 7px 0 15px;
+ }
+ .jmkt-yichuli {
+ padding: 0 5px 0 37px;
+ }
+ .pdgxq-group-item {
+ width: 120px;
+ }
+ .jmkt-jkxx-box {
+ margin: 25px 4px 20px 4px;
+ height: 360px;
+ overflow: hidden;
+ position: relative;
+ }
+
+
+ .pdgxq-m1-left {
+ height: 650px;
+ }
+ .pdgxq-m1-right {
+ height: 460px;
+ }
+ .table-tbody {
+ height: 420px;
+ overflow-y: scroll;
+ }
+
+ .scroll {
+ height: 360px;
+ overflow-y: scroll;
+ }
+ .jmkt-pic-hfwd {
+ font-size: 10px;
+ }
+ .jmkt-pic-sfwd {
+ font-size: 10px;
+ }
+}
+
+
diff --git a/local/www/css/page/detail-mj.css b/local/www/css/page/detail-mj.css
index 7110c0a..f628101 100644
--- a/local/www/css/page/detail-mj.css
+++ b/local/www/css/page/detail-mj.css
@@ -55,6 +55,9 @@
.pdgxq-m1-box {
height: 540px;
}
+.pdgxq-m1-left,.pdgxq-m1-right {
+ height: 730px;
+}
.pdgxq-m1-box {
@@ -373,4 +376,53 @@
/*Firefox ----闅愯棌婊氬姩鏉�*/
.table-tbody {
scrollbar-width: none;
+}
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+
+ .pdgxq-group {
+ overflow: hidden;
+ height: 48px;
+ width: 325px;
+ margin: 22px 20px 0 20px;
+ background-image: url(../../images/jmkt-chuli.png);
+ background-size: 100% 100%;
+ }
+ .jmkt-chuli {
+ padding: 0 7px 0 15px;
+ }
+ .jmkt-yichuli {
+ padding: 0 5px 0 37px;
+ }
+ .pdgxq-group-item {
+ width: 120px;
+ }
+
+ .pdgxq-m1-left,.pdgxq-m1-right {
+ height: 650px;
+ }
+
+ .table-tbody {
+ height: 420px;
+ overflow-y: scroll;
+ }
+
}
\ No newline at end of file
diff --git a/local/www/css/page/detail-pd.css b/local/www/css/page/detail-pd.css
index 4bd6408..6e39b54 100644
--- a/local/www/css/page/detail-pd.css
+++ b/local/www/css/page/detail-pd.css
@@ -55,6 +55,12 @@
.pdgxq-m1-box {
height: 540px;
}
+.pdgxq-m1-left {
+ height: 730px;
+}
+.pdgxq-m1-right {
+ height: 540px;
+}
.pdgxq-m1-box {
@@ -378,6 +384,10 @@
border-radius: 8px;
-webkit-box-sizing: border-box;
}
+.lsyq-item div {
+ width: 100%;
+ height: 216px;
+}
.popBox {
display: none;
@@ -433,3 +443,83 @@
.table-tbody {
scrollbar-width: none;
}
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+
+ .pdgxq-group {
+ overflow: hidden;
+ height: 48px;
+ width: 325px;
+ margin: 22px 20px 0 20px;
+ background-image: url(../../images/jmkt-chuli.png);
+ background-size: 100% 100%;
+ }
+ .jmkt-chuli {
+ padding: 0 7px 0 15px;
+ }
+ .jmkt-yichuli {
+ padding: 0 5px 0 37px;
+ }
+ .pdgxq-group-item {
+ width: 120px;
+ }
+ .lsyg-jkxx-box {
+ margin: 25px 4px 20px 4px;
+ height: 360px;
+ overflow: hidden;
+ position: relative;
+ }
+
+
+ .pdgxq-m1-left {
+ height: 650px;
+ }
+ .pdgxq-m1-right {
+ height: 460px;
+ }
+ .table-tbody {
+ height: 420px;
+ overflow-y: scroll;
+ }
+
+ .battery .battery-text {
+ font-size: 10px;
+ }
+ .battery .battery-info {
+ line-height: 14px;
+ position: absolute;
+ top: 24%;
+ left: 20%;
+ }
+ .scroll {
+ height: 360px;
+ overflow-y: scroll;
+ }
+ .lsyq-item {
+ height: 176px;
+ }
+ .lsyq-item div {
+ width: 100%;
+ height: 176px;
+ }
+
+}
+
diff --git a/local/www/css/page/detail-ty.css b/local/www/css/page/detail-ty.css
index 39eaac5..fa6c034 100644
--- a/local/www/css/page/detail-ty.css
+++ b/local/www/css/page/detail-ty.css
@@ -46,6 +46,12 @@
.pdgxq-m1-box {
height: 540px;
}
+.pdgxq-m1-left {
+ height: 730px;
+}
+.pdgxq-m1-right {
+ height: 730px;
+}
.pdgxq-m1-box {
background: #2f3740;
@@ -500,4 +506,56 @@
.popClose-btn{
background: #607182;
-}
\ No newline at end of file
+}
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+
+ .pdgxq-group {
+ overflow: hidden;
+ height: 48px;
+ width: 325px;
+ margin: 22px 20px 0 20px;
+ background-image: url(../../images/jmkt-chuli.png);
+ background-size: 100% 100%;
+ }
+ .jmkt-chuli {
+ padding: 0 7px 0 15px;
+ }
+ .jmkt-yichuli {
+ padding: 0 5px 0 37px;
+ }
+ .pdgxq-group-item {
+ width: 120px;
+ }
+
+ .pdgxq-m1-left {
+ height: 650px;
+ }
+ .pdgxq-m1-right {
+ height: 650px;
+ }
+ .table-tbody {
+ height: 420px;
+ overflow-y: scroll;
+ }
+
+
+}
diff --git a/local/www/css/page/detail-ups.css b/local/www/css/page/detail-ups.css
index 9be0d23..4141588 100644
--- a/local/www/css/page/detail-ups.css
+++ b/local/www/css/page/detail-ups.css
@@ -55,6 +55,12 @@
width: 100%;
height: 540px;
}
+.pdgxq-m1-left {
+ height: 730px;
+}
+.pdgxq-m1-right {
+ height: 540px;
+}
.pdgxq-m1-box {
@@ -528,4 +534,76 @@
/*Firefox ----闅愯棌婊氬姩鏉�*/
.table-tbody {
scrollbar-width: none;
-}
\ No newline at end of file
+}
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+
+ .pdgxq-group {
+ overflow: hidden;
+ height: 48px;
+ width: 325px;
+ margin: 22px 20px 0 20px;
+ background-image: url(../../images/jmkt-chuli.png);
+ background-size: 100% 100%;
+ }
+ .jmkt-chuli {
+ padding: 0 7px 0 15px;
+ }
+ .jmkt-yichuli {
+ padding: 0 5px 0 37px;
+ }
+ .pdgxq-group-item {
+ width: 120px;
+ }
+ .jmkt-jkxx-box {
+ margin: 25px 4px 20px 4px;
+ height: 360px;
+ overflow: hidden;
+ position: relative;
+ }
+
+
+ .pdgxq-m1-left {
+ height: 650px;
+ }
+ .pdgxq-m1-right {
+ height: 460px;
+ }
+ .table-tbody {
+ height: 420px;
+ overflow-y: scroll;
+ }
+
+ .battery .battery-text {
+ font-size: 10px;
+ }
+ .battery .battery-info {
+ line-height: 14px;
+ position: absolute;
+ top: 24%;
+ left: 20%;
+ }
+ .scroll {
+ height: 360px;
+ overflow-y: scroll;
+ }
+
+}
diff --git a/local/www/css/page/detail-video.css b/local/www/css/page/detail-video.css
index b7a4647..b8e5bf2 100644
--- a/local/www/css/page/detail-video.css
+++ b/local/www/css/page/detail-video.css
@@ -105,8 +105,10 @@
.sp-showItem {
text-align: center;
- line-height: 316px;
- height: 316px;
+ /*line-height: 316px;*/
+ /*height: 316px;*/
+ line-height: 210px;
+ height: 210px;
background: #262c33;
margin: 2px;
-webkit-border-radius: 8px;
@@ -431,3 +433,129 @@
-webkit-border-radius: 2px;
border-radius: 2px;
}
+
+
+@media only screen and (max-width:1280px) and (max-height: 1024px){
+ .i-container {
+ min-width: 1040px;
+ }
+ .jmkt-main {
+ overflow: hidden;
+ padding: 0 5px;
+ margin-top: 20px;
+ }
+
+ .layui-col-space20>* {
+ padding: 5px;
+ }
+ .sp-cz-wrap {
+ width: 250px;
+ overflow: hidden;
+ margin: 20px auto;
+ }
+ .sp-cz-box {
+ overflow: hidden;
+ width: 270px;
+ height: 270px;
+ }
+ .sp-cz-l1,.sp-cz-l2,.sp-cz-l3,.sp-cz-l4,.sp-cz-l5,
+ .sp-cz-l6,.sp-cz-l7,.sp-cz-l8,.sp-cz-l9{
+ width: 80px;
+ height: 80px;
+ border-top-left-radius: 8px;
+ }
+ .sp-cz-box ul li a img {
+ width: 28px;
+ height: 28px;
+ }
+
+ .sp-bianbei {
+ height: 50px;
+ background: #262c33;
+ width: 250px;
+ -webkit-border-radius: 30px;
+ border-radius: 30px;
+ overflow: hidden;
+ margin: 20px 2px 0 2px;
+ text-align: center;
+ }
+}
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+
+ .jmkt-main {
+ overflow: hidden;
+ padding: 0 5px;
+ margin-top: 20px;
+ }
+
+ .layui-col-space20>* {
+ padding: 5px;
+ }
+ .sp-cz-wrap {
+ width: 250px;
+ overflow: hidden;
+ margin: 20px auto;
+ }
+ .sp-cz-box {
+ overflow: hidden;
+ width: 270px;
+ height: 270px;
+ }
+ .sp-cz-l1,.sp-cz-l2,.sp-cz-l3,.sp-cz-l4,.sp-cz-l5,
+ .sp-cz-l6,.sp-cz-l7,.sp-cz-l8,.sp-cz-l9{
+ width: 80px;
+ height: 80px;
+ border-top-left-radius: 8px;
+ }
+ .sp-cz-box ul li a img {
+ width: 28px;
+ height: 28px;
+ }
+
+ .sp-bianbei {
+ height: 50px;
+ background: #262c33;
+ width: 250px;
+ -webkit-border-radius: 30px;
+ border-radius: 30px;
+ overflow: hidden;
+ margin: 20px 2px 0 2px;
+ text-align: center;
+ }
+ .sp-boxWrap, .sp-box {
+ height: 650px;
+ }
+ .sp-showBox {
+ display: none;
+ margin: 15px 20px 20px 20px;
+ height: 540px;
+ }
+ .sp-showItem2 {
+ text-align: center;
+ line-height: 540px;
+ height: 540px;
+ background: #262c33;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ }
+
+}
+
diff --git a/local/www/css/page/detail-wsd-single2.css b/local/www/css/page/detail-wsd-single2.css
new file mode 100644
index 0000000..b2d737e
--- /dev/null
+++ b/local/www/css/page/detail-wsd-single2.css
@@ -0,0 +1,239 @@
+@charset "utf-8";
+
+/*-----------------
+ Author:xxxx
+ update:2020
+ -------------------*/
+
+
+@font-face {
+ font-family: DINCond-Bold;
+}
+
+
+body {
+ font-family: "寰蒋闆呴粦", Arial, sans-serif;
+ font-size: 14px;
+ background: #282e35;
+ position: relative;
+}
+
+i, em {
+ font-style: normal;
+}
+
+a {
+ text-decoration: none;
+}
+
+.fl {
+ float: left;
+}
+
+.fr {
+ float: right;
+}
+
+.i-container {
+ width: 100%;
+ min-width: 1290px;
+ margin-left: auto;
+ margin-right: auto;
+ overflow: hidden;
+ background: url(../../images/b-bg.jpg) center no-repeat;
+ background-size: 100% 100%;
+}
+
+
+.jmkt-main {
+ overflow: hidden;
+ padding: 0 20px;
+ margin-top: 20px;
+}
+
+
+.mj-item {
+ position: relative;
+ height: 1000px;
+ margin: 15px;
+ overflow: hidden;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ padding: 10px 0;
+}
+
+
+.mj-item1 {
+ background-color: rgba(33, 185, 255,0.1);
+ /*background: url(../../images/wsd-bg1.png) center no-repeat;*/
+ /*background-size: 100% 100%;*/
+}
+
+.mj-item2 {
+ background-color: rgba(33, 185, 255,0.1);
+ /*background: url(../../images/wsd-bg2.png) center no-repeat;*/
+ /*background-size: 100% 100%;*/
+}
+
+.mj-item-img {
+ max-width: 320px;
+ max-height: 320px;
+ width: 80%;
+ position: absolute;
+ z-index: 2;
+ left: 0;
+ bottom: 0;
+}
+
+
+.mj-itemCon {
+ position: absolute;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 5;
+}
+
+.mj-itemCon h4 {
+ line-height: 30px;
+ font-size: 80px;
+ color: #fff;
+ font-weight: bold;
+ padding: 0 25px;
+ text-align: center;
+}
+
+.mj-itemCon h4 span {
+ color: #3edcff;
+ font-size: 24px;
+ font-weight: normal;
+
+}
+
+.mj-itemCon p {
+ line-height: 1;
+ font-size: 210px;
+ margin-top: 10px;
+ color: #3edcff;
+ padding-right: 25px;
+
+ font-weight: bold;
+ font-family: DINCond-Bold;
+ position: absolute;
+ top: 10%;
+ width: 100%;
+ text-align: center;
+}
+
+.mj-itemCon p i {
+ font-size: 120px;
+ font-family: arial;
+ font-weight: normal;
+}
+
+
+
+.wsd-icon .dz {
+ position: absolute;
+ top: 40%;
+ left: 15%;
+ width: 640px;
+ height: 640px;
+ z-index: 2;
+}
+.wsd-icon .icn {
+ position: absolute;
+ top: 38%;
+ left: 32%;
+ width: 360px;
+ height: 360px;
+ z-index: 3;
+ -webkit-animation: bounce-down 8s linear infinite;
+ -moz-animation: bounce-down 8s linear infinite;
+ -o-animation: bounce-down 8s linear infinite;
+ animation: bounce-down 8s linear infinite;
+}
+@keyframes bounce-down {
+ 25% {
+ transform: translateY(-50px)
+ }
+ 100%,
+ 50% {
+ transform: translateY(0)
+ }
+
+ 75% {
+ transform: translateY(50px)
+ }
+}
+
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+
+ .pdgxq-group {
+ overflow: hidden;
+ height: 48px;
+ width: 325px;
+ margin: 22px 20px 0 20px;
+ background-image: url(../../images/jmkt-chuli.png);
+ background-size: 100% 100%;
+ }
+ .jmkt-chuli {
+ padding: 0 7px 0 15px;
+ }
+ .jmkt-yichuli {
+ padding: 0 5px 0 37px;
+ }
+ .pdgxq-group-item {
+ width: 120px;
+ }
+ .lsyg-jkxx-box {
+ margin: 25px 4px 20px 4px;
+ height: 440px;
+ overflow: hidden;
+ position: relative;
+ }
+ .mj-item {
+ margin: 5px;
+ height: 340px;
+ padding: 0px 0px;
+ }
+ .mj-itemCon p {
+ font-size: 60px;
+ }
+ .mj-itemCon p i {
+ font-size: 60px;
+ }
+
+ .pdgxq-m1-left {
+ height: 650px;
+ }
+ .pdgxq-m1-right {
+ height: 460px;
+ }
+ .wsd-icon{
+ margin-top: 0px;
+ }
+
+}
diff --git a/local/www/css/page/detail-wsd.css b/local/www/css/page/detail-wsd.css
index e2ce221..e13f52c 100644
--- a/local/www/css/page/detail-wsd.css
+++ b/local/www/css/page/detail-wsd.css
@@ -54,6 +54,12 @@
.pdgxq-m1-box {
height: 540px;
}
+.pdgxq-m1-left {
+ height: 730px;
+}
+.pdgxq-m1-right {
+ height: 540px;
+}
.pdgxq-m1-box {
background: #2f3740;
@@ -451,4 +457,72 @@
.wsd-icon img {
width: 140px;
height: 140px;
-}
\ No newline at end of file
+}
+
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+
+ .pdgxq-group {
+ overflow: hidden;
+ height: 48px;
+ width: 325px;
+ margin: 22px 20px 0 20px;
+ background-image: url(../../images/jmkt-chuli.png);
+ background-size: 100% 100%;
+ }
+ .jmkt-chuli {
+ padding: 0 7px 0 15px;
+ }
+ .jmkt-yichuli {
+ padding: 0 5px 0 37px;
+ }
+ .pdgxq-group-item {
+ width: 120px;
+ }
+ .lsyg-jkxx-box {
+ margin: 25px 4px 20px 4px;
+ height: 440px;
+ overflow: hidden;
+ position: relative;
+ }
+ .mj-item {
+ margin: 5px;
+ height: 340px;
+ padding: 0px 0px;
+ }
+ .mj-itemCon p {
+ font-size: 60px;
+ }
+ .mj-itemCon p i {
+ font-size: 60px;
+ }
+
+ .pdgxq-m1-left {
+ height: 650px;
+ }
+ .pdgxq-m1-right {
+ height: 460px;
+ }
+ .wsd-icon{
+ margin-top: 0px;
+ }
+
+}
diff --git a/local/www/css/page/detail-yghwls.css b/local/www/css/page/detail-yghwls.css
index b7c6e0d..a44cef4 100644
--- a/local/www/css/page/detail-yghwls.css
+++ b/local/www/css/page/detail-yghwls.css
@@ -47,6 +47,13 @@
.pdgxq-m1-box{
height: 540px;
}
+.pdgxq-m1-left{
+ height: 730px;
+}
+.pdgxq-m1-right{
+ height: 540px;
+}
+
.pdgxq-m1-box{
@@ -385,6 +392,75 @@
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+
+ .pdgxq-group {
+ overflow: hidden;
+ height: 48px;
+ width: 325px;
+ margin: 22px 20px 0 20px;
+ background-image: url(../../images/jmkt-chuli.png);
+ background-size: 100% 100%;
+ }
+ .jmkt-chuli {
+ padding: 0 7px 0 15px;
+ }
+ .jmkt-yichuli {
+ padding: 0 5px 0 37px;
+ }
+ .pdgxq-group-item {
+ width: 120px;
+ }
+ .lsyg-jkxx-box {
+ margin: 25px 4px 20px 4px;
+ height: 440px;
+ overflow: hidden;
+ position: relative;
+ }
+
+
+ .pdgxq-m1-left {
+ height: 650px;
+ }
+ .pdgxq-m1-right {
+ height: 460px;
+ }
+ .table-tbody {
+ height: 420px;
+ overflow-y: scroll;
+ }
+
+ .scroll {
+ height: 360px;
+ overflow-y: scroll;
+ }
+ .lsyq-item {
+ height: 160px;
+ }
+ .lsyq-group {
+ height: 110px;
+ margin-top: 0px;
+ }
+
+}
diff --git a/local/www/css/page/device-common.css b/local/www/css/page/device-common.css
index 8706371..b867710 100644
--- a/local/www/css/page/device-common.css
+++ b/local/www/css/page/device-common.css
@@ -336,3 +336,40 @@
}
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+ .table-tbody {
+ height: 510px;
+ overflow-y: scroll;
+ }
+ .scroll {
+ height: 320px;
+ overflow-y: scroll;
+ }
+ .ff {
+ height: 320px;
+ }
+ .pop-item .layui-input-block {
+ margin-left: 75px;
+ width: 180px;
+ }
+}
+
+
diff --git a/local/www/css/page/login.css b/local/www/css/page/login.css
index f1a47ee..963f9af 100644
--- a/local/www/css/page/login.css
+++ b/local/www/css/page/login.css
@@ -60,6 +60,13 @@
max-width: 90%;
}
+.login-tit p{
+ color:#ffffff;
+ font-size: 60px;
+ padding-top: 30px;
+ letter-spacing: 20px;
+}
+
.login2-ewm{
text-align: right;
@@ -326,7 +333,18 @@
}
-
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .login-tit p{
+ color:#ffffff;
+ font-size: 50px;
+ padding-top: 30px;
+ letter-spacing: 20px;
+ }
+ .login-box {
+ width: 330px;
+ height: 440px;
+ }
+}
diff --git a/local/www/css/page/query-state.css b/local/www/css/page/query-state.css
index 9466a20..ffa9231 100644
--- a/local/www/css/page/query-state.css
+++ b/local/www/css/page/query-state.css
@@ -58,3 +58,28 @@
.layui-tab-content .layui-tab-item{
scrollbar-width: none;
}
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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-tab-content .layui-tab-item {
+ height: 580px;
+ }
+
+
+}
diff --git a/local/www/css/page/record-his.css b/local/www/css/page/record-his.css
index e2062e6..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;
@@ -334,3 +337,126 @@
.popCon .table-tbody {
scrollbar-width: none;
}
+
+
+.table-tbody{
+ height: 540px;
+ overflow-y: scroll;
+}
+/** 闅愯棌鍒楄〃涓嬫媺婊氬姩鏉� **/
+.table-tbody::-webkit-scrollbar {
+ display: none;
+}
+/*IE 10+ ----闅愯棌婊氬姩鏉�*/
+.table-tbody {
+ -ms-overflow-style: none;
+}
+/*Firefox ----闅愯棌婊氬姩鏉�*/
+.table-tbody {
+ scrollbar-width: none;
+}
+
+
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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 {
+ margin-top: 3px;
+ 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;
+ }
+}
+
+@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/single/single.css b/local/www/css/page/single/single.css
index 7a460a2..0967552 100644
--- a/local/www/css/page/single/single.css
+++ b/local/www/css/page/single/single.css
@@ -724,6 +724,22 @@
@media only screen and (max-width:1280px) and (max-height: 800px){
+ .div-body {
+ overflow-y: scroll;
+ }
+ /** 闅愯棌鍒楄〃涓嬫媺婊氬姩鏉� **/
+ .div-body::-webkit-scrollbar {
+ display: none;
+ }
+ /*IE 10+ ----闅愯棌婊氬姩鏉�*/
+ .div-body {
+ -ms-overflow-style: none;
+ }
+ /*Firefox ----闅愯棌婊氬姩鏉�*/
+ .div-body {
+ scrollbar-width: none;
+ }
+
/*鍛婅鐩戞帶*/
#databoardWarnView{width: 100%; height:120px; margin-top: 15px;}
#databoardWarnTrend{width: 100%; height:140px; margin-top: 10px;}
diff --git a/local/www/css/page/state-device.css b/local/www/css/page/state-device.css
index 5b5e8e3..be379f8 100644
--- a/local/www/css/page/state-device.css
+++ b/local/www/css/page/state-device.css
@@ -343,3 +343,29 @@
border: 1px solid rgba(187, 187, 187, 0.3);
color: #ffffff;
}
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 95px;
+ 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;
+ }
+
+ .table-tbody {
+ height: 500px;
+ overflow-y: scroll;
+ }
+
+}
diff --git a/local/www/css/page/sys-network.css b/local/www/css/page/sys-network.css
index 06d099a..ed69007 100644
--- a/local/www/css/page/sys-network.css
+++ b/local/www/css/page/sys-network.css
@@ -135,3 +135,47 @@
border-width: 0;
color: #ffffff;
}
+.lsyg-jkxx-box{
+ margin: 1px 5px 5px 5px;
+ height: 680px;
+}
+.lsyq-item4{
+ height: 360px;
+}
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 95px;
+ 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;
+ }
+
+ .table-tbody {
+ height: 500px;
+ overflow-y: scroll;
+ }
+ .pdgxq-m1, .pdgxq-m1-box {
+ width: 100%;
+ height: 580px;
+ }
+ .lsyg-jkxx-box {
+ margin: 1px 5px 5px 5px;
+ height: 560px;
+ }
+ .lsyq-item4{
+ height: 440px;
+ }
+
+}
diff --git a/local/www/css/page/sys-password.css b/local/www/css/page/sys-password.css
index 72f02f1..142c30c 100644
--- a/local/www/css/page/sys-password.css
+++ b/local/www/css/page/sys-password.css
@@ -115,4 +115,29 @@
height: 34px;
padding: 0;
}
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+ .pdgxq-m1, .pdgxq-m1-box {
+ width: 100%;
+ height: 640px;
+ }
+
+
+}
diff --git a/local/www/css/page/three-img.css b/local/www/css/page/three-img.css
index 0a41077..a1ac179 100644
--- a/local/www/css/page/three-img.css
+++ b/local/www/css/page/three-img.css
@@ -390,4 +390,50 @@
height: 700px;
padding: 0px;
}
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+}
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ #record-info .popCon{
+ height: 500px;
+ padding: 0px;
+ }
+ .i-container {
+ min-width: 1045px;
+ 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;
+ }
+
+ .img-main{
+ height: 450px;
+ text-align: center;
+ }
}
diff --git a/local/www/css/page/warn-list.css b/local/www/css/page/warn-list.css
index 7479332..2090e37 100644
--- a/local/www/css/page/warn-list.css
+++ b/local/www/css/page/warn-list.css
@@ -454,4 +454,121 @@
background: #607182;
}
+.table-tbody{
+ height: 540px;
+ overflow-y: scroll;
+}
+/** 闅愯棌鍒楄〃涓嬫媺婊氬姩鏉� **/
+.table-tbody::-webkit-scrollbar {
+ display: none;
+}
+/*IE 10+ ----闅愯棌婊氬姩鏉�*/
+.table-tbody {
+ -ms-overflow-style: none;
+}
+/*Firefox ----闅愯棌婊氬姩鏉�*/
+.table-tbody {
+ scrollbar-width: none;
+}
+
+
+
+@media only screen and (max-width:1280px) and (max-height: 800px){
+ .i-container {
+ min-width: 1045px;
+ 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 {
+ margin-top: 3px;
+ 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: 380px;
+ overflow-y: scroll;
+ }
+}
+
+@media only screen and (max-width:1080px) and (min-width: 1750px){
+ .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/detail-dcz.html b/local/www/detail-dcz.html
index 55a8c76..2588cf6 100644
--- a/local/www/detail-dcz.html
+++ b/local/www/detail-dcz.html
@@ -18,12 +18,12 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg6 layui-col-md6">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
</div>
diff --git a/local/www/detail-fl.html b/local/www/detail-fl.html
index 56bb908..1b3f6e5 100644
--- a/local/www/detail-fl.html
+++ b/local/www/detail-fl.html
@@ -11,14 +11,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
</div>
@@ -85,90 +85,20 @@
<div class="lsyg-jkxx-box">
<div class="layui-row scroll" id="deviceList">
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>闃查浄</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon5.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">婕忔按</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">婕忔按</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">婕忔按</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-col-lg4 layui-col-md4">
+ <div class="lsyq-item">
+ <h4>闃查浄</h4>
+ <div class="lsyq-group layui-row">
+ <div class="lsyq-icon layui-col-lg6 layui-col-md6">
+ <img src="./images/lsyg-icon5.png"/>
+ </div>
+ <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">
+ <a href="#">閫氳</a>
+ <a href="#">姝ｅ父</a>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div><!--lsyg-jkxx-box end-->
@@ -180,9 +110,9 @@
<h3>璁惧鍩烘湰淇℃伅</h3>
<p>璁惧鍚嶇О锛�<span id="deviceName">娑堥槻璁惧鐩戞帶</span></p>
<p>璁惧鐘舵�侊細<span id="deviceVld">婵�娲�</span></p>
- <p>杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
+ <p style="display: none;">杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
- <div class="pdgxq-phone">
+ <div class="pdgxq-phone" style="display: none;">
<h4>杩愮淮鐢佃瘽</h4>
<p id="opPhone"></p>
</div>
diff --git a/local/www/detail-hw.html b/local/www/detail-hw.html
index 077b09b..8bee9ce 100644
--- a/local/www/detail-hw.html
+++ b/local/www/detail-hw.html
@@ -11,14 +11,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
</div>
@@ -86,90 +86,20 @@
<div class="lsyg-jkxx-box">
<div class="layui-row scroll" id="deviceList">
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>绾㈠</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon3.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>绾㈠</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon3.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>绾㈠</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon3.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>绾㈠</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon3h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">鎶ヨ</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>绾㈠</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon3h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">鎶ヨ</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>绾㈠</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon3h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">鎶ヨ</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-col-lg4 layui-col-md4">
+ <div class="lsyq-item">
+ <h4>绾㈠</h4>
+ <div class="lsyq-group layui-row">
+ <div class="lsyq-icon layui-col-lg6 layui-col-md6">
+ <img src="./images/lsyg-icon3.png"/>
+ </div>
+ <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">
+ <a href="#">閫氳</a>
+ <a href="#">姝ｅ父</a>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div><!--lsyg-jkxx-box end-->
@@ -181,9 +111,9 @@
<h3>璁惧鍩烘湰淇℃伅</h3>
<p>璁惧鍚嶇О锛�<span id="deviceName">绾㈠璁惧鐩戞帶</span></p>
<p>璁惧鐘舵�侊細<span id="deviceVld">婵�娲�</span></p>
- <p>杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
+ <p style="display: none;">杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
- <div class="pdgxq-phone">
+ <div class="pdgxq-phone" style="display: none;">
<h4>杩愮淮鐢佃瘽</h4>
<p id="opPhone"></p>
</div>
diff --git a/local/www/detail-jmkt.html b/local/www/detail-jmkt.html
index e54dc82..be5c207 100644
--- a/local/www/detail-jmkt.html
+++ b/local/www/detail-jmkt.html
@@ -23,14 +23,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
<div id="open" class="jmkt-tit-more" style="display: none;" onclick="sendAction('9',this.id);">
@@ -473,6 +473,23 @@
function renderValue(type,item) {
var result = item.value;
+ // if(type == "2002" || type == "2020" || type == "2022"){
+ // if(item.passcode >= 8 && item.passcode <= 998){
+ // result = (item.value=="0"?"姝ｅ父":"鍛婅");
+ // if(item.passcode == 16){
+ // if(item.value=="0"){
+ // result = "閫侀";
+ // }
+ // if(item.value=="1"){
+ // result = "鍒剁儹";
+ // }
+ // if(item.value=="2"){
+ // result = "鍒跺喎";
+ // }
+ // // result = (item.value=="0"?"鍏抽棴":"寮�鍚�");
+ // }
+ // }
+ // }
var str = "";
if(item.note && item.note.length > 0){
@@ -526,26 +543,36 @@
function sendAction(passcode,valId) {
var passcode = passcode;
var value = $("#"+valId).val();
-
- if(valId == "stop"){
+/*
+ if(valId == "stop")
+ {
passcode = "10";
value = "1";
- }else if(valId == "open"){
+ }else if(valId == "open")
+ {
passcode = "9";
value = "1";
- }else{
- if(passcode == "9"){
- if(value == "-1"){
+ }
+ else
+ {
+ if(passcode == "9")
+ {
+ if(value == "-1")
+ {
layer.msg("寮�-鍏虫満鍛戒护锛氳閫夋嫨瑕佸彂閫佺殑鍛戒护锛�");
return ;
- }else if(value == "0"){
+ }
+ else if(value == "0")
+ {
passcode = "12";
- }else if(value == "1"){
+ }
+ else if(value == "1")
+ {
passcode = "13";
}
}
}
-
+*/
var address = deviceInfo.address;
var param = {"id": id,"address": address,"passcode": passcode,"value":value};
// console.log(param);
@@ -626,7 +653,7 @@
<div class="pop-item pop-item-all">
<div class="layui-form-item" style="text-align: center;">
<button type="button" class="layui-btn layui-btn-normal pop-complete-btn"
- onclick="sendAction('9','runStatus1');" style="width: 20%;font-size: 18px;">纭畾</button>
+ onclick="sendAction('101','runStatus1');" style="width: 20%;font-size: 18px;">纭畾</button>
</div>
</div>
</div><!--pop-group end-->
@@ -680,7 +707,7 @@
<div class="pop-item pop-item-all">
<div class="layui-form-item" style="text-align: center;">
<button type="button" class="layui-btn layui-btn-normal pop-complete-btn"
- onclick="sendAction('11','setTem1');" style="width: 20%;font-size: 18px;">纭畾</button>
+ onclick="sendAction('102','setTem1');" style="width: 20%;font-size: 18px;">纭畾</button>
</div>
</div>
</div><!--pop-group end-->
@@ -734,7 +761,7 @@
<div class="pop-item pop-item-all">
<div class="layui-form-item" style="text-align: center;">
<button type="button" class="layui-btn layui-btn-normal pop-complete-btn"
- onclick="sendAction('13','setHum1');" style="width: 20%;font-size: 18px;">纭畾</button>
+ onclick="sendAction('106','setHum1');" style="width: 20%;font-size: 18px;">纭畾</button>
</div>
</div>
</div><!--pop-group end-->
diff --git a/local/www/detail-ls.html b/local/www/detail-ls.html
index 820d692..fe091b8 100644
--- a/local/www/detail-ls.html
+++ b/local/www/detail-ls.html
@@ -11,14 +11,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
</div>
@@ -85,90 +85,20 @@
<div class="lsyg-jkxx-box">
<div class="layui-row scroll" id="deviceList">
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">婕忔按</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">婕忔按</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">婕忔按</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-col-lg4 layui-col-md4">
+ <div class="lsyq-item">
+ <h4>婕忔按</h4>
+ <div class="lsyq-group layui-row">
+ <div class="lsyq-icon layui-col-lg6 layui-col-md6">
+ <img src="./images/lsyg-icon2.png"/>
+ </div>
+ <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">
+ <a href="#">閫氳</a>
+ <a href="#">姝ｅ父</a>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div><!--lsyg-jkxx-box end-->
@@ -180,7 +110,7 @@
<h3>璁惧鍩烘湰淇℃伅</h3>
<p>璁惧鍚嶇О锛�<span id="deviceName">婕忔按璁惧鐩戞帶</span></p>
<p>璁惧鐘舵�侊細<span id="deviceVld">婵�娲�</span></p>
- <p>杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
+ <p style="display: none">杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
<div class="pdgxq-phone" style="display: none">
<h4>杩愮淮鐢佃瘽</h4>
diff --git a/local/www/detail-mj.html b/local/www/detail-mj.html
index 2a24808..cdf3dac 100644
--- a/local/www/detail-mj.html
+++ b/local/www/detail-mj.html
@@ -12,14 +12,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box">
<div class="pdgxq-H">
<h3><i></i>璁惧鍩烘湰淇℃伅</h3>
</div>
@@ -45,18 +45,18 @@
<div class="layui-col-lg7 layui-col-md7">
- <div class="pdgxq-m1-right pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-right pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>寮�闂ㄨ褰�</h3>
- <div id="open" class="jmkt-tit-more" onclick="sendAction();">
- <button type="button" class="layui-btn layui-btn-normal pop-complete-btn"
- style="background-color: #46b8da;color: #ffffff;">寮�闂�</button>
- </div>
+<!-- <div id="open" class="jmkt-tit-more" onclick="sendAction();">-->
+<!-- <button type="button" class="layui-btn layui-btn-normal pop-complete-btn"-->
+<!-- style="background-color: #46b8da;color: #ffffff;">寮�闂�</button>-->
+<!-- </div>-->
</div>
- <div class="pdgxq-group clearfix" style="">
+ <div class="pdgxq-group clearfix">
<div class="pdgxq-group-item jmkt-chuli">
- <span id="warnState">鍏抽棬</span>鍛婅鐘舵��
+ <span id="warnState">鏃�</span>璀﹀憡鐘舵��
</div>
<div class="pdgxq-group-item jmkt-yichuli">
<span id="conState">姝ｅ父</span>閫氳鐘舵��
@@ -116,8 +116,6 @@
</div><!--pdgxq-m1 end-->
</div>
-
-
</div> <!--i-container end-->
@@ -147,21 +145,21 @@
$("#deviceName").html(device.name);
$("#deviceVld").html(device.vld==0?'婵�娲�':'鍋滅敤');
queryRecord(deviceId);
- setInterval(function () {
- // queryRecord(deviceId);
- queryData(deviceId);
- },5000);
+ //setInterval(function () {
+ // queryRecord(deviceId);
+ // // queryData(deviceId);
+ //},5000);
}
- function queryData(deviceId) {
+ function queryData(deviceId,device) {
console.log("======闂ㄧ椤甸潰-鏌ヨ瀹炴椂======");
var data = {id: deviceId};
$.post("./cgi-bin/detail/query-data", JSON.stringify(data), function (data, status) {
if ("success" == status) {
console.log('---------鑾峰彇鍒扮殑璁惧瀹炴椂鏁版嵁-----' + data);
- renderInfo(data);
+ renderInfo(data,device);
} else {
console.log("鏁版嵁鏌ヨ鍑洪敊锛岃閲嶆柊鎿嶄綔锛�");
window.parent.notify("鏁版嵁鏌ヨ鍑洪敊锛岃閲嶆柊鎿嶄綔锛�");
@@ -170,20 +168,25 @@
};
//寮�濮嬫覆鏌撳疄鏃舵暟鎹�
- function renderInfo(deviceData) {
+ function renderInfo(deviceData, device) {
+ console.log("--------娓叉煋瀹炴椂鏁版嵁-------闂ㄧid="+device.id);
+ console.log(deviceData);
+ //璁惧鍩烘湰淇℃伅
+ $("#deviceName").html(device.name);
+ $("#deviceVld").html(device.vld==0?'婵�娲�':'鍋滅敤');
+
//鐩戞帶灞炴�у疄鏃舵暟鎹覆鏌�
var list = deviceData.value;
if(list !=null && list.length>0){
$.each(list,function(index,item) {
//閫氳鐘舵��
if (item.passcode == 1) {
- $("#conState").html(item.value == 0 ? "姝ｅ父" : "閫氳寮傚父");
- $("#warnState").html(item.value == 0 ? "姝ｅ父" : "閫氳寮傚父");
+ $("#conState").html(item.value == 0 ? "姝ｅ父" : "寮傚父");
}
- // //闂ㄧ鐘舵��
- // if (item.passcode == 4) {
- // $("#warnState").html(item.value == 0 ? "鍏抽棬" : "寮�闂�");
- // }
+ //璀﹀憡鐘舵��
+ if (item.passcode == 2) {
+ $("#warnState").html(item.value == 0 ? "鏃�" : "鎶ヨ");
+ }
});
}
@@ -206,15 +209,6 @@
function queryRecord(id) {
console.log("--------鏌ョ湅闂ㄧ鍘嗗彶璁板綍-------闂ㄧid="+id);
var param = {"id": id};
- // $.post("./cgi-bin/record-his/query", JSON.stringify(param), function (data, status) {
- // if ("success" == status) {
- // //娓叉煋鍘嗗彶鏁版嵁鍒楄〃
- // renderRecordInfo(data);
- // }else {
- // window.parent.notify("闂ㄧ鏁版嵁鏌ヨ鍑洪敊锛岃閲嶆柊鎿嶄綔锛�");
- // }
- // }, "json");
-
$.post("./cgi-bin/record-his/query-by-id", JSON.stringify(param), function (data, status) {
if ("success" == status) {
//娓叉煋鍘嗗彶鏁版嵁鍒楄〃
@@ -226,74 +220,46 @@
}
//寮�濮嬫覆鏌�
function renderRecordInfo(dataList) {
- var li = dataList;
- console.log(li);
- console.log(li.length);
+ console.log(dataList);
+
//闂ㄧ鍘嗗彶鏁版嵁娓叉煋
var html="";
- if(li != null && li.length > 0){
+ if(dataList !=null && dataList.length>0){
var list;
- $.each(li,function(index,item){
- if(item.value){
- list = eval(item.value);
- if(list !=null && list.length>0) {
- var tag1 = ''; //鍗″彿/濮撳悕
- var tag2 = ''; //闂ㄥ彿
- var tag3 = ''; //寮�闂ㄧ被鍨�
- var tag4 = ''; //寮�闂ㄦ椂闂�
- for (var i = 0; i < list.length; i++) {
- var cur = list[i];
- if (cur.passcode == 3) {
- tag2 = cur.value + '鍙烽棬-';
- }
- if (cur.passcode == 5) {
- tag1 = cur.value;
- }
- if (cur.passcode == 6) {
- tag3 = cur.value;
- }
- if (cur.passcode == 7) {
- // tag4 = cur.value.substring(0, 4) + "-" +
- // cur.value.substring(4, 6) + "-" +
- // cur.value.substring(6, 8) + " " +
- // cur.value.substring(8, 10) + ":" +
- // cur.value.substring(10, 12) + ":" +
- // cur.value.substring(12, 14);
- tag4 = cur.value;
- }
+ $.each(dataList,function(index,item){
+ list = eval(item.value);
+ if(list !=null && list.length>0){
+ var tag1 = ''; //鍗″彿/濮撳悕
+ var tag2 = ''; //闂ㄥ彿
+ var tag3 = ''; //寮�闂ㄧ被鍨�
+ var tag4 = ''; //寮�闂ㄦ椂闂�
+ $.each(list,function(index,item){
+ if(item.passcode == 3){
+ tag2 = item.value + '鍙烽棬-';
}
-
- html += "<tr><td>" + tag1 + "</td><td>" + tag2 + tag3 + "</td><td>" + tag4 + "</td></tr>";
- }
+ if(item.passcode == 5){
+ tag1 = item.value;
+ }
+ if(item.passcode == 6){
+ tag3 = item.value;
+ }
+ if(item.passcode == 7){
+ tag4 = item.value.substring(0,4) + "-" +
+ item.value.substring(4,6) + "-" +
+ item.value.substring(6,8) + " " +
+ item.value.substring(8,10) + ":" +
+ item.value.substring(10,12)+ ":" +
+ item.value.substring(12,14);
+ }
+ });
+ html += "<tr><td>"+ tag1 +"</td><td>" + tag2 + tag3 + "</td><td>" + tag4 + "</td></tr>";
}
-
});
}else {
- // html += "<tr><td colspan='3'>鏆傛棤鏁版嵁</td></tr>";
+ html += "<tr><td colspan='3'>鏆傛棤鏁版嵁</td></tr>";
}
$("#listData").html(html);
}
-
-
-
- function sendAction() {
- if (confirm('鏄惁杩涜寮�闂ㄦ搷浣滐紵')){
- var param = {"id": deviceId,"passcode":8,"value":1};
- console.log("======寮�闂ㄦ搷浣滃懡浠ゅ彂閫�======");
- // console.log(JSON.stringify(param));
- // $.post("./cgi-bin/action/open-door", JSON.stringify(param), function (data, status) {
- //
- // }, "json");
- $.ajaxSettings.async = false;
- $.post("./cgi-bin/file/action-control", JSON.stringify(param), function (data, status) {
-
- }, "json");
- window.parent.notify("鍛戒护鍙戦�佹垚鍔燂紒");
- }
- return false;
- }
-
-
</script>
</body>
diff --git a/local/www/detail-pd.html b/local/www/detail-pd.html
index e3492e6..6763ae7 100644
--- a/local/www/detail-pd.html
+++ b/local/www/detail-pd.html
@@ -11,14 +11,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
</div>
@@ -102,32 +102,32 @@
<div class="layui-row">
<div class="layui-col-lg4 layui-col-md4">
<div class="lsyq-item">
- <div id="i-echart1" style="width: 100%; height: 216px;"></div>
+ <div id="i-echart1" style=""></div>
</div>
</div>
<div class="layui-col-lg4 layui-col-md4">
<div class="lsyq-item">
- <div id="i-echart2" style="width: 100%; height: 216px;"></div>
+ <div id="i-echart2" style=""></div>
</div>
</div>
<div class="layui-col-lg4 layui-col-md4">
<div class="lsyq-item">
- <div id="i-echart3" style="width: 100%; height: 216px;"></div>
+ <div id="i-echart3" style=";"></div>
</div>
</div>
<div class="layui-col-lg4 layui-col-md4">
<div class="lsyq-item">
- <div id="i-echart4" style="width: 100%; height: 216px;"></div>
+ <div id="i-echart4" style=""></div>
</div>
</div>
<div class="layui-col-lg4 layui-col-md4">
<div class="lsyq-item">
- <div id="i-echart5" style="width: 100%; height: 216px;"></div>
+ <div id="i-echart5" style=""></div>
</div>
</div>
<div class="layui-col-lg4 layui-col-md4">
<div class="lsyq-item">
- <div id="i-echart6" style="width: 100%; height: 216px;"></div>
+ <div id="i-echart6" style=""></div>
</div>
</div>
</div>
diff --git a/local/www/detail-ty.html b/local/www/detail-ty.html
index 9a77c83..9c6c106 100644
--- a/local/www/detail-ty.html
+++ b/local/www/detail-ty.html
@@ -11,14 +11,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>璁惧鍩烘湰淇℃伅</h3>
</div>
@@ -44,7 +44,7 @@
<div class="layui-col-lg7 layui-col-md7">
- <div class="pdgxq-m1-right pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-right pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
<div id="open" class="jmkt-tit-more kt" style="display: none;" onclick="sendAction(this.id);">
diff --git a/local/www/detail-ups.html b/local/www/detail-ups.html
index 205581f..f33b2a8 100644
--- a/local/www/detail-ups.html
+++ b/local/www/detail-ups.html
@@ -11,14 +11,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
</div>
@@ -203,7 +203,7 @@
}
html += "<tr><td>"+cur.name+"</td><td>"+str+"</td><td>"+time+"</td></tr>";
}else{
- html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.type,cur)+"</td><td>"+time+"</td></tr>";
+ html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.id,device.type,cur.passcode,cur.value)+"</td><td>"+time+"</td></tr>";
//娓叉煋鍒楄〃
@@ -284,7 +284,7 @@
}
html += "<tr><td>"+cur.name+"</td><td>"+str+"</td><td>"+time+"</td></tr>";
}else{
- html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.type,cur)+"</td><td>"+time+"</td></tr>";
+ html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.id,device.type,cur.passcode,cur.value)+"</td><td>"+time+"</td></tr>";
//娓叉煋鍒楄〃
// html += "<tr><td>"+cur.name+"</td><td>"+(cur.value?cur.value:"")+"</td><td>"+time+"</td></tr>";
@@ -357,8 +357,139 @@
}
}
- function renderValue(type,cur) {
- var res = cur.value;
+ function renderValue(id,type,code,value) {
+ var res = value;
+
+ // if(type == "1001"){
+ // if(code == 3 || code == 5){
+ // res = value+"V";
+ // }
+ // else if(code == 4 || code == 6){
+ // res = value+"A";
+ // }
+ // else if(code == 7){
+ // res = value+"Hz";
+ // }
+ // else if(code == 8){
+ // res = value+"%";
+ // }
+ // else if(code == 9){
+ // res = value+"鈩�";
+ // }
+ // else if(code == 10){
+ // if(value == 0){
+ // res = "甯傜數渚涚數"
+ // }
+ // if(value == 1){
+ // res = "鐢垫睜渚涚數"
+ // }
+ // }
+ // else if(code == 11){
+ // if(value == 0){
+ // res = "姝ｅ父"
+ // }
+ // if(value == 1){
+ // res = "鏃佽矾"
+ // }
+ // if(value == 2){
+ // res = "鐢垫睜渚涚數"
+ // }
+ // }
+ // else if(code == 12){
+ // res = value+"V";
+ // }
+ // else if(code == 13){
+ // res = value+"%";
+ // }
+ // else if(code == 14){
+ // res = value+"min";
+ // }
+ // else if(code >= 15 && code < 999){
+ // res = value == "0"?"姝ｅ父":"鍛婅";
+ // }
+ // }
+ //
+ // if(type == "1002"){
+ // if(code >= 3 && code <= 5){
+ // res = value+"V";
+ // }
+ // else if(code >= 6 && code <= 8){
+ // res = value+"A";
+ // }
+ // else if(code >= 9 && code <= 11){
+ // res = value+"V";
+ // }
+ // else if(code >= 12 && code <= 14){
+ // res = value+"A";
+ // }
+ // else if(code == 15){
+ // res = value+"Hz";
+ // }
+ // else if(code >= 16 && code <= 18){
+ // res = value+"%";
+ // }
+ // else if(code == 19){
+ // res = value+"鈩�";
+ // }
+ // else if(code == 20){
+ // if(value == 0){
+ // res = "甯傜數渚涚數"
+ // }
+ // if(value == 1){
+ // res = "鐢垫睜渚涚數"
+ // }
+ // if(value == 2){
+ // res = "涓嶄緵鐢�"
+ // }
+ // if(value == 3){
+ // res = "鑱斿悎渚涚數"
+ // }
+ // if(value == 4){
+ // res = "鏃佽矾渚涚數"
+ // }
+ // }
+ // else if(code == 21){
+ // if(value == 0){
+ // res = "姝ｅ父"
+ // }
+ // if(value == 1){
+ // res = "鏃佽矾"
+ // }
+ // if(value == 2){
+ // res = "鐢垫睜渚涚數"
+ // }
+ // }
+ // else if(code == 22){
+ // res = value+"V";
+ // }
+ // else if(code == 23){
+ // res = value+"%";
+ // }
+ // else if(code == 24){
+ // res = value+"min";
+ // }
+ // else{
+ // if(code >= 25 && code <= 998){
+ // res = value == 0 ? "姝ｅ父" : "鍛婅";
+ // if(value != 0 && value != 1){
+ // res = value;
+ // }
+ //
+ // // if(code >= 25 && code <= 27){
+ // // res = value + "V";
+ // // }
+ // // if(code >= 28 && code <= 30){
+ // // res = value + "KW";
+ // // }
+ // // if(code >= 31 && code <= 35){
+ // // res = value + "Hz";
+ // // }
+ //
+ // }
+ //
+ // }
+ // }
+
var str = "";
if(cur.note && cur.note.length > 0){
diff --git a/local/www/detail-video-pop.html b/local/www/detail-video-pop.html
index 92e8d44..6835caa 100755
--- a/local/www/detail-video-pop.html
+++ b/local/www/detail-video-pop.html
@@ -199,7 +199,7 @@
<script src="./plugins/layui/layui.js"></script>
<script src="./js/constant.js"></script>
<script src="./plugins/EZUIKit/ezuikit.js"></script>
-<script src="./js/page/detail-video-pop-dkkj.js"></script>
+<script src="./js/page/detail-video-pop.js"></script>
</body>
diff --git a/local/www/detail-video.html b/local/www/detail-video.html
index dfad0f5..e4d44d3 100644
--- a/local/www/detail-video.html
+++ b/local/www/detail-video.html
@@ -33,7 +33,7 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
@@ -43,46 +43,65 @@
<div class="pdgxq-H">
<h3><i></i>鐩戞帶淇℃伅</h3>
- <div class="sp-tab-hd">
- <select id="select_type" class="videoType">
- <option value="IN">VLC鍐呯綉鎾斁</option>
- <option value="OUT">VLC澶栫綉鎾斁</option>
- <option value="WEB">Web鐩存挱璁块棶</option>
- </select>
- <span><img src="./images/sp-tabImg2.png"/></span>
- <span class="active"><img src="./images/sp-tabImg1.png"/></span>
- </div>
+<!-- <div class="sp-tab-hd">-->
+<!-- <select id="select_type" class="videoType">-->
+<!-- <option value="IN">VLC鍐呯綉鎾斁</option>-->
+<!-- <option value="OUT">VLC澶栫綉鎾斁</option>-->
+<!-- <option value="WEB">Web鐩存挱璁块棶</option>-->
+<!-- </select>-->
+<!-- <span><img src="./images/sp-tabImg2.png"/></span>-->
+<!-- <span class="active"><img src="./images/sp-tabImg1.png"/></span>-->
+<!-- </div>-->
</div>
<div class="sp-tab-bd">
- <div class="sp-showBox layui-row">
- <div class="layui-col-lg6 layui-col-md6">
+ <div class="sp-showBox layui-row ">
+ <div class="layui-col-lg4 layui-col-md4">
<div id="video1" class="sp-showItem ">
<img src="./images/sp-img.png" class="sp-hideImg"/>
-<!-- <iframe id="myPlayer1" width="100%" height="100%"style="border-radius: 5px;"-->
-<!-- src="http://127.0.0.1:8083/stream/player/鎽勫儚鏈�1" ></iframe>-->
</div>
</div>
- <div class="layui-col-lg6 layui-col-md6">
+ <div class="layui-col-lg4 layui-col-md4">
<div id="video2" class="sp-showItem ">
<img src="./images/sp-img.png" class="sp-hideImg"/>
-<!-- <iframe id="myPlayer2" width="100%" height="100%"style="border-radius: 5px;"-->
-<!-- src="http://127.0.0.1:8083/stream/player/鎽勫儚鏈�2" ></iframe>-->
</div>
</div>
- <div class="layui-col-lg6 layui-col-md6">
+ <div class="layui-col-lg4 layui-col-md4">
<div id="video3" class="sp-showItem ">
<img src="./images/sp-img.png" class="sp-hideImg"/>
-<!-- <iframe id="myPlayer3" width="100%" height="100%"style="border-radius: 5px;"-->
-<!-- src="http://127.0.0.1:8083/stream/player/鎽勫儚鏈�3" ></iframe>-->
</div>
</div>
- <div class="layui-col-lg6 layui-col-md6">
+ <div class="layui-col-lg4 layui-col-md4">
<div id="video4" class="sp-showItem ">
<img src="./images/sp-img.png" class="sp-hideImg"/>
-<!-- <iframe id="myPlayer4" width="100%" height="100%"style="border-radius: 5px;"-->
-<!-- src="http://127.0.0.1:8083/stream/player/鎽勫儚鏈�4" ></iframe>-->
</div>
</div>
+
+ <div class="layui-col-lg4 layui-col-md4">
+ <div id="video5" class="sp-showItem ">
+ <img src="./images/sp-img.png" class="sp-hideImg"/>
+ </div>
+ </div>
+ <div class="layui-col-lg4 layui-col-md4">
+ <div id="video6" class="sp-showItem ">
+ <img src="./images/sp-img.png" class="sp-hideImg"/>
+ </div>
+ </div>
+ <div class="layui-col-lg4 layui-col-md4">
+ <div id="video7" class="sp-showItem ">
+ <img src="./images/sp-img.png" class="sp-hideImg"/>
+ </div>
+ </div>
+ <div class="layui-col-lg4 layui-col-md4">
+ <div id="video8" class="sp-showItem ">
+ <img src="./images/sp-img.png" class="sp-hideImg"/>
+ </div>
+ </div>
+ <div class="layui-col-lg4 layui-col-md4">
+ <div id="video9" class="sp-showItem ">
+ <img src="./images/sp-img.png" class="sp-hideImg"/>
+ </div>
+ </div>
+
</div>
<div class="sp-showBox layui-row show">
@@ -199,7 +218,7 @@
<script src="./plugins/layui/layui.js"></script>
<script src="./js/constant.js"></script>
<script src="./plugins/EZUIKit/ezuikit.js"></script>
-<script src="./js/page/detail-video.js"></script>
+<script src="./js/page/detail-video-dkkj.js"></script>
</body>
diff --git a/local/www/detail-wg.html b/local/www/detail-wg.html
index e3ff7a4..de21cd5 100644
--- a/local/www/detail-wg.html
+++ b/local/www/detail-wg.html
@@ -11,14 +11,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
</div>
@@ -86,90 +86,6 @@
<div class="lsyg-jkxx-box">
<div class="layui-row scroll" id="deviceList">
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>娓╂劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>娓╂劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>娓╂劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>娓╂劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">鎶ヨ</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>娓╂劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">鎶ヨ</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>娓╂劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">鎶ヨ</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
</div>
</div><!--lsyg-jkxx-box end-->
@@ -181,9 +97,9 @@
<h3>璁惧鍩烘湰淇℃伅</h3>
<p>璁惧鍚嶇О锛�<span id="deviceName">娓╂劅璁惧鐩戞帶</span></p>
<p>璁惧鐘舵�侊細<span id="deviceVld">婵�娲�</span></p>
- <p>杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
+ <p style="display: none;">杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
- <div class="pdgxq-phone">
+ <div class="pdgxq-phone" style="display: none;">
<h4>杩愮淮鐢佃瘽</h4>
<p id="opPhone"></p>
</div>
diff --git a/local/www/detail-wsd-single2.html b/local/www/detail-wsd-single2.html
new file mode 100644
index 0000000..4665a17
--- /dev/null
+++ b/local/www/detail-wsd-single2.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="renderer" content="webkit">
+ <title>鏅鸿兘鏈烘埧绠＄悊骞冲彴-娓╂箍搴�</title>
+ <link rel="stylesheet" type="text/css" href="./plugins/layui/css/layui.css"/>
+ <link rel="stylesheet" type="text/css" href="css/page/detail-wsd-single2.css"/>
+ <style>
+
+
+ </style>
+</head>
+
+<body class="pdgxq-body">
+<div class="i-container div-body">
+ <div class="jmkt-main">
+ <div class="layui-fluid">
+ <div class="pdgxq-m1 layui-row layui-col-space20">
+ <div class="layui-col-md6">
+ <div class="mj-item mj-item1">
+
+ <div class="mj-itemCon">
+ <h4><span class="time">2020-10-30 15:30:26</span></h4>
+ <div class="wsd-icon">
+ <img class="icn" src="./images/icon-wendu.png"/>
+ <img class="dz" src="images/wsd-single/dz2.png" alt="">
+ </div>
+ <p><span id="tem">22.1</span><i>鈩�</i></p>
+ </div>
+
+ </div>
+
+ </div><!--pdgxq-m1-left end-->
+
+ <div class="layui-col-md6">
+ <div class="mj-item mj-item2">
+ <div class="mj-itemCon">
+ <h4><span class="time">2020-10-30 15:30:26</span></h4>
+ <div class="wsd-icon">
+ <img class="icn" src="./images/icon-shidu.png"/>
+ <img class="dz" src="images/wsd-single/dz1.png" alt="">
+ </div>
+ <p><span id="hum">36.4</span><i>%</i></p>
+ </div>
+ </div>
+
+ </div><!--pdgxq-m1-left end-->
+
+ </div><!--pdgxq-m1 end-->
+
+ </div>
+
+ </div><!--jmkt-main end-->
+
+</div> <!--i-container end-->
+
+<script src="./js/jquery.min.js"></script>
+
+<script type="text/javascript">
+
+ $(function () {
+ //鑾峰彇URL涓殑鍙傛暟id
+ var deviceId = "1";
+
+ console.log("-----deviceId=" + deviceId);
+
+ if (!deviceId) {
+ console.log("娌℃湁鑾峰彇鍒拌澶嘔D锛屾棤娉曟煡鐪嬬洃鎺т俊鎭�");
+ return false;
+ }
+
+ //鏍规嵁璁惧ID浠庢帴鍙ｄ腑鑾峰彇瀹炴椂鐩戞帶
+ queryData(deviceId);
+ //瀹氭椂鍣紝姣�5绉掓煡璇竴娆★紱鏌ヨ璁惧淇℃伅骞舵覆鏌�
+ setInterval(function () {
+ queryData(deviceId);
+ },2000);
+
+ }).call(this);
+
+
+ function queryData(deviceId) {
+ var data = {id: deviceId};
+ $.post("./cgi-bin/detail/query-data", JSON.stringify(data), function (data, status) {
+ if ("success" == status) {
+ // console.log('---------鑾峰彇鍒扮殑璁惧瀹炴椂鏁版嵁-----' + data);
+ renderInfo(data);
+ } else {
+ console.log("鏁版嵁鏌ヨ鍑洪敊锛岃閲嶆柊鎿嶄綔锛�");
+ }
+ }, "json");
+ };
+
+ //寮�濮嬫覆鏌�
+ function renderInfo(deviceData) {
+
+ //瀹炴椂鏁版嵁
+ var list = deviceData.value;
+ //鏃堕棿鏍煎紡鍖� yyyy-MM-dd hh:mm
+ var time = deviceData.time;
+ time = time.slice(0,4)+"-"+time.slice(4,6)+"-"+time.slice(6,8)+" "+time.slice(8,10)+":"+time.slice(10,12);
+ var cur;
+ for (var i = 1; i <= list.length; i++) {
+ cur = list[i - 1];
+
+ //娓╁害鐘舵��
+ if(cur.passcode == 3){
+ $("#tem").html(cur.value);
+ }
+ //婀垮害鐘舵��
+ if(cur.passcode == 4){
+ $("#hum").html(cur.value);
+ }
+ //鏇存柊鏃堕棿
+ $(".time").html(time);
+ }
+ }
+</script>
+
+<script src="./js/page/detail.js"></script>
+</body>
+</html>
diff --git a/local/www/detail-wsd.html b/local/www/detail-wsd.html
index 7cea34a..783349b 100644
--- a/local/www/detail-wsd.html
+++ b/local/www/detail-wsd.html
@@ -11,12 +11,12 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
</div>
@@ -117,7 +117,7 @@
</div>
<!-- 鍩烘湰淇℃伅 -->
- <div style="padding-top: 20px">
+ <div style="padding-top: 20px;">
<div class="pdgxq-m2-right pdgxq-m2-box">
<h3>璁惧鍩烘湰淇℃伅</h3>
<p>璁惧鍚嶇О锛�<span id="deviceName">娓╂箍搴�1</span></p>
diff --git a/local/www/detail-xf.html b/local/www/detail-xf.html
index 738c342..640b97b 100644
--- a/local/www/detail-xf.html
+++ b/local/www/detail-xf.html
@@ -11,14 +11,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
</div>
@@ -99,76 +99,6 @@
</div>
</div>
</div>
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">婕忔按</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">婕忔按</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>婕忔按</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon2h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">婕忔按</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
</div>
</div><!--lsyg-jkxx-box end-->
@@ -180,9 +110,9 @@
<h3>璁惧鍩烘湰淇℃伅</h3>
<p>璁惧鍚嶇О锛�<span id="deviceName">娑堥槻璁惧鐩戞帶</span></p>
<p>璁惧鐘舵�侊細<span id="deviceVld">婵�娲�</span></p>
- <p>杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
+ <p style="display: none;">杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
- <div class="pdgxq-phone">
+ <div class="pdgxq-phone" style="display: none;">
<h4>杩愮淮鐢佃瘽</h4>
<p id="opPhone"></p>
</div>
diff --git a/local/www/detail-xfj.html b/local/www/detail-xfj.html
index 30eb4e3..0679bac 100644
--- a/local/www/detail-xfj.html
+++ b/local/www/detail-xfj.html
@@ -11,14 +11,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>璁惧鍩烘湰淇℃伅</h3>
</div>
@@ -29,9 +29,9 @@
<p></p>
<p>璁惧鍚嶇О锛�<span id="deviceName">鏈煡璁惧#1</span></p>
<p>璁惧鐘舵�侊細<span id="deviceVld">婵�娲�</span></p>
- <p>杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
+ <p style="display: none">杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
- <div class="pdgxq-phone">
+ <div class="pdgxq-phone" style="display: none">
<h4>杩愮淮鐢佃瘽</h4>
<p id="opPhone"></p>
</div>
@@ -44,7 +44,7 @@
<div class="layui-col-lg7 layui-col-md7">
- <div class="pdgxq-m1-right pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-right pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
<div id="open" class="jmkt-tit-more" onclick="sendAction(this.id);">
diff --git a/local/www/detail-yg.html b/local/www/detail-yg.html
index c9e0f29..22429cc 100644
--- a/local/www/detail-yg.html
+++ b/local/www/detail-yg.html
@@ -11,14 +11,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>瀹炴椂鐩戞帶</h3>
</div>
@@ -86,90 +86,7 @@
<div class="lsyg-jkxx-box">
<div class="layui-row scroll" id="deviceList">
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>鐑熸劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>鐑熸劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>鐑熸劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#">姝ｅ父</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>鐑熸劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">鎶ヨ</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>鐑熸劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">鎶ヨ</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg4 layui-col-md4">-->
-<!-- <div class="lsyq-item">-->
-<!-- <h4>鐑熸劅</h4>-->
-<!-- <div class="lsyq-group layui-row">-->
-<!-- <div class="lsyq-icon layui-col-lg6 layui-col-md6">-->
-<!-- <img src="./images/lsyg-icon1h.png"/>-->
-<!-- </div>-->
-<!-- <div class="lsyq-btnBox layui-col-lg6 layui-col-md6">-->
-<!-- <a href="#">閫氳</a>-->
-<!-- <a href="#" class="active">鎶ヨ</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
+
</div>
</div><!--lsyg-jkxx-box end-->
@@ -181,9 +98,9 @@
<h3>璁惧鍩烘湰淇℃伅</h3>
<p>璁惧鍚嶇О锛�<span id="deviceName">鐑熸劅璁惧鐩戞帶</span></p>
<p>璁惧鐘舵�侊細<span id="deviceVld">婵�娲�</span></p>
- <p>杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
+ <p style="display: none;">杩愮淮鍘傚晢锛�<span id="opVendor"></span></p>
- <div class="pdgxq-phone">
+ <div class="pdgxq-phone" style="display: none;">
<h4>杩愮淮鐢佃瘽</h4>
<p id="opPhone"></p>
</div>
diff --git a/local/www/device-common.html b/local/www/device-common.html
index 22e3289..161ad4f 100644
--- a/local/www/device-common.html
+++ b/local/www/device-common.html
@@ -13,7 +13,7 @@
</head>
<body>
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
@@ -36,7 +36,7 @@
<div class="pdgxq-m1-right pdgxq-m1-box">
<div class="pdgxq-table jmkt-table-wrap">
<i class="i"></i>
- <div style="height: 670px">
+ <div style="">
<div class="table-thead">
<table class="layui-table pdgxq-table1" lay-skin="nob">
<colgroup>
@@ -194,6 +194,14 @@
<option value="6">COM6</option>
<option value="7">COM7</option>
<option value="8">COM8</option>
+ <option value="9">COM9</option>
+ <option value="10">COM10</option>
+ <option value="11">COM11</option>
+ <option value="12">COM12</option>
+ <option value="13">COM13</option>
+ <option value="14">COM14</option>
+ <option value="15">COM15</option>
+ <option value="16">COM16</option>
</select>
</div>
</div>
diff --git a/local/www/device-expand.html b/local/www/device-expand.html
index 8c6e39f..d52b99b 100644
--- a/local/www/device-expand.html
+++ b/local/www/device-expand.html
@@ -218,6 +218,14 @@
<option value="6">COM6</option>
<option value="7">COM7</option>
<option value="8">COM8</option>
+ <option value="9">COM9</option>
+ <option value="10">COM10</option>
+ <option value="11">COM11</option>
+ <option value="12">COM12</option>
+ <option value="13">COM13</option>
+ <option value="14">COM14</option>
+ <option value="15">COM15</option>
+ <option value="16">COM16</option>
</select>
</div>
</div>
diff --git a/local/www/home.html b/local/www/home.html
index 72cfa9f..fc02126 100644
--- a/local/www/home.html
+++ b/local/www/home.html
@@ -22,20 +22,21 @@
background: #e45163;
}
/** 璁剧疆鍒楄〃鍙互涓嬫媺 **/
- body {
+ .div-body {
+ height: 100%;
overflow-y: scroll;
}
/** 闅愯棌鍒楄〃涓嬫媺婊氬姩鏉� **/
- body::-webkit-scrollbar {
+ .div-body::-webkit-scrollbar {
display: none;
}
/*IE 10+ ----闅愯棌婊氬姩鏉�*/
- body {
+ .div-body {
-ms-overflow-style: none;
}
/*Firefox ----闅愯棌婊氬姩鏉�*/
- body {
+ .div-body {
scrollbar-width: none;
}
#data1{
@@ -58,10 +59,27 @@
height: 210px;
}
}
+ @media only screen and (max-width:1280px) and (max-height: 800px){
+ #warnUnDoNum,#deviceManageNum,#day{
+ font-size: 40px;
+ }
+ #data1{
+ height: 300px;
+ }
+ #data2{
+ height: 260px;
+ }
+ #data3{
+ height: 210px;
+ }
+ .pdgxq-table-parent {
+ height: 285px;
+ }
+ }
</style>
</head>
<body class="layui-layout-body" style="overflow:auto;">
-<div style="padding: 15px;">
+<div class="div-body" style="padding: 15px;">
<div class="layui-row workbench-row layui-col-space15">
<div class="layui-col-md3">
<div>
diff --git a/local/www/images/wsd-single/wsd-single/dz1.png b/local/www/images/wsd-single/wsd-single/dz1.png
new file mode 100644
index 0000000..cb0aecb
--- /dev/null
+++ b/local/www/images/wsd-single/wsd-single/dz1.png
Binary files differ
diff --git a/local/www/images/wsd-single/wsd-single/dz2.png b/local/www/images/wsd-single/wsd-single/dz2.png
new file mode 100644
index 0000000..3eeabac
--- /dev/null
+++ b/local/www/images/wsd-single/wsd-single/dz2.png
Binary files differ
diff --git a/local/www/images/wsd-single/wsd-single/icn1.png b/local/www/images/wsd-single/wsd-single/icn1.png
new file mode 100644
index 0000000..a423770
--- /dev/null
+++ b/local/www/images/wsd-single/wsd-single/icn1.png
Binary files differ
diff --git a/local/www/images/wsd-single/wsd-single/icn2.png b/local/www/images/wsd-single/wsd-single/icn2.png
new file mode 100644
index 0000000..5a8de0c
--- /dev/null
+++ b/local/www/images/wsd-single/wsd-single/icn2.png
Binary files differ
diff --git a/local/www/index.html b/local/www/index.html
index 5ad741b..cbfdc9d 100644
--- a/local/www/index.html
+++ b/local/www/index.html
@@ -76,7 +76,7 @@
<a class="J_menuItem" data-id="0" href="record-his.html">鍘嗗彶鏁版嵁</a>
</li>
<li>
- <a class="J_menuItem" data-id="0" style="display: none;" href="three-img.html" id="menu3DVld" >鍏ㄦ櫙瀵艰埅</a>
+ <a class="J_menuItem" data-id="0" href="three-img.html" style="display: none;" id="menu3DVld" >鍏ㄦ櫙瀵艰埅</a>
</li>
</ul>
diff --git a/local/www/js/page/device-common.js b/local/www/js/page/device-common.js
index 01d40ee..2791415 100644
--- a/local/www/js/page/device-common.js
+++ b/local/www/js/page/device-common.js
@@ -28,7 +28,7 @@
//鍒濆鍖栧崗璁簱鍒楄〃
initLibname();
-initDevLibname();
+
$(document).ready(function () {
//娣诲姞鍗忚搴撲笅鎷夌洃鍚�
@@ -561,16 +561,7 @@
});
};
-function initDevLibname() {
- $.get("./cgi-bin/do/find_debug_libname", function (data, status) {
- if (data != null) {
- renderDevLibname(data);
- } else {
- window.parent.notify("绯荤粺鍚庢湡鍗忚搴撳垪琛ㄥけ璐ワ紒");
- }
- }, "json");
-}
function renderDevLibname(list) {
$.each(list, function (index, item) {
diff --git a/local/www/js/page/device-net.js b/local/www/js/page/device-net.js
index c56babc..79a68f1 100644
--- a/local/www/js/page/device-net.js
+++ b/local/www/js/page/device-net.js
@@ -14,7 +14,6 @@
//鍒濆鍖栧崗璁簱鍒楄〃
initLibname();
-initDevLibname();
$(document).ready(function () {
@@ -556,15 +555,7 @@
});
};
-function initDevLibname() {
- $.get("./cgi-bin/do/find_debug_libname", function (data, status) {
- if (data != null) {
- renderDevLibname(data);
- } else {
- window.parent.notify("绯荤粺鍚庢湡鍗忚搴撳垪琛ㄥけ璐ワ紒");
- }
- }, "json");
-}
+
function renderDevLibname(list) {
$.each(list, function (index, item) {
diff --git a/local/www/js/page/index.js b/local/www/js/page/index.js
index fba910a..30510cb 100644
--- a/local/www/js/page/index.js
+++ b/local/www/js/page/index.js
@@ -92,7 +92,7 @@
//绯荤粺鍚嶇О
$("#sys-name").text(window.SYS_SET.name);
// $("#menu3DVld").hide();
- if(window.SYS_SET.menu3DVld == 1){
+ if(window.SYS_SET.menu3DVld == "1"){
$("#menu3DVld").show();
}
if(window.SYS_SET.linkage == "1"){
@@ -152,12 +152,14 @@
parentEle.append("<li><a class='J_menuItem' id='hw' href='detail-hw.html?id=999&type=" + data.type + "'>绾㈠鐩戞帶</a></li>");
}
tag_hw = false;
- } else if ("3008" == data.type) {//娓╂劅
+ }
+ else if ("3008" == data.type) {//娓╂劅
if (tag_wg) {
parentEle.append("<li><a class='J_menuItem' id='wg' href='detail-wg.html?id=999&type=" + data.type + "'>娓╂劅</a></li>");
}
tag_wg = false;
}
+
else if ("3012" == data.type) {//娑堥槻寮�鍏抽噺
if (tag_xf) {
parentEle.append("<li><a class='J_menuItem' id='xf' href='detail-xf.html?id=999&type=" + data.type + "'>娑堥槻</a></li>");
diff --git a/local/www/js/page/record-his.js b/local/www/js/page/record-his.js
index 59066d1..3f2abd9 100644
--- a/local/www/js/page/record-his.js
+++ b/local/www/js/page/record-his.js
@@ -162,7 +162,7 @@
//娓叉煋鍘嗗彶鏁版嵁鍒楄〃
function renderRecordInfo(data) {
-
+ var num = getWHNum();
var div_body_x = false;
var thead = "";
thead += "<tr><th style='width: 100px'>ID</th>";
@@ -172,22 +172,6 @@
var theadData = [];
if (data != null && data.length > 0) {
- // $.each(data, function (index, item) {
- // html += "<tr><td>" + item.id + "</td>";
- // html += "<td>" + item.name + "</td>";
- // html += "<td>" + timeStr(item.time) + "</td>";
- // var tempData = eval(item.value);
- // var temp = '';
- // for (var i = 0; i < tempData.length; i++) {
- // if (i != 0) {
- // temp += "锛�";
- // }
- // temp += tempData[i].name + "=" + tempData[i].value;
- // }
- // html += "</tr>";
- // });
-
-
//鑾峰彇琛ㄥご
$.each(data, function (index, item) {
var tempData = eval(item.value);
@@ -197,12 +181,12 @@
});
// console.log(theadData);
for(var i=0;i<theadData.length;i++){
- if(i >= 5){
+ if(i >= num){
break;
}
thead += "<th style='width: 150px'>"+ theadData[i].name +"</th>";
}
- thead += "<th style='width: 150px'>璇︽儏</th>";
+ thead += "<th style=''>璇︽儏</th>";
thead += "</tr>";
$.each(data, function (index, item) {
@@ -211,7 +195,7 @@
tbody += "<td>" + timeStr(item.time) + "</td>";
var tempData = eval(item.value);
for (var i = 0; i < theadData.length; i++) {
- if(i >= 5){
+ if(i >= num){
break;
}
if(i < tempData.length){
@@ -226,10 +210,10 @@
dataMap[key] = tempData;
});
} else {
- thead += "<th style='width: 150px'>鏁版嵁</th></tr>";
+ thead += "<th style=''>鏁版嵁</th></tr>";
tbody += '<tr><td colspan="4">鏆傛湭鏌ュ埌鏁版嵁</td></tr>';
}
- $("#div-body").attr("style","height: 615px;");
+ // $("#div-body").attr("style","height: 615px;");
$("#thead").html(thead);
$("#recordList").html(tbody);
}
@@ -261,7 +245,6 @@
//瀵煎嚭Excel鐐瑰嚮浜嬩欢
function generateClick(){
- // var tableId = "record-his-list";
var request = {};
request.id = $("#deviceId").val();
if(!request.id)
@@ -365,6 +348,7 @@
}
function getTable(data) {
+
var thead = "";
thead += "<tr><th style='width: 100px'>ID</th>";
thead += "<th style='width: 180px'>璁惧鍚嶇О</th>";
@@ -445,11 +429,14 @@
});
$("#tbody").html(html);
+
+ var paramWH = getWH("detail");
layer.open({
skin: 'mypop',
type: 1,
title: false,
- area: ['40%', '65%'],
+ // area: ['40%', '65%'],
+ area: [paramWH.w, paramWH.h],
closeBtn: 0,
shade: 0,
scrollbar: false,
@@ -464,3 +451,43 @@
+
+function getWH(tag) {
+ var res = {
+ w:"50%",
+ h:"64%"
+ };
+ if(screen.width==1920 && screen.height==1080){
+ res = {w:"80%",h:"64%"};
+ if(tag == "batchHandle"){
+ res = {w:"80%",h:"64%"};
+ }
+ }else if(screen.width==1280 && screen.height==1024){
+ res = {w:"80%",h:"64%"};
+ if(tag == "detail"){
+ res = {w:"80%",h:"95%"};
+ }
+ if(tag == "batchHandle"){
+ res = {w:"80%",h:"64%"};
+ }
+ }else if(screen.width==1280 && screen.height==800){
+ res = {w:"80%",h:"64%"};
+ if(tag == "detail"){
+ res = {w:"80%",h:"95%"};
+ }
+ if(tag == "batchHandle"){
+ res = {w:"80%",h:"64%"};
+ }
+ }
+ return res;
+}
+
+function getWHNum() {
+ var res = 5;
+ if(screen.width==1920){
+ res = 5;
+ }else if(screen.width==1280){
+ res = 1;
+ }
+ return res;
+}
diff --git a/local/www/js/page/sys-set.js b/local/www/js/page/sys-set.js
index 5cc306b..a060d57 100644
--- a/local/www/js/page/sys-set.js
+++ b/local/www/js/page/sys-set.js
@@ -65,7 +65,6 @@
// if(info.menu3DVld){
// sysInfo.menu3DVld = info.menu3DVld;
// }
-
if(info.mainShow){
sysInfo.mainShow = info.mainShow;
}else if(!sysInfo.mainShow){
diff --git a/local/www/js/page/three-img.js b/local/www/js/page/three-img.js
index bd305cb..70852f4 100644
--- a/local/www/js/page/three-img.js
+++ b/local/www/js/page/three-img.js
@@ -20,50 +20,58 @@
var testList = [
{
- "id":"21",
+ "id":"2211",
"name":"娓╂箍搴�#1",
- "category":"2001",
- "type":"0",
- "leftV":"0.4840",
- "topV":"0.2015",
- "value":[{
- "passcode":"3",
- "name":"娓╁害",
- "value":"18"
- },{
- "passcode":"4",
- "name":"婀垮害",
- "value":"60"
- }]
- },{
- "id":"2",
- "name":"娓╂箍搴�#1",
- "category":"2001",
- "type":"0",
- "leftV":"0.4840",
- "topV":"0.2015",
- "value":[{
- "passcode":"3",
- "name":"娓╁害",
- "value":"18"
- },{
- "passcode":"4",
- "name":"婀垮害",
- "value":"60"
- }]
- },{
- "id":"3",
- "name":"绮惧瘑绌鸿皟#1",
"category":"3004",
+ "type":"0",
+ "leftV":"0.4040",
+ "topV":"0.2515",
+ "value":[{
+ "passcode":"2",
+ "name":"娓╁害",
+ "value":"1"
+ },{
+ "passcode":"3",
+ "name":"娓╁害",
+ "value":"18"
+ },{
+ "passcode":"4",
+ "name":"婀垮害",
+ "value":"60"
+ }]
+ },{
+ "id":"2221",
+ "name":"娓╂箍搴�#1",
+ "category":"2002",
+ "type":"0",
+ "leftV":"0.4840",
+ "topV":"0.2015",
+ "value":[{
+ "passcode":"3",
+ "name":"娓╁害",
+ "value":"18"
+ },{
+ "passcode":"4",
+ "name":"婀垮害",
+ "value":"60"
+ }]
+ },{
+ "id":"3331",
+ "name":"绮惧瘑绌鸿皟#1",
+ "category":"2002",
"type":"0",
"leftV":"0.6840",
"topV":"0.5015",
"value":[{
"passcode":"1",
"name":"娓╁害",
- "value":"18"
+ "value":"1"
},{
"passcode":"2",
+ "name":"娓╁害",
+ "value":"1"
+ },{
+ "passcode":"3",
"name":"婀垮害",
"value":"60"
}]
@@ -144,7 +152,9 @@
if(imgData){
$("#img-three").attr('src', imgData);
}
- // $("#img-three").css("height", imgHei);
+ $("#img-three").css("height", imgHei);
+ // $("#img-three").css("width", "100%");
+ $("#img-three").show();
};
//鑾峰彇璁惧鍒楄〃锛屾覆鏌撴樉绀鸿澶囦俊鎭�
@@ -179,74 +189,113 @@
var tagValue;
var category;
var recordMap;
- var warnState;
+ var warnState = 0;
var i;
- console.log("=========鎵�鏈夎澶囦俊鎭�=========");
- console.log(listDevice);
+ var name;
+ var warnStr = " warn-div ";
+ // console.log("=========鎵�鏈夎澶囦俊鎭�=========");
+ // console.log(listDevice);
$.each(listDevice, function (index, device) {
+
i = index;
left = (parentWidth * device.leftV).toFixed(4);
top = (parentHeight * device.topV).toFixed(4);
category = device.category;//璁惧绫诲瀷
id = device.id;//璁惧ID
- if(id && category){
- if(category != CATEGORY.D2090.code && category != CATEGORY.D2091.code){
- recordMap = device.value;//璁惧鐩戞帶灞炴�ч泦鍚�
- warnState = device.type;
- tagValue = addCurData(category, recordMap, warnState,device);
- temp = "";
- if(device.id == thId1 || device.id == thId2){
- if(device.id == thId1){
- thData1 = device;
+ name = device.name;
+
+ if(category != CATEGORY.D3009.code){
+ if(id && category){
+ if(category != CATEGORY.D2090.code && category != CATEGORY.D2091.code){
+ recordMap = device.value;//璁惧鐩戞帶灞炴�ч泦鍚�
+ warnState = device.type;
+ tagValue = addCurData(category, recordMap, warnState,device);
+ warnState = tagValue.warnState;
+ if(warnState == 0){
+ warnStr = "";
}else{
- thData2 = device;
- }
- temp += "<div id='" + device.id
- + "' class='tip arrow_box' style='left:" + left+ "px;top:" + top + "px;display: none;' "
- + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
- temp += "<div class = 'div-c'>";
- temp += "</div>";
- temp += "<div class = 'div-d' style='font-size: 14px;'><p style='margin-bottom: 5px;'><span>闇茬偣娓╁害1</span><span style='margin-left: 10%;'>闇茬偣娓╁害2</span></p>" +
- "<p><span style='margin-left: 1%;background-color: rgba(21, 221, 86, 1);padding: 0% 5%;'>22.2鈩�</span>" +
- "<span style='margin-left: 15%;background-color: rgba(21, 221, 86, 1);padding: 0% 5%;'>22.2鈩�</span></div>";
- temp += "</div>";
-
- }else{
- if ("FULL" == tagValue.code) {
- temp += "<div id='" + device.id
- + "' class='tip arrow_box' style='left:" + left+ "px;top:" + top + "px;' "
- + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
- } else {
- temp += "<div id='" + device.id
- + "' class='tip arrow_min' style='left:" + left + "px;top:" + top + "px;' "
- + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
+ warnStr = " warn-div ";
}
- temp += "<div class = 'div-c'>";
- temp += addCurImg(category);
- temp += "</div>";
- temp += tagValue.htm;
- temp += "</div>";
- }
- // if(category == CATEGORY.D3001.code){
- // console.log("=========闂ㄧ璁惧=========璁惧淇℃伅锛�");
- // console.log(device);
- // }
+ temp = "";
+ if(device.id == thId1 || device.id == thId2){
+ if(device.id == thId1){
+ thData1 = device;
+ }else{
+ thData2 = device;
+ }
+ temp += "<div id='" + device.id
+ + "' class='tip arrow_box "+warnStr+"' style='left:" + left+ "px;top:" + top + "px;display: none;' "
+ + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
+ temp += "<div class = 'div-c'>";
+ temp += "</div>";
+ temp += "<div class = 'div-d' style='font-size: 14px;'><p style='margin-bottom: 5px;'><span>闇茬偣娓╁害1</span><span style='margin-left: 10%;'>闇茬偣娓╁害2</span></p>" +
+ "<p><span style='margin-left: 1%;background-color: rgba(21, 221, 86, 1);padding: 0% 5%;'>22.2鈩�</span>" +
+ "<span style='margin-left: 15%;background-color: rgba(21, 221, 86, 1);padding: 0% 5%;'>22.2鈩�</span></div>";
+ temp += "</div>";
- if(device.id != "1001" && device.id != "1002"){
+ }else{
+ if ("FULL" == tagValue.code) {
+ temp += "<div id='" + device.id
+ + "' class='tip arrow_box "+warnStr+"' style='left:" + left+ "px;top:" + top + "px;' "
+ + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
+ temp += "<div class = 'div-c'>";
+ temp += addCurImg(category,warnState);
+ temp += "</div>";
+ temp += tagValue.htm;
+
+ // temp += "<div class = 'div-d' style='margin-top: -5px;'>";
+ // temp += "<span style='padding: 2px;background-color: #524c4c;color: white;'>";
+ // temp += name;
+ // temp += "</span>";
+ // temp += "</div>";
+
+ temp += "</div>";
+ } else {
+ temp += "<div id='" + device.id
+ + "' class='tip arrow_min "+warnStr+"' style='left:" + left + "px;top:" + top + "px;' "
+ + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
+ temp += "<div class = 'div-c'>";
+ temp += addCurImg(category,warnState);
+ temp += "</div>";
+ temp += tagValue.htm;
+
+ // temp += "<div class = 'div-d' style='margin-top: -10px;'>";
+ // temp += "<span style='padding: 2px;background-color: #524c4c;color: white;'>";
+ // temp += name;
+ // temp += "</span>";
+ // temp += "</div>";
+
+ temp += "</div>";
+ }
+
+ // temp += "<div class = 'div-c'>";
+ // temp += addCurImg(category);
+ // temp += "</div>";
+ // temp += tagValue.htm;
+ // temp += "</div>";
+ }
+ // if(category == CATEGORY.D3001.code){
+ // console.log("=========闂ㄧ璁惧=========璁惧淇℃伅锛�");
+ // console.log(device);
+ // }
+
+ // if(device.id != "1001" && device.id != "1002"){
+ // //鍒犻櫎鍘熸湁鍏冪礌锛屽湪杩涜杩藉姞
+ // $("#"+device.id).remove();
+ // parent.append(temp);
+ //
+ // }
//鍒犻櫎鍘熸湁鍏冪礌锛屽湪杩涜杩藉姞
$("#"+device.id).remove();
parent.append(temp);
-
}
- // //鍒犻櫎鍘熸湁鍏冪礌锛屽湪杩涜杩藉姞
- // $("#"+device.id).remove();
- // parent.append(temp);
+ }else{
+ console.log("=========娌℃湁鑾峰彇鍒拌璁惧鐨勮澶噄d锛堢被鍨嬶級=========璁惧淇℃伅锛�");
+ console.log(device);
}
- }else{
- console.log("=========娌℃湁鑾峰彇鍒拌璁惧鐨勮澶噄d锛堢被鍨嬶級=========璁惧淇℃伅锛�");
- console.log(device);
}
+
});
@@ -308,25 +357,25 @@
name = "娓╂劅";
}
if (category == CATEGORY.D3004.code) {
- // url = "./detail-video.html?id=999&type=" + category;
- // name = "瑙嗛";
- var html = '';
- html += '<iframe class="J_iframe" name="iframe0" width="100%" height="100%" ';
- html += 'src="./detail-video-pop.html?id='+deviceId+'&type='+category+'" ';
- html += ' frameborder="0" data-id="detail-ty-2.html" seamless></iframe>';
- $("#video .popCon").html(html);
- $("#device-name").text(name);
- layer.open({
- skin: 'mypop',
- type: 1,
- title: false,
- area: ['100%', '100%'],
- closeBtn: 0,
- shade: 0,
- scrollbar: false,
- content: $('#video')
- });
- return;
+ url = "./detail-video.html?id=999&type=" + category;
+ name = "瑙嗛";
+ // var html = '';
+ // html += '<iframe class="J_iframe" name="iframe0" width="100%" height="100%" ';
+ // html += 'src="./detail-video-pop.html?id='+deviceId+'&type='+category+'" ';
+ // html += ' frameborder="0" data-id="detail-ty-2.html" seamless></iframe>';
+ // $("#video .popCon").html(html);
+ // $("#device-name").text(name);
+ // layer.open({
+ // skin: 'mypop',
+ // type: 1,
+ // title: false,
+ // area: ['100%', '100%'],
+ // closeBtn: 0,
+ // shade: 0,
+ // scrollbar: false,
+ // content: $('#video')
+ // });
+ // return;
}
// console.log("===================璺宠浆==================");
// console.log("url="+url);
@@ -586,20 +635,22 @@
recordMap[record[i].passcode] = record[i];
}
}
- var result = {code: "FULL", htm: ""};
+ var result = {code: "FULL", htm: "",warnState:0};
var temp = "";
- //娓╂箍搴�-鍙樉绀烘俯搴﹀拰婀垮害
+ // //娓╂箍搴�-鍙樉绀烘俯搴﹀拰婀垮害
if (category == CATEGORY.D2001.code) {
if(recordMap){
if(recordMap[1] && recordMap[1].value == 1){
temp += "<div class = 'div-d font-warn'>";
// temp += "<p><span>"+device.name+"</span></p>";
temp += "<p><span>閫氳寮傚父</span></p>";
+ result.warnState = 1;
}else{
if(recordMap[2] && recordMap[2].value == 1){
temp += "<div class = 'div-d font-warn'>";
// temp += "<p><span>"+device.name+"</span></p>";
// temp += "<p><span>鎶ヨ</span></p>";
+ result.warnState = 1;
}else{
temp += "<div class = 'div-d'>";
// temp += "<p><span>"+device.name+"</span></p>";
@@ -616,6 +667,7 @@
temp += "<div class = 'div-d font-warn'>";
temp += "<p><span>"+device.name+"</span></p>";
temp += "<p><span>閫氳寮傚父</span></p>";
+ result.warnState = 1;
}
temp += "</div>";
result.htm = temp;
@@ -628,108 +680,114 @@
temp += "<div class = 'div-d font-warn'>";
// temp += "<p><span>"+device.name+"</span></p>";
temp += "<p><span>閫氳寮傚父</span></p>";
+ result.warnState = 1;
}else{
if(recordMap[2] && recordMap[2].value == 1){
temp += "<div class = 'div-d font-warn'>";
// temp += "<p><span>"+device.name+"</span></p>";
// temp += "<p><span>鎶ヨ</span></p>";
+ result.warnState = 1;
}else{
temp += "<div class = 'div-d'>";
// temp += "<p><span>"+device.name+"</span></p>";
// temp += "<p><span>姝ｅ父</span></p>";
- }
- if (recordMap[6]) {
- temp += "<p><span>璁惧畾娓╁害锛�" + recordMap[7].value + "鈩�</span></p>";
- }
- if (recordMap[6]) {
- temp += "<p><span>璁惧畾婀垮害锛�" + recordMap[7].value + "%</span></p>";
- }
- }
- }else{
- temp += "<div class = 'div-d font-warn'>";
- temp += "<p><span>"+device.name+"</span></p>";
- temp += "<p><span>閫氳寮傚父</span></p>";
- }
- temp += "</div>";
- result.htm = temp;
- return result;
- }
- //鏅�氱┖璋�
- if (category == CATEGORY.D2003.code) {
- if(recordMap){
- if(recordMap[1] && recordMap[1].value == 1){
- temp += "<div class = 'div-d font-warn'>";
- // temp += "<p><span>"+device.name+"</span></p>";
- temp += "<p><span>閫氳寮傚父</span></p>";
- }else{
- if(recordMap[2] && recordMap[2].value == 1){
- temp += "<div class = 'div-d font-warn'>";
- // temp += "<p><span>"+device.name+"</span></p>";
- // temp += "<p><span>鎶ヨ</span></p>";
- }else{
- temp += "<div class = 'div-d'>";
- // temp += "<p><span>"+device.name+"</span></p>";
- // temp += "<p><span>姝ｅ父</span></p>";
- }
- if (recordMap[3]) {
- temp += "<p><span>璁惧畾娓╁害锛�" + recordMap[3].value + "鈩�</span></p>";
}
if (recordMap[4]) {
- temp += "<p><span>璁惧畾婀垮害锛�" + recordMap[4].value + "%</span></p>";
+ temp += "<p><span>瀹ゅ唴娓╁害锛�" + recordMap[4].value + "鈩�</span></p>";
+ }
+ if (recordMap[5]) {
+ temp += "<p><span>瀹ゅ唴婀垮害锛�" + recordMap[5].value + "%</span></p>";
+ }
+ if (recordMap[6]) {
+ temp += "<p><span>璁惧畾娓╁害" + recordMap[6].value + "鈩�</span></p>";
}
}
}else{
temp += "<div class = 'div-d font-warn'>";
temp += "<p><span>"+device.name+"</span></p>";
temp += "<p><span>閫氳寮傚父</span></p>";
+ result.warnState = 1;
}
temp += "</div>";
result.htm = temp;
return result;
}
- //鐢垫睜
- if (category == CATEGORY.D1005.code) {
- if(recordMap){
- if(recordMap[1] && recordMap[1].value == 1){
- temp += "<div class = 'div-d font-warn'>";
- // temp += "<p><span>"+device.name+"</span></p>";
- temp += "<p><span>閫氳寮傚父</span></p>";
- }else{
- if(recordMap[2] && recordMap[2].value == 1){
- temp += "<div class = 'div-d font-warn'>";
- // temp += "<p><span>"+device.name+"</span></p>";
- // temp += "<p><span>鎶ヨ</span></p>";
- }else{
- temp += "<div class = 'div-d'>";
- // temp += "<p><span>"+device.name+"</span></p>";
- // temp += "<p><span>姝ｅ父</span></p>";
- }
- if (recordMap[125]) {
- temp += "<p><span>鎬� 鐢� 鍘嬶細" + recordMap[125].value + "</span></p>";
- }
- if (recordMap[124]) {
- temp += "<p><span>鎬� 鐢� 娴侊細" + recordMap[124].value + "</span></p>";
- }
- // if (recordMap[3]) {
- // temp += "<p><span>鐢垫睜涓暟锛�" + recordMap[3].value + "</span></p>";
- // }
- // if (recordMap[126]) {
- // temp += "<p><span>鍚庡鏃堕棿锛�" + recordMap[126].value + "</span></p>";
- // }
- }
- }else{
- temp += "<div class = 'div-d font-warn'>";
- temp += "<p><span>"+device.name+"</span></p>";
- temp += "<p><span>閫氳寮傚父</span></p>";
- }
- temp += "</div>";
- // temp += "</marquee>";
- result.htm = temp;
- return result;
- }
+ // //鏅�氱┖璋�
+ // if (category == CATEGORY.D2003.code) {
+ // if(recordMap){
+ // if(recordMap[1] && recordMap[1].value == 1){
+ // temp += "<div class = 'div-d font-warn'>";
+ // // temp += "<p><span>"+device.name+"</span></p>";
+ // temp += "<p><span>閫氳寮傚父</span></p>";
+ // }else{
+ // if(recordMap[2] && recordMap[2].value == 1){
+ // temp += "<div class = 'div-d font-warn'>";
+ // // temp += "<p><span>"+device.name+"</span></p>";
+ // // temp += "<p><span>鎶ヨ</span></p>";
+ // }else{
+ // temp += "<div class = 'div-d'>";
+ // // temp += "<p><span>"+device.name+"</span></p>";
+ // // temp += "<p><span>姝ｅ父</span></p>";
+ // }
+ // if (recordMap[3]) {
+ // temp += "<p><span>璁惧畾娓╁害锛�" + recordMap[3].value + "鈩�</span></p>";
+ // }
+ // if (recordMap[4]) {
+ // temp += "<p><span>璁惧畾婀垮害锛�" + recordMap[4].value + "%</span></p>";
+ // }
+ // }
+ // }else{
+ // temp += "<div class = 'div-d font-warn'>";
+ // temp += "<p><span>"+device.name+"</span></p>";
+ // temp += "<p><span>閫氳寮傚父</span></p>";
+ // }
+ // temp += "</div>";
+ // result.htm = temp;
+ // return result;
+ // }
+ // //鐢垫睜
+ // if (category == CATEGORY.D1005.code) {
+ // if(recordMap){
+ // if(recordMap[1] && recordMap[1].value == 1){
+ // temp += "<div class = 'div-d font-warn'>";
+ // // temp += "<p><span>"+device.name+"</span></p>";
+ // temp += "<p><span>閫氳寮傚父</span></p>";
+ // }else{
+ // if(recordMap[2] && recordMap[2].value == 1){
+ // temp += "<div class = 'div-d font-warn'>";
+ // // temp += "<p><span>"+device.name+"</span></p>";
+ // // temp += "<p><span>鎶ヨ</span></p>";
+ // }else{
+ // temp += "<div class = 'div-d'>";
+ // // temp += "<p><span>"+device.name+"</span></p>";
+ // // temp += "<p><span>姝ｅ父</span></p>";
+ // }
+ // if (recordMap[125]) {
+ // temp += "<p><span>鎬� 鐢� 鍘嬶細" + recordMap[125].value + "</span></p>";
+ // }
+ // if (recordMap[124]) {
+ // temp += "<p><span>鎬� 鐢� 娴侊細" + recordMap[124].value + "</span></p>";
+ // }
+ // // if (recordMap[3]) {
+ // // temp += "<p><span>鐢垫睜涓暟锛�" + recordMap[3].value + "</span></p>";
+ // // }
+ // // if (recordMap[126]) {
+ // // temp += "<p><span>鍚庡鏃堕棿锛�" + recordMap[126].value + "</span></p>";
+ // // }
+ // }
+ // }else{
+ // temp += "<div class = 'div-d font-warn'>";
+ // temp += "<p><span>"+device.name+"</span></p>";
+ // temp += "<p><span>閫氳寮傚父</span></p>";
+ // }
+ // temp += "</div>";
+ // // temp += "</marquee>";
+ // result.htm = temp;
+ // return result;
+ // }
if(category == CATEGORY.D3001.code){
temp += "<div class = 'div-d'>";
- temp += "<p><span>"+device.name+"</span></p>";
+ // temp += "<p><span>"+device.name+"</span></p>";
temp += "</div>";
result.htm = temp;
result.code = "EMPTY";
@@ -752,21 +810,24 @@
temp += "<div class = 'div-d font-warn'>";
// temp += "<p><span>"+device.name+"</span></p>";
temp += "<p><span>閫氳寮傚父</span></p>";
+ result.warnState = 1;
}else{
if(recordMap[2] && recordMap[2].value == 1){
temp += "<div class = 'div-d font-warn'>";
// temp += "<p><span>"+device.name+"</span></p>";
temp += "<p><span>鎶ヨ</span></p>";
+ result.warnState = 1;
}else{
- temp += "<div class = 'div-d'>";
+ temp += "<div class = 'div-d '>";
// temp += "<p><span>"+device.name+"</span></p>";
temp += "<p><span>姝ｅ父</span></p>";
}
}
}else{
temp += "<div class = 'div-d font-warn'>";
- temp += "<p><span>"+device.name+"</span></p>";
+ // temp += "<p><span>"+device.name+"</span></p>";
temp += "<p><span>閫氳寮傚父</span></p>";
+ result.warnState = 1;
}
temp += "</div>";
result.htm = temp;
@@ -778,23 +839,26 @@
if(recordMap){
if(recordMap[1] && recordMap[1].value == 1){
temp += "<div class = 'div-d font-warn'>";
- temp += "<p><span>"+device.name+"</span></p>";
- temp += "<p><span>閫氳寮傚父</span></p>";
+ // temp += "<p><span>"+device.name+"</span></p>";
+ // temp += "<p><span>閫氳寮傚父</span></p>";
+ result.warnState = 1;
}else{
if(recordMap[2] && recordMap[2].value == 1){
temp += "<div class = 'div-d font-warn'>";
- temp += "<p><span>"+device.name+"</span></p>";
- temp += "<p><span>鎶ヨ</span></p>";
+ // temp += "<p><span>"+device.name+"</span></p>";
+ // temp += "<p><span>鎶ヨ</span></p>";
+ result.warnState = 1;
}else{
temp += "<div class = 'div-d'>";
- temp += "<p><span>"+device.name+"</span></p>";
- temp += "<p><span>姝ｅ父</span></p>";
+ // temp += "<p><span>"+device.name+"</span></p>";
+ // temp += "<p><span>姝ｅ父</span></p>";
}
}
}else{
temp += "<div class = 'div-d font-warn'>";
- temp += "<p><span>"+device.name+"</span></p>";
- temp += "<p><span>閫氳寮傚父</span></p>";
+ // temp += "<p><span>"+device.name+"</span></p>";
+ // temp += "<p><span>閫氳寮傚父</span></p>";
+ result.warnState = 1;
}
temp += "</div>";
result.htm = temp;
@@ -808,7 +872,7 @@
* @param category
* @returns {String}
*/
-function addCurImg(category) {
+function addCurImg(category,warnState) {
//娓╂箍搴�
if (category == CATEGORY.D2001.code) {
return "<img src='images/icon-ht@64.png'/>";
@@ -823,10 +887,16 @@
}
//UPS-涓夌浉
if (category == CATEGORY.D1002.code) {
+ if(warnState == 1){
+ return "<img src='images/icon-ups@64.png'/>";
+ }
return "<img src='images/icon-ups@64.png'/>";
}
//UPS-鍗曞悜
if (category == CATEGORY.D1001.code) {
+ if(warnState == 1){
+ return "<img src='images/icon-ups@64.png'/>";
+ }
return "<img src='images/icon-ups@64.png'/>";
}
//闂ㄧ
@@ -836,10 +906,12 @@
//绮惧瘑绌鸿皟
if (category == CATEGORY.D2002.code) {
return "<img src='images/img-kt.png'/>";
+ // return "<img src='images/icon-ups@64.png'/>";
}
//鏅�氱┖璋�
if (category == CATEGORY.D2003.code) {
return "<img src='images/img-kt2.png'/>";
+ // return "<img src='images/icon-ups@64.png'/>";
}
//椋庢満
if (category == CATEGORY.D2004.code) {
diff --git a/local/www/js/page/warn-list.js b/local/www/js/page/warn-list.js
index 957476a..e766fbe 100644
--- a/local/www/js/page/warn-list.js
+++ b/local/www/js/page/warn-list.js
@@ -29,7 +29,7 @@
, trigger: 'click'
, theme: 'custom'
});
-
+ renderPageInfo(2,50);
//娓叉煋鎸夐挳浣嶇疆
renderParamBtn();
@@ -119,7 +119,7 @@
$.each(data, function (index, item) {
// if(item.flag == 0){
- html += '<tr><td><input class="ckeck" name="ckeck" type="checkbox" id="'+item.sn+'"/></td>';
+ html += '<tr>';
// html += '<td>' + (index + 1) + '</td>';
html += '<td>' + item.sn + '</td>';
html += '<td>' + item.name + '</td>';
@@ -172,7 +172,7 @@
"processTime": timeStr1(data.processTime),
"id": data.id
};
- console.log(comData);
+ // console.log(comData);
$.post("./cgi-bin/warn-list/update", JSON.stringify(comData), function (data, status) {
if ("success" == status) {
@@ -205,40 +205,19 @@
"processTime": new Date().Format("yyyy-MM-dd hh:mm:ss")
});
- if(screen.width==1920 && screen.height==1080){
- layer.open({
- skin: 'mypop',
- type: 1,
- title: false,
- area: ['50%', '62%'],
- closeBtn: 0,
- shade: 0,
- scrollbar: false,
- content: $('#editWarnDom')
- });
- }else if(screen.width==1280 && screen.height==1024){
- layer.open({
- skin: 'mypop',
- type: 1,
- title: false,
- area: ['80%', '64%'],
- closeBtn: 0,
- shade: 0,
- scrollbar: false,
- content: $('#editWarnDom')
- });
- }else{
- layer.open({
- skin: 'mypop',
- type: 1,
- title: false,
- area: ['50%', '62%'],
- closeBtn: 0,
- shade: 0,
- scrollbar: false,
- content: $('#editWarnDom')
- });
- }
+ var paramWH = getWH("detail");
+ layer.open({
+ skin: 'mypop',
+ type: 1,
+ title: false,
+ // area: ['50%', '62%'],
+ area: [paramWH.w, paramWH.h],
+ closeBtn: 0,
+ shade: 0,
+ scrollbar: false,
+ content: $('#editWarnDom')
+ });
+
};
@@ -260,11 +239,13 @@
"processTime": new Date().Format("yyyy-MM-dd hh:mm:ss")
});
+ var paramWH = getWH("detail");
layer.open({
skin: 'mypop',
type: 1,
title: false,
- area: ['50%', '62%'],
+ // area: ['50%', '62%'],
+ area: [paramWH.w, paramWH.h],
closeBtn: 0,
shade: 0,
scrollbar: false,
@@ -409,41 +390,18 @@
//鎵瑰鐞�
function batchHandle() {
- console.log("=============鎵瑰鐞�============");
- checkbox_warn = [];
- var b;
- var id= "";
- $('[name=ckeck]:checked').each(function() {
- id= "";
- b = false;
- b = $(this).prop('checked');
- if(b){
- id = $(this).attr('id');
- checkbox_warn.push(warnMap[id]);
- }
- });
- if(checkbox_warn.length <= 0){
- layer.msg("閫夋嫨涓嶈兘涓虹┖锛�");
- return;
- }
- console.log(checkbox_warn);
- for(var i=0;i<checkbox_warn.length;i++){
- if(checkbox_warn[i].flag !=0 ){
- console.log(checkbox_warn[i]);
- console.log("閫変腑鐨勬暟鎹腑瀛樺湪宸茬粡澶勭悊杩囩殑鏁版嵁锛�");
- layer.msg("閫変腑鐨勬暟鎹腑瀛樺湪宸茬粡澶勭悊杩囩殑鏁版嵁锛�");
- return;
- }
- }
+
$("#batch_processTime").attr("readOnly","readOnly");
$("#batch_processTime").val(new Date().Format("yyyy-MM-dd hh:mm:ss"));
+ var paramWH = getWH("batchHandle");
layer.open({
skin: 'mypop',
type: 1,
// title: '璀︽姤淇℃伅',
title: false,
- area: ['50%', '35%'],
+ // area: ['50%', '35%'],
+ area: [paramWH.w, paramWH.h],
closeBtn: 0,
shade: 0,
scrollbar: false,
@@ -458,46 +416,6 @@
//鎵归噺淇敼璀︽姤鐘舵��
function warnUpdateBatch() {
- // //鍚屾杩涜
- // $.ajaxSettings.async = false;
- // var param = {};
- // var note = $("#batch_note").val();
- // var processTime = $("#batch_processTime").val();
- // if(note){
- // if(checkbox_warn && checkbox_warn.length > 0){
- // for(var i=0;i<checkbox_warn.length;i++){
- // param = {};
- // param = {
- // "sn": checkbox_warn[i].sn,
- // "flag": 1,
- // "note": note,
- // "processTime": timeStr1(processTime),
- // "id": checkbox_warn[i].id
- // };
- // $.post("./cgi-bin/warn-list/update-batch", JSON.stringify(param), function (data, status) {
- // if ("success" == status) {
- // //鍏抽棴寮圭獥
- // // closepopBtn();
- // //閲嶆柊鍒锋柊姝ら〉闈㈡暟鎹�
- // // queryWarn();
- // } else {
- // window.parent.notify("澶勭悊澶辫触锛岃閲嶆柊鎿嶄綔锛�");
- // }
- // }, "json");
- // }
- // //鍏抽棴寮圭獥
- // closepopBtn();
- // //閲嶆柊鍒锋柊姝ら〉闈㈡暟鎹�
- // queryWarn();
- // }else{
- // layer.msg("娌℃湁閫変腑鏁版嵁锛岃鍏堥�変腑鏁版嵁锛�");
- // console.log("娌℃湁閫変腑鏁版嵁锛岃鍏堥�変腑鏁版嵁锛�");
- // }
- // }else{
- // layer.msg("澶勭悊璇存槑涓嶈兘涓虹┖锛�");
- // console.log("澶勭悊璇存槑涓嶈兘涓虹┖锛�");
- // }
-
//鍚屾杩涜
$.ajaxSettings.async = false;
@@ -509,7 +427,7 @@
if(note){
param = {
- "sn": sns,
+ // "sn": sns,
"note": note,
"processTime": timeStr1(processTime)
};
@@ -524,38 +442,6 @@
}
}, "json");
- // if(checkbox_warn && checkbox_warn.length > 0){
- // for(var i=0;i<checkbox_warn.length;i++){
- // sns += checkbox_warn[i].sn;
- // ids += checkbox_warn[i].id;
- // if(i < checkbox_warn.length -1){
- // sns += ",";
- // ids += ",";
- // }
- // }
- // param = {
- // "sn": sns,
- // "note": note,
- // "processTime": timeStr1(processTime)
- // };
- // $.post("./cgi-bin/warn-list/update-batch", JSON.stringify(param), function (data, status) {
- // if ("success" == status) {
- // //鍏抽棴寮圭獥
- // closepopBtn();
- // //閲嶆柊鍒锋柊姝ら〉闈㈡暟鎹�
- // queryWarn();
- // } else {
- // window.parent.notify("澶勭悊澶辫触锛岃閲嶆柊鎿嶄綔锛�");
- // }
- // }, "json");
- // // //鍏抽棴寮圭獥
- // // closepopBtn();
- // // //閲嶆柊鍒锋柊姝ら〉闈㈡暟鎹�
- // // queryWarn();
- // }else{
- // layer.msg("娌℃湁閫変腑鏁版嵁锛岃鍏堥�変腑鏁版嵁锛�");
- // console.log("娌℃湁閫変腑鏁版嵁锛岃鍏堥�変腑鏁版嵁锛�");
- // }
}else{
layer.msg("澶勭悊璇存槑涓嶈兘涓虹┖锛�");
console.log("澶勭悊璇存槑涓嶈兘涓虹┖锛�");
@@ -570,6 +456,9 @@
}else if(screen.width==1280 && screen.height==1024){
// $("#param-btn").addClass("layui-col-md4");
$("#param-btn").removeClass("layui-col-md4");
+ }else if(screen.width==1280 && screen.height==800){
+ // $("#param-btn").addClass("layui-col-md4");
+ $("#param-btn").removeClass("layui-col-md4");
}else{
// $("#param-btn").addClass("layui-col-md6");
$("#param-btn").removeClass("layui-col-md6");
@@ -578,4 +467,34 @@
}
+function getWH(tag) {
+ var res = {
+ w:"50%",
+ h:"64%"
+ };
+ if(screen.width==1920 && screen.height==1080){
+ res = {w:"80%",h:"64%"};
+ if(tag == "batchHandle"){
+ res = {w:"80%",h:"64%"};
+ }
+ }else if(screen.width==1280 && screen.height==1024){
+ res = {w:"80%",h:"64%"};
+ if(tag == "detail"){
+ res = {w:"80%",h:"95%"};
+ }
+ if(tag == "batchHandle"){
+ res = {w:"80%",h:"64%"};
+ }
+ }else if(screen.width==1280 && screen.height==800){
+ res = {w:"80%",h:"64%"};
+ if(tag == "detail"){
+ res = {w:"80%",h:"95%"};
+ }
+ if(tag == "batchHandle"){
+ res = {w:"80%",h:"64%"};
+ }
+ }
+ return res;
+}
+
diff --git a/local/www/login.html b/local/www/login.html
index ae89ad9..852d48e 100644
--- a/local/www/login.html
+++ b/local/www/login.html
@@ -25,7 +25,7 @@
<h1 class="login-tit">
<img src="images/login-titimg.png" style="display: none;" />
- <p style="color:#ffffff;font-size: 60px;padding-top: 30px;letter-spacing: 20px;">
+ <p style="">
鏅鸿兘鏁版嵁閲囬泦涓绘満
</p>
</h1>
diff --git a/local/www/query-state.html b/local/www/query-state.html
index a0611bc..785c7a5 100644
--- a/local/www/query-state.html
+++ b/local/www/query-state.html
@@ -29,7 +29,7 @@
</head>
<body>
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-col-space20">
diff --git a/local/www/record-his.html b/local/www/record-his.html
index e15c727..5e838f6 100644
--- a/local/www/record-his.html
+++ b/local/www/record-his.html
@@ -13,7 +13,7 @@
</head>
<body>
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-col-space20">
@@ -76,9 +76,9 @@
<div class="pdgxq-m1-right pdgxq-m1-box">
<div class="pdgxq-table jmkt-table-wrap">
<i class="i"></i>
- <div id="div-body" style="height: 615px;">
+ <div class="div-body" style="">
<table class="layui-table pdgxq-table1" id="record-his-list" lay-skin="nob"
- style="width: 1620px;">
+ style="width: 100%;">
<thead id="thead">
<tr>
<th style="width: 100px;">璁惧ID</th>
@@ -87,23 +87,7 @@
<th style="width: 120px;">鏁版嵁</th>
</tr>
</thead>
- <tbody id="recordList">
-
-<!-- <tr>-->
-<!-- <td>璁惧ID</td>-->
-<!-- <td>1鍙风簿瀵嗙┖璋�</td>-->
-<!-- <td>2021-10-25 10:25:25</td>-->
-<!-- <td>鏁版嵁1</td>-->
-<!-- <td>鏁版嵁2</td>-->
-<!-- <td>鏁版嵁3</td>-->
-<!-- <td>鏁版嵁4</td>-->
-<!-- <td>鏁版嵁5</td>-->
-<!-- <td>鏁版嵁6</td>-->
-<!-- <td>鏁版嵁7</td>-->
-<!-- <td>鏁版嵁8</td>-->
-<!-- <td>鏁版嵁9</td>-->
-<!-- </tr>-->
-
+ <tbody class="table-tbody" id="recordList">
</tbody>
</table>
</div>
@@ -145,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/single.html b/local/www/single.html
index 350a6d8..026d61a 100644
--- a/local/www/single.html
+++ b/local/www/single.html
@@ -42,13 +42,13 @@
</style>
</head>
-<body id="body">
+<body id="body" class="div-body">
<!-- 澶撮儴 -->
<!-- 澶撮儴 -->
<!-- banner -->
<!-- banner -->
<!-- 鍐呭 -->
-<div class="main" style="position: absolute;left: 0px;top: 0px;right: 0px;bottom: 0px;z-index:2;">
+<div class="main " style="position: absolute;left: 0px;top: 0px;right: 0px;bottom: 0px;z-index:2;">
<div class="g-box">
<div class="m-topl">
<!-- <a href="" class="back"><i></i>杩斿洖棣栭〉</a>-->
diff --git a/local/www/state-device.html b/local/www/state-device.html
index 105283e..f0c711f 100644
--- a/local/www/state-device.html
+++ b/local/www/state-device.html
@@ -13,7 +13,7 @@
</head>
<body>
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
@@ -21,7 +21,7 @@
<div class="pdgxq-m1-right pdgxq-m1-box">
<div class="pdgxq-table jmkt-table-wrap">
<i class="i"></i>
- <div style="height: 640px">
+ <div style="">
<div class="table-thead">
<table class="layui-table pdgxq-table1" lay-skin="nob">
<colgroup>
diff --git a/local/www/state-network.html b/local/www/state-network.html
index 3867b61..d2feca3 100644
--- a/local/www/state-network.html
+++ b/local/www/state-network.html
@@ -14,15 +14,12 @@
.jmkt-main{
margin-top: 10px;
}
- .lsyg-jkxx-box{
- margin: 1px 5px 5px 5px;
- height: 680px;
- }
+
</style>
</head>
<body>
<!-- <h2>涓存椂椤甸潰</h2>-->
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
@@ -169,7 +166,7 @@
</div>
</div>
<div class="layui-col-lg6 layui-col-md6">
- <div class="lsyq-item" style="height: 360px;">
+ <div class="lsyq-item lsyq-item4" style="">
<div id="i-form4" style="width: 100%;">
<form class="layui-form" id="4g" lay-filter="4g" action="">
<div class="pdgxq-H">
diff --git a/local/www/state-platform.html b/local/www/state-platform.html
index 2132a85..a3314b8 100644
--- a/local/www/state-platform.html
+++ b/local/www/state-platform.html
@@ -13,7 +13,7 @@
</head>
<body>
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
@@ -21,7 +21,7 @@
<div class="pdgxq-m1-right pdgxq-m1-box">
<div class="pdgxq-table jmkt-table-wrap">
<i class="i"></i>
- <div style="height: 640px">
+ <div style="">
<div class="table-thead">
<table class="layui-table pdgxq-table1" lay-skin="nob">
<colgroup>
diff --git a/local/www/sys-debug.html b/local/www/sys-debug.html
index 8ecee95..c023d8c 100644
--- a/local/www/sys-debug.html
+++ b/local/www/sys-debug.html
@@ -95,6 +95,14 @@
<option value="6">COM6</option>
<option value="7">COM7</option>
<option value="8">COM8</option>
+ <option value="9">COM9</option>
+ <option value="10">COM10</option>
+ <option value="11">COM11</option>
+ <option value="12">COM12</option>
+ <option value="13">COM13</option>
+ <option value="14">COM14</option>
+ <option value="15">COM15</option>
+ <option value="16">COM16</option>
</select>
</div>
</div>
@@ -216,6 +224,14 @@
<option value="6">COM6</option>
<option value="7">COM7</option>
<option value="8">COM8</option>
+ <option value="9">COM9</option>
+ <option value="10">COM10</option>
+ <option value="11">COM11</option>
+ <option value="12">COM12</option>
+ <option value="13">COM13</option>
+ <option value="14">COM14</option>
+ <option value="15">COM15</option>
+ <option value="16">COM16</option>
</select>
</div>
</div>
@@ -337,6 +353,14 @@
<option value="6">COM6</option>
<option value="7">COM7</option>
<option value="8">COM8</option>
+ <option value="9">COM9</option>
+ <option value="10">COM10</option>
+ <option value="11">COM11</option>
+ <option value="12">COM12</option>
+ <option value="13">COM13</option>
+ <option value="14">COM14</option>
+ <option value="15">COM15</option>
+ <option value="16">COM16</option>
</select>
</div>
</div>
diff --git a/local/www/sys-password.html b/local/www/sys-password.html
index 1424776..408ae75 100644
--- a/local/www/sys-password.html
+++ b/local/www/sys-password.html
@@ -14,7 +14,7 @@
<body>
<!-- <h2>涓存椂椤甸潰</h2>-->
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
diff --git a/local/www/three-img.html b/local/www/three-img.html
index 42de31b..eb9b278 100644
--- a/local/www/three-img.html
+++ b/local/www/three-img.html
@@ -14,28 +14,30 @@
.arrow_box {
position: absolute;
background: #88b7d5;
- border: 1px solid #c2e1f5;
+ /*background: #fff;*/
+ /*opacity: 0.8;*/
+ border: 0px solid #c2e1f5;
padding: 2px;
- width: 150px;
- height: 45px;
- border-radius: 6px;
+ /*width: 140px;*/
+ height: 30px;
+ border-radius: 3px;
}
.arrow_box_1 {
position: absolute;
- background: rgba(12, 70, 118, 1);
- border: 1px solid rgba(22, 146, 220, 1);
+ background: rgba(255,255,255, 0);
+ border: 1px solid rgba(255,255,255, 0);
padding: 2px;
- width: 150px;
- height: 45px;
- border-radius: 6px;
+ /*width: 160px;*/
+ height: 40px;
+ border-radius: 3px;
}
.arrow_min{
width: 80px;
- height: 45px;
+ height: 40px;
border-radius: 6px;
position: absolute;
-/* background: #88b7d5; */
+ /* background: #88b7d5; */
}
.arrow_box:after, .arrow_box:before {
@@ -51,50 +53,59 @@
.arrow_box:after {
border-color: rgba(136, 183, 213, 0);
- border-top-color: #88b7d5;
+ border-top-color: #fff;
+ opacity: 0;
border-width: 18px;
margin-left: -18px;
}
.arrow_box:before {
border-color: rgba(194, 225, 245, 0);
- border-top-color: #c2e1f5;
+ border-top-color: #fff;
+ opacity: 0;
border-width: 19px;
margin-left: -19px;
}
-
+
.tip{
cursor: pointer;
}
-
+
.tip img {
- height: 44px;
- width: 44px;
+ height: 22px;
+ width: 22px;
}
.div-c {
- /*float: left;*/
- height: 43px;
+ /*display: none;*/
+ float: left;
+ height: 38px;
}
.div-d2 {
text-align: left;
- height: 43px;
+ height: 38px;
/*color: #FFF;*/
- color: #FFF;
- font-size: 14px;
+ color: #000;
+ font-size: 12px;
line-height: 20px;
}
.div-d {
- text-align: left;
- height: 43px;
- color: rgb(255,128,64);
- font-size: 12px;
- line-height: 18px;
+ float: left;
+ text-align: center;
+ height: 40px;
+ color: #000;
+ /*color: #FFF;*/
+ font-size: 8px;
+ line-height: 10px;
+ font-weight: bold;
+ }
+ .arrow_min .div-d {
+ color: #000cff;
}
.font-warn{
- color: #FF5722 !important;
+ color: #ff0000 !important;
}
.div-temp {
text-align: left;
@@ -134,15 +145,18 @@
color: #FFF;
}
.div-d p{
- /*width: 200px;*/
- width: 80px;
+ /*width: 200px;*/
+ /* width: 80px;*/
/*white-space:nowrap;*/
+ }
+ @media only screen and (max-width:1280px) and (max-height: 800px){
+
}
</style>
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
diff --git a/local/www/warn-list.html b/local/www/warn-list.html
index 1dfe7a3..36e6a98 100644
--- a/local/www/warn-list.html
+++ b/local/www/warn-list.html
@@ -14,7 +14,7 @@
</head>
<body>
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
@@ -56,7 +56,7 @@
</div>
</div>
</div>
- <div class="layui-col-md4 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"
@@ -79,10 +79,9 @@
<div class="pdgxq-m1-right pdgxq-m1-box">
<div class="pdgxq-table jmkt-table-wrap">
<i class="i"></i>
- <div style="height: 555px">
+ <div class="table-thead">
<table class="layui-table pdgxq-table1" id="warn-list" lay-skin="nob">
<colgroup>
- <col width="2%">
<col width="5%">
<col width="15%">
<col width="10%">
@@ -93,8 +92,7 @@
</colgroup>
<thead>
<tr>
- <th onclick="allCheckbox();"><input id="all" type="checkbox"/></th>
- <th>搴忓彿</th>
+ <th></th>
<th>璁惧鍚嶇О</th>
<th>璁惧ID</th>
<th>璀﹀憡鏃堕棿</th>
@@ -103,26 +101,22 @@
<th>鎿嶄綔</th>
</tr>
</thead>
+ </table>
+ </div>
+ <div class="table-tbody">
+ <table class="layui-table pdgxq-table1" lay-skin="nob">
+ <colgroup>
+ <col width="5%">
+ <col width="15%">
+ <col width="10%">
+ <col width="15%">
+ <col width="10%">
+ <col>
+ <col width="16%">
+ </colgroup>
<tbody id="warnList">
- <tr>
+<!-- <tr>-->
<!-- <td>1</td>-->
- <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>2</td>-->
<!-- <td>璁惧1</td>-->
<!-- <td>10010001</td>-->
<!-- <td>2021-02-18 16:46:46</td>-->
@@ -133,12 +127,12 @@
<!-- class="layui-btn layui-btn-normal" lay-event="edit">澶勭悊-->
<!-- </button>-->
<!-- <button style="height: 29px;line-height: 29px;"-->
-<!-- class="layui-btn layui-btn-normal" lay-event="detail">鏌ョ湅-->
+<!-- class="layui-btn layui-btn-normal" onclick="warnTodo()" lay-event="detail">鏌ョ湅-->
<!-- </button>-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr>-->
-<!-- <td>3</td>-->
+<!-- <td>1</td>-->
<!-- <td>璁惧1</td>-->
<!-- <td>10010001</td>-->
<!-- <td>2021-02-18 16:46:46</td>-->
@@ -149,126 +143,17 @@
<!-- class="layui-btn layui-btn-normal" lay-event="edit">澶勭悊-->
<!-- </button>-->
<!-- <button style="height: 29px;line-height: 29px;"-->
-<!-- class="layui-btn layui-btn-normal" lay-event="detail">鏌ョ湅-->
-<!-- </button>-->
-<!-- </td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td>4</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" lay-event="detail">鏌ョ湅-->
-<!-- </button>-->
-<!-- </td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td>5</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" lay-event="detail">鏌ョ湅-->
-<!-- </button>-->
-<!-- </td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td>6</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" lay-event="detail">鏌ョ湅-->
-<!-- </button>-->
-<!-- </td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td>7</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" lay-event="detail">鏌ョ湅-->
-<!-- </button>-->
-<!-- </td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td>8</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" lay-event="detail">鏌ョ湅-->
-<!-- </button>-->
-<!-- </td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td>9</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" lay-event="detail">鏌ョ湅-->
-<!-- </button>-->
-<!-- </td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td>10</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" lay-event="detail">鏌ョ湅-->
+<!-- class="layui-btn layui-btn-normal" onclick="warnTodo()" lay-event="detail">鏌ョ湅-->
<!-- </button>-->
<!-- </td>-->
<!-- </tr>-->
+
</tbody>
</table>
</div>
+
+ </div>
<div class="pdgxq-pagebox">
<div id="pdgxq-page"></div>
</div>
diff --git a/upgrade/app.tgz b/upgrade/app.tgz
index d4eed89..1afc98a 100644
--- a/upgrade/app.tgz
+++ b/upgrade/app.tgz
Binary files differ
--
Gitblit v1.9.3