diff --git a/css/newDataAnalysis/projectProgress.css b/css/newDataAnalysis/projectProgress.css index 2891bb3..3c12fd9 100644 --- a/css/newDataAnalysis/projectProgress.css +++ b/css/newDataAnalysis/projectProgress.css @@ -5,10 +5,13 @@ } .tap-box div { - padding: 4px 10px; - border-radius: 5px; + text-align: center; + padding: 8px 16px; + background: rgba(22, 186, 170, 0.2); + border-radius: 6px; + border: 1px solid rgba(22, 186, 170, 0.5); + transition: all 0.3s ease; cursor: pointer; - border: 1px solid #e0e0e0; } .tap-box div:last-child { @@ -16,7 +19,9 @@ } .active { - background-color: #0052cc; + background: rgba(22, 186, 170, 0.8) !important; + border: 1px solid rgba(22, 186, 170, 0.8) !important; + color: #fff; } .chart-box { @@ -25,6 +30,21 @@ } .chart-box-left, .chart-box-right { - width: 50%; + width: 48%; height: 400px; + + background: linear-gradient( + 135deg, + rgba(22, 186, 170, 0.1) 0%, + rgba(22, 186, 170, 0.05) 100% + ); + border: 1px solid rgba(22, 186, 170, 0.3); + border-radius: 12px; + padding: 20px; + position: relative; + overflow: hidden; + box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3); +} +.chart-box-left { + margin-right: 1%; } diff --git a/js/pages/newDataAnalysis/projectManagement.js b/js/pages/newDataAnalysis/projectManagement.js index 62661f7..825ba16 100644 --- a/js/pages/newDataAnalysis/projectManagement.js +++ b/js/pages/newDataAnalysis/projectManagement.js @@ -80,7 +80,6 @@ function initTable(type, bidCode) { function setCols(type) { if (type === 1) { - // 工程质量分析 return [ { type: "numbers", title: "序号", width: "10%" }, // 添加序号列 { @@ -134,7 +133,7 @@ function initTable(type, bidCode) { templet: (d) => { let text = ""; text += - '导出'; + '导出'; return text; }, }, diff --git a/js/pages/newDataAnalysis/projectProgress.js b/js/pages/newDataAnalysis/projectProgress.js index 95facdc..9b1d63d 100644 --- a/js/pages/newDataAnalysis/projectProgress.js +++ b/js/pages/newDataAnalysis/projectProgress.js @@ -166,15 +166,14 @@ function initLineChart() { trigger: "axis", }, legend: { + show: true, data: ["计划进度", "实际进度"], textStyle: { // 图例文字样式 color: "#fff", // 图例文字颜色 }, itemStyle: { - color: function (name) { - return name === "计划进度" ? "#5470C6" : "#FF0000"; - }, + color: "auto", }, }, grid: { @@ -203,7 +202,9 @@ function initLineChart() { }, itemStyle: { color: "#5470C6", + borderWidth: 0, // 去除白色边框 }, + symbolSize: 8, // 可以调整小圆点的大小 }, { name: "实际进度", @@ -216,7 +217,9 @@ function initLineChart() { }, itemStyle: { color: "#FF0000", + borderWidth: 0, // 去除白色边框 }, + symbolSize: 10, // 可以调整小圆点的大小 }, ], }; diff --git a/pages/newDataAnalysis/energySavingAnalysis.html b/pages/newDataAnalysis/energySavingAnalysis.html index d3dce25..b7d0070 100644 --- a/pages/newDataAnalysis/energySavingAnalysis.html +++ b/pages/newDataAnalysis/energySavingAnalysis.html @@ -22,8 +22,7 @@