cwchen
/
ah_jjzhgd_webscreen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端修改-组塔检测

This commit is contained in:
zzyuan 2024-04-19 15:32:37 +08:00
parent 978548f695
commit a9eef1a6f3
11 changed files with 89 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
css/consQuality/consQuality.css
View File

@ -47,7 +47,7 @@ body {
/* 表格头部背景色 */ /* 表格头部背景色 */
th { th {
background-color: #184B49; /* MediumSeaGreen */ background-color: #278178; /* MediumSeaGreen */
color: #fff; color: #fff;
font-weight: bold font-weight: bold
} }
@ -58,39 +58,39 @@ th {
} }
.layui-laypage .layui-laypage-curr .layui-laypage-em { .layui-laypage .layui-laypage-curr .layui-laypage-em {
background-color: #184B49; background-color: #278178;
} }
.layui-laypage a:hover { .layui-laypage a:hover {
color: #184B49; color: #278178;
} }
.layui-laypage .layui-laypage-skip { .layui-laypage .layui-laypage-skip {
color: #16534c; color: #3ACAB8;
} }
.layui-laypage-count{ .layui-laypage-count{
color:#184B49; color:#278178;
} }
.layui-laypage button, .layui-laypage input { .layui-laypage button, .layui-laypage input {
background-color: transparent; background-color: transparent;
border: #184B49 1px solid; border: #278178 1px solid;
color: #184B49; color: #278178;
} }
.layui-table-view select[lay-ignore] { .layui-table-view select[lay-ignore] {
background-color: transparent; background-color: transparent;
border: #184B49 1px solid; border: #278178 1px solid;
color: #184B49; color: #278178;
} }
.layui-table-page .layui-laypage span { .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 { .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{ .button-style{
color: #298B83; color: #298B83;
border: #184B49 1px solid; border: #278178 1px solid;
padding: 4px 9px; padding: 4px 9px;
margin-left: 10px; margin-left: 10px;
cursor: pointer; cursor: pointer;

22
css/coreTable.css
View File

@ -21,7 +21,7 @@
/* 表格头部背景色 */ /* 表格头部背景色 */
th { th {
background-color: #184B49; /* MediumSeaGreen */ background-color: #3ACAB8; /* MediumSeaGreen */
color: #fff; color: #fff;
font-weight: bold font-weight: bold
} }
@ -32,39 +32,39 @@ th {
} }
.layui-laypage .layui-laypage-curr .layui-laypage-em { .layui-laypage .layui-laypage-curr .layui-laypage-em {
background-color: #184B49; background-color: #3ACAB8;
} }
.layui-laypage a:hover { .layui-laypage a:hover {
color: #184B49; color: #3ACAB8;
} }
.layui-laypage .layui-laypage-skip { .layui-laypage .layui-laypage-skip {
color: #16534c; color: #3ACAB8;
} }
.layui-laypage-count{ .layui-laypage-count{
color:#184B49; color:#3ACAB8;
} }
.layui-laypage button, .layui-laypage input { .layui-laypage button, .layui-laypage input {
background-color: transparent; background-color: transparent;
border: #184B49 1px solid; border: #3ACAB8 1px solid;
color: #184B49; color: #3ACAB8;
} }
.layui-table-view select[lay-ignore] { .layui-table-view select[lay-ignore] {
background-color: transparent; background-color: transparent;
border: #184B49 1px solid; border: #3ACAB8 1px solid;
color: #184B49; color: #3ACAB8;
} }
.layui-table-page .layui-laypage span { .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 { .layui-table-page .layui-laypage a, .layui-table-page .layui-laypage span.layui-laypage-curr {
color: #184B49; color: #3ACAB8;
} }
.layout-vertical{ .layout-vertical{

22
css/operEnvironment/operEnvironment.css
View File

@ -47,7 +47,7 @@ body {
/* 表格头部背景色 */ /* 表格头部背景色 */
th { th {
background-color: #184B49; /* MediumSeaGreen */ background-color: #278178; /* MediumSeaGreen */
color: #fff; color: #fff;
font-weight: bold font-weight: bold
} }
@ -58,39 +58,39 @@ th {
} }
.layui-laypage .layui-laypage-curr .layui-laypage-em { .layui-laypage .layui-laypage-curr .layui-laypage-em {
background-color: #184B49; background-color: #278178;
} }
.layui-laypage a:hover { .layui-laypage a:hover {
color: #184B49; color: #278178;
} }
.layui-laypage .layui-laypage-skip { .layui-laypage .layui-laypage-skip {
color: #16534c; color: #3ACAB8;
} }
.layui-laypage-count{ .layui-laypage-count{
color:#184B49; color:#278178;
} }
.layui-laypage button, .layui-laypage input { .layui-laypage button, .layui-laypage input {
background-color: transparent; background-color: transparent;
border: #184B49 1px solid; border: #278178 1px solid;
color: #184B49; color: #278178;
} }
.layui-table-view select[lay-ignore] { .layui-table-view select[lay-ignore] {
background-color: transparent; background-color: transparent;
border: #184B49 1px solid; border: #278178 1px solid;
color: #184B49; color: #278178;
} }
.layui-table-page .layui-laypage span { .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 { .layui-table-page .layui-laypage a, .layui-table-page .layui-laypage span.layui-laypage-curr {
color: #184B49; color: #278178;
} }
/**公共类**/ /**公共类**/

24
css/personnelControl/personnelControl.css
View File

@ -47,7 +47,7 @@ body {
/* 表格头部背景色 */ /* 表格头部背景色 */
th { th {
background-color: #184B49; /* MediumSeaGreen */ background-color: #278178; /* MediumSeaGreen */
color: #fff; color: #fff;
font-weight: bold font-weight: bold
} }
@ -58,39 +58,39 @@ th {
} }
.layui-laypage .layui-laypage-curr .layui-laypage-em { .layui-laypage .layui-laypage-curr .layui-laypage-em {
background-color: #184B49; background-color: #278178;
} }
.layui-laypage a:hover { .layui-laypage a:hover {
color: #184B49; color: #278178;
} }
.layui-laypage .layui-laypage-skip { .layui-laypage .layui-laypage-skip {
color: #16534c; color: #3ACAB8;
} }
.layui-laypage-count{ .layui-laypage-count{
color:#184B49; color:#278178;
} }
.layui-laypage button, .layui-laypage input { .layui-laypage button, .layui-laypage input {
background-color: transparent; background-color: transparent;
border: #184B49 1px solid; border: #278178 1px solid;
color: #184B49; color: #278178;
} }
.layui-table-view select[lay-ignore] { .layui-table-view select[lay-ignore] {
background-color: transparent; background-color: transparent;
border: #184B49 1px solid; border: #278178 1px solid;
color: #184B49; color: #278178;
} }
.layui-table-page .layui-laypage span { .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 { .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{ .button-style{
color: #298B83; color: #298B83;
border: #184B49 1px solid; border: #278178 1px solid;
padding: 4px 9px; padding: 4px 9px;
margin-left: 10px; margin-left: 10px;
} }

24
css/personnelControl/personnelControlList.css
View File

@ -50,7 +50,7 @@ body {
/* 表格头部背景色 */ /* 表格头部背景色 */
th { th {
background-color: #184B49; /* MediumSeaGreen */ background-color: #278178; /* MediumSeaGreen */
color: #fff; color: #fff;
font-weight: bold font-weight: bold
} }
@ -61,39 +61,39 @@ th {
} }
.layui-laypage .layui-laypage-curr .layui-laypage-em { .layui-laypage .layui-laypage-curr .layui-laypage-em {
background-color: #184B49; background-color: #278178;
} }
.layui-laypage a:hover { .layui-laypage a:hover {
color: #184B49; color: #278178;
} }
.layui-laypage .layui-laypage-skip { .layui-laypage .layui-laypage-skip {
color: #16534c; color: #3ACAB8;
} }
.layui-laypage-count{ .layui-laypage-count{
color:#184B49; color:#278178;
} }
.layui-laypage button, .layui-laypage input { .layui-laypage button, .layui-laypage input {
background-color: transparent; background-color: transparent;
border: #184B49 1px solid; border: #278178 1px solid;
color: #184B49; color: #278178;
} }
.layui-table-view select[lay-ignore] { .layui-table-view select[lay-ignore] {
background-color: transparent; background-color: transparent;
border: #184B49 1px solid; border: #278178 1px solid;
color: #184B49; color: #278178;
} }
.layui-table-page .layui-laypage span { .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 { .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{ .button-style{
color: #298B83; color: #298B83;
border: #184B49 1px solid; border: #278178 1px solid;
padding: 4px 9px; padding: 4px 9px;
margin-left: 10px; margin-left: 10px;
} }

12
css/towerAssInspect/towerAssInspect.css
View File

@ -90,12 +90,12 @@ body {
} }
.model { .model {
width: 80%; width: 98%;
height: 80%; height: 90%;
margin-top: 5%; /* margin-top: 5%; */
margin-left: 10%; margin-left: 1%;
padding: 8% 2% 2% 2%; padding: 3% 0% 2% 0%;
background: url("../../img/towerAssInspect/model.png") no-repeat 0 0 / 100% 100%; /* background: url("../../img/towerAssInspect/model.png") no-repeat 0 0 / 100% 100%; */
} }
.device-list{ .device-list{

3
js/consQuality/consQuality.js
View File

@ -218,8 +218,9 @@ function AlarmList(deviceId){
bidCode: bidCode bidCode: bidCode
}, },
cols: [[ 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: 'warningContent', align: 'center', title: '告警内容'},
{field: 'warnTime', align: 'center', title: '告警时间'},
]], ]],
initComplete: function () { initComplete: function () {
// 在表格渲染完成后，重新渲染序号列 // 在表格渲染完成后，重新渲染序号列

2
js/operEnvironment/operEnvironment.js
View File

@ -97,6 +97,8 @@ function DaylightDisplacementList(deviceId){
return '<span style="color: #FF5722;">告警</span>'; return '<span style="color: #FF5722;">告警</span>';
} else if (d.isWarn == 1) { } else if (d.isWarn == 1) {
return '<span style="color: #5FB878;">正常</span>'; return '<span style="color: #5FB878;">正常</span>';
}else{
return '<span></span>';
} }
} }
} }

24
js/pages/towerAssInspect/towerAssInspect.js
View File

@ -2,6 +2,8 @@ let layer,table,form;
let myChart = echarts.init(document.getElementById('tendency')); let myChart = echarts.init(document.getElementById('tendency'));
const bidCode = parent.$('#bidPro').val(); const bidCode = parent.$('#bidPro').val();
$('#modelIframe').attr('src', URL_IP+'/pages/3Dglb/index.html');
layui.use(['layer','table','form'], function () { layui.use(['layer','table','form'], function () {
layer = layui.layer; layer = layui.layer;
table = layui.table; table = layui.table;
@ -208,13 +210,21 @@ function getHistoryList(deviceId){
}, },
cols: [[ cols: [[
{type: 'numbers', title: '序号'}, // 添加序号列 {type: 'numbers', title: '序号'}, // 添加序号列
{field: 'areaName', title: '区域名称',align:'center'}, {field: 'areaName', align: 'center', title: '区域名称'},
{field: 'modeName', title: '检测点名称',align:'center'}, {field: 'deviceName', align: 'center', title: '设备名称'},
{field: 'val', title: '检测值',align:'center'}, {field: 'modeName', align: 'center', title: '施工工艺'},
{field: 'thisChangeVal', title: '本次变化值',align:'center'}, {field: 'changeVal', align: 'center', title: '变化值'},
{field: 'changeVal', title: '累计变化值',align:'center'}, {field: 'val', align: 'center', title: '检测值'},
{field: 'updateTime', title: '检测时间',align:'center'}, {field: 'createTime', align: 'center', title: '检测时间'},
{field: 'isWarn', title: '状态',align:'center'} {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 () { initComplete: function () {
// 在表格渲染完成后，重新渲染序号列 // 在表格渲染完成后，重新渲染序号列

5
pages/3Dglb/lib/3dmodel.js
View File

@ -21,8 +21,9 @@ function init() {
scene = new THREE.Scene(); scene = new THREE.Scene();
bbox = new THREE.Box3(); bbox = new THREE.Box3();
scene.background = new THREE.Color( 0xeeeeee ); // scene.background = new THREE.Color( 0xeeeeee );//白色
light = new THREE.HemisphereLight( 0xbbbbff, 0x444422, 1.5 ); // scene.background = new THREE.Color();//黑色
light = new THREE.HemisphereLight( 0xbbbbff, 0x444422, 2 );
light.position.set( 0, 1, 0 ); light.position.set( 0, 1, 0 );
scene.add( light ); scene.add( light );

2
pages/towerAssInspect/towerAssInspect.html
View File

@ -29,7 +29,7 @@
</form> </form>
</div> </div>
<div class="img-style model"> <div class="img-style model">
<iframe id="modelIframe" width="100%" height="99%" frameborder="0"></iframe>
</div> </div>
</div> </div>
</div> </div>