diff --git a/package.json b/package.json index fb6b564..f2afa08 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@ant-design/icons": "^4.8.0", - "@antv/g6": "4.8.0", + "@antv/g6": "^5.0.50", "@umijs/max": "^4.0.70", "antd": "5.6.0", "braft-editor": "^2.3.9", diff --git a/src/pages/safe_majorHazard/SafeMajorHazardList.js b/src/pages/safe_majorHazard/SafeMajorHazardList.js index 22b9c79..2754e30 100644 --- a/src/pages/safe_majorHazard/SafeMajorHazardList.js +++ b/src/pages/safe_majorHazard/SafeMajorHazardList.js @@ -1,10 +1,10 @@ import React, { useState } from 'react'; import { Card, Row, Col, Statistic, Progress, Button, Space } from 'antd'; import styles from './SafeMajorHazardList.less'; -import ResponsibilityImplementation from './module/ResponsibilityImplementation'; //责任落实 -import OnlineMonitoring from './module/OnlineMonitoring'; //在线监测预警 -import RiskAssessment from './module/RiskAssessment'; //风险管控 -import EvaluationReport from './module/EvaluationReport'; //评估报告 +import ResponsibilityImplementation from './components/ResponsibilityImplementation'; //责任落实 +import OnlineMonitoring from './components/OnlineMonitoring'; //在线监测预警 +import RiskAssessment from './components/RiskAssessment'; //风险管控 +import EvaluationReport from './components/EvaluationReport'; //评估报告 const SafeMajorHazardList = () => { const [activeModule, setActiveModule] = useState('responsibility'); diff --git a/src/pages/safe_majorHazard/module/EvaluationReport.js b/src/pages/safe_majorHazard/components/EvaluationReport.js similarity index 100% rename from src/pages/safe_majorHazard/module/EvaluationReport.js rename to src/pages/safe_majorHazard/components/EvaluationReport.js diff --git a/src/pages/safe_majorHazard/module/EvaluationReport.less b/src/pages/safe_majorHazard/components/EvaluationReport.less similarity index 100% rename from src/pages/safe_majorHazard/module/EvaluationReport.less rename to src/pages/safe_majorHazard/components/EvaluationReport.less diff --git a/src/pages/safe_majorHazard/module/OnlineMonitoring.js b/src/pages/safe_majorHazard/components/OnlineMonitoring.js similarity index 100% rename from src/pages/safe_majorHazard/module/OnlineMonitoring.js rename to src/pages/safe_majorHazard/components/OnlineMonitoring.js diff --git a/src/pages/safe_majorHazard/module/OnlineMonitoring.less b/src/pages/safe_majorHazard/components/OnlineMonitoring.less similarity index 100% rename from src/pages/safe_majorHazard/module/OnlineMonitoring.less rename to src/pages/safe_majorHazard/components/OnlineMonitoring.less diff --git a/src/pages/safe_majorHazard/module/ResponsibilityImplementation.js b/src/pages/safe_majorHazard/components/ResponsibilityImplementation.js similarity index 72% rename from src/pages/safe_majorHazard/module/ResponsibilityImplementation.js rename to src/pages/safe_majorHazard/components/ResponsibilityImplementation.js index ee48f03..3487abe 100644 --- a/src/pages/safe_majorHazard/module/ResponsibilityImplementation.js +++ b/src/pages/safe_majorHazard/components/ResponsibilityImplementation.js @@ -1,6 +1,6 @@ -import React from 'react'; -import { Card, Result, Timeline, Statistic, Table, Row, Input, Button, Col, Select } from 'antd'; +import React, { useState } from 'react'; +import { Card, Result, Timeline, Statistic, Table, Row, Input, Button, Col, Select, Modal, Form } from 'antd'; import { ExportOutlined, PlusOutlined } from '@ant-design/icons'; import StandardTable from '@/components/StandardTable'; import ReactECharts from 'echarts-for-react'; @@ -10,6 +10,28 @@ import timer_shaft from '@/assets/basic_information/timer_shaft.png' const ResponsibilityImplementation = () => { + const [isModalVisible, setIsModalVisible] = useState(false); + const [form] = Form.useForm(); + + const handleAddResponsible = () => { + setIsModalVisible(true); + }; + + const handleModalCancel = () => { + setIsModalVisible(false); + form.resetFields(); + }; + + const handleModalOk = () => { + form.validateFields().then(values => { + console.log('表单数据:', values); + // 这里可以添加提交逻辑 + setIsModalVisible(false); + form.resetFields(); + }).catch(err => { + console.log('表单验证失败:', err); + }); + }; const columns = [ { @@ -433,6 +455,7 @@ const ResponsibilityImplementation = () => {
+ + {/* 新增责任人弹窗 */} + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
); }; diff --git a/src/pages/safe_majorHazard/module/ResponsibilityImplementation.less b/src/pages/safe_majorHazard/components/ResponsibilityImplementation.less similarity index 100% rename from src/pages/safe_majorHazard/module/ResponsibilityImplementation.less rename to src/pages/safe_majorHazard/components/ResponsibilityImplementation.less diff --git a/src/pages/safe_majorHazard/module/RiskAssessment.js b/src/pages/safe_majorHazard/components/RiskAssessment.js similarity index 100% rename from src/pages/safe_majorHazard/module/RiskAssessment.js rename to src/pages/safe_majorHazard/components/RiskAssessment.js diff --git a/src/pages/safe_majorHazard/module/RiskAssessment.less b/src/pages/safe_majorHazard/components/RiskAssessment.less similarity index 100% rename from src/pages/safe_majorHazard/module/RiskAssessment.less rename to src/pages/safe_majorHazard/components/RiskAssessment.less