From a9eef1a6f332b8a86a0540a3c7318c0f430ede4f Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 19 Apr 2024 15:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9-=E7=BB=84?=
=?UTF-8?q?=E5=A1=94=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
css/consQuality/consQuality.css | 24 +++++++++----------
css/coreTable.css | 22 ++++++++---------
css/operEnvironment/operEnvironment.css | 22 ++++++++---------
css/personnelControl/personnelControl.css | 24 +++++++++----------
css/personnelControl/personnelControlList.css | 24 +++++++++----------
css/towerAssInspect/towerAssInspect.css | 12 +++++-----
js/consQuality/consQuality.js | 3 ++-
js/operEnvironment/operEnvironment.js | 2 ++
js/pages/towerAssInspect/towerAssInspect.js | 24 +++++++++++++------
pages/3Dglb/lib/3dmodel.js | 5 ++--
pages/towerAssInspect/towerAssInspect.html | 2 +-
11 files changed, 89 insertions(+), 75 deletions(-)
diff --git a/css/consQuality/consQuality.css b/css/consQuality/consQuality.css
index e20ee49..cf0743c 100644
--- a/css/consQuality/consQuality.css
+++ b/css/consQuality/consQuality.css
@@ -47,7 +47,7 @@ body {
/* 表格头部背景色 */
th {
- background-color: #184B49; /* MediumSeaGreen */
+ background-color: #278178; /* MediumSeaGreen */
color: #fff;
font-weight: bold
}
@@ -58,39 +58,39 @@ th {
}
.layui-laypage .layui-laypage-curr .layui-laypage-em {
- background-color: #184B49;
+ background-color: #278178;
}
.layui-laypage a:hover {
- color: #184B49;
+ color: #278178;
}
.layui-laypage .layui-laypage-skip {
- color: #16534c;
+ color: #3ACAB8;
}
.layui-laypage-count{
- color:#184B49;
+ color:#278178;
}
.layui-laypage button, .layui-laypage input {
background-color: transparent;
- border: #184B49 1px solid;
- color: #184B49;
+ border: #278178 1px solid;
+ color: #278178;
}
.layui-table-view select[lay-ignore] {
background-color: transparent;
- border: #184B49 1px solid;
- color: #184B49;
+ border: #278178 1px solid;
+ color: #278178;
}
.layui-table-page .layui-laypage span {
- color: #184B49;
+ color: #278178;
}
.layui-table-page .layui-laypage a, .layui-table-page .layui-laypage span.layui-laypage-curr {
- color: #184B49;
+ color: #278178;
}
/**公共类**/
@@ -176,7 +176,7 @@ th {
.button-style{
color: #298B83;
- border: #184B49 1px solid;
+ border: #278178 1px solid;
padding: 4px 9px;
margin-left: 10px;
cursor: pointer;
diff --git a/css/coreTable.css b/css/coreTable.css
index 17041c2..0f7e860 100644
--- a/css/coreTable.css
+++ b/css/coreTable.css
@@ -21,7 +21,7 @@
/* 表格头部背景色 */
th {
- background-color: #184B49; /* MediumSeaGreen */
+ background-color: #3ACAB8; /* MediumSeaGreen */
color: #fff;
font-weight: bold
}
@@ -32,39 +32,39 @@ th {
}
.layui-laypage .layui-laypage-curr .layui-laypage-em {
- background-color: #184B49;
+ background-color: #3ACAB8;
}
.layui-laypage a:hover {
- color: #184B49;
+ color: #3ACAB8;
}
.layui-laypage .layui-laypage-skip {
- color: #16534c;
+ color: #3ACAB8;
}
.layui-laypage-count{
- color:#184B49;
+ color:#3ACAB8;
}
.layui-laypage button, .layui-laypage input {
background-color: transparent;
- border: #184B49 1px solid;
- color: #184B49;
+ border: #3ACAB8 1px solid;
+ color: #3ACAB8;
}
.layui-table-view select[lay-ignore] {
background-color: transparent;
- border: #184B49 1px solid;
- color: #184B49;
+ border: #3ACAB8 1px solid;
+ color: #3ACAB8;
}
.layui-table-page .layui-laypage span {
- color: #184B49;
+ color: #3ACAB8;
}
.layui-table-page .layui-laypage a, .layui-table-page .layui-laypage span.layui-laypage-curr {
- color: #184B49;
+ color: #3ACAB8;
}
.layout-vertical{
diff --git a/css/operEnvironment/operEnvironment.css b/css/operEnvironment/operEnvironment.css
index 2dcde0b..189e1d5 100644
--- a/css/operEnvironment/operEnvironment.css
+++ b/css/operEnvironment/operEnvironment.css
@@ -47,7 +47,7 @@ body {
/* 表格头部背景色 */
th {
- background-color: #184B49; /* MediumSeaGreen */
+ background-color: #278178; /* MediumSeaGreen */
color: #fff;
font-weight: bold
}
@@ -58,39 +58,39 @@ th {
}
.layui-laypage .layui-laypage-curr .layui-laypage-em {
- background-color: #184B49;
+ background-color: #278178;
}
.layui-laypage a:hover {
- color: #184B49;
+ color: #278178;
}
.layui-laypage .layui-laypage-skip {
- color: #16534c;
+ color: #3ACAB8;
}
.layui-laypage-count{
- color:#184B49;
+ color:#278178;
}
.layui-laypage button, .layui-laypage input {
background-color: transparent;
- border: #184B49 1px solid;
- color: #184B49;
+ border: #278178 1px solid;
+ color: #278178;
}
.layui-table-view select[lay-ignore] {
background-color: transparent;
- border: #184B49 1px solid;
- color: #184B49;
+ border: #278178 1px solid;
+ color: #278178;
}
.layui-table-page .layui-laypage span {
- color: #184B49;
+ color: #278178;
}
.layui-table-page .layui-laypage a, .layui-table-page .layui-laypage span.layui-laypage-curr {
- color: #184B49;
+ color: #278178;
}
/**公共类**/
diff --git a/css/personnelControl/personnelControl.css b/css/personnelControl/personnelControl.css
index 21145b1..4e32905 100644
--- a/css/personnelControl/personnelControl.css
+++ b/css/personnelControl/personnelControl.css
@@ -47,7 +47,7 @@ body {
/* 表格头部背景色 */
th {
- background-color: #184B49; /* MediumSeaGreen */
+ background-color: #278178; /* MediumSeaGreen */
color: #fff;
font-weight: bold
}
@@ -58,39 +58,39 @@ th {
}
.layui-laypage .layui-laypage-curr .layui-laypage-em {
- background-color: #184B49;
+ background-color: #278178;
}
.layui-laypage a:hover {
- color: #184B49;
+ color: #278178;
}
.layui-laypage .layui-laypage-skip {
- color: #16534c;
+ color: #3ACAB8;
}
.layui-laypage-count{
- color:#184B49;
+ color:#278178;
}
.layui-laypage button, .layui-laypage input {
background-color: transparent;
- border: #184B49 1px solid;
- color: #184B49;
+ border: #278178 1px solid;
+ color: #278178;
}
.layui-table-view select[lay-ignore] {
background-color: transparent;
- border: #184B49 1px solid;
- color: #184B49;
+ border: #278178 1px solid;
+ color: #278178;
}
.layui-table-page .layui-laypage span {
- color: #184B49;
+ color: #278178;
}
.layui-table-page .layui-laypage a, .layui-table-page .layui-laypage span.layui-laypage-curr {
- color: #184B49;
+ color: #278178;
}
/**公共类**/
@@ -184,7 +184,7 @@ th {
.button-style{
color: #298B83;
- border: #184B49 1px solid;
+ border: #278178 1px solid;
padding: 4px 9px;
margin-left: 10px;
}
diff --git a/css/personnelControl/personnelControlList.css b/css/personnelControl/personnelControlList.css
index f89ca00..c1fd30d 100644
--- a/css/personnelControl/personnelControlList.css
+++ b/css/personnelControl/personnelControlList.css
@@ -50,7 +50,7 @@ body {
/* 表格头部背景色 */
th {
- background-color: #184B49; /* MediumSeaGreen */
+ background-color: #278178; /* MediumSeaGreen */
color: #fff;
font-weight: bold
}
@@ -61,39 +61,39 @@ th {
}
.layui-laypage .layui-laypage-curr .layui-laypage-em {
- background-color: #184B49;
+ background-color: #278178;
}
.layui-laypage a:hover {
- color: #184B49;
+ color: #278178;
}
.layui-laypage .layui-laypage-skip {
- color: #16534c;
+ color: #3ACAB8;
}
.layui-laypage-count{
- color:#184B49;
+ color:#278178;
}
.layui-laypage button, .layui-laypage input {
background-color: transparent;
- border: #184B49 1px solid;
- color: #184B49;
+ border: #278178 1px solid;
+ color: #278178;
}
.layui-table-view select[lay-ignore] {
background-color: transparent;
- border: #184B49 1px solid;
- color: #184B49;
+ border: #278178 1px solid;
+ color: #278178;
}
.layui-table-page .layui-laypage span {
- color: #184B49;
+ color: #278178;
}
.layui-table-page .layui-laypage a, .layui-table-page .layui-laypage span.layui-laypage-curr {
- color: #184B49;
+ color: #278178;
}
/**公共类**/
@@ -187,7 +187,7 @@ th {
.button-style{
color: #298B83;
- border: #184B49 1px solid;
+ border: #278178 1px solid;
padding: 4px 9px;
margin-left: 10px;
}
diff --git a/css/towerAssInspect/towerAssInspect.css b/css/towerAssInspect/towerAssInspect.css
index b23e86b..f7e3acf 100644
--- a/css/towerAssInspect/towerAssInspect.css
+++ b/css/towerAssInspect/towerAssInspect.css
@@ -90,12 +90,12 @@ body {
}
.model {
- width: 80%;
- height: 80%;
- margin-top: 5%;
- margin-left: 10%;
- padding: 8% 2% 2% 2%;
- background: url("../../img/towerAssInspect/model.png") no-repeat 0 0 / 100% 100%;
+ width: 98%;
+ height: 90%;
+ /* margin-top: 5%; */
+ margin-left: 1%;
+ padding: 3% 0% 2% 0%;
+ /* background: url("../../img/towerAssInspect/model.png") no-repeat 0 0 / 100% 100%; */
}
.device-list{
diff --git a/js/consQuality/consQuality.js b/js/consQuality/consQuality.js
index 4f7ab25..7c1f810 100644
--- a/js/consQuality/consQuality.js
+++ b/js/consQuality/consQuality.js
@@ -218,8 +218,9 @@ function AlarmList(deviceId){
bidCode: bidCode
},
cols: [[
- {field: 'number', width:80,title: '序号', align: 'center', type: 'numbers'},
+ // {field: 'number', width:80,title: '序号', align: 'center', type: 'numbers'},
{field: 'warningContent', align: 'center', title: '告警内容'},
+ {field: 'warnTime', align: 'center', title: '告警时间'},
]],
initComplete: function () {
// 在表格渲染完成后，重新渲染序号列
diff --git a/js/operEnvironment/operEnvironment.js b/js/operEnvironment/operEnvironment.js
index f66b622..ba8b79a 100644
--- a/js/operEnvironment/operEnvironment.js
+++ b/js/operEnvironment/operEnvironment.js
@@ -97,6 +97,8 @@ function DaylightDisplacementList(deviceId){
return '告警';
} else if (d.isWarn == 1) {
return '正常';
+ }else{
+ return '';
}
}
}
diff --git a/js/pages/towerAssInspect/towerAssInspect.js b/js/pages/towerAssInspect/towerAssInspect.js
index 5c2bf58..bb3e191 100644
--- a/js/pages/towerAssInspect/towerAssInspect.js
+++ b/js/pages/towerAssInspect/towerAssInspect.js
@@ -2,6 +2,8 @@ let layer,table,form;
let myChart = echarts.init(document.getElementById('tendency'));
const bidCode = parent.$('#bidPro').val();
+$('#modelIframe').attr('src', URL_IP+'/pages/3Dglb/index.html');
+
layui.use(['layer','table','form'], function () {
layer = layui.layer;
table = layui.table;
@@ -208,13 +210,21 @@ function getHistoryList(deviceId){
},
cols: [[
{type: 'numbers', title: '序号'}, // 添加序号列
- {field: 'areaName', title: '区域名称',align:'center'},
- {field: 'modeName', title: '检测点名称',align:'center'},
- {field: 'val', title: '检测值',align:'center'},
- {field: 'thisChangeVal', title: '本次变化值',align:'center'},
- {field: 'changeVal', title: '累计变化值',align:'center'},
- {field: 'updateTime', title: '检测时间',align:'center'},
- {field: 'isWarn', title: '状态',align:'center'}
+ {field: 'areaName', align: 'center', title: '区域名称'},
+ {field: 'deviceName', align: 'center', title: '设备名称'},
+ {field: 'modeName', align: 'center', title: '施工工艺'},
+ {field: 'changeVal', align: 'center', title: '变化值'},
+ {field: 'val', align: 'center', title: '检测值'},
+ {field: 'createTime', align: 'center', title: '检测时间'},
+ {field: 'isWarn', align: 'center', title: '是否告警'},
+
+ // {field: 'areaName', title: '区域名称',align:'center'},
+ // {field: 'modeName', title: '检测点名称',align:'center'},
+ // {field: 'val', title: '检测值',align:'center'},
+ // {field: 'thisChangeVal', title: '本次变化值',align:'center'},
+ // {field: 'changeVal', title: '累计变化值',align:'center'},
+ // {field: 'updateTime', title: '检测时间',align:'center'},
+ // {field: 'isWarn', title: '状态',align:'center'}
]],
initComplete: function () {
// 在表格渲染完成后，重新渲染序号列
diff --git a/pages/3Dglb/lib/3dmodel.js b/pages/3Dglb/lib/3dmodel.js
index 8ac39e7..5c264fd 100644
--- a/pages/3Dglb/lib/3dmodel.js
+++ b/pages/3Dglb/lib/3dmodel.js
@@ -21,8 +21,9 @@ function init() {
scene = new THREE.Scene();
bbox = new THREE.Box3();
- scene.background = new THREE.Color( 0xeeeeee );
- light = new THREE.HemisphereLight( 0xbbbbff, 0x444422, 1.5 );
+ // scene.background = new THREE.Color( 0xeeeeee );//白色
+ // scene.background = new THREE.Color();//黑色
+ light = new THREE.HemisphereLight( 0xbbbbff, 0x444422, 2 );
light.position.set( 0, 1, 0 );
scene.add( light );
diff --git a/pages/towerAssInspect/towerAssInspect.html b/pages/towerAssInspect/towerAssInspect.html
index 788c2ab..1672ad5 100644
--- a/pages/towerAssInspect/towerAssInspect.html
+++ b/pages/towerAssInspect/towerAssInspect.html
@@ -29,7 +29,7 @@
-
+