diff --git a/src/components/CustomPages/BI/BI001HomeDetail.js b/src/components/CustomPages/BI/BI001HomeDetail.js index 02419f5..341b1d1 100644 --- a/src/components/CustomPages/BI/BI001HomeDetail.js +++ b/src/components/CustomPages/BI/BI001HomeDetail.js @@ -207,17 +207,12 @@ class BI001HomeDetail extends React.Component { } loadData = () => { this.state.showLoading = true; - let mineType = this.props.data.mineType; let param = this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS; - if (param) { - mineType = param === "选矿厂" ? "10" : param === "尾矿库" ? "20" : "30"; - this.props.data.mineType = mineType; - } - this.chart1(mineType); + this.chart1(); }; //矿山 - chart1 = (mineType) => { - let json = initFilter(this.props.login.OrgId, mineType); + chart1 = () => { + let json = initFilter(this.props.login.OrgId); // extendRule(json, 'DEPARTMENT_NAME', 1, "矿山部"); // extendOrder(json, "MONTH", 0); this.props.dispatch({ diff --git a/src/components/CustomPages/BI/BI054HomeDetail.js b/src/components/CustomPages/BI/BI054HomeDetail.js index c1fc74a..0d2d509 100644 --- a/src/components/CustomPages/BI/BI054HomeDetail.js +++ b/src/components/CustomPages/BI/BI054HomeDetail.js @@ -56,7 +56,7 @@ class BI054HomeDetail extends React.Component { loadData = () => { this.state.showLoading = true; // let json = initFilter(this.props.login.OrgId, this.props.data.mineType, "NUM"); - let json = initFilter(this.props.login.OrgId, (this.props.data.mineType == null ? this.props.formParam.mineType : this.props.data.mineType), "NUM"); + let json = initFilter(this.props.login.OrgId,'', "NUM"); this.props.dispatch({ type: 'app/getDataByPost', diff --git a/src/components/CustomPages/BI/BI055HomeDetail.js b/src/components/CustomPages/BI/BI055HomeDetail.js index 362a645..28c1077 100644 --- a/src/components/CustomPages/BI/BI055HomeDetail.js +++ b/src/components/CustomPages/BI/BI055HomeDetail.js @@ -55,8 +55,8 @@ class BI055HomeDetail extends React.Component { // } else { // mineType = this.props.formParam.mineType; // } - debugger - let json = initFilter(this.props.login.OrgId, (this.props.data.mineType == null ? this.props.formParam.mineType : this.props.data.mineType)); + + let json = initFilter(this.props.login.OrgId); this.props.dispatch({ type: "app/getDataByPost", url: "BI/BIHome/GetHomeDetailMonthRisk", diff --git a/src/layout/Sider.js b/src/layout/Sider.js index 775729c..996313f 100644 --- a/src/layout/Sider.js +++ b/src/layout/Sider.js @@ -163,8 +163,8 @@ const Sider = (props) => { setCollapsed(!collapsed); }; useEffect(() => { - if (collapsed == false) { - setCollapsed(true); + if (MenuShow == true) { + setMenuShow(false); } }, [props.repost]); const menuCUR = topMenus.menus[mainSilder - 2]; diff --git a/src/routes/Home.js b/src/routes/Home.js index a910442..48a91e3 100644 --- a/src/routes/Home.js +++ b/src/routes/Home.js @@ -53,7 +53,7 @@ const AllTech = (props) => { span={6} className="home-tech-col" onClick={() => { - props.techClick() + props.techClick(); }} >
@@ -189,6 +189,15 @@ class Home extends React.Component { currentpageIndex: "1", visibleStartTime: [], visibleEndTime: [], + mineType: + localStorage.getItem("currentMineType") === "20" + ? "10" + : localStorage.getItem("currentMineType"), + detailForm: { + isShow: false, + formCode: "", + title: "", + }, completeName: [ { name: "张森友", @@ -1206,6 +1215,47 @@ class Home extends React.Component { visible: false, }); }; + ExpandCancel = () => {}; + showDetailModal = (formCode) => { + console.log(this.state.mineType,'this.state.mineType') + var titleTemp = + this.state.mineType == 20 + ? "尾矿库" + : this.state.mineType == 10 + ? "选矿厂" + : "露天矿"; + if (formCode == "BI054_HOMEDETAIL") { + titleTemp += "安全检查次数统计（近12月）"; + } else if (formCode == "BI055_HOMEDETAIL") { + titleTemp += "月度隐患整改情况（近12月）"; + } else if (formCode == "BI001_HOMEDETAIL") { + titleTemp += "班组活动任务完成详情（近12月）"; + } else if (formCode == "BI002_HOMEDETAIL") { + titleTemp += "工作票完成详情（近12月）"; + } else if (formCode == "BI013_RISKANALYSISMODEL") { + titleTemp += "风险管理统计分析"; + } + + const newtmpData = { + data: { + id: guid(), + mineType: this.state.mineType, + onCancel: this.ExpandCancel, + homeReload: true, + }, + formCode: formCode, + }; + this.setState({ tmpData: newtmpData }, () => { + var detailForm = { + isShow: true, + formCode: formCode, + title: titleTemp, + }; + this.setState({ + detailForm: detailForm, + }); + }); + }; doubleClear = () => { if (this.state.searchVisible === true) { this.setState({ searchVisible: false }); @@ -1296,6 +1346,16 @@ class Home extends React.Component { ); this.setState({ querySearch }); }; + detailFormClose = () => { + var detailForm = { + isShow: false, + formCode: "", + title: "", + }; + this.setState({ + detailForm: detailForm, + }); + }; render() { const rowSelection = { @@ -1326,6 +1386,17 @@ class Home extends React.Component { > + + + {this.navToMenu("6dc35aee-dd5e-4b31-b7ca-5f62d337d0c1")}} + techClick={() => { + this.navToMenu("6dc35aee-dd5e-4b31-b7ca-5f62d337d0c1"); + }} /> {this.navToMenu("b3767117-f0aa-4122-97c1-2fc58fbaf934")}} + techClick={() => { + this.navToMenu("b3767117-f0aa-4122-97c1-2fc58fbaf934"); + }} /> {this.navToMenu("7a9b51b1-3d56-4199-b450-f9f5f9cc3235")}} + techClick={() => { + this.navToMenu("7a9b51b1-3d56-4199-b450-f9f5f9cc3235"); + }} /> {this.navToMenu("2beef9b3-e4b9-4b0b-9e82-238c4bf3be5d")}} + techClick={() => { + this.navToMenu("2beef9b3-e4b9-4b0b-9e82-238c4bf3be5d"); + }} /> - {this.navToMenu("21b685c9-d298-4a14-9700-c9ab1bb8a918")}} + techClick={() => { + this.navToMenu("21b685c9-d298-4a14-9700-c9ab1bb8a918"); + }} /> {this.navToMenu("2e7835ef-0e5a-41b5-8bb7-ad9c64a6b2f4")}} + techClick={() => { + this.navToMenu("2e7835ef-0e5a-41b5-8bb7-ad9c64a6b2f4"); + }} /> {this.navToMenu("818ab476-b29f-4db5-9393-fd13e1d2a565")}} + techClick={() => { + this.navToMenu("818ab476-b29f-4db5-9393-fd13e1d2a565"); + }} /> {this.navToMenu("800abe55-a2cf-4e23-a2b6-1caf2dca816c")}} + techClick={() => { + this.navToMenu("800abe55-a2cf-4e23-a2b6-1caf2dca816c"); + }} />
@@ -2020,6 +2107,17 @@ class Home extends React.Component { {/* */} +
this.showDetailModal("BI001_HOMEDETAIL")}> + +
安全检查次数统计
+
this.showDetailModal("BI054_HOMEDETAIL")}> + +
月度隐患整改情况
+
this.showDetailModal("BI055_HOMEDETAIL")}> + +
风险等级占比
+
+ this.showDetailModal("BI013_RISKANALYSISMODEL") + } + > + +