+
+
{
/>
-
+ {
+ return {
+ onClick: () => {
+ clickRow(r)
+ }
+ }
+ }}
+ />
+
+
+ )
+
+}
+
+export default Tabledata
\ No newline at end of file
diff --git a/src/views/SafeWatch/TransformWatch/historyToolbar.js b/src/views/SafeWatch/TransformWatch/historyToolbar.js
new file mode 100644
index 0000000..ac482b9
--- /dev/null
+++ b/src/views/SafeWatch/TransformWatch/historyToolbar.js
@@ -0,0 +1,65 @@
+import React, { useEffect, useState } from 'react';
+import { Form, Input, Button, DatePicker, Radio } from 'antd';
+import NormalSelect from '../../../components/Form/NormalSelect';
+
+import moment from 'moment';
+const { RangePicker } = DatePicker;
+const ToolBar = ({ setHistorySearchVal, exportFile1, setTabVal }) => {
+ const start = moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
+ const end = moment().format('YYYY-MM-DD 23:59:59')
+ const [form] = Form.useForm();
+
+ const onFinish = (values) => {
+ let dateTimeRangeSo;
+ if (values.tm) {
+ dateTimeRangeSo = {
+ start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
+ end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
+ }
+ }
+ delete values.tm
+ setHistorySearchVal({ ...values, dateTimeRangeSo });
+ }
+
+ useEffect(() => {
+ form.setFieldValue('tm', [moment(start), moment(end)])
+ setHistorySearchVal({ dateTimeRangeSo: { start: start, end: end } })
+ }, [])
+
+
+ return (
+ <>
+
{setTabsActive(e) }}
+ defaultActiveKey={0}
+ onChange={(e) => { setTabsActive(e) }}
items={[
{
label: '水平位移',
- key: '1',
+ key: 0,
},
{
label: '结构缝开度',
- key: '2',
+ key: 1,
}
]}
@@ -120,21 +163,67 @@ const Page = () => {
setSearchVal={setSearchVal}
onSave={command('save')}
tabsActive={tabsActive}
- exportFile1={exportExcel}
+
/>
+
+
+
+
+ );
+}
+
+export default ToolBar;
\ No newline at end of file
diff --git a/src/views/SafeWatch/TransformWatch/index.js b/src/views/SafeWatch/TransformWatch/index.js
index 6cb9836..72f55c8 100644
--- a/src/views/SafeWatch/TransformWatch/index.js
+++ b/src/views/SafeWatch/TransformWatch/index.js
@@ -2,28 +2,31 @@ import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
import BasicCrudModal from '../../../components/crud/BasicCrudModal';
import { Table, Card, Modal, Form, Input, Button, Row, Col, Timeline, message, Tabs, Image } from 'antd';
import ToolBar from './toolbar';
+import ReactEcharts from 'echarts-for-react';
import ModalForm from './form';
import apiurl from '../../../service/apiurl';
import usePageTable from '../../../components/crud/usePageTable2';
import { createCrudService } from '../../../components/crud/_';
import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
-import { httppost5 } from '../../../utils/request';
+import { httppost2, httppost5 } from '../../../utils/request';
import { exportFile } from '../../../utils/tools.js';
-
+import HistoryToolBar from './historyToolbar'
+import TableData from './TableData';
+import drpOption from './options'
const Page = () => {
- const types = {
- 0: "设备维修",
- 1: '设备更换',
- 2: "结构加固"
- }
const refModal = useRef();
const [searchVal, setSearchVal] = useState(false)
- const [tabsActive, setTabsActive] = useState("1")
-
+ const [tabsActive, setTabsActive] = useState(0)
+ const [jgfOpen, setJgfOpen] = useState(false)
+ const [clickItem, setClickItem] = useState(false)
+ const [tabVal, setTabVal] = useState('1')
+ const [historySearchVal, setHistorySearchVal] = useState(false)
+ const [ tableData, setTableData ] = useState([])
+ const option = useMemo(() => drpOption(tableData), [tableData])
const wColumns = [
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
- { title: '监测点', key: 'stationCode', dataIndex: 'stationCode', width: 150},
- { title: 'X方向位移(mm)', key: 'x', dataIndex: 'x', width: 150},
+ { title: '监测点', key: 'stationCode', dataIndex: 'stationCode', width: 150 },
+ { title: 'X方向位移(mm)', key: 'x', dataIndex: 'x', width: 150 },
{ title: 'Y方向位移(mm)', key: 'y', dataIndex: 'y', width: 150 },
{ title: 'H方向位移(mm)', key: 'h', dataIndex: 'h', width: 150 },
{
@@ -41,15 +44,20 @@ const Page = () => {
];
const jColumns = [
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
- { title: '监测点', key: 'stationCode', dataIndex: 'stationCode', width: 150},
- { title: '缝开度(mm)', key: 'createUserName', dataIndex: 'createUserName', width: 150 },
+ { title: '监测点', key: 'stationCode', dataIndex: 'stationCode', width: 150 },
+ { title: '缝开度(mm)', key: 'value', dataIndex: 'value', width: 150 },
+ { title: '温度(°℃)', key: 'temp', dataIndex: 'temp', width: 150 },
+ { title: '模数(F)', key: 'modulus', dataIndex: 'modulus', width: 150 },
{
title: '监测时间', key: 'tm', dataIndex: 'tm', width: 140,
},
+ { title: '测点位置', key: 'location', dataIndex: 'location', width: 150,ellipse:true },
+
];
const columns = useMemo(() => {
- return tabsActive == '1' ? wColumns : jColumns
- },[tabsActive])
+ return tabsActive == 0 ? wColumns : jColumns
+ }, [tabsActive])
+
const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
@@ -68,7 +76,13 @@ const Page = () => {
const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.aqjc.bxjc.wypage).find_noCode);
+ const { tableProps: tableProps1, search: search1, refresh: refresh1 } = usePageTable(createCrudService(apiurl.aqjc.bxjc.jgfpage).find_noCode);
+ const dataSource = useMemo(() => {
+ if (tableProps || tableProps1) {
+ return tabsActive == 0 ? tableProps : tableProps1
+ }
+ }, [tabsActive, tableProps, tableProps1])
/**
* @description 处理成功的回调
*/
@@ -77,39 +91,68 @@ const Page = () => {
}
- // 导出
- const exportExcel = () => {
- let params = {
- ...searchVal,
- }
- httppost5(apiurl.aqjc.bxjc.wyexport, params).then(res => {
- exportFile(`${tabsActive == '1' ? '水平位移':'结构缝开度'}.xlsx`,res.data)
+ // 导出
+ const exportExcel = () => {
+ const exportUrl = tabsActive == 0 ? apiurl.aqjc.bxjc.wyexport : apiurl.aqjc.bxjc.jgfexport;
+ const params = tabsActive == 0 ? searchVal :historySearchVal
+ httppost5(exportUrl, params).then(res => {
+ exportFile(`${tabsActive == 0 ? '水平位移':clickItem.stationCode}.xlsx`, res.data)
})
+ }
+ // 获取结构缝历史数据
+ const getHistoryData = async (parmas) => {
+ try {
+ const res = await httppost2(apiurl.aqjc.bxjc.jgflist, parmas)
+ if (res.code == 200) {
+ setTableData(res.data)
+ }
+ } catch (error) {
+ console.log(error);
+
}
+ }
+
+ // 单击行的回调
+ const clickRow = (r) => {
+ if (tabsActive != 0) {
+ setClickItem(r)
+ setJgfOpen(true)
+ }
+ }
useEffect(() => {
const params = {
search: {
...searchVal,
+ type: tabsActive
}
};
- search(params)
- }, [searchVal])
-
+ tabsActive == 0 ? search(params) : search1(params);
+ }, [searchVal, tabsActive])
+ useEffect(() => {
+ if (historySearchVal && clickItem) {
+ const params = {
+ ...historySearchVal,
+ stationCode:clickItem.stationCode
+ }
+ getHistoryData(params)
+ }
+ }, [historySearchVal,clickItem])
+
return (
<>
-
+ {dataSource &&
+ {
+ return {
+ onClick: () => {
+ clickRow(r)
+ }
+ }
+ }}
+ />
+ }
-