From dc6c9f5ef2282bfe3139cfc1c737d241a3bcddf7 Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Tue, 21 Oct 2025 17:02:58 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E8=A7=86=E9=A2=91=E7=82=B9=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/MapCtrl/components/GsJcsj/drpOption.js | 1 + src/views/Home/homePanelsLayoutPage/item_gongcheng.js | 8 ++++---- src/views/Home/homePanelsLayoutPage/item_shipindian.js | 2 +- src/views/gcaqjc/bzt2/index.js | 6 +++--- src/views/gxsl/zfzl/shuiguan/drpOption.js | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js b/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js index 0ca893ea6..d6b4139b8 100644 --- a/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js +++ b/src/views/Home/MapCtrl/components/GsJcsj/drpOption.js @@ -48,6 +48,7 @@ export default function DrpOption(data, num) { { type: 'category', data: data?.map(item => item.tm), + inverse:true, splitLine: { show: false }, diff --git a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js index efc16cda2..d54d79c04 100644 --- a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js +++ b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js @@ -32,10 +32,10 @@ const Page = () => { }else{ return [ { title: '监测点', key: 'cdnm', dataIndex: 'cdnm',align: "center",width: 80, ellipsis: true }, - { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 80, ellipsis: true, render:(v,row)=>
{v?.slice(5,10)}
{v?.slice(11,16)}
}, - { title:
x方向
(mm)
, key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=>
{v}
}, - { title:
y方向
(mm)
, key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=>
{v}
}, - { title:
h方向
(mm)
, key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=>
{v}
}, + { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 80, ellipsis: true, render:(v,row)=>
{v?.slice(5,10)}
{v?.slice(11,16)|| '-'}
}, + { title:
x方向
(mm)
, key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=>
{v !== null ?v: '-'}
}, + { title:
y方向
(mm)
, key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=>
{v !== null ?v: '-'}
}, + { title:
h方向
(mm)
, key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=>
{v !== null ?v: '-'}
}, ] } }, [checked]); diff --git a/src/views/Home/homePanelsLayoutPage/item_shipindian.js b/src/views/Home/homePanelsLayoutPage/item_shipindian.js index 4791cf45b..91eb49570 100644 --- a/src/views/Home/homePanelsLayoutPage/item_shipindian.js +++ b/src/views/Home/homePanelsLayoutPage/item_shipindian.js @@ -18,7 +18,7 @@ const Page = () => { const columns = [ // { title: '序号', key: 'stationCode', dataIndex: 'stationCode',align: "center",width: 50, ellipsis: true, render: (text, rec, index) => index + 1 }, { title: '视频点名称', key: 'name', dataIndex: 'name',align: "center",width:80, ellipsis: true, }, - { title: '所属区域', key: 'name', dataIndex: 'name',align: "center",width: 150, ellipsis: true }, + { title: '所属区域', key: 'menuName', dataIndex: 'menuName',align: "center",width: 150, ellipsis: true }, ]; const getData = async(val)=>{ setChecked(val) diff --git a/src/views/gcaqjc/bzt2/index.js b/src/views/gcaqjc/bzt2/index.js index d59ed73ad..9eacf565b 100644 --- a/src/views/gcaqjc/bzt2/index.js +++ b/src/views/gcaqjc/bzt2/index.js @@ -50,9 +50,9 @@ export default function Page({ isHome }) { const columnsWy = [ { title: '监测点', key: 'cdnm', dataIndex: 'cdnm', align: "center", width: 150, ellipsis: true }, { title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 80, ellipsis: true, render: (v, row) =>
{v?.slice(5, 10)}
{v?.slice(11, 16) || '-'}
}, - { title:
x方向
(mm)
, key: 'de', dataIndex: 'de', align: "center", ellipsis: true, render: (v, row) =>
{v || '-'}
}, - { title:
y方向
(mm)
, key: 'dn', dataIndex: 'dn', align: "center", ellipsis: true, render: (v, row) =>
{v || '-'}
}, - { title:
h方向
(mm)
, key: 'du', dataIndex: 'du', align: "center", ellipsis: true, render: (v, row) =>
{v || '-'}
}, + { title:
x方向
(mm)
, key: 'de', dataIndex: 'de', align: "center", ellipsis: true, render: (v, row) =>
{v !== null ?v: '-'}
}, + { title:
y方向
(mm)
, key: 'dn', dataIndex: 'dn', align: "center", ellipsis: true, render: (v, row) =>
{v !== null ?v: '-'}
}, + { title:
h方向
(mm)
, key: 'du', dataIndex: 'du', align: "center", ellipsis: true, render: (v, row) =>
{v !== null ?v: '-'}
}, ] diff --git a/src/views/gxsl/zfzl/shuiguan/drpOption.js b/src/views/gxsl/zfzl/shuiguan/drpOption.js index fce1300f6..a6c29c37f 100644 --- a/src/views/gxsl/zfzl/shuiguan/drpOption.js +++ b/src/views/gxsl/zfzl/shuiguan/drpOption.js @@ -60,6 +60,7 @@ export default function DrpOption(data, num) { { type: 'category', data: data?.map(item => item.tm), + inverse:true, splitLine: { show: false },