From b76c0594158e67dfa76d6d45dba1516c71865c52 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 23 Jul 2025 19:27:27 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=86=E6=9E=90=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/pages/newDataAnalysis/newDataAnalysis.js | 110 +++++++++-------
js/pages/newDataAnalysis/projectManagement.js | 120 ++++++++++++++++++
pages/newDataAnalysis/projectManagement.html | 45 +++++++
3 files changed, 226 insertions(+), 49 deletions(-)
create mode 100644 js/pages/newDataAnalysis/projectManagement.js
create mode 100644 pages/newDataAnalysis/projectManagement.html
diff --git a/js/pages/newDataAnalysis/newDataAnalysis.js b/js/pages/newDataAnalysis/newDataAnalysis.js
index 2f48703..f06029d 100644
--- a/js/pages/newDataAnalysis/newDataAnalysis.js
+++ b/js/pages/newDataAnalysis/newDataAnalysis.js
@@ -1,56 +1,68 @@
let table, layer, form;
-layui.use(['layer', 'table', 'form'], function () {
- layer = layui.layer;
- table = layui.table;
- form = layui.form;
- // 响应成功后的拦截器
- $.ajaxSetup({
- beforeSend: function (xhr, options) {
- var originalSuccess = options.success
- options.success = function (data, textStatus, jqXhr) {
- data = modifyResponseData(data);
- // success(data,textStatus, jqXhr);
- originalSuccess.apply(this, arguments)
- }
- }
- })
- $('#indexIframe').attr('src','proQualityAnalysis.html');
+layui.use(["layer", "table", "form"], function () {
+ layer = layui.layer;
+ table = layui.table;
+ form = layui.form;
+ // 响应成功后的拦截器
+ $.ajaxSetup({
+ beforeSend: function (xhr, options) {
+ var originalSuccess = options.success;
+ options.success = function (data, textStatus, jqXhr) {
+ data = modifyResponseData(data);
+ // success(data,textStatus, jqXhr);
+ originalSuccess.apply(this, arguments);
+ };
+ },
+ });
+ $("#indexIframe").attr("src", "proQualityAnalysis.html");
});
/* 切换数据 */
function changeData(that, type) {
- let src = '';
- const bidCode = parent.$('#bidPro').val();
- $(".ul-box li").each(function () {
- if ($(this).hasClass("check")) {
- $(this).removeClass("check").addClass("nocheck");
+ let src = "";
+ const bidCode = parent.$("#bidPro").val();
+ $(".ul-box li").each(function () {
+ if ($(this).hasClass("check")) {
+ $(this).removeClass("check").addClass("nocheck");
+ }
+ });
+ $(that).removeClass("nocheck").addClass("check");
+ if (type == 1) {
+ // 工程质量分析
+ src = "proQualityAnalysis.html";
+ } else if (type == 2) {
+ // 工程安全分析
+ src = "";
+ } else if (type == 3) {
+ // 工程进度分析
+ src = "";
+ } else if (type == 4) {
+ // 资源利用率分析
+ src = "";
+ } else if (type == 5) {
+ // 节能减排分析
+ src = "";
+ } else if (type == 6) {
+ // 工人效率分析
+ src = "workerEfficiencyAnalysis.html";
+ } else if (type == 7) {
+ // 环境监测分析
+ src = "environDetection.html";
+ } else if (type == 8) {
+ // 项目管理分析
+ src = "projectManagement.html";
+ } else if (type == 9) {
+ // 整体效能分析
+ src = "overallEfficiency.html";
+ } else if (type == 10) {
+ // 风险值班分析
+ src = "";
+ } else if (type == 11) {
+ // 穿戴设备监测设备指标分析
+ src = "";
+ } else if (type == 12) {
+ // 延期原因分析
+ src = "";
}
- });
- $(that).removeClass("nocheck").addClass("check");
- if(type == 1){ // 工程质量分析
- src = 'proQualityAnalysis.html';
- }else if(type == 2){ // 工程安全分析
- src = '';
- }else if(type == 3){ // 工程进度分析
- src = '';
- }else if(type == 4){ // 资源利用率分析
- src = '';
- }else if(type == 5){ // 节能减排分析
- src = '';
- }else if(type == 6){ // 工人效率分析
- src = 'workerEfficiencyAnalysis.html';
- }else if(type == 7){ // 环境监测分析
- src = 'environDetection.html';
- }else if(type == 8){ // 项目管理分析
- src = '';
- }else if(type == 9){ // 整体效能分析
- src = 'overallEfficiency.html';
- }else if(type == 10){ // 风险值班分析
- src = '';
- }else if(type == 11){ // 穿戴设备监测设备指标分析
- src = '';
- }else if(type == 12){ // 延期原因分析
- src = '';
- }
- $('#indexIframe').attr('src',src);
+ $("#indexIframe").attr("src", src);
}
diff --git a/js/pages/newDataAnalysis/projectManagement.js b/js/pages/newDataAnalysis/projectManagement.js
new file mode 100644
index 0000000..d909ce0
--- /dev/null
+++ b/js/pages/newDataAnalysis/projectManagement.js
@@ -0,0 +1,120 @@
+let table, layer, form;
+layui.use(["layer", "table", "form"], function () {
+ layer = layui.layer;
+ table = layui.table;
+ form = layui.form;
+ // 响应成功后的拦截器
+ $.ajaxSetup({
+ beforeSend: function (xhr, options) {
+ var originalSuccess = options.success;
+ options.success = function (data, textStatus, jqXhr) {
+ data = modifyResponseData(data);
+ // success(data,textStatus, jqXhr);
+ originalSuccess.apply(this, arguments);
+ };
+ },
+ });
+ initTable(1, parent.$("#bidPro").val());
+});
+
+/* 切换数据 */
+function changeData(that, type) {
+ const bidCode = parent.$("#bidPro").val();
+ $(".ul-box li").each(function () {
+ if ($(this).hasClass("check")) {
+ $(this).removeClass("check").addClass("nocheck");
+ }
+ });
+ var tableElem = $("#demo2").parents(".layui-table-view");
+ tableElem.remove();
+ $(that).removeClass("nocheck").addClass("check");
+ if (type === 1 || type === 2 || type === 3 || type === 6 || type === 12) {
+ initTable(type, bidCode);
+ $("#right-table-box").removeAttr("style");
+ $("#no-data-box").css({ display: "none" });
+ $("#right-box").css({ display: "none" });
+ }
+}
+
+function initTable(type, bidCode) {
+ const url =
+ commonUrl + "screen/largeScreen/dataAnalysis/getEngqualityAnalysis";
+ table.render({
+ elem: "#demo2",
+ url: url,
+ skin: "line",
+ page: true,
+ height: "full-100",
+ headers: {
+ decrypt: "decrypt",
+ Authorization: token,
+ },
+ where: {
+ bidCode: bidCode,
+ type: type,
+ },
+ cols: [setCols(type)],
+ initComplete: function () {
+ // 在表格渲染完成后,重新渲染序号列
+ var that = this.elem.next();
+ var tool = that
+ .children(".layui-table-box")
+ .children(".layui-table-fixed")
+ .children(".layui-table-body")
+ .children(".layui-table");
+ tool.find("tr").each(function (index, item) {
+ $(this)
+ .find('td[data-field="LAY_TABLE_INDEX"]')
+ .text(index + 1);
+ });
+ },
+ done: function (res, curr, count, origin) {
+ // console.log(res);
+ },
+ });
+
+ function setCols(type) {
+ if (type === 1) {
+ // 工程质量分析
+ return [
+ { type: "numbers", title: "序号", width: "10%" }, // 添加序号列
+ {
+ field: "projectName",
+ title: "工程名称",
+ align: "center",
+ width: "15%",
+ },
+ {
+ field: "projectNumber",
+ title: "工程编号",
+ align: "center",
+ width: "15%",
+ },
+ {
+ field: "projectAddress",
+ title: "项目地址",
+ align: "center",
+ width: "15%",
+ },
+ {
+ field: "contractorName",
+ title: "合同编号",
+ align: "center",
+ width: "15%",
+ },
+ {
+ field: "qualityLevel",
+ title: "质量等级",
+ align: "center",
+ width: "15%",
+ },
+ {
+ field: "isContract",
+ title: "是否签订合同",
+ align: "center",
+ width: "15%",
+ },
+ ];
+ }
+ }
+}
diff --git a/pages/newDataAnalysis/projectManagement.html b/pages/newDataAnalysis/projectManagement.html
new file mode 100644
index 0000000..c87a48c
--- /dev/null
+++ b/pages/newDataAnalysis/projectManagement.html
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 工程质量分析
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From fb2128207f4e80c4765cd3204d0a5adeed99310b Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Wed, 23 Jul 2025 19:58:47 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=85=8D=E7=BD=AEhtml=20=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/pages/newDataAnalysis/newDataAnalysis.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/pages/newDataAnalysis/newDataAnalysis.js b/js/pages/newDataAnalysis/newDataAnalysis.js
index f06029d..2b4b5c8 100644
--- a/js/pages/newDataAnalysis/newDataAnalysis.js
+++ b/js/pages/newDataAnalysis/newDataAnalysis.js
@@ -32,7 +32,7 @@ function changeData(that, type) {
src = "proQualityAnalysis.html";
} else if (type == 2) {
// 工程安全分析
- src = "";
+ src = "engineeringSafetyAnalysis.html";
} else if (type == 3) {
// 工程进度分析
src = "";
From 98974bd9e996cdef08e5c962895ebbd92322bdb1 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 23 Jul 2025 20:39:10 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=88=86=E6=9E=90=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83?=
=?UTF-8?q?=E8=AF=95=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/pages/newDataAnalysis/projectManagement.js | 60 +++++++++++++------
1 file changed, 42 insertions(+), 18 deletions(-)
diff --git a/js/pages/newDataAnalysis/projectManagement.js b/js/pages/newDataAnalysis/projectManagement.js
index d909ce0..62661f7 100644
--- a/js/pages/newDataAnalysis/projectManagement.js
+++ b/js/pages/newDataAnalysis/projectManagement.js
@@ -37,8 +37,7 @@ function changeData(that, type) {
}
function initTable(type, bidCode) {
- const url =
- commonUrl + "screen/largeScreen/dataAnalysis/getEngqualityAnalysis";
+ const url = commonUrl + "screen/largeScreen/tb_project_new/list";
table.render({
elem: "#demo2",
url: url,
@@ -53,6 +52,12 @@ function initTable(type, bidCode) {
bidCode: bidCode,
type: type,
},
+ response: {
+ statusName: "code", // 规定数据状态的字段名称,默认:code
+ statusCode: 200, // 规定成功的状态码,默认:0
+ countName: "count", // 规定数据总数的字段名称,默认:count
+ dataName: "rows", // 规定数据列表的字段名称,默认:data
+ },
cols: [setCols(type)],
initComplete: function () {
// 在表格渲染完成后,重新渲染序号列
@@ -79,40 +84,59 @@ function initTable(type, bidCode) {
return [
{ type: "numbers", title: "序号", width: "10%" }, // 添加序号列
{
- field: "projectName",
+ field: "taskName",
title: "工程名称",
align: "center",
- width: "15%",
},
{
field: "projectNumber",
- title: "工程编号",
+ title: "任务名称",
align: "center",
- width: "15%",
},
{
- field: "projectAddress",
- title: "项目地址",
+ field: "planStartTime",
+ title: "计划开始时间",
align: "center",
- width: "15%",
},
{
- field: "contractorName",
- title: "合同编号",
+ field: "planEndTime",
+ title: "实际开始时间",
align: "center",
- width: "15%",
},
{
- field: "qualityLevel",
- title: "质量等级",
+ field: "diffDay",
+ title: "偏差天数",
align: "center",
- width: "15%",
},
{
- field: "isContract",
- title: "是否签订合同",
+ field: "planCost",
+ title: "成本预算",
align: "center",
- width: "15%",
+ },
+ {
+ field: "actualCost",
+ title: "实际成本",
+ align: "center",
+ },
+ {
+ field: "riskLevel",
+ title: "风险等级",
+ align: "center",
+ },
+ {
+ field: "suggestion",
+ title: "建议策略",
+ align: "center",
+ },
+ {
+ title: "操作",
+ align: "center",
+ templet: (d) => {
+ let text = "";
+ text +=
+ '导出';
+ return text;
+ },
},
];
}
From e2208da2ac7f8262a407e596bea1c9fb4692fa4c Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 23 Jul 2025 20:48:49 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=BF=9B=E5=BA=A6?=
=?UTF-8?q?=E5=88=86=E6=9E=90=E9=A1=B5=E9=9D=A2=E4=BB=A5=E5=8F=8A=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/pages/newDataAnalysis/newDataAnalysis.js | 2 +-
js/pages/newDataAnalysis/projectProgress.js | 154 +++++++++++++++++++
pages/newDataAnalysis/projectManagement.html | 2 +-
pages/newDataAnalysis/projectProgress.html | 45 ++++++
4 files changed, 201 insertions(+), 2 deletions(-)
create mode 100644 js/pages/newDataAnalysis/projectProgress.js
create mode 100644 pages/newDataAnalysis/projectProgress.html
diff --git a/js/pages/newDataAnalysis/newDataAnalysis.js b/js/pages/newDataAnalysis/newDataAnalysis.js
index 2b4b5c8..564c650 100644
--- a/js/pages/newDataAnalysis/newDataAnalysis.js
+++ b/js/pages/newDataAnalysis/newDataAnalysis.js
@@ -35,7 +35,7 @@ function changeData(that, type) {
src = "engineeringSafetyAnalysis.html";
} else if (type == 3) {
// 工程进度分析
- src = "";
+ src = "projectProgress.html";
} else if (type == 4) {
// 资源利用率分析
src = "";
diff --git a/js/pages/newDataAnalysis/projectProgress.js b/js/pages/newDataAnalysis/projectProgress.js
new file mode 100644
index 0000000..3b788af
--- /dev/null
+++ b/js/pages/newDataAnalysis/projectProgress.js
@@ -0,0 +1,154 @@
+let table, layer, form;
+layui.use(["layer", "table", "form"], function () {
+ layer = layui.layer;
+ table = layui.table;
+ form = layui.form;
+ // 响应成功后的拦截器
+ $.ajaxSetup({
+ beforeSend: function (xhr, options) {
+ var originalSuccess = options.success;
+ options.success = function (data, textStatus, jqXhr) {
+ data = modifyResponseData(data);
+ // success(data,textStatus, jqXhr);
+ originalSuccess.apply(this, arguments);
+ };
+ },
+ });
+ initTable(1, parent.$("#bidPro").val());
+});
+
+/* 切换数据 */
+function changeData(that, type) {
+ const bidCode = parent.$("#bidPro").val();
+ $(".ul-box li").each(function () {
+ if ($(this).hasClass("check")) {
+ $(this).removeClass("check").addClass("nocheck");
+ }
+ });
+ var tableElem = $("#demo2").parents(".layui-table-view");
+ tableElem.remove();
+ $(that).removeClass("nocheck").addClass("check");
+ if (type === 1 || type === 2 || type === 3 || type === 6 || type === 12) {
+ initTable(type, bidCode);
+ $("#right-table-box").removeAttr("style");
+ $("#no-data-box").css({ display: "none" });
+ $("#right-box").css({ display: "none" });
+ }
+}
+
+function initTable(type, bidCode) {
+ const url = commonUrl + "screen/largeScreen/tb_project_progress_new/list";
+ table.render({
+ elem: "#demo2",
+ url: url,
+ skin: "line",
+ page: true,
+ height: "full-100",
+ headers: {
+ decrypt: "decrypt",
+ Authorization: token,
+ },
+ where: {
+ bidCode: bidCode,
+ type: type,
+ },
+ response: {
+ statusName: "code", // 规定数据状态的字段名称,默认:code
+ statusCode: 200, // 规定成功的状态码,默认:0
+ countName: "count", // 规定数据总数的字段名称,默认:count
+ dataName: "rows", // 规定数据列表的字段名称,默认:data
+ },
+ cols: [setCols(type)],
+ initComplete: function () {
+ // 在表格渲染完成后,重新渲染序号列
+ var that = this.elem.next();
+ var tool = that
+ .children(".layui-table-box")
+ .children(".layui-table-fixed")
+ .children(".layui-table-body")
+ .children(".layui-table");
+ tool.find("tr").each(function (index, item) {
+ $(this)
+ .find('td[data-field="LAY_TABLE_INDEX"]')
+ .text(index + 1);
+ });
+ },
+ done: function (res, curr, count, origin) {
+ // console.log(res);
+ },
+ });
+
+ function setCols(type) {
+ if (type === 1) {
+ // 工程质量分析
+ return [
+ { type: "numbers", title: "序号", width: "10%" }, // 添加序号列
+ {
+ field: "projectName",
+ title: "项目名称",
+ align: "center",
+ },
+ {
+ field: "taskName",
+ title: "作业任务名称",
+ align: "center",
+ },
+ {
+ field: "taskCode",
+ title: "任务编号",
+ align: "center",
+ },
+ {
+ field: "planStartTime",
+ title: "计划开始时间",
+ align: "center",
+ },
+ {
+ field: "planEndTime",
+ title: "计划完成时间",
+ align: "center",
+ },
+ {
+ field: "actualStartTime",
+ title: "实际开始时间",
+ align: "center",
+ },
+ {
+ field: "actualEndTime",
+ title: "实际完成时间",
+ align: "center",
+ },
+ {
+ field: "processDiff",
+ title: "进度偏差",
+ align: "center",
+ },
+ {
+ field: "completeEffort",
+ title: "已完成工程量",
+ align: "center",
+ },
+ {
+ field: "totalEffort",
+ title: "总工程量",
+ align: "center",
+ },
+ {
+ field: "delayActor",
+ title: "延误因素分析",
+ align: "center",
+ },
+ {
+ field: "resourceMatchStatus",
+ title: "资源匹配状态",
+ align: "center",
+ },
+ {
+ field: "keyPathFlag",
+ title: "关键路径任务标识",
+ align: "center",
+ },
+ ];
+ }
+ }
+}
diff --git a/pages/newDataAnalysis/projectManagement.html b/pages/newDataAnalysis/projectManagement.html
index c87a48c..6f8b712 100644
--- a/pages/newDataAnalysis/projectManagement.html
+++ b/pages/newDataAnalysis/projectManagement.html
@@ -21,7 +21,7 @@
- 工程质量分析
+ 工程管理分析
+
+
+
+
+
+
+
+
+
+
+ 工程进度分析
+
+
+
+
+
+
+
+
+
+