wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:0effc0a205c693aac9c6594f2d84c3bc18caac1d
Branches Tags
wyw:master
wyw:dev_csw1
..
compare: wyw:8d7755cbf480c6346e65c31ee422b5ddc4c1dc56
Branches Tags
wyw:master
wyw:dev_csw1

No commits in common. "0effc0a205c693aac9c6594f2d84c3bc18caac1d" and "8d7755cbf480c6346e65c31ee422b5ddc4c1dc56" have entirely different histories.
0effc0a205 ... 8d7755cbf4

1 changed files with 11 additions and 23 deletions
Show Stats Expand all files Collapse all files

34
src/layout/FullScreenInter.js
View File

@ -607,18 +607,6 @@ class FullScreen extends React.Component {
getDangerSubData = () => { getDangerSubData = () => {
const orgId = storage('lacal').getItem('webOrgId')?.val; const orgId = storage('lacal').getItem('webOrgId')?.val;
const json = initFilter(orgId); const json = initFilter(orgId);
json.Keyword =''
if (this.state.selectedDangerCompany) {
const selectedCompanyObj = this.state.dangerCompanyData?.find(
(company) => company.ID === this.state.selectedDangerCompany
);
const selectedCompanyName = selectedCompanyObj?.NAME;
if (selectedCompanyName) {
json.Keyword = selectedCompanyName;
// filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName);
}
}
json.Parameter1 = this.state.selectedStartDate?.format('YYYY-MM-DD') || ''; json.Parameter1 = this.state.selectedStartDate?.format('YYYY-MM-DD') || '';
json.Parameter2 = this.state.selectedEndDate?.format('YYYY-MM-DD') || ''; json.Parameter2 = this.state.selectedEndDate?.format('YYYY-MM-DD') || '';
this.props.dispatch({ this.props.dispatch({
@ -627,19 +615,19 @@ class FullScreen extends React.Component {
url: 'BI/BIKanBanController/JobManage', url: 'BI/BIKanBanController/JobManage',
onComplete: (ret) => { onComplete: (ret) => {
if (ret && !this.isUnmounted) { if (ret && !this.isUnmounted) {
//let filteredData = ret.jobList; let filteredData = ret.jobList;
// if (this.state.selectedDangerCompany) { if (this.state.selectedDangerCompany) {
// const selectedCompanyObj = this.state.dangerCompanyData?.find( const selectedCompanyObj = this.state.dangerCompanyData?.find(
// (company) => company.ID === this.state.selectedDangerCompany (company) => company.ID === this.state.selectedDangerCompany
// ); );
// const selectedCompanyName = selectedCompanyObj?.NAME; const selectedCompanyName = selectedCompanyObj?.NAME;
// if (selectedCompanyName) { if (selectedCompanyName) {
// filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName); filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName);
// }. }
// } }
this.setState({ this.setState({
dangerSubData: ret.jobList, dangerSubData: filteredData,
jobTodayQty: ret.jobTodayQty, jobTodayQty: ret.jobTodayQty,
}); });
} }