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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2025-07-24 21:51:04 +08:00
parent ab77ecc47f d496cb81b4
commit 74f1f79ff4
6 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all 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>';
}
},
{

2
js/pages/newDataAnalysis/environDetection.js
View File

@ -382,7 +382,7 @@ function getGisOption(gisData) {
{
name: '标准值',
type: 'bar',
data: [25, 50, 0.10],
data: [25, 50, 0.50],
itemStyle: {
color: '#94a3b8'
}

2
js/pages/newDataAnalysis/projectManagement.js
View File

@ -483,7 +483,7 @@ function initTable(type, bidCode) {
cols: [
[
{
field: "number",
type: "numbers",
title: "序号",
width: 100,
},

4
js/pages/newDataAnalysis/projectProgress.js
View File

@ -24,8 +24,8 @@ function setCols(type) {
},
{ field: "actualEndTime", title: "实际完成时间", align: "center" },
{ field: "processDiff", title: "进度偏差", align: "center" },
{ field: "completeEffort", title: "已完成工程量", align: "center" },
{ field: "totalEffort", title: "总工程量", align: "center" },
// { field: "completeEffort", title: "已完成工程量", align: "center" },
// { field: "totalEffort", title: "总工程量", align: "center" },
{
title: "延误因素分析",
align: "center",

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,

21
pages/newDataAnalysis/environDetection.html
View File

@ -83,16 +83,9 @@
</nav>
<main class="max-w-[1440px] mx-auto px-6 pt-20">
<div class="h-4"></div>
<div class="grid grid-cols-3 gap-6">
<div class="bg-[#002628] rounded-lg shadow-sm p-6 border border-[#004446]">
<h3 class="text-lg font-medium mb-6 text-[#00C6BE]">GIS 无尘化安装监测</h3>
<div id="gisChart" class="w-full h-[300px]"></div>
</div>
<div class="bg-[#002628] rounded-lg shadow-sm p-6 border border-[#004446]">
<h3 class="text-lg font-medium mb-6 text-[#00C6BE]">有限空间监测</h3>
<div id="spaceChart" class="w-full h-[300px]"></div>
</div>
<div class="bg-[#002628] rounded-lg shadow-sm p-6 border border-[#004446]">
<div class="grid grid-cols-4 gap-6">
<div class="col-span-2 bg-[#002628] rounded-lg shadow-sm p-6 border border-[#004446]">
<h3 class="text-lg font-medium mb-6 text-[#00C6BE]">实时数据</h3>
<div class="grid grid-cols-2 gap-3">
<div class="p-3 rounded-lg bg-[#003436] border border-[#004446]">
@ -139,6 +132,14 @@
</div>
</div>
</div>
<div class="col-span-1 bg-[#002628] rounded-lg shadow-sm p-6 border border-[#004446]">
<h3 class="text-lg font-medium mb-6 text-[#00C6BE]">GIS 无尘化安装监测</h3>
<div id="gisChart" class="w-full h-[300px]"></div>
</div>
<div class="col-span-1 bg-[#002628] rounded-lg shadow-sm p-6 border border-[#004446]">
<h3 class="text-lg font-medium mb-6 text-[#00C6BE]">有限空间监测</h3>
<div id="spaceChart" class="w-full h-[300px]"></div>
</div>
</div>
<div class="h-6"></div>
<div class="grid grid-cols-12 gap-6">