diff --git a/jjb.config.js b/jjb.config.js index f3e6c6a..70371b4 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -10,6 +10,7 @@ module.exports = { javaGitBranch: "", // 接口服务地址 API_HOST: "https://gbs-gateway.qhdsafety.com", + }, production: { // 应用后端分支名称,部署上线需要 @@ -44,7 +45,7 @@ module.exports = { // 开发服务 server: { // 监听端口号 - port: "8080", + port: "8030", // 服务地址 host: "127.0.0.1", // 是否自动打开浏览器 diff --git a/package.json b/package.json index 1e912c8..46fe2f1 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lodash-es": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "zy-react-library": "latest" + "zy-react-library": "^1.3.15" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/pages/Container/Accident/components/Accident/index.js b/src/pages/Container/Accident/components/Accident/index.js index 2bef760..a3bb79f 100644 --- a/src/pages/Container/Accident/components/Accident/index.js +++ b/src/pages/Container/Accident/components/Accident/index.js @@ -37,6 +37,7 @@ function Accident(props) { params: { eqType: props.type, eqCorpinfoId: props.corpinfoId, + eqIncidentType: props.eqIncidentType, }, transform: data => ({ geIncidentDate: data.incidentDate?.[0] ? (`${data.incidentDate[0]} 00:00:00`) : "", diff --git a/src/pages/Container/SuperviseAccident/Info/index.js b/src/pages/Container/SuperviseAccident/Info/index.js index 8944fdf..7893818 100644 --- a/src/pages/Container/SuperviseAccident/Info/index.js +++ b/src/pages/Container/SuperviseAccident/Info/index.js @@ -1,6 +1,6 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Form } from "antd"; +import { Button, Form } from "antd"; import { useEffect, useState } from "react"; import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; @@ -27,7 +27,7 @@ function Bulletin(props) { usePagination: false, params: { eqAccidentType: query.eqAccidentType, - corpinfoId: query.corpinfoId, + corpinfoIds: [query.corpinfoId], }, onSuccess: ({ data }) => { setCountByIncidentType(data); @@ -39,15 +39,24 @@ function Bulletin(props) { }; return ( - + ({ dataIndex: `countByCorpinfoAndType_${item.dictValue}`, title: `${item.dictLabel}`, render: (_, record) => ( - getAccidentCount(record.corpinfoId, item.dictValue) + + ), })), ]} diff --git a/src/pages/Container/SuperviseAccident/View/index.js b/src/pages/Container/SuperviseAccident/View/index.js new file mode 100644 index 0000000..6d2f751 --- /dev/null +++ b/src/pages/Container/SuperviseAccident/View/index.js @@ -0,0 +1,19 @@ +import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; +import Accident from "../../Accident/components/Accident"; + +function AccidentContainer(props) { + const { corpinfoId, eqAccidentType, eqIncidentType } = useGetUrlQuery(); + + return ( + + ); +} + +export default AccidentContainer;