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: , key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=>{v}
},
- { title: , key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=>{v}
},
- { title: , 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: , key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=>{v !== null ?v: '-'}
},
+ { title: , key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=>{v !== null ?v: '-'}
},
+ { title: , 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: , key: 'de', dataIndex: 'de', align: "center", ellipsis: true, render: (v, row) => {v || '-'}
},
- { title: , key: 'dn', dataIndex: 'dn', align: "center", ellipsis: true, render: (v, row) => {v || '-'}
},
- { title: , key: 'du', dataIndex: 'du', align: "center", ellipsis: true, render: (v, row) => {v || '-'}
},
+ { title: , key: 'de', dataIndex: 'de', align: "center", ellipsis: true, render: (v, row) => {v !== null ?v: '-'}
},
+ { title: , key: 'dn', dataIndex: 'dn', align: "center", ellipsis: true, render: (v, row) => {v !== null ?v: '-'}
},
+ { title: , 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
},