From 355310b340fee9f80e24f172661a15d8f9757a3e Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 24 Jul 2025 18:39:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/pages/newDataAnalysis/projectProgress.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/pages/newDataAnalysis/projectProgress.js b/js/pages/newDataAnalysis/projectProgress.js index 2b57d8a..6f0a89c 100644 --- a/js/pages/newDataAnalysis/projectProgress.js +++ b/js/pages/newDataAnalysis/projectProgress.js @@ -157,11 +157,11 @@ function initTable(type, bidCode) { "
延误原因：" + rowData.delayActor + "
" + - "
其他原因：" + - data1[index] + + "
延误对策：" + + rowData.delayPolicy + "
" + "
分析结果：" + - data2[index] + + rowData.analyzeResult + "
" + "
", area: ["600px", "300px"], From b5c7fe9bc0c9a03dd0fbd9e6dc286de8af79c60d Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 24 Jul 2025 18:42:28 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/pages/newDataAnalysis/projectManagement.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/pages/newDataAnalysis/projectManagement.js b/js/pages/newDataAnalysis/projectManagement.js index 10477b8..1767ce5 100644 --- a/js/pages/newDataAnalysis/projectManagement.js +++ b/js/pages/newDataAnalysis/projectManagement.js @@ -562,6 +562,7 @@ function initTable(type, bidCode) { } $(".chart-box").hide(); +$(".chart-box2").hide(); $(".list-view").click(function () { if ($(this).hasClass("active")) return; From 68e49b1b485cba174ee6036fb67d417d25bb1535 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 24 Jul 2025 18:48:50 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/pages/newDataAnalysis/projectManagement.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/pages/newDataAnalysis/projectManagement.js b/js/pages/newDataAnalysis/projectManagement.js index 1767ce5..2ebe70f 100644 --- a/js/pages/newDataAnalysis/projectManagement.js +++ b/js/pages/newDataAnalysis/projectManagement.js @@ -190,12 +190,12 @@ function setCols(type) { return [ { type: "numbers", title: "序号", width: "10%" }, // 添加序号列 { - field: "taskName", + field: "proName", title: "工程名称", align: "center", }, { - field: "projectNumber", + field: "taskName", title: "任务名称", align: "center", }, From d265151e1781423569e37bd93f478ffaeb94b822 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 24 Jul 2025 19:07:53 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engineeringSafetyAnalysis.js | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js b/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js index 963100b..5fc09a1 100644 --- a/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js +++ b/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js @@ -33,10 +33,10 @@ function initTable(bidCode,name) { { field: 'workLocation', title: '作业地点', align: 'center', width: '10%' }, { field: 'monitoringPointId', title: '监测点编号', align: 'center', width: '10%' }, { field: 'name', title: '监测点名称', align: 'center', width: '10%' }, - { field: 'temperature', title: '当前平均温度', align: 'center', width: '8%' }, - { field: 'humidity', title: '当前平均湿度', align: 'center', width: '8%' }, - { field: 'windSpeed', title: '当前平均风速', align: 'center', width: '8%' }, - { field: 'gasValue', title: '当前平均气体值', align: 'center', width: '10%' }, + { field: 'temperature', title: '温度', align: 'center', width: '8%' }, + { field: 'humidity', title: '湿度', align: 'center', width: '8%' }, + { field: 'windSpeed', title: '风速', align: 'center', width: '8%' }, + { field: 'gasValue', title: '气体值', align: 'center', width: '10%' }, { field: 'rateLevel', title: '最高隐患等级', align: 'center', width: '8%', templet: function (d) { @@ -144,6 +144,14 @@ function initEchartsOne(data) { tooltip: { trigger: 'axis' }, + title: { + text: '异常检测', // 标题文本 + left: 'left', // 标题位置，可以是 'left', 'right', 'center' + textStyle: { + color: '#fff', // 标题颜色 + fontSize: 18, // 字体大小 + }, + }, legend: { data: ['温度', '湿度', '风速'], textStyle: { @@ -155,7 +163,11 @@ function initEchartsOne(data) { data: dates, axisLabel: { color: "#fff", // X轴标签白色 - fontSize: 10, + formatter: function(value) { + // 假设 value 是 "2025-07-24" 格式的字符串 + // 你可以根据需要进行格式化，例如换行显示 + return value.split('-').join('\n'); // 将日期字符串按 "-" 分割，并用换行符连接 + } }, axisLine: { lineStyle: { From a7c749bb1867f5efdd4020fd245a1115bf43dacc Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 24 Jul 2025 19:15:40 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/pages/newDataAnalysis/proQualityAnalysis.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/pages/newDataAnalysis/proQualityAnalysis.js b/js/pages/newDataAnalysis/proQualityAnalysis.js index c57e0d8..36064ed 100644 --- a/js/pages/newDataAnalysis/proQualityAnalysis.js +++ b/js/pages/newDataAnalysis/proQualityAnalysis.js @@ -155,7 +155,7 @@ function initTable(type, bidCode) { // 工程质量分析 return [ { type: "numbers", title: "序号", width: "10%" }, // 添加序号列 - { field: "projectName", title: "工程名称", align: "center" }, + { field: "checkItems", title: "检查项目", align: "center" }, { field: "projectManager", title: "项目经理", align: "center" }, { field: "team", title: "施工队伍", align: "center" }, { field: "startTime", title: "开始时间", align: "center" }, @@ -291,12 +291,12 @@ function initEchartsOne(passRate, noPassRate) { } function initEchartsTwo(data) { - const teams = data.map((item) => item.team); + const teams = data.map((item) => item.checkItems); const scores = data.map((item) => item.score); const option = { title: { - text: "队伍得分柱状图", + text: "检查项目得分情况", left: "center", textStyle: { color: "#fff", From 927a65be85bfe2dd8fdfeea30c402d68f659ce33 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 24 Jul 2025 19:17:19 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/pages/newDataAnalysis/projectManagement.js | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/js/pages/newDataAnalysis/projectManagement.js b/js/pages/newDataAnalysis/projectManagement.js index 2ebe70f..8d900ca 100644 --- a/js/pages/newDataAnalysis/projectManagement.js +++ b/js/pages/newDataAnalysis/projectManagement.js @@ -224,19 +224,19 @@ function setCols(type) { title: "实际成本", align: "center", }, - { - title: "风险等级", - align: "center", - templet: (d) => { - let text = ""; - text += - '' + - d.riskLevel + - "级" + - ""; - return text; - }, - }, + // { + // title: "风险等级", + // align: "center", + // templet: (d) => { + // let text = ""; + // text += + // '' + + // d.riskLevel + + // "级" + + // ""; + // return text; + // }, + // }, { title: "风险数量", align: "center", @@ -249,11 +249,11 @@ function setCols(type) { return text; }, }, - { - field: "suggestion", - title: "建议策略", - align: "center", - }, + // { + // field: "suggestion", + // title: "建议策略", + // align: "center", + // }, { title: "操作", align: "center", @@ -276,7 +276,7 @@ function setCols2(type) { { type: "numbers", title: "序号", width: "10%" }, // 添加序号列 { field: "proPart", - title: "工程部位", + title: "工序名称", align: "center", }, { @@ -375,7 +375,7 @@ function initTable(type, bidCode) { tableData = res.rows; barData = tableData.map((item) => { - return item.taskName; + return item.proName; }); barData_1 = tableData.map((item) => { return item.actualCost; @@ -716,8 +716,10 @@ function initPieChart() { type: "category", data: barData, axisLabel: { - color: "#fff", // x轴文字颜色设为白色 + color: "#fff", fontSize: 12, + interval: 0, // 强制显示所有标签 + rotate: barData.length > 5 ? 30 : 0, // 如果项目多就旋转标签 }, axisLine: { lineStyle: { From aaee9bfa8e4bd1d92b40b3a0fbe0bfb69f2af2a5 Mon Sep 17 00:00:00 2001 From: jiang Date: Thu, 24 Jul 2025 19:38:54 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=8A=82=E8=83=BD=E5=87=8F=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newDataAnalysis/energySavingAnalysis.html | 125 +++++++++--------- pages/newDataAnalysis/exception-detail.html | 8 +- 2 files changed, 69 insertions(+), 64 deletions(-) diff --git a/pages/newDataAnalysis/energySavingAnalysis.html b/pages/newDataAnalysis/energySavingAnalysis.html index f192519..3257a24 100644 --- a/pages/newDataAnalysis/energySavingAnalysis.html +++ b/pages/newDataAnalysis/energySavingAnalysis.html @@ -158,14 +158,14 @@

设备能耗占比

-
+
-

节能减排措施落实情况

-
+

设备节能占比

+

能耗异常分析

@@ -179,6 +179,8 @@ diff --git a/pages/newDataAnalysis/exception-detail.html b/pages/newDataAnalysis/exception-detail.html index 23ad64a..fbe1c53 100644 --- a/pages/newDataAnalysis/exception-detail.html +++ b/pages/newDataAnalysis/exception-detail.html @@ -78,10 +78,9 @@ - From 8080211bea0ebc882beab80c0bb8b0c691440d94 Mon Sep 17 00:00:00 2001 From: jiang Date: Thu, 24 Jul 2025 19:40:30 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=8A=82=E8=83=BD=E5=87=8F=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/newDataAnalysis/energySavingAnalysis.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/newDataAnalysis/energySavingAnalysis.html b/pages/newDataAnalysis/energySavingAnalysis.html index 3257a24..6ab781c 100644 --- a/pages/newDataAnalysis/energySavingAnalysis.html +++ b/pages/newDataAnalysis/energySavingAnalysis.html @@ -165,7 +165,7 @@

设备节能占比

-
+

能耗异常分析