diff --git a/js/pages/dataAnalysisOctober/overallEfficiency.js b/js/pages/dataAnalysisOctober/overallEfficiency.js index ad52df3..40ec2ec 100644 --- a/js/pages/dataAnalysisOctober/overallEfficiency.js +++ b/js/pages/dataAnalysisOctober/overallEfficiency.js @@ -198,6 +198,31 @@ function initEnvironmental(data) { fontSize: 15, }, }, + "dataZoom": [{ + "show": true, + "height": 12, + "xAxisIndex": [ + 0 + ], + bottom:'8%', + "start": 10, + "end": 90, + handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z', + handleSize: '110%', + handleStyle:{ + color:"#d3dee5", + + }, + textStyle:{ + color:"#fff"}, + borderColor:"#90979c" + }, { + "type": "inside", + "show": true, + "height": 15, + "start": 1, + "end": 35 + }], series: [ { type: "bar", @@ -360,6 +385,31 @@ function initSafetyAlert(data) { fontSize: 15, }, }, + "dataZoom": [{ + "show": true, + "height": 12, + "xAxisIndex": [ + 0 + ], + bottom:'8%', + "start": 10, + "end": 90, + handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z', + handleSize: '110%', + handleStyle:{ + color:"#d3dee5", + + }, + textStyle:{ + color:"#fff"}, + borderColor:"#90979c" + }, { + "type": "inside", + "show": true, + "height": 15, + "start": 1, + "end": 35 + }], series: [ { type: "bar", diff --git a/js/pages/dataAnalysisOctober/projectManagement.js b/js/pages/dataAnalysisOctober/projectManagement.js index f0d0e3d..3662cd4 100644 --- a/js/pages/dataAnalysisOctober/projectManagement.js +++ b/js/pages/dataAnalysisOctober/projectManagement.js @@ -1,54 +1,59 @@ -let table, layer, form; +let table, layer, form, laydate; let fontSize = "14", fontFamily = "Alibaba PuHuiTi R", fontColor = "#fff"; -layui.use(["layer", "table", "form"], function () { +layui.use(["layer", "table", "form", "laydate"], function () { layer = layui.layer; table = layui.table; form = layui.form; - // getProjectProgress(); + laydate = layui.laydate; + laydate.render({ + elem: "#ID-laydate-rangeLinked", + range: ["#ID-laydate-start-date-1", "#ID-laydate-end-date-1"], + rangeLinked: true, // 开启日期范围选择时的区间联动标注模式 --- 2.8+ 新增 + }); - // getProjectCost(); + $("#ID-laydate-start-date-1").val(getNowTime()) + $("#ID-laydate-end-date-1").val(getNowTime()) - // getProjectRisk(); + let startTime = ""; + let endTime = ""; + if ($("#ID-laydate-start-date-1").val() != "") { + startTime = $("#ID-laydate-start-date-1").val(); + endTime = $("#ID-laydate-end-date-1").val(); + } else { + startTime = ""; + endTime = ""; + } - //土建专业 - // getCivilEngineering(); - - //电气专业 - // getElectrical(); - - //项目成本 - // getItemCost(); - - //总风险数量 - // getTotalRisk(); + initData(startTime , endTime); }); -function getProjectProgress() { - initProjectProgress(); +function query() { + let startTime = ""; + let endTime = ""; + if ($("#ID-laydate-start-date-1").val() != "") { + startTime = $("#ID-laydate-start-date-1").val(); + endTime = $("#ID-laydate-end-date-1").val(); + } else { + startTime = ""; + endTime = ""; + } + initData(startTime, endTime); } // 获取数据 -function initData() { - // const url = commonUrl + "screen/proSafety/selectOverallEfficiencyData"; +function initData(startTime, endTime) { const url = commonUrl + "screen/projectData/selectProjectData"; - let encryptStr = encryptCBC( - JSON.stringify({ - startTime: "2025-10-10", - endTime: "2025-10-17", - }) - ); - ajaxRequest( url, "get", { - startTime: "2025-10-10", - endTime: "2025-10-17", + startTime: startTime, + endTime: endTime, }, true, function () {}, @@ -124,7 +129,7 @@ function initData() { ); } -initData(); + function initProjectProgress(projectProgress) { const a = projectProgress.split("%")[0] * 1; @@ -584,6 +589,31 @@ function initCivilEngineering(date) { }, }, ], + "dataZoom": [{ + "show": true, + "height": 12, + "xAxisIndex": [ + 0 + ], + bottom:'8%', + "start": 10, + "end": 90, + handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z', + handleSize: '110%', + handleStyle:{ + color:"#d3dee5", + + }, + textStyle:{ + color:"#fff"}, + borderColor:"#90979c" + }, { + "type": "inside", + "show": true, + "height": 15, + "start": 1, + "end": 35 + }], series: [ { name: "计划", @@ -838,6 +868,31 @@ function initElectrical(data) { }, }, ], + "dataZoom": [{ + "show": true, + "height": 12, + "xAxisIndex": [ + 0 + ], + bottom:'8%', + "start": 10, + "end": 90, + handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z', + handleSize: '110%', + handleStyle:{ + color:"#d3dee5", + + }, + textStyle:{ + color:"#fff"}, + borderColor:"#90979c" + }, { + "type": "inside", + "show": true, + "height": 15, + "start": 1, + "end": 35 + }], series: [ { name: "计划", @@ -1083,6 +1138,31 @@ function initItemCost(data) { }, }, ], + "dataZoom": [{ + "show": true, + "height": 12, + "xAxisIndex": [ + 0 + ], + bottom:'8%', + "start": 10, + "end": 90, + handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z', + handleSize: '110%', + handleStyle:{ + color:"#d3dee5", + + }, + textStyle:{ + color:"#fff"}, + borderColor:"#90979c" + }, { + "type": "inside", + "show": true, + "height": 15, + "start": 1, + "end": 35 + }], series: [ { name: "项目成本", diff --git a/pages/dataAnalysisOctober/overallEfficiency.html b/pages/dataAnalysisOctober/overallEfficiency.html index 6199319..1132047 100644 --- a/pages/dataAnalysisOctober/overallEfficiency.html +++ b/pages/dataAnalysisOctober/overallEfficiency.html @@ -329,9 +329,10 @@