@@ -73,9 +73,9 @@ const DataQuery = (props) => {
/>
diff --git a/web/client/src/sections/data/containers/dataTableComponent.jsx b/web/client/src/sections/data/containers/dataTableComponent.jsx
new file mode 100644
index 0000000..25cd0df
--- /dev/null
+++ b/web/client/src/sections/data/containers/dataTableComponent.jsx
@@ -0,0 +1,137 @@
+/*
+ * @Author: zhaobing
+ * @Date: 2023-11-02 09:32:25
+ */
+import React, { useState, useEffect } from 'react';
+import { connect } from 'react-redux';
+import { Table, Button, Alert, Spin } from '@douyinfe/semi-ui';
+// import { ApiTable } from '../../../../utils/webapi';
+import FileSaver from 'file-saver';
+import moment from 'moment';
+
+const DataTableComponent = (props) => {
+ const {dataList}=props
+ const [currentPage, setCurrentPage] = useState(1);
+ const [exportingFlag, setExportingFlag] = useState(false);
+ const [isRequesting, setIsRequesting] = useState(false);
+ const [arr,setArr]=useState(dataList.items)
+ const [data,setData]=useState([])
+ const [columns,setColumns]=useState([])
+ //初始化
+
+ useEffect(()=>{
+
+ // let arr=[{readingNumber:{name: '电表示数', unit: 'kWh'}}]
+ // let dataSource = [{values: {total: 24138.97}, time: "2023-11-03 14:18:27.000"},{values: {total: 24138.97}, time: "2023-11-03 14:18:27.000"}]
+ let columns = []
+ columns.push({
+ title: '设备位置',
+ dataIndex: 'position',
+ key: 'position',
+ });
+ for (let index in arr) {
+ columns.push({
+ title: arr[index].name + '(' + arr[index].unit + ')',
+ dataIndex: index,
+ sorter: (a, b) => b[index] - a[index],
+ key: index,
+ })
+ };
+ columns.push({
+ title: '采集时间',
+ dataIndex: 'acqTime',
+ sorter: (a, b) => b['realTime'] - a['realTime'],
+ key: 'acqTime',
+ });
+ //设备
+ const data1=[]
+ for (let i = 0; i < dataList.length; i++) {
+ for (let k = 0; k < dataList[i].data.length; k++) {
+ let cdataT={}
+ let startT = "";
+ let endT = "";
+ let dataTS = dataList[i].data[k];
+ cdataT.key = `station-${dataList[i].id}-${k}`;
+ cdataT.position = dataList[i].name;
+ cdataT.acqTime = moment(dataTS.time).format('YYYY-MM-DD HH:mm:ss');
+ cdataT.realTime = moment(dataTS.time).valueOf();
+ if (startT == "") {
+ startT = dataTS.time;
+ endT = dataTS.time;
+ } else {
+ if (moment(startT) >= moment(dataTS.time))
+ startT = dataTS.time;
+ if (moment(endT) <= moment(dataTS.time))
+ endT = dataTS.time;
+ }
+ //动态列的值
+ for (let themeItem in arr) {
+ cdataT[themeItem] = dataTS.values[themeItem];
+ }
+ data1.push(cdataT)
+ }
+ }
+ setData(data1)
+ setColumns(columns)
+ },[])
+
+
+
+
+
+
+
+ const exporting = () => {
+ setIsRequesting(true);
+ };
+
+ const pageChange = (page, pageSize) => {
+ setCurrentPage(page);
+ };
+
+ const exportCsv = (data, title, filename) => {
+ setExportingFlag(true);
+ };
+
+ const exportVibrationCsv = (data, title, filename) => {
+ setExportingFlag(true);
+ };
+
+ const renderViberationChart = () => {
+ };
+
+ useEffect(() => {
+ setCurrentPage(1);
+ }, [props]);
+
+
+
+
+ return (
+
+
+
+ {/*
+ {
+ data.length ? : null
+ }
+
*/}
+
+
+
+
+
+
+
+
+ {
+ showSlider ? [
+
,
+
+ ] : null
+ }
+
+
+
+
+
+
]}>
+
+
+ ;
+}
+
+function mapStateToProps(state) {
+ const { abnItemState_tr, global} = state;
+ return {
+ abnItemCompData: abnItemState_tr.items,
+ actions:global.actions
+ }
+}
+
+export default connect(mapStateToProps)(TrendModal)
diff --git a/web/client/src/sections/install/components/burrModal.jsx b/web/client/src/sections/install/components/burrModal.jsx
new file mode 100644
index 0000000..bab3140
--- /dev/null
+++ b/web/client/src/sections/install/components/burrModal.jsx
@@ -0,0 +1,214 @@
+import React, { useRef,useState,useEffect } from "react";
+import { connect } from "react-redux";
+import moment from 'moment';
+import { Form, Tooltip, Select, Checkbox, Modal, Input, Button, Switch, DatePicker, Row, IconLineChartStroked } from "@douyinfe/semi-ui";
+import {IconInfoCircle} from "@douyinfe/semi-icons"
+import { TimeAbnValueLineChart } from '../components/TimeAbnValueLineChart';
+import PropTypes from 'prop-types';
+
+const BurrModal = (props) => {
+ const form = useRef()
+ const {dispatch, modalData, closeModal, visible, structId,item,actions,sensorId,project } = props
+ const [currStartTime, setCurrStartTime] = useState(moment().add('days', -1).format('YYYY-MM-DD HH:mm:ss'))
+ const [currEndTime, setcurrEndTime] = useState(moment().format('YYYY-MM-DD HH:mm:ss'))
+ const{install}=actions
+ useEffect(()=>{
+ // form.current.setValues({stationName: modalData.sensorName,
+ // factorName: modalData.factorName + "/" + modalData.item,
+ // burr: modalData.params.thr_burr,
+ // isEnable: modalData.enabled})
+ },[])
+ //表单类
+ const btnFormSubmit = () => {
+ let data = modalData;
+ form.current.validate().then(value=>{
+ let paramJson = { "thr_burr": Number(value.burr) };
+ let pushData = {
+ station: data.sensorId,//测点
+ factorId: data.factorId,
+ itemId: data.itemIndex,
+ abnType: 2,//毛刺
+ enabled: value.checked,
+ params: paramJson
+ }
+ dispatch(install.editAbnParams(data.id,pushData)).then(res => {
+ if (res.success) {
+ const id=[...sensorId?.map(item=>project+'-'+item), -1].join(',')
+ dispatch(install.getAbnParamList({ sensorId:id}))
+ closeModal()
+ }
+ })
+ // this.props.dispatch(editAbnParams(data.id, pushData)).then(_ => {
+ // this.props.dispatch(getAbnParamList(this.props.structId)).then(() => {
+ // this.props.closeModal();
+ // });
+ // });
+
+ })
+ }
+const checkInterger = (rule, value, callback) => {
+ if (!value) {
+ callback();
+ } else {
+ const pattern = /^[1-9]*[1-9][0-9]*$/;
+ if (pattern.test(value)) {
+ callback();
+ } else {
+ callback(new Error('请输入正整数'));
+ }
+ }
+ };
+const timeOnChange = (dates, dateStrings) => {
+ if (dates.length == 0) {
+ setCurrStartTime(null)
+ setcurrEndTime(null)
+ return message.warning('请选择时间');
+ }
+ setCurrStartTime(dates[0].format('YYYY-MM-DD HH:mm:ss'))
+ setcurrEndTime(dates[1].format('YYYY-MM-DD HH:mm:ss'))
+ }
+ //数据对比
+// const dataCompare = () => {
+// form.current.validate().then(res=>{
+// if (res.success) {
+// let paramJson = { "thr_burr": values.burr }
+// let data = {
+// station: modalData.stationId,
+// factorId: modalData.factorId,
+// itemId: modalData.itemId,
+// abnType: 'burr',//算法类型
+// enabled: true,
+// params: paramJson
+// };
+// let start = this.state.currStartTime
+// let end = this.state.currEndTime
+
+// // this.props.dispatch(getItemAbnResult_burr(this.props.structId, start, end, data)).then(res => {
+// // })
+// }
+// })
+// }
+const checkNumber = (rule, val) => {
+ const strRegex = /^-?\d+(\.\d+)?$/
+ if (strRegex.test(val)) {
+ return true
+ }
+ return false
+
+
+
+}
+ // let originalData = ['还没查询'], calcArray = [], key, itemName, start, end;
+ // let stationsData = [];
+ // if (abnItemCompData) {
+ // originalData = abnItemCompData.stationData;
+ // calcArray = abnItemCompData.resultArray;
+ // key = abnItemCompData.itemKey;
+ // itemName = abnItemCompData.itemName;
+ // start = originalData && originalData.length > 0 ? originalData[0].time : '';
+ // end = originalData && originalData.length > 0 ? originalData[originalData.length - 1].time : '';
+ // for (let i = 0; i < originalData.length; i++) {
+ // let one = { name: itemName + "（单位：" + abnItemCompData.unit + "）", value: originalData[i][key], time: originalData[i].time };
+ // stationsData.push(one);
+ // }
+ // for (let j = 0; j < calcArray.length; j++) {
+ // let one = {
+ // name: "毛刺点：" + calcArray[j].time + "（突变大小：" + calcArray[j].burr.toFixed(2) + abnItemCompData.unit + "）"
+ // , value: calcArray[j].value, time: calcArray[j].time
+ // };
+ // stationsData.push(one);
+ // }
+ // }
+ BurrModal.propTypes = {
+ visible: PropTypes.bool.isRequired,
+ closeModal: PropTypes.func.isRequired
+ }
+ return (<>
+
+
+
+ ]}>
+