diff --git a/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js b/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js
index ca20e2945..fca29726a 100644
--- a/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js
+++ b/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js
@@ -96,7 +96,7 @@ export default class ShuiKuLayer extends BaseLayer {
// }
- const list = data.filter(o=>o.stnm==='檀树岗' || o.stnm==='檀树岗(新)')
+ const list = data.filter(o=>o.stcd==="61610700" || o.stcd==="10818")
.map((i) => {
return {
id : i.stcd,
@@ -104,7 +104,6 @@ export default class ShuiKuLayer extends BaseLayer {
...i
}
})
-
this._dispatch.runtime.setMarkers({
[this.getLayerName()]: list || []
});
diff --git a/src/views/Home/homePanelsLayoutPage/index.js b/src/views/Home/homePanelsLayoutPage/index.js
index 132ac12cf..e05ea4aaf 100644
--- a/src/views/Home/homePanelsLayoutPage/index.js
+++ b/src/views/Home/homePanelsLayoutPage/index.js
@@ -677,7 +677,7 @@ const HomePage = ({ showPanels }) => {
>
{
item.children.map((item) =>
- {
+ {
// 清空搜索输入框
setSearchVal('')
setCheckedObj(item)
@@ -699,7 +699,7 @@ const HomePage = ({ showPanels }) => {
: null
}
-
+
)
}
diff --git a/src/views/Home/homePanelsLayoutPage/item_daba.js b/src/views/Home/homePanelsLayoutPage/item_daba.js
index 50e934797..1aff78cb2 100644
--- a/src/views/Home/homePanelsLayoutPage/item_daba.js
+++ b/src/views/Home/homePanelsLayoutPage/item_daba.js
@@ -40,50 +40,50 @@ const Page = () => {
return (
<>
{navigator('/mgr/sg/byfz/bypc')}}>
-
{count.hasAnt}
+
{setOpen(true);setkey('白蚁告警')}}>
+
{dataObj.byWarn?.length || 0}处
白蚁告警
@@ -130,7 +114,7 @@ const Page = ({ mySetTms }) => {
- {key}
+ {key == '白蚁告警' ? key + "(" + tms[0]?.slice(0,16) + "至" + tms[1]?.slice(0,16) + ')':key }
setOpen(false)} style={{color:"#333"}}/>
@@ -139,7 +123,8 @@ const Page = ({ mySetTms }) => {
{ key==='位移告警'?
setOpen(false)}/>:null }
{ key==='渗压告警'?setOpen(false)}/>:null }
{ key==='渗流告警'?setOpen(false)}/>:null }
- { key==='AI告警'?:null }
+ {key === 'AI告警' ? : null}
+ { key==='白蚁告警'?setOpen(false)}/>:null }
diff --git a/src/views/Home/homePanelsLayoutPage/item_yujing/table_by.js b/src/views/Home/homePanelsLayoutPage/item_yujing/table_by.js
new file mode 100644
index 000000000..b8cd67b86
--- /dev/null
+++ b/src/views/Home/homePanelsLayoutPage/item_yujing/table_by.js
@@ -0,0 +1,56 @@
+import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
+import { Table, Modal, message,Tag } from 'antd';
+import { CloseOutlined } from "@ant-design/icons";
+import usePageTable from '../../../../components/crud/usePageTable2'
+import { createCrudService } from '../../../../components/crud/_';
+
+import { httppost2 } from "../../../../utils/request";
+import apiurl from "../../../../service/apiurl";
+
+
+const Page = ({ data }) => {
+ const columns = [
+ { title: '序号', key: 'inx', dataIndex: 'inx', align: "center", render: (text, rec, index) => index + 1 },
+ { title: '最近报警时间', key: 'obDate', dataIndex: 'obDate', ellipsis: true },
+ { title: '测点编号', key: 'order', dataIndex: 'order' },
+ {
+ title: '有无白蚁',
+ dataIndex: 'status',
+ align: 'center',
+ key: 'status',
+ width: 100,
+ render: (text, record) => {
+ // 如果 isHarm 为 null 或 undefined,显示无
+ if (text == null) {
+ return
无;
+ }
+
+ // 如果 isHandle 为 null 或 undefined,当作 false 处理
+ const isHandle = record.isHandle ?? false;
+
+ return (
+
+ {!text ? '无' : '有'}
+
+ );
+ }
+ },
+ ];
+
+ return (
+
+ )
+}
+
+export default Page
diff --git a/src/views/rcgl/byfz/bypc/precessForm.js b/src/views/rcgl/byfz/bypc/precessForm.js
index b6d4fea35..f2ffd1803 100644
--- a/src/views/rcgl/byfz/bypc/precessForm.js
+++ b/src/views/rcgl/byfz/bypc/precessForm.js
@@ -48,7 +48,6 @@ const ModalForm = ({ mode, record, refresh, setPrecessVisible }) => {
setHandleDetails(row)
}
const reviewPic = (arrPic) => {
- debugger
if (arrPic.length > 0) {
setImgVisible(true)
setImgList(arrPic)
@@ -329,12 +328,8 @@ const ModalForm = ({ mode, record, refresh, setPrecessVisible }) => {
const handleFile = (arr = []) => {
const newArr = arr?.map(item => ({
name: item.fileName,
- response: {
- data: {
- filePath: item.filePath,
- fileId: item.fileId
- }
- },
+ filePath: item.filePath,
+ fileId: item.fileId
}))
return newArr
}
@@ -652,7 +647,7 @@ const ModalForm = ({ mode, record, refresh, setPrecessVisible }) => {
@@ -680,7 +675,7 @@ const ModalForm = ({ mode, record, refresh, setPrecessVisible }) => {
{ setVideoOpen(true); setVideoParams(file) }}
+ onClick={() => {setVideoOpen(true); setVideoParams(file) }}
style={{ cursor: 'pointer' }}
>
{
const handleFile = (arr=[]) => {
const newArr = arr?.map(item => ({
name: item.fileName,
- response: {
- data: {
- filePath: item.filePath,
- fileId:item.fileId
- }
- },
+ filePath: item.filePath,
+ fileId:item.fileId
}))
return newArr
}
diff --git a/src/views/sq/qth/sksq/index.js b/src/views/sq/qth/sksq/index.js
index 1bea7b587..d5feb909b 100644
--- a/src/views/sq/qth/sksq/index.js
+++ b/src/views/sq/qth/sksq/index.js
@@ -17,7 +17,7 @@ export default function Sksq() {
const getData = async (params) => {
const data = await reservoirlist(params)
- setTableData(data.filter(o=>o.stnm==='檀树岗' || o.stnm==='檀树岗(新)'));
+ setTableData(data);
}
useEffect(() => {
let option = {
@@ -38,8 +38,8 @@ export default function Sksq() {
站点:
({ label: item.stnm, value: index }))}
+ style={{ width: '250px' }}
+ options={tableData.map((item,index)=>({ label: item.stnm, value:index }))}
value={selected}
onChange={(e) => setSelected(e)}
/>