diff --git a/css/operEnvironment/operEnvironment.css b/css/operEnvironment/operEnvironment.css index e9292f3..2dcde0b 100644 --- a/css/operEnvironment/operEnvironment.css +++ b/css/operEnvironment/operEnvironment.css @@ -330,43 +330,68 @@ th { height: 60%; } -.monitor-data:nth-child(1) .monitor-icon { +.left-under .layout .monitor-data.wd .monitor-icon { background: url("../../img/index/wd.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; background-size: initial; - } -.monitor-data:nth-child(2) .monitor-icon { +.left-under .layout .monitor-data.sd .monitor-icon { background: url("../../img/index/sd.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; background-size: initial; } -.monitor-data:nth-child(3) .monitor-icon { +.left-under .layout .monitor-data.zs .monitor-icon { background: url("../../img/index/zs.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; background-size: initial; } -.monitor-data:nth-child(4) .monitor-icon { +.left-under .layout .monitor-data.gz .monitor-icon { background: url("../../img/index/gz.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; background-size: initial; } -.monitor-data:nth-child(5) .monitor-icon { +.left-under .layout .monitor-data.pm2 .monitor-icon { background: url("../../img/index/pm2.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; background-size: initial; } -.monitor-data:nth-child(6) .monitor-icon { +.left-under .layout .monitor-data.pm10 .monitor-icon { background: url("../../img/index/pm10.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; background-size: initial; } + +.left-under .layout .monitor-data.ryht .monitor-icon { + background: url("../../img/operEnvironment/eyht.png") no-repeat 0 0 / 100% 100%; + background-position: center center !important; + background-size: initial; +} + +.left-under .layout .monitor-data.krqt .monitor-icon { + background: url("../../img/operEnvironment/krqt.png") no-repeat 0 0 / 100% 100%; + background-position: center center !important; + background-size: initial; +} + +.left-under .layout .monitor-data.hyl .monitor-icon { + background: url("../../img/operEnvironment/hyl.png") no-repeat 0 0 / 100% 100%; + background-position: center center !important; + background-size: initial; +} + +.left-under .layout .monitor-data.lhq .monitor-icon { + background: url("../../img/operEnvironment/lhq.png") no-repeat 0 0 / 100% 100%; + background-position: center center !important; + background-size: initial; +} + + .environment{ overflow: auto; width: 100%; diff --git a/css/personnelControl/personnelControl.css b/css/personnelControl/personnelControl.css index c6e9fd6..1551c81 100644 --- a/css/personnelControl/personnelControl.css +++ b/css/personnelControl/personnelControl.css @@ -282,7 +282,7 @@ ul li { } .drawing-panel { position: fixed; - bottom: 41.5rem; + bottom: 44.5rem; margin-left: -49rem; padding: 1rem 1rem; border-radius: .25rem; diff --git a/css/personnelControl/personnelControlList.css b/css/personnelControl/personnelControlList.css index a1bdfd2..f89ca00 100644 --- a/css/personnelControl/personnelControlList.css +++ b/css/personnelControl/personnelControlList.css @@ -113,7 +113,7 @@ th { .background-img{ width: 100%; height: 100%; - padding: 9% 2% 2% 2%; + padding: 5% 2% 2% 2%; box-sizing: border-box; background-position: center center !important; flex-direction: column; diff --git a/img/operEnvironment/eyht.png b/img/operEnvironment/eyht.png new file mode 100644 index 0000000..1a90760 Binary files /dev/null and b/img/operEnvironment/eyht.png differ diff --git a/img/operEnvironment/hyl.png b/img/operEnvironment/hyl.png new file mode 100644 index 0000000..d9526d9 Binary files /dev/null and b/img/operEnvironment/hyl.png differ diff --git a/img/operEnvironment/krqt.png b/img/operEnvironment/krqt.png new file mode 100644 index 0000000..e4c6ad4 Binary files /dev/null and b/img/operEnvironment/krqt.png differ diff --git a/img/operEnvironment/lhq.png b/img/operEnvironment/lhq.png new file mode 100644 index 0000000..fece68f Binary files /dev/null and b/img/operEnvironment/lhq.png differ diff --git a/img/personnelControl/electronicFence.png b/img/personnelControl/electronicFence.png new file mode 100644 index 0000000..bdcea68 Binary files /dev/null and b/img/personnelControl/electronicFence.png differ diff --git a/js/consQuality/consQualityList.js b/js/consQuality/consQualityList.js index e9e68dd..4c9598b 100644 --- a/js/consQuality/consQualityList.js +++ b/js/consQuality/consQualityList.js @@ -9,8 +9,6 @@ layui.use(['layer', 'element', 'table'], function () { laydate = layui.laydate; table = layui.table; - $('#ID-laydate-type-datetime').val(getNowDay()); - //下拉选 getConstruction(); getRegion(); diff --git a/pages/consQuality/consQualityList.html b/pages/consQuality/consQualityList.html index b7bacd4..15b561a 100644 --- a/pages/consQuality/consQualityList.html +++ b/pages/consQuality/consQualityList.html @@ -27,7 +27,7 @@
- +
diff --git a/pages/operEnvironment/operEnvironment.html b/pages/operEnvironment/operEnvironment.html index 87bd7eb..e80f6e7 100644 --- a/pages/operEnvironment/operEnvironment.html +++ b/pages/operEnvironment/operEnvironment.html @@ -76,35 +76,35 @@
异常
-
-

45

+
+

0

温度

-
-

45%

+
+

0%

湿度

-
-

45分贝

+
+

0分贝

噪声

-
-

45kwh

+
+

0kwh

光照

-
-

45μg/m³

+
+

0μg/m³

PM2.5

-
-

45μg/m³

+
+

0μg/m³

PM10

@@ -132,22 +132,22 @@
-
+

0

二氧化碳

-
+

0%

可燃气体

-
+

0分贝

含氧量

-
+

0分贝

硫化氢

@@ -163,17 +163,17 @@
-
+

45

温度

-
+

45%

湿度

-
+

45分贝

噪声

diff --git a/pages/personnelControl/personnelControl.html b/pages/personnelControl/personnelControl.html index dc384a2..7cfbb51 100644 --- a/pages/personnelControl/personnelControl.html +++ b/pages/personnelControl/personnelControl.html @@ -53,7 +53,7 @@
-
+
  • 电子围栏
  • diff --git a/pages/personnelControl/personnelControlList.html b/pages/personnelControl/personnelControlList.html index f7021ca..6af26ce 100644 --- a/pages/personnelControl/personnelControlList.html +++ b/pages/personnelControl/personnelControlList.html @@ -22,7 +22,7 @@
    -
    +