From 3a0402d7aa5678dee993e510104b032598f62dd1 Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Wed, 22 Oct 2025 11:19:39 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E4=BF=AE=E6=AD=A3=E6=B0=B4=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E8=B0=83=E5=BA=A6=E5=9B=BE=E8=A1=A8y=E8=BD=B4?= =?UTF-8?q?=E7=9A=84=E6=9C=80=E5=B0=8F=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/MapCtrl/Pops/TuRang/TableData.js | 2 +- src/views/Home/MapCtrl/components/GsJcsj/drpOption.js | 3 +-- src/views/Home/homePanelsLayoutPage/item_gongshui.js | 8 ++++---- .../Home/homePanelsLayoutPage/item_turangshangqing.js | 2 +- src/views/gxsl/gstjfx/gsOption.js | 2 +- src/views/gxsl/gstjfx/tjOption.js | 2 +- src/views/sq/qth/trsq/sjcx.js | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/Home/MapCtrl/Pops/TuRang/TableData.js b/src/views/Home/MapCtrl/Pops/TuRang/TableData.js index 1a83bbc5e..2139b0aa1 100644 --- a/src/views/Home/MapCtrl/Pops/TuRang/TableData.js +++ b/src/views/Home/MapCtrl/Pops/TuRang/TableData.js @@ -7,7 +7,7 @@ const Tabledata = ({tableData}) => { const columns = [ { title: '序号', key: '', dataIndex: '', align: 'center',width:'40px',render:(a,b,c)=>c+1}, { title: '数据时间', key: 'createTime', dataIndex: 'createTime', align: 'center',width:'200px',render: (rec) => {rec ?? "-"} }, - { title: '湿度', key: 'val', dataIndex: 'val', align: 'center',render: (rec) => {getVal(rec)} }, + { title: '湿度(%RH)', key: 'val', dataIndex: 'val', align: 'center',render: (rec) => {getVal(rec)} }, ]; const getVal = (v)=>{ diff --git a/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js b/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js index d6b4139b8..3c0d8c634 100644 --- a/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js +++ b/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js @@ -3,7 +3,6 @@ import { useMemo } from 'react'; import echarts from 'echarts/lib/echarts'; export default function DrpOption(data, num) { - console.log("num",num); const minL = Math.floor(Math.min(...data?.map(s => s.q))); const maxL = Math.ceil(Math.max(...data?.map(s => s.q))); const minS = Math.floor(Math.min(...data?.map(s => s.v))); @@ -116,7 +115,7 @@ export default function DrpOption(data, num) { axisTick: { show: false, }, - min: minS - 1, + min: minS, max: maxS } ], diff --git a/src/views/Home/homePanelsLayoutPage/item_gongshui.js b/src/views/Home/homePanelsLayoutPage/item_gongshui.js index 06932ddcd..d8bab23a7 100644 --- a/src/views/Home/homePanelsLayoutPage/item_gongshui.js +++ b/src/views/Home/homePanelsLayoutPage/item_gongshui.js @@ -51,7 +51,7 @@ const Page = () => {
实时流量:
-
{data1.q}
+
{data1.q}m³/s
{/*
@@ -64,7 +64,7 @@ const Page = () => {
今日水量:
-
{data1.v}
+
{data1.v}m³
@@ -75,7 +75,7 @@ const Page = () => {
实时流量:
-
{data2.q}
+
{data2.q}m³/s
{/*
@@ -88,7 +88,7 @@ const Page = () => {
今日水量:
-
{data2.v}
+
{data2.v}m³
diff --git a/src/views/Home/homePanelsLayoutPage/item_turangshangqing.js b/src/views/Home/homePanelsLayoutPage/item_turangshangqing.js index d6ad44cf4..6ae6794be 100644 --- a/src/views/Home/homePanelsLayoutPage/item_turangshangqing.js +++ b/src/views/Home/homePanelsLayoutPage/item_turangshangqing.js @@ -10,7 +10,7 @@ const Page = () => { const [ tableData, setTableData ] = useState([])//在线 const columns = [ { title: '站点', key: 'stnm', dataIndex: 'stnm',align: "center",width:80, ellipsis: true, }, - { title: '湿度', key: 'val', dataIndex: 'val',align: "center",width:80, ellipsis: true,render:(v)=>typeof v ==='number'?v.toFixed(2):'' }, + { title: '湿度(%RH)', key: 'val', dataIndex: 'val',align: "center",width:80, ellipsis: true,render:(v)=>typeof v ==='number'?v.toFixed(2):'' }, { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true }, ]; diff --git a/src/views/gxsl/gstjfx/gsOption.js b/src/views/gxsl/gstjfx/gsOption.js index d8134c844..7a9394380 100644 --- a/src/views/gxsl/gstjfx/gsOption.js +++ b/src/views/gxsl/gstjfx/gsOption.js @@ -100,7 +100,7 @@ export default function drpOption (data) { type: 'value', // gridIndex:0, position: 'left', - // name: '水位(m)', + name: '供水量(万m³)', splitLine: { show: true, lineStyle: { diff --git a/src/views/gxsl/gstjfx/tjOption.js b/src/views/gxsl/gstjfx/tjOption.js index 0de1af535..e3695bc2c 100644 --- a/src/views/gxsl/gstjfx/tjOption.js +++ b/src/views/gxsl/gstjfx/tjOption.js @@ -67,7 +67,7 @@ return{ }, labelLine: { normal: { - length: 80, + length: 60, // length2: 120, lineStyle: { color: "#e6e6e6", diff --git a/src/views/sq/qth/trsq/sjcx.js b/src/views/sq/qth/trsq/sjcx.js index ae34cf2af..0558c2f11 100644 --- a/src/views/sq/qth/trsq/sjcx.js +++ b/src/views/sq/qth/trsq/sjcx.js @@ -17,7 +17,7 @@ export default function Sjcx({ data }) { const columns = [ { title: '序号', key: '', dataIndex: '', align: 'center',width:'80px',render:(a,b,c)=>c+1}, { title: '数据时间', key: 'createTime', dataIndex: 'createTime', align: 'center',width:'200px',render: (rec) => {rec ?? "-"} }, - { title: '湿度', key: 'val', dataIndex: 'val', align: 'center',render: (rec) => {rec ?? "-"} }, + { title: '湿度(%RH)', key: 'val', dataIndex: 'val', align: 'center',render: (rec) => {rec ?? "-"} }, ];