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

Merge branch 'master' of http://192.168.0.75:3000/cwchen/ah_jjzhgd_webscreen

This commit is contained in:
fl 2025-07-24 22:51:20 +08:00
parent 6afaec5024 af0bd910ba
commit 732b6479e7
5 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/commonRequest.js
View File

@ -13,7 +13,7 @@ let aqEnnable = false; // 参数加密开关
const URL_IP = "http://127.0.0.1:13030/ah_jjzhgd_webscreen";
// const commonUrl = "http://192.168.0.38:13030/zhgd/";
const commonUrl = "http://192.168.2.72:13030/zhgd/";
const commonUrl = "http://127.0.0.1:13030/zhgd/";
// const commonUrl = "http://192.168.1.105:18080/zhgd/";
// const imgUrl = "http://192.168.0.38:13030/zhgd/file/files/";
const imgUrl = "http://sgwpdm.ah.sgcc.com.cn/zhgd/file/files/";

18
js/pages/newDataAnalysis/engineeringSafetyAnalysis.js
View File

@ -38,17 +38,17 @@ function initTable(bidCode,name) {
{ field: 'windSpeed', title: '风速', align: 'center', width: '8%' },
{ field: 'gasValue', title: '气体值', align: 'center', width: '10%' },
{
field: 'rateLevel', title: '最高隐患等级', align: 'center', width: '8%',
field: 'rateLevel', title: '隐患', align: 'center', width: '8%',
templet: function (d) {
let color = '';
if (d.level == "一般隐患") {
color = 'green';
} else if (d.level == '较大隐患') {
color = 'yellow';
} else if (d.level == '重大隐患') {
color = 'red';
}
return '<p style="color:' + color + '">' + d.level + '</p>';
// if (d.level == "一般隐患") {
// color = 'green';
// } else if (d.level == '较大隐患') {
// color = 'yellow';
// } else if (d.level == '重大隐患') {
// color = 'red';
// }
return '<p >存在隐患</p>';
}
},
{

38
js/pages/newDataAnalysis/workerEfficiencyAnalysis.js
View File

@ -8,15 +8,6 @@ const tipsArr = [
'定期组织技能培训和考试，并做好施工工具的维护与定期检查工作。',
];
// let
const inefficiencyArr = [
{
'gxName':'',
nameList:['专业技能不足', '工具故障','人员异常','设备维保','环境变化'],
valueList:[{ name: '专业技能不足', value: 4 }, { name: '工具故障', value: 1 }]
}
];
layui.use(['layer', 'table', 'form'], function () {
layer = layui.layer;
table = layui.table;
@ -58,22 +49,33 @@ function initTable() {
userName: userName,
},
cols: [[
{ type: 'numbers', title: '序号', width: '10%' }, // 添加序号列
{ type: 'numbers', title: '序号', width: '6%' }, // 添加序号列
{ field: 'userName', title: '班组长', align: 'center', width: '10%' },
{ field: 'teamName', title: '班组', align: 'center', width: '15%' },
{
field: 'gxName', title: '工序', align: 'center', width: '20%',
field: 'gxName', title: '工序', align: 'center', width: '35%',
templet: function (d) {
if (d.gxName) {
if (d.gxName.length > 100) {
return '<span title="' + d.gxName + '">' + d.gxName.substring(0, 100) + '...</span>'
} else {
return '<span title="' + d.gxName + '">' + d.gxName + '</span>'
}
} else {
return '';
}
}
},
{
field: 'planDay', title: '计划完成天数', align: 'center', width: '10%',
field: 'planDay', title: '计划完成天数', align: 'center', width: '12%',
},
{
field: 'actualDay', title: '实际完成天数', align: 'center', width: '10%',
field: 'actualDay', title: '实际完成天数', align: 'center', width: '12%',
},
{
field: 'workStandard', title: '作业内容', align: 'center', width: '15%',
/* {
field: 'workStandard', title: '作业内容', align: 'center', width: '19%',
templet: function (d) {
if (d.workStandard) {
if (d.workStandard.length > 60) {
@ -86,7 +88,7 @@ function initTable() {
}
}
},
}, */
{
title: '效率评级', align: 'center', width: '10%',
templet: function (d) {
@ -399,8 +401,8 @@ function initEchartsOne(obj) {
/* 变化趋势 */
function initEchartsTwo(data) {
let nameList = ['专业技能不足', '工具故障','人员异常','设备维保','环境变化'];
let valueList = [{ name: '专业技能不足', value: 4 }, { name: '工具故障', value: 1 }];
let nameList = ['专业技能不足', '工具故障','设备维保','环境变化'];
let valueList = [{ name: '专业技能不足', value: 4 }, { name: '工具故障', value: 1 },{ name: '设备维保', value: 1 },{ name: '环境变化', value: 1 }];
const option = {
grid: {
top: 0,

6
pages/newDataAnalysis/engineeringSafetyAnalysis.html
View File

@ -32,11 +32,11 @@
<body>
<div style="height: 100%;width: 100%;">
<div style="height: 42%;width: 100%;display: flex;">
<div style="height: 90%;width: 48%;" class="bg-white">
<div style="height: 90%;width: 100%;" class="bg-white">
<div id="environmentChart" style="height: 100%;width: 100%;"></div>
</div>
<div style="height: 90%;width: 48%;" class="bg-white">
<div id="riskChart" style="height: 100%;width: 100%;"></div>
<div style="height: 0%;width: 0%;" class="bg-white">
<div id="riskChart" style="height: 0%;width: 0%;"></div>
</div>
</div>
<div style="height: 57%;width: 100%; margin-top: 1%">

14
pages/newDataAnalysis/proQualityAnalysis.html
View File

@ -31,16 +31,14 @@
<body>
<div id="proQuality">
<div class="leftBox">
<button class="layui-btn" id="uploadBtn">上传</button>
<table id="demo2" lay-filter="test"></table>
</div>
<div class="rightBox" id="rightLineBox">
</div>
<i class="layui-icon layui-icon-upload" id="uploadBtn"
style="font-size: 20px; cursor: pointer; color: #7aa2a7;"></i>
</div>
<!-- <div id="oneEcharts">
@ -71,11 +69,13 @@
width: 75%;
}
#uploadBtn{
margin-top: 40px;
#uploadBtn {
margin-top: 32px;
margin-bottom: -14px;
margin-left: 20px;
margin-right: 10px;
}
.rightBox {
width: 25%;
height: 500px;