@@ -2200,7 +2209,8 @@ class Home extends React.Component {
style={{
margin: "0px 0px 10px 0px",
minHeight: "275px",
- minWidth: "1704px",
+ // minWidth: "1204px",
+ minWidth: "1136px",
}}
>
diff --git a/src/routes/dashboard.css b/src/routes/dashboard.css
index 202f069..dff70f9 100644
--- a/src/routes/dashboard.css
+++ b/src/routes/dashboard.css
@@ -34,6 +34,7 @@
padding: 3px 10px;
border-radius: 15px;
border: 1px solid #55c596;
+ white-space: nowrap;
}
:global(.home-userInfo-card) {
height: 50%;
@@ -52,7 +53,8 @@
height: 100%;
justify-content: space-between;
border-radius: 10px;
- width: calc(25% - 10px);
+ min-width: 100px;
+ /* width: calc(25% - 10px); */
}
:global(.home-userInfo-pad) {
display: flex;
@@ -69,6 +71,7 @@
color: #303133;
font-weight: bold;
white-space: nowrap;
+ margin-right: 5px;
}
:global(.home-userInfo-content) {
font-size: 24px;
@@ -143,7 +146,7 @@
width: 100%;
height: calc(35% - 70px);
display: flex;
- padding: 0px 20px;
+ /* padding: 0px 20px; */
justify-content: space-between;
align-items: center;
}
@@ -173,8 +176,11 @@
:global(.home-rank-name) {
color: #303133;
font-size: 13px;
- margin-right: 40px;
+ margin-right: 20px;
+ width: 90px;
white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
:global(.home-img) {
object-fit: contain;
@@ -328,10 +334,12 @@
font-size: 15px;
color: #303133;
padding: 5px 0px;
- font-weight: bold;
+ /* font-weight: bold; */
white-space: nowrap;
+ /* width: 250px; */
overflow: hidden;
text-overflow: ellipsis;
+ flex: 1;
}
:global(.home-work-date) {
color: #909399;
@@ -349,7 +357,7 @@
flex-direction: column;
background-color: #fff;
border-radius: 5px;
- min-width: 574px;
+ /* min-width: 374px; */
}
:global(.home-setting) {
display: flex;
From 72bd40787b4572185657195e94009b79dfc32aed Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Mon, 29 Apr 2024 10:20:20 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90=E3=80=81=E5=AE=89=E5=85=A8?=
=?UTF-8?q?=E6=95=99=E8=82=B2=E4=B8=8E=E5=9F=B9=E8=AE=AD=E7=BB=9F=E8=AE=A1?=
=?UTF-8?q?=E5=88=86=E6=9E=90=E6=8A=A5=E8=A1=A8=20=E5=81=87=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CustomPages/BI/BI009RiskAnalysis.js | 389 +++++++++++++++++-
.../CustomPages/BI/BI011TrainSafeAnalysis.js | 100 +++--
2 files changed, 443 insertions(+), 46 deletions(-)
diff --git a/src/components/CustomPages/BI/BI009RiskAnalysis.js b/src/components/CustomPages/BI/BI009RiskAnalysis.js
index e389c59..5d192a0 100644
--- a/src/components/CustomPages/BI/BI009RiskAnalysis.js
+++ b/src/components/CustomPages/BI/BI009RiskAnalysis.js
@@ -63,14 +63,359 @@ class BI008RiskAnalysis extends React.Component {
getBaseInfoData = () => {
const json2 = initFilter(this.props.login.OrgId);
extendOrder(json2, "CREATE_TIME", 1);
- this.props.dispatch({
- type: "app/getDataByPost",
- url: "BI/BIController/getRiskData",
- payload: json2,
- onlyData: false,
- onComplete: (ret) => {
- if (ret) {
- this.state.retData = ret?.Data.RISKLEVELCOUNTS;
+ // this.props.dispatch({
+ // type: "app/getDataByPost",
+ // url: "BI/BIController/getRiskData",
+ // payload: json2,
+ // onlyData: false,
+ // onComplete: (ret) => {
+ // if (ret) {
+ // console.log(ret);
+ let ret = {
+ IsSuccessful: true,
+ Data: {
+ RISKLEVELCOUNTS: [
+ {
+ NAME: "选矿部",
+ LEVEL1: 0,
+ LEVEL2: 82,
+ LEVEL3: 311,
+ LEVEL4: 1834,
+ },
+ {
+ NAME: "矿山部",
+ LEVEL1: 0,
+ LEVEL2: 0,
+ LEVEL3: 70,
+ LEVEL4: 378,
+ },
+ {
+ NAME: "生产一班",
+ LEVEL1: 0,
+ LEVEL2: 0,
+ LEVEL3: 0,
+ LEVEL4: 0,
+ },
+ {
+ NAME: "机电设备管理办公室",
+ LEVEL1: 0,
+ LEVEL2: 0,
+ LEVEL3: 0,
+ LEVEL4: 0,
+ },
+ {
+ NAME: "财务部",
+ LEVEL1: 0,
+ LEVEL2: 0,
+ LEVEL3: 0,
+ LEVEL4: 0,
+ },
+ {
+ NAME: "办公室",
+ LEVEL1: 0,
+ LEVEL2: 0,
+ LEVEL3: 0,
+ LEVEL4: 0,
+ },
+ {
+ NAME: "非金属资源部筹备组",
+ LEVEL1: 0,
+ LEVEL2: 0,
+ LEVEL3: 0,
+ LEVEL4: 0,
+ },
+ {
+ NAME: "企业管理部",
+ LEVEL1: 0,
+ LEVEL2: 0,
+ LEVEL3: 0,
+ LEVEL4: 0,
+ },
+ {
+ NAME: "技术管理部",
+ LEVEL1: 0,
+ LEVEL2: 0,
+ LEVEL3: 0,
+ LEVEL4: 0,
+ },
+ {
+ NAME: "营销部",
+ LEVEL1: 0,
+ LEVEL2: 0,
+ LEVEL3: 0,
+ LEVEL4: 0,
+ },
+ ],
+ AREACOUNTS: [
+ {
+ AREANAME: "破碎车间-粗碎单元",
+ AREACOUNT: 1,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "综合回收车间-精多金属仓库单元",
+ AREACOUNT: 2,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "磨重车间-脱泥单元",
+ AREACOUNT: 3,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "食堂",
+ AREACOUNT: 3,
+ AREATYPE: 0,
+ },
+ {
+ AREANAME: "综合回收车间-精矿烘干单元",
+ AREACOUNT: 4,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "尾矿库截渗池回水单元",
+ AREACOUNT: 4,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "破碎车间-辊磨单元",
+ AREACOUNT: 6,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "磨重车间-中矿再磨单元",
+ AREACOUNT: 9,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "磨重车间-粗粒选别单元",
+ AREACOUNT: 9,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "加油站-采场",
+ AREACOUNT: 11,
+ AREATYPE: 0,
+ },
+ {
+ AREANAME: "尾矿库截洪单元",
+ AREACOUNT: 19,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "采场道路",
+ AREACOUNT: 20,
+ AREATYPE: 0,
+ },
+ {
+ AREANAME: "破碎车间-放矿运输单元",
+ AREACOUNT: 21,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "卢家边回水单元",
+ AREACOUNT: 22,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "钨细泥回收车间-回水单元",
+ AREACOUNT: 22,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "综合回收车间-硫化矿综合回收单元",
+ AREACOUNT: 23,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "磨重车间-细粒选别单元",
+ AREACOUNT: 27,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "尾矿库库区",
+ AREACOUNT: 31,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "磨重车间-磨矿分级单元",
+ AREACOUNT: 32,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "截渗池回水单元",
+ AREACOUNT: 32,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "加油站",
+ AREACOUNT: 34,
+ AREATYPE: 0,
+ },
+ {
+ AREANAME: "钨细泥回收车间-取砂单元",
+ AREACOUNT: 38,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "采场-排土场",
+ AREACOUNT: 39,
+ AREATYPE: 0,
+ },
+ {
+ AREANAME: "综合回收车间",
+ AREACOUNT: 40,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "磨重车间-给料单元",
+ AREACOUNT: 42,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "排土场",
+ AREACOUNT: 45,
+ AREATYPE: 0,
+ },
+ {
+ AREANAME: "尾矿库库内回水单元",
+ AREACOUNT: 50,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "维修场",
+ AREACOUNT: 52,
+ AREATYPE: 0,
+ },
+ {
+ AREANAME: "炸药库区",
+ AREACOUNT: 55,
+ AREATYPE: 0,
+ },
+ {
+ AREANAME: "尾矿库库坝单元",
+ AREACOUNT: 55,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "钨细泥回收车间-配药单元",
+ AREACOUNT: 62,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "钨细泥回收车间-排尾单元",
+ AREACOUNT: 71,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "钨细泥回收车间-脱硫单元",
+ AREACOUNT: 79,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "磨矿变配电区",
+ AREACOUNT: 86,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "磨重车间-机修房",
+ AREACOUNT: 90,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "钨细泥回收车间-浓密机单元",
+ AREACOUNT: 90,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "钨细泥回收车间-脱泥单元",
+ AREACOUNT: 153,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "破碎车间",
+ AREACOUNT: 164,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "磨重车间",
+ AREACOUNT: 174,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "钨细泥回收车间-低钨回收单元",
+ AREACOUNT: 180,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "采场",
+ AREACOUNT: 189,
+ AREATYPE: 0,
+ },
+ {
+ AREANAME: "机电设备科作业区",
+ AREACOUNT: 257,
+ AREATYPE: 1,
+ },
+ {
+ AREANAME: "配电单元",
+ AREACOUNT: 368,
+ AREATYPE: 1,
+ },
+ ],
+ DATECOUNTS: [
+ {
+ DATE: "2024-01-31 23:59:59",
+ COUNT: 2714,
+ TYPE: 0,
+ },
+ {
+ DATE: "2024-01-31 23:59:59",
+ COUNT: 50,
+ TYPE: 1,
+ },
+ {
+ DATE: "2024-02-29 23:59:59",
+ COUNT: 2714,
+ TYPE: 0,
+ },
+ {
+ DATE: "2024-02-29 23:59:59",
+ COUNT: 50,
+ TYPE: 1,
+ },
+ {
+ DATE: "2024-03-31 23:59:59",
+ COUNT: 2714,
+ TYPE: 0,
+ },
+ {
+ DATE: "2024-03-31 23:59:59",
+ COUNT: 50,
+ TYPE: 1,
+ },
+ {
+ DATE: "2024-04-30 23:59:59",
+ COUNT: 2714,
+ TYPE: 0,
+ },
+ {
+ DATE: "2024-04-30 23:59:59",
+ COUNT: 51,
+ TYPE: 1,
+ },
+ ],
+ RISKTOTALCOUNT: 2714,
+ HAZARDTOTALCOUNT: 51,
+ MEASURESTOTALCOUNT: 653,
+ },
+ TotalCount: 0,
+ MessageType: 0,
+ };
+ // this.state.retData = ret?.Data.RISKLEVELCOUNTS;
+ this.setState({
+ retData:ret.Data.RISKLEVELCOUNTS
+ })
let level1all = 0;
let level2all = 0;
let level3all = 0;
@@ -88,7 +433,7 @@ class BI008RiskAnalysis extends React.Component {
this.state.HAZARDTOTALCOUNT = ret.Data.HAZARDTOTALCOUNT;
this.state.RISKTOTALCOUNT = ret.Data.RISKTOTALCOUNT;
this.state.MEASURESTOTALCOUNT = ret.Data.MEASURESTOTALCOUNT;
- }
+ // }
this.chart1();
this.chart2(
ret?.Data.AREACOUNTS.filter((t) => t.AREATYPE == 0).slice(0, 10)
@@ -97,8 +442,8 @@ class BI008RiskAnalysis extends React.Component {
ret?.Data.AREACOUNTS.filter((t) => t.AREATYPE == 1).slice(0, 10)
);
this.chart4(ret?.Data.DATECOUNTS);
- },
- });
+ // },
+ // });
};
chart1 = () => {
let showData = [
@@ -113,7 +458,11 @@ class BI008RiskAnalysis extends React.Component {
color: ["#c92a2a", "#ffa94d", "#ffe066", "#4285F4", "#fa8a89"],
title: [
{
- text:this.state.LEVEL1TOTAL+this.state.LEVEL2TOTAL+this.state.LEVEL3TOTAL+this.state.LEVEL4TOTAL ,
+ text:
+ this.state.LEVEL1TOTAL +
+ this.state.LEVEL2TOTAL +
+ this.state.LEVEL3TOTAL +
+ this.state.LEVEL4TOTAL,
x: "24%",
y: "40%",
textStyle: {
@@ -709,7 +1058,7 @@ class BI008RiskAnalysis extends React.Component {
alignItems: "center",
justifyContent: "space-around",
border: "1px #888 solid",
- padding: "8px 0px"
+ padding: "8px 0px",
}}
>
-
+
@@ -815,18 +1162,18 @@ class BI008RiskAnalysis extends React.Component {
> */}
-
+
diff --git a/src/components/CustomPages/BI/BI011TrainSafeAnalysis.js b/src/components/CustomPages/BI/BI011TrainSafeAnalysis.js
index 6699428..0e5995a 100644
--- a/src/components/CustomPages/BI/BI011TrainSafeAnalysis.js
+++ b/src/components/CustomPages/BI/BI011TrainSafeAnalysis.js
@@ -94,29 +94,79 @@ class TrainSafeAnalysis extends React.Component {
this.loadData(this.state.searchMonth);
}
loadData = (startTime) => {
- const json = initFilter(this.props.login.OrgId);
- this.state.showLoading = true;
- json.Parameter1 = startTime;
- this.props.dispatch({
- type: "app/getDataByPost",
- url: "BI/BIController/getSafeTrainData",
- payload: json,
- onlyData: false,
- onComplete: (ret) => {
- if (ret) {
- this.state.showLoading = false;
- this.state.NUM1 = ret.Data.NUM1;
- this.state.NUM2 = ret.Data.NUM2;
- this.state.NUM3 = ret.Data.NUM3;
- this.state.NUM4 = ret.Data.NUM4;
- this.state.NUM5 = ret.Data.NUM5;
- this.state.NUM6 = ret.Data.NUM6;
- this.state.NUM7 = ret.Data.NUM7;
- this.state.retData = ret.Data.trainRecords;
- this.chart1(ret.Data.dateCountModel);
- }
+ // const json = initFilter(this.props.login.OrgId);
+ // this.state.showLoading = true;
+ // json.Parameter1 = startTime;
+ // this.props.dispatch({
+ // type: "app/getDataByPost",
+ // url: "BI/BIController/getSafeTrainData",
+ // payload: json,
+ // onlyData: false,
+ // onComplete: (ret) => {
+ // if (ret) {
+ let ret = {
+ IsSuccessful: true,
+ Data: {
+ NUM1: 1,
+ NUM2: 94,
+ NUM3: 42,
+ NUM4: 13,
+ NUM5: 14,
+ NUM6: 15,
+ NUM7: 539,
+ trainRecords: [],
+ dateCountModel: [
+ {
+ DATE: "2024-01-01 00:00:00",
+ COUNT: 44,
+ TYPE: 0,
+ },
+ {
+ DATE: "2024-02-01 00:00:00",
+ COUNT: 50,
+ TYPE: 0,
+ },
+ {
+ DATE: "2024-03-01 00:00:00",
+ COUNT: 0,
+ TYPE: 0,
+ },
+ {
+ DATE: "2024-04-01 00:00:00",
+ COUNT: 0,
+ TYPE: 0,
+ },
+ ],
},
- });
+ TotalCount: 0,
+ MessageType: 0,
+ };
+ this.setState(
+ {
+ showLoading: false,
+ NUM1: ret.Data.NUM1,
+ NUM2: ret.Data.NUM2,
+ NUM3: ret.Data.NUM3,
+ NUM4: ret.Data.NUM4,
+ NUM5: ret.Data.NUM5,
+ NUM6: ret.Data.NUM6,
+ NUM7: ret.Data.NUM7,
+ retData: ret.Data.trainRecords,
+ }
+ );
+ // this.state.showLoading = false;
+ // this.state.NUM1 = ret.Data.NUM1;
+ // this.state.NUM2 = ret.Data.NUM2;
+ // this.state.NUM3 = ret.Data.NUM3;
+ // this.state.NUM4 = ret.Data.NUM4;
+ // this.state.NUM5 = ret.Data.NUM5;
+ // this.state.NUM6 = ret.Data.NUM6;
+ // this.state.NUM7 = ret.Data.NUM7;
+ // this.state.retData = ret.Data.trainRecords;
+ this.chart1(ret.Data.dateCountModel);
+ // }
+ // },
+ // });
};
chart1 = (ret) => {
this.state.recordNums = [];
@@ -398,7 +448,7 @@ class TrainSafeAnalysis extends React.Component {
style={{
// borderRadius: "10px",
backgroundColor: "white",
- border: "1px solid rgb(232,232,232)"
+ border: "1px solid rgb(232,232,232)",
// boxShadow: "0px 0px 10px rgba(0,0,0,.15)",
}}
>
@@ -418,8 +468,8 @@ class TrainSafeAnalysis extends React.Component {