diff --git a/src/renderer/src/App.jsx b/src/renderer/src/App.jsx index a4803cd..ec6293a 100644 --- a/src/renderer/src/App.jsx +++ b/src/renderer/src/App.jsx @@ -2,14 +2,51 @@ import { Layout } from 'antd' import styles from './App.module.css' const { Sider, Content } = Layout import SiderHeader from './components/SiderHeader/SiderHeader' -const App = () => ( - - - - - - Content +import { FundFilled, CameraFilled } from '@ant-design/icons' +import { Tabs } from 'antd' +const tabItem = [ + { + key: '1', + label: `挠度数据采集`, + children: `挠度数据采集`, + icon: + }, + { + key: '2', + label: `图像数据采集`, + children: `图像数据采集`, + icon: + } +] + +import { useState } from 'react' + +const App = () => { + const [activeKey, setActiveKey] = useState('1') + return ( + + + + + + + ({ + key: item.key, + label: ( + + {item.icon} + {item.label} + + ), + children: item.children + }))} + /> + + - -) + ) +} export default App diff --git a/src/renderer/src/App.module.css b/src/renderer/src/App.module.css index a3450aa..521f606 100644 --- a/src/renderer/src/App.module.css +++ b/src/renderer/src/App.module.css @@ -2,6 +2,7 @@ text-align: center; min-height: calc(100vh - 20px); background-color: #fff; + padding: 0 10px; } .siderStyle { diff --git a/src/renderer/src/components/MeasurementPointSetting/MeasurementPointSetting.jsx b/src/renderer/src/components/MeasurementPointSetting/MeasurementPointSetting.jsx index db4b1e3..4f71e1f 100644 --- a/src/renderer/src/components/MeasurementPointSetting/MeasurementPointSetting.jsx +++ b/src/renderer/src/components/MeasurementPointSetting/MeasurementPointSetting.jsx @@ -5,7 +5,8 @@ import { MinusOutlined, DeleteOutlined, ReloadOutlined, - SendOutlined + SendOutlined, + BoxPlotFilled } from '@ant-design/icons' function MeasurementPointSetting() { @@ -131,7 +132,10 @@ function MeasurementPointSetting() { {/* 标题 */}
- 测点设置: + + + 测点设置 +
{/* 基本信息 */} diff --git a/src/renderer/src/components/MeasurementPointSetting/index.jsx b/src/renderer/src/components/MeasurementPointSetting/index.jsx deleted file mode 100644 index d6456cf..0000000 --- a/src/renderer/src/components/MeasurementPointSetting/index.jsx +++ /dev/null @@ -1,219 +0,0 @@ -import React, { useState } from 'react' -import styles from './index.module.css' -import { Flex, Input, Select, InputNumber, Button, Table } from 'antd' -import { - PlusOutlined, - MinusOutlined, - DeleteOutlined, - ReloadOutlined, - SendOutlined -} from '@ant-design/icons' - -function MeasurementPointSetting() { - const [measurementData] = useState([ - { - key: '1', - 项目: '传感器', - 数值: '', - children: [ - { key: '1-1', 项目: '测点位置', 数值: '1' }, - { key: '1-2', 项目: '测点描述', 数值: '' }, - { key: '1-3', 项目: '计算系数', 数值: '0.448' }, - { key: '1-4', 项目: '营样标定', 数值: 'n' }, - { key: '1-5', 项目: 'x', 数值: '349' }, - { key: '1-6', 项目: 'y', 数值: '1108' }, - { key: '1-7', 项目: 'w', 数值: '125' }, - { key: '1-8', 项目: 'h', 数值: '15' } - ] - }, - { key: '2', 项目: '传感器', 数值: '' }, - { key: '3', 项目: '传感器', 数值: '' }, - { key: '4', 项目: '传感器', 数值: '' }, - { key: '5', 项目: '传感器', 数值: '' } - ]) - - const columns = [ - { - title: '项目', - dataIndex: '项目', - key: '项目', - width: '50%' - }, - { - title: '数值', - dataIndex: '数值', - key: '数值', - width: '50%', - render: (text) => text || '-' - } - ] - - return ( - - {/* 标题 */} -
- 测点设置: -
- - {/* 基本信息 */} -
-
基本信息
- - - 测点位置: - - - - - 计算系数: - - - - - 营样标定: - - - - - 测点距离: - - -
- - {/* 测点列表 */} -
-
测点列表
- -
- - - - - - - - - {measurementData.map((item) => ( - - - - - ))} - -
项目数值
{item.type}{item.value || '-'}
-
- - {/* 操作按钮 */} - -
-
- ) -} - -export default MeasurementPointSetting diff --git a/src/renderer/src/components/SystemSettings/SystemSettings.module.css b/src/renderer/src/components/SystemSettings/SystemSettings.module.css index 7d7ae0d..c4a85f1 100644 --- a/src/renderer/src/components/SystemSettings/SystemSettings.module.css +++ b/src/renderer/src/components/SystemSettings/SystemSettings.module.css @@ -12,6 +12,7 @@ .title { font-weight: bold; + font-size: 14px; } .titleIcon {