From 91d754e050baeeae06aa10bcee01d64969b23996 Mon Sep 17 00:00:00 2001 From: wgx <31655391@qq.com> Date: Sat, 6 Dec 2025 18:29:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=92=AD=E6=94=BE=E5=99=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E3=80=81=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E5=9B=9E=E6=94=BE=E3=80=81=E6=80=BB=E6=B0=AE=E7=A3=B7COD?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/index.css | 7 ++++++- src/components/SoilDialog.vue | 30 ++++++++++++++++------------ src/pages/Home/index.vue | 37 +++++++++++++++-------------------- src/pages/MywrList/index.vue | 23 +++++++++++++++------- 4 files changed, 56 insertions(+), 41 deletions(-) diff --git a/src/assets/css/index.css b/src/assets/css/index.css index a843c35..bb3cbe5 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -371,6 +371,7 @@ text-align: left; font-size: 0.7vw; margin-top: 0.4vw; + margin-left: 0.2vw; color: #fff; white-space: nowrap; overflow: hidden; @@ -383,7 +384,7 @@ color: #27ddfe; } .jczbtm_lf_rtnum span{ - font-size: 0.7vw; + font-size: 1vw; } .mywrcov{ width: 94%; @@ -894,6 +895,10 @@ background-color: #000a21 !important; color: #fff !important; } +.el-table { + background-color: rgb(34, 28, 28, 0.1) !important; +} + ::-webkit-scrollbar { width: 0 !important; /* 隐藏滚动条 */ } diff --git a/src/components/SoilDialog.vue b/src/components/SoilDialog.vue index f6e536a..1d18132 100644 --- a/src/components/SoilDialog.vue +++ b/src/components/SoilDialog.vue @@ -9,13 +9,8 @@ @close="closeDialog" >
-
- +
+
长期定位监测
@@ -75,15 +70,16 @@
展示方式： - + 折线 表格
-
+
{ @@ -163,6 +161,7 @@ export default { this.tableHead = res.result.realTimeData this.tableIndex = res.result.tableIndex } + this.loading = false this.initEchartDom(); } }) @@ -179,6 +178,9 @@ export default { // }) }, initEchartDom() { + if(!(this.echartOrTable == '1')){ + return; + } console.log('initEchart') if(!this.allData) { console.error('数据未获取到') @@ -899,7 +901,11 @@ export default { } } .tableRowClassName{ - background-color: rgb(216, 19, 19); + background-color: rgb(34, 28, 28); color: #fff; } +:deep(.el-table) :deep(.el-table__body-wrapper){ + background-color: rgb(34, 28, 28); +} + \ No newline at end of file diff --git a/src/pages/Home/index.vue b/src/pages/Home/index.vue index 7245a31..295c1af 100644 --- a/src/pages/Home/index.vue +++ b/src/pages/Home/index.vue @@ -262,9 +262,9 @@
{{ valist.name }} - - + + + {{valist.code?parseFloat((valist.code-0).toFixed(2)):'--'}} {{ valist.unit }}
@@ -669,24 +669,17 @@ export default { if (this.stationInfoList) { for (var i = 0; i < this.stationInfoList.length; i++) { let objlist = this.stationInfoList[i].newestData - let arryobjlist = Object.keys(objlist).map(key => objlist[key]) - let newobjList = Object.keys(objlist) this.stationInfoList[i].wrwcode = [] - for (var j = 0; j < this.getPollutionDictCover.length; j++) { - // Object.keys 获取字段名 - for (var k = 0; k < newobjList.length; k++) { - if (this.getPollutionDictCover[j].code == newobjList[k]) { - this.stationInfoList[i].wrwcode.push({ - name: this.getPollutionDictCover[j].description, - icon: this.getPollutionDictCover[j].icon, - unit: this.getPollutionDictCover[j].unit, - color: this.getPollutionDictCover[j].color, - code: arryobjlist[k], - tylename: newobjList[k] - }) - } - } - } + objlist.map(item => { + this.stationInfoList[i].wrwcode.push({ + name: item.name, + icon: item.icon, + unit: item.unit, + color: item.color, + code: item.value, + tylename: item.survItem + }) + }); } } @@ -930,7 +923,9 @@ export default { }); var optionLine = { tooltip: { - trigger: 'axis' + trigger: 'axis', + enterable: true, + confine: true, }, grid: { top: '14%', diff --git a/src/pages/MywrList/index.vue b/src/pages/MywrList/index.vue index a3180d0..72e230e 100644 --- a/src/pages/MywrList/index.vue +++ b/src/pages/MywrList/index.vue @@ -520,7 +520,8 @@ export default { }); var optionLine = { tooltip: { - trigger: 'axis' + trigger: 'axis', + confine: true, }, grid: { top: '14%', @@ -647,13 +648,21 @@ export default { this.stationDetail = res.result this.DetailListAirData = res.result.latestAirData[0] //空气数据 - if (this.DetailListAirData) {} + if (this.DetailListAirData) { } if (this.stationDetail.latestWaterData[0]) { //水数据 - this.waterData.dataWaterTemp = this.stationDetail.latestWaterData[0].dataWaterTemp - this.waterData.dataWaterPh = this.stationDetail.latestWaterData[0].dataWaterPh - this.waterData.dataWaterDo = this.stationDetail.latestWaterData[0].dataWaterDo - this.waterData.dataWaterDdl = this.stationDetail.latestWaterData[0].dataWaterDdl - this.waterData.dataWaterNtu = this.stationDetail.latestWaterData[0].dataWaterNtu + this.stationDetail.latestWaterData.map(item => { + if(item.survItem == 'dataWaterTemp'){ + that.waterData.dataWaterTemp = item.value + } else if(item.survItem == 'dataWaterPh'){ + that.waterData.dataWaterPh = item.value + } else if(item.survItem == 'dataWaterDo'){ + that.waterData.dataWaterDo = item.value + } else if(item.survItem == 'dataWaterDdl'){ + that.waterData.dataWaterDdl = item.value + } else if(item.survItem == 'dataWaterNtu'){ + that.waterData.dataWaterNtu = item.value + } + }); this.animateObj = []; this.hhlistxunh(); }