From 15a5aed6b8348e38d0a53ffcdd3b5851fbe5b484 Mon Sep 17 00:00:00 2001 From: jiang Date: Thu, 24 Jul 2025 14:30:02 +0800 Subject: [PATCH 1/9] =?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 | 2 ++ pages/newDataAnalysis/exception-detail.html | 32 +++++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/pages/newDataAnalysis/energySavingAnalysis.html b/pages/newDataAnalysis/energySavingAnalysis.html index 585c776..e933376 100644 --- a/pages/newDataAnalysis/energySavingAnalysis.html +++ b/pages/newDataAnalysis/energySavingAnalysis.html @@ -182,6 +182,7 @@ laydate.render({ elem: '#ID-laydate-range', range: ['#ID-laydate-start-date', '#ID-laydate-end-date'], + btns: ['confirm'], value: range.startDate + ' - ' + range.endDate, done: function (value) { // value 是选择的字符串，比如 '2025-06-23 - 2025-07-23' @@ -304,6 +305,7 @@ function insetLatest(data) { const container = document.getElementById('progress-container'); + container.innerHTML = ''; // 🔄 清空原有内容 data.map(item => { const block = document.createElement('div'); block.innerHTML = ` diff --git a/pages/newDataAnalysis/exception-detail.html b/pages/newDataAnalysis/exception-detail.html index cceeb53..f421116 100644 --- a/pages/newDataAnalysis/exception-detail.html +++ b/pages/newDataAnalysis/exception-detail.html @@ -16,7 +16,7 @@ .card { border-radius: 12px; - box-shadow: 0 2px 8px rgba(0,0,0,0.2); + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2); max-width: 600px; margin: 0 auto; } @@ -62,39 +62,53 @@
异常类型
-
设备过载能耗
+
加载中...
异常时段
-
13:00 - 14:30
+
13:00 - 14:30
建议措施
-
检查设备运行负荷，适当分配工作任务。
+
加载中...
From a25b452b88f1c12d20ab6d66622919d183e2cd58 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 24 Jul 2025 14:31:25 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= 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 16f68e1..2b57d8a 100644 --- a/js/pages/newDataAnalysis/projectProgress.js +++ b/js/pages/newDataAnalysis/projectProgress.js @@ -29,7 +29,7 @@ function setCols(type) { { title: "延误因素分析", align: "center", - templet: (d) => { + templet: (d, index) => { let text = ""; text += '查看'; @@ -144,8 +144,8 @@ function initTable(type, bidCode) { $(".layui-table-body table.layui-table tbody tr #viewBtn").on( "click", function () { - // 获取当前行的数据 - var index = $(this).index(); + const index = $(this).closest("tr").data("index"); + console.log(index, "index"); var rowData = res.rows[index]; // 获取对应行的数据 // 弹框配置 From f3b3fb426ea6b7a1deea1767297329c49ef81576 Mon Sep 17 00:00:00 2001 From: jiang Date: Thu, 24 Jul 2025 14:32:45 +0800 Subject: [PATCH 3/9] =?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/exception-detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/newDataAnalysis/exception-detail.html b/pages/newDataAnalysis/exception-detail.html index f421116..23ad64a 100644 --- a/pages/newDataAnalysis/exception-detail.html +++ b/pages/newDataAnalysis/exception-detail.html @@ -61,7 +61,7 @@
-
异常类型
+
异常描述
加载中...
From 50e3246e95ac79485679cbe83903c2b22fd048fc Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 24 Jul 2025 14:41:35 +0800 Subject: [PATCH 4/9] =?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 | 24 +++++-- .../newDataAnalysis/environmentalReadings.js | 62 +++++++++++++++++++ js/pages/newDataAnalysis/hiddenDanger.js | 60 ++++++++++++++++++ .../environmentalReadings.html | 57 +++++++++++++++++ pages/newDataAnalysis/hiddenDanger.html | 57 +++++++++++++++++ 5 files changed, 255 insertions(+), 5 deletions(-) create mode 100644 js/pages/newDataAnalysis/environmentalReadings.js create mode 100644 js/pages/newDataAnalysis/hiddenDanger.js create mode 100644 pages/newDataAnalysis/environmentalReadings.html create mode 100644 pages/newDataAnalysis/hiddenDanger.html diff --git a/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js b/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js index f458ce7..4eaf339 100644 --- a/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js +++ b/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js @@ -39,12 +39,12 @@ 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: '8%' }, + { 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: '10%', + field: 'rateLevel', title: '最高隐患等级', align: 'center', width: '8%', templet: function (d) { let color = ''; if (d.level == "一般隐患") { @@ -161,6 +161,7 @@ function initEchartsOne(data) { data: dates, axisLabel: { color: "#fff", // X轴标签白色 + fontSize: 10, }, axisLine: { lineStyle: { @@ -260,11 +261,24 @@ function initEchartsOne(data) { ] }; myChart.setOption(environmentOption, true); + + // 添加点击事件监听器 + myChart.on('click', function (params) { + if (params.componentType === 'series') { + environmentalReadings() + } + }); + + window.addEventListener("resize", function () { myChart.resize(); }); } +function environmentalReadings() { + layer.open() +} + function initEchartsTwo(data) { diff --git a/js/pages/newDataAnalysis/environmentalReadings.js b/js/pages/newDataAnalysis/environmentalReadings.js new file mode 100644 index 0000000..70db927 --- /dev/null +++ b/js/pages/newDataAnalysis/environmentalReadings.js @@ -0,0 +1,62 @@ +let table, layer, form; +let myChart = null, myChart2 = null; +layui.use(['layer', 'table', 'form'], function () { + layer = layui.layer; + table = layui.table; + form = layui.form; + let bidCode = parent.parent.parent.$('#bidPro').val() + initTable(bidCode,""); +}); + + +function initTable(bidCode,name) { + const url = commonUrl + "screen/largeScreen/engineeringSafetyAnalysis/getEnvironmentalList"; + table.render({ + elem: '#demo2', + url: url, + id: 'demo2', + skin: 'line', + page: true, + height: 'full-400', + headers: { + "decrypt": "decrypt", + "Authorization": token + }, + where: { + bidCode: bidCode, + name:name + }, + response: { + statusName: "code", + statusCode: 200, + countName: "count", + dataName: "rows", + }, + cols: [[ + { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列 + { field: 'id', title: '监测点编号', align: 'center' }, + { field: 'date', title: '环境数据记录日期', align: 'center' }, + { field: 'temperature', title: '当前温度', align: 'center' }, + { field: 'humidity', title: '当前湿度', align: 'center'}, + { field: 'windSpeed', title: '当前风速', align: 'center'}, + { field: 'gasValue', title: '当前气体值', align: 'center'}, + ]], + 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 query(type) { + let name = $('#name').val(); + let bidCode = parent.parent.$('#bidPro').val() + initTable(bidCode,name); +} diff --git a/js/pages/newDataAnalysis/hiddenDanger.js b/js/pages/newDataAnalysis/hiddenDanger.js new file mode 100644 index 0000000..0c245c2 --- /dev/null +++ b/js/pages/newDataAnalysis/hiddenDanger.js @@ -0,0 +1,60 @@ +let table, layer, form; +let myChart = null, myChart2 = null; +layui.use(['layer', 'table', 'form'], function () { + layer = layui.layer; + table = layui.table; + form = layui.form; + let bidCode = parent.parent.parent.$('#bidPro').val() + initTable(bidCode,""); +}); + + +function initTable(bidCode,name) { + const url = commonUrl + "screen/largeScreen/engineeringSafetyAnalysis/getHazardsList"; + table.render({ + elem: '#demo2', + url: url, + id: 'demo2', + skin: 'line', + page: true, + height: 'full-400', + headers: { + "decrypt": "decrypt", + "Authorization": token + }, + where: { + bidCode: bidCode, + name:name + }, + response: { + statusName: "code", + statusCode: 200, + countName: "count", + dataName: "rows", + }, + cols: [[ + { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列 + { field: 'id', title: '隐患编号', align: 'center',}, + { field: 'type', title: '隐患类型', align: 'center', }, + { field: 'level', title: '隐患等级', align: 'center', }, + { field: 'timestamp', title: '隐患发生时间', align: 'center', }, + ]], + 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 query(type) { + let name = $('#name').val(); + let bidCode = parent.parent.$('#bidPro').val() + initTable(bidCode,name); +} diff --git a/pages/newDataAnalysis/environmentalReadings.html b/pages/newDataAnalysis/environmentalReadings.html new file mode 100644 index 0000000..1415c95 --- /dev/null +++ b/pages/newDataAnalysis/environmentalReadings.html @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + 工程安全分析-左边echarts + + + +
+
+
+
+
+
+ +
+ +
+
+ +
+
+
+
+
+
+ + + + + diff --git a/pages/newDataAnalysis/hiddenDanger.html b/pages/newDataAnalysis/hiddenDanger.html new file mode 100644 index 0000000..38b068f --- /dev/null +++ b/pages/newDataAnalysis/hiddenDanger.html @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + 工程安全分析-左边echarts + + + +
+
+
+
+
+
+ +
+ +
+
+ +
+
+
+
+
+
+ + + + + From c416b2599a4a3c038d38ab2e8d6b6d449ddc0c04 Mon Sep 17 00:00:00 2001 From: jiang Date: Thu, 24 Jul 2025 14:51:03 +0800 Subject: [PATCH 5/9] =?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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pages/newDataAnalysis/energySavingAnalysis.html b/pages/newDataAnalysis/energySavingAnalysis.html index e933376..988bf45 100644 --- a/pages/newDataAnalysis/energySavingAnalysis.html +++ b/pages/newDataAnalysis/energySavingAnalysis.html @@ -81,6 +81,10 @@ color: #FFFFFF; } + .layui-layer-title { + border: none; + } + #alarm-container { overflow-x: auto; /* 或 overflow-y: auto，根据需要 */ From 06235ff1c0227c8b2ad0bfe319316c9520923278 Mon Sep 17 00:00:00 2001 From: jiang Date: Thu, 24 Jul 2025 14:52:54 +0800 Subject: [PATCH 6/9] =?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 988bf45..3778659 100644 --- a/pages/newDataAnalysis/energySavingAnalysis.html +++ b/pages/newDataAnalysis/energySavingAnalysis.html @@ -82,7 +82,7 @@ } .layui-layer-title { - border: none; + border-bottom: 1px solid #008781; } #alarm-container { From bd94cacfd8422157ad81bf99558a8acef263785e Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 24 Jul 2025 15:29:59 +0800 Subject: [PATCH 7/9] =?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 | 86 +++++++++++++++++-- .../newDataAnalysis/environmentalReadings.js | 9 +- js/pages/newDataAnalysis/hiddenDanger.js | 10 +-- .../environmentalReadings.html | 4 +- pages/newDataAnalysis/hiddenDanger.html | 10 ++- 5 files changed, 89 insertions(+), 30 deletions(-) diff --git a/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js b/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js index 4eaf339..b9acf27 100644 --- a/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js +++ b/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js @@ -18,7 +18,7 @@ function initTable(bidCode,name) { id: 'demo2', skin: 'line', page: true, - height: 'full-400', + height: 'full-410', headers: { "decrypt": "decrypt", "Authorization": token @@ -27,12 +27,6 @@ function initTable(bidCode,name) { bidCode: bidCode, name:name }, - response: { - statusName: "code", - statusCode: 200, - countName: "count", - dataName: "rows", - }, cols: [[ { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列 { field: 'proName', title: '工程名称', align: 'center', width: '10%' }, @@ -269,14 +263,43 @@ function initEchartsOne(data) { } }); - window.addEventListener("resize", function () { myChart.resize(); }); } function environmentalReadings() { - layer.open() + layer.open({ + type: 2, + title: "监测点", + content: "environmentalReadings.html", + area: ["80%", "80%"], + shade: 0.3, // 遮罩透明度 + skin: "custom-layer-style", // 自定义皮肤 + success: function (layero, index) { + // 修改弹框背景颜色 + $(layero).css( + "background", + "rgba(13, 34, 37, 0.9)" + ); // 半透明黑色背景 + $(layero).find(".layui-layer-title").css({ + color: "#fff", // 标题文字颜色 + background: "transparent", // 标题背景透明 + "border-bottom": + "1px solid rgba(255, 255, 255, 0.2)", // 标题底部边框 + }); + $(layero).find(".layui-layer-content").css({ + background: "transparent", // 内容区域透明 + }); + + $(layero) + .find(".layui-layer-setwin .layui-layer-close") + .css({ + color: "#fff", // 文字颜色 + "border-color": "#fff", // 边框颜色（如果按钮有边框） + }); + }, + }); } function initEchartsTwo(data) { @@ -328,6 +351,51 @@ function initEchartsTwo(data) { ] } myChart2.setOption(riskOption, true) + + // 添加点击事件监听器 + myChart2.on('click', function (params) { + if (params.componentType === 'series') { + hiddenDanger() + } + }); +} + +function hiddenDanger() { + layer.open({ + type: 2, + title: "监测点", + content: "hiddenDanger.html", + area: ["80%", "80%"], + shade: 0.3, // 遮罩透明度 + skin: "custom-layer-style", // 自定义皮肤 + success: function (layero, index) { + // 修改弹框背景颜色 + $(layero).css( + "background", + "rgba(13, 34, 37, 0.9)" + ); // 半透明黑色背景 + $(layero).find(".layui-layer-title").css({ + color: "#fff", // 标题文字颜色 + background: "transparent", // 标题背景透明 + "border-bottom": + "1px solid rgba(255, 255, 255, 0.2)", // 标题底部边框 + }); + $(layero).find(".layui-layer-content").css({ + background: "transparent", // 内容区域透明 + }); + + $(layero) + .find(".layui-layer-setwin .layui-layer-close") + .css({ + color: "#fff", // 文字颜色 + "border-color": "#fff", // 边框颜色（如果按钮有边框） + }); + // 获取弹出层内容区域的高度 + var contentHeight = $(layero).find('.layui-layer-content').height(); + // 设置表格的高度 + $('#dangerTable').css('height', contentHeight + 'px'); + }, + }); } function handlDetails(analysisReason){ diff --git a/js/pages/newDataAnalysis/environmentalReadings.js b/js/pages/newDataAnalysis/environmentalReadings.js index 70db927..d14604f 100644 --- a/js/pages/newDataAnalysis/environmentalReadings.js +++ b/js/pages/newDataAnalysis/environmentalReadings.js @@ -17,7 +17,6 @@ function initTable(bidCode,name) { id: 'demo2', skin: 'line', page: true, - height: 'full-400', headers: { "decrypt": "decrypt", "Authorization": token @@ -26,12 +25,6 @@ function initTable(bidCode,name) { bidCode: bidCode, name:name }, - response: { - statusName: "code", - statusCode: 200, - countName: "count", - dataName: "rows", - }, cols: [[ { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列 { field: 'id', title: '监测点编号', align: 'center' }, @@ -57,6 +50,6 @@ function initTable(bidCode,name) { function query(type) { let name = $('#name').val(); - let bidCode = parent.parent.$('#bidPro').val() + let bidCode = parent.parent.parent.$('#bidPro').val() initTable(bidCode,name); } diff --git a/js/pages/newDataAnalysis/hiddenDanger.js b/js/pages/newDataAnalysis/hiddenDanger.js index 0c245c2..474fc79 100644 --- a/js/pages/newDataAnalysis/hiddenDanger.js +++ b/js/pages/newDataAnalysis/hiddenDanger.js @@ -17,7 +17,7 @@ function initTable(bidCode,name) { id: 'demo2', skin: 'line', page: true, - height: 'full-400', + // height: 'full-400', headers: { "decrypt": "decrypt", "Authorization": token @@ -26,12 +26,6 @@ function initTable(bidCode,name) { bidCode: bidCode, name:name }, - response: { - statusName: "code", - statusCode: 200, - countName: "count", - dataName: "rows", - }, cols: [[ { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列 { field: 'id', title: '隐患编号', align: 'center',}, @@ -55,6 +49,6 @@ function initTable(bidCode,name) { function query(type) { let name = $('#name').val(); - let bidCode = parent.parent.$('#bidPro').val() + let bidCode = parent.parent.parent.$('#bidPro').val() initTable(bidCode,name); } diff --git a/pages/newDataAnalysis/environmentalReadings.html b/pages/newDataAnalysis/environmentalReadings.html index 1415c95..1ef6a79 100644 --- a/pages/newDataAnalysis/environmentalReadings.html +++ b/pages/newDataAnalysis/environmentalReadings.html @@ -47,7 +47,9 @@ -
+
+
+
diff --git a/pages/newDataAnalysis/hiddenDanger.html b/pages/newDataAnalysis/hiddenDanger.html index 38b068f..3235f59 100644 --- a/pages/newDataAnalysis/hiddenDanger.html +++ b/pages/newDataAnalysis/hiddenDanger.html @@ -32,10 +32,10 @@
-
+
-
-
+
+
@@ -47,7 +47,9 @@
-
+
+
+
From c803f459d1ed05d3305faaa9c7013e6945bf9816 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 24 Jul 2025 15:30:56 +0800 Subject: [PATCH 8/9] =?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 ++---- pages/newDataAnalysis/proQualityAnalysis.html | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/js/pages/newDataAnalysis/proQualityAnalysis.js b/js/pages/newDataAnalysis/proQualityAnalysis.js index 28e594d..ff170dd 100644 --- a/js/pages/newDataAnalysis/proQualityAnalysis.js +++ b/js/pages/newDataAnalysis/proQualityAnalysis.js @@ -206,7 +206,7 @@ layui.use('upload', function () { // 执行上传 upload.render({ elem: '#uploadBtn', // 绑定元素 - url: commonUrl + "screen/largeScreen/dataAnalysis/uploadProQuality", + url: commonUrl + "screen/largeScreen/dataAnalysis/uploadProQualityFile", accept: 'file', // 允许上传任意文件 exts: 'docx', // 允许的文件类型 size: 1024 * 10, // 限制文件大小，单位 KB（10MB） @@ -223,9 +223,7 @@ layui.use('upload', function () { layer.closeAll('loading'); layer.msg('上传成功'); console.log('服务器返回:', res); - - // 显示文件名或路径 - document.getElementById('fileName').innerText = '已上传文件：' + res.fileName; + parent.location.reload(); // 刷新父页面 }, error: function () { // 上传失败回调 diff --git a/pages/newDataAnalysis/proQualityAnalysis.html b/pages/newDataAnalysis/proQualityAnalysis.html index 8089f6a..3e8a3fb 100644 --- a/pages/newDataAnalysis/proQualityAnalysis.html +++ b/pages/newDataAnalysis/proQualityAnalysis.html @@ -33,7 +33,7 @@
- +
From 924c84647eb1ccad960d25e02e9dceb85d702122 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 24 Jul 2025 17:02:43 +0800 Subject: [PATCH 9/9] =?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, 1 insertion(+), 5 deletions(-) diff --git a/js/pages/newDataAnalysis/proQualityAnalysis.js b/js/pages/newDataAnalysis/proQualityAnalysis.js index ff170dd..c57e0d8 100644 --- a/js/pages/newDataAnalysis/proQualityAnalysis.js +++ b/js/pages/newDataAnalysis/proQualityAnalysis.js @@ -16,7 +16,7 @@ layui.use(["layer", "table", "form"], function () { }; }, }); - initTable(1, parent.$("#bidPro").val()); + initTable(1, parent.parent.$("#bidPro").val()); }); /* 切换数据 */ @@ -156,10 +156,6 @@ function initTable(type, bidCode) { return [ { type: "numbers", title: "序号", width: "10%" }, // 添加序号列 { field: "projectName", title: "工程名称", align: "center" }, - // { field: 'projectNumber', title: '工程编号', align: 'center'}, - // { field: 'projectAddress', title: '项目地址', align: 'center'}, - // { field: 'contractorName', title: '承包商名称', align: 'center',}, - // { field: 'qualityLevel', title: '质量等级', align: 'center'}, { field: "projectManager", title: "项目经理", align: "center" }, { field: "team", title: "施工队伍", align: "center" }, { field: "startTime", title: "开始时间", align: "center" },