|
|
@ -8,7 +8,7 @@ import AutomaticModal from '../components/automatic-Modal' |
|
|
|
import SimpleBar from 'simplebar-react'; |
|
|
|
|
|
|
|
|
|
|
|
const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, socket, projectPoms, pepProjectId }) => { |
|
|
|
const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, generateloading, socket, projectPoms, pepProjectId }) => { |
|
|
|
|
|
|
|
const { service, } = actions; |
|
|
|
|
|
|
@ -103,7 +103,7 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, socke |
|
|
|
> |
|
|
|
<Button theme="borderless" type='danger'>删除</Button> |
|
|
|
</Popconfirm> |
|
|
|
<Button theme="borderless" onClick={() => { |
|
|
|
<Button theme="borderless" loading={generateloading} onClick={() => { |
|
|
|
// WSDJC(温湿度监测) 1002 |
|
|
|
// FSFXJC(风速风向监测) 1001 |
|
|
|
// SSFJC(伸缩缝监测) 4009 |
|
|
@ -248,14 +248,15 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, socke |
|
|
|
} |
|
|
|
|
|
|
|
function mapStateToProps (state) { |
|
|
|
const { auth, global, automaticReport, ProjectPoms } = state; |
|
|
|
const { auth, global, automaticReport, generateReport, ProjectPoms } = state; |
|
|
|
return { |
|
|
|
loading: automaticReport.isRequesting, |
|
|
|
user: auth.user, |
|
|
|
actions: global.actions, |
|
|
|
pepProjectId: global.pepProjectId, |
|
|
|
clientHeight: global?.clientHeight, |
|
|
|
projectPoms: ProjectPoms?.data?.rows |
|
|
|
projectPoms: ProjectPoms?.data?.rows, |
|
|
|
generateloading: generateReport.isRequesting, |
|
|
|
}; |
|
|
|
} |
|
|
|
|
|
|
|