Merge branch 'main' of http://47.122.43.22:3000/wjn/mh-sms-web

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({
+    // this.props.dispatch({
-      type: "app/getDataByPost",
+    //   type: "app/getDataByPost",
-      url: "BI/BIController/getRiskData",
+    //   url: "BI/BIController/getRiskData",
-      payload: json2,
+    //   payload: json2,
-      onlyData: false,
+    //   onlyData: false,
-      onComplete: (ret) => {
+    //   onComplete: (ret) => {
-        if (ret) {
+    //     if (ret) {
-          this.state.retData = ret?.Data.RISKLEVELCOUNTS;
+    //       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",
               }}
             >
               <div
@@ -799,9 +1148,7 @@ class BI008RiskAnalysis extends React.Component {
         <Row gutter={10} style={{ marginTop: "14px" }}>
           <Col span={1}></Col>
           <Col span={22}>
-            <div
+            <div style={{ border: "1px solid rgb(232,232,232)" }}>
-              style={{ border: "1px solid rgb(232,232,232)" }}
-            >
               <div id="chart4" style={{ width: "100%", height: "350px" }}></div>
             </div>
           </Col>
@@ -815,7 +1162,7 @@ class BI008RiskAnalysis extends React.Component {
         ></hr> */}
         <Row gutter={10} style={{ marginTop: "24px" }}>
           <Col span={1}></Col>
-          <Col span={11} style={{borderRight:'1px solid #e7e6e4'}}>
+          <Col span={11} style={{ borderRight: "1px solid #e7e6e4" }}>
             <div
             // className="dashboard-div-style"
             // style={{ border: "1px gray dotted" }}

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);
+    // const json = initFilter(this.props.login.OrgId);
-    this.state.showLoading = true;
+    // this.state.showLoading = true;
-    json.Parameter1 = startTime;
+    // json.Parameter1 = startTime;
-    this.props.dispatch({
+    // this.props.dispatch({
-      type: "app/getDataByPost",
+    //   type: "app/getDataByPost",
-      url: "BI/BIController/getSafeTrainData",
+    //   url: "BI/BIController/getSafeTrainData",
-      payload: json,
+    //   payload: json,
-      onlyData: false,
+    //   onlyData: false,
-      onComplete: (ret) => {
+    //   onComplete: (ret) => {
-        if (ret) {
+    //     if (ret) {
-          this.state.showLoading = false;
+    let ret = {
-          this.state.NUM1 = ret.Data.NUM1;
+      IsSuccessful: true,
-          this.state.NUM2 = ret.Data.NUM2;
+      Data: {
-          this.state.NUM3 = ret.Data.NUM3;
+        NUM1: 1,
-          this.state.NUM4 = ret.Data.NUM4;
+        NUM2: 94,
-          this.state.NUM5 = ret.Data.NUM5;
+        NUM3: 42,
-          this.state.NUM6 = ret.Data.NUM6;
+        NUM4: 13,
-          this.state.NUM7 = ret.Data.NUM7;
+        NUM5: 14,
-          this.state.retData = ret.Data.trainRecords;
+        NUM6: 15,
-          this.chart1(ret.Data.dateCountModel);
+        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)",
               }}
             >

src/components/CustomPages/BI/BI051BSCompanyYearOne.js

@@ -77,12 +77,528 @@ class BI051BSCompanyYear extends React.Component {
   loadData = () => {
     var orgId = this.props.login ? this.props.login.OrgId : "";
     let json = initFilter(orgId);
-    this.props.dispatch({
+    // this.props.dispatch({
-      type: "app/getDataByPost",
+    //   type: "app/getDataByPost",
-      payload: json,
+    //   payload: json,
-      url: "BI/BISafeYear/BISafeYearShow",
+    //   url: "BI/BISafeYear/BISafeYearShow",
-      onComplete: (data) => {
+    //   onComplete: (data) => {
-        if (data) {
+    //     if (data) {
+    //       console.log(data);
+    var data = {
+      NAME: "宁化行洛坑钨矿有限公司",
+      listCheckTypeYear: [
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2023,
+          MONTH: 5,
+          ALLCOUNT: 34,
+          INTTIMECOUNT: 20,
+          OUTTIMECOUNT: 13,
+          NOTFINISHCOUN: 1,
+          FINISHPERCENT: 97.06,
+          ID: "23bcb111-ee16-48c4-85b6-cce1740749f0",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2023-09-07 14:06:46",
+          MODIFY_TIME: "2023-12-06 16:49:12",
+          CREATER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2023,
+          MONTH: 6,
+          ALLCOUNT: 30,
+          INTTIMECOUNT: 16,
+          OUTTIMECOUNT: 13,
+          NOTFINISHCOUN: 1,
+          FINISHPERCENT: 96.67,
+          ID: "1feee87b-4113-4da4-a887-3d8ab39a0b3c",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2023-09-07 14:06:46",
+          MODIFY_TIME: "2023-12-06 16:49:12",
+          CREATER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2023,
+          MONTH: 7,
+          ALLCOUNT: 27,
+          INTTIMECOUNT: 17,
+          OUTTIMECOUNT: 8,
+          NOTFINISHCOUN: 2,
+          FINISHPERCENT: 92.59,
+          ID: "1ab92899-87d8-4fb7-b337-f3586200e2cb",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2023-09-07 14:06:46",
+          MODIFY_TIME: "2023-12-06 16:49:12",
+          CREATER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2023,
+          MONTH: 8,
+          ALLCOUNT: 7,
+          INTTIMECOUNT: 6,
+          OUTTIMECOUNT: 1,
+          NOTFINISHCOUN: 0,
+          FINISHPERCENT: 100,
+          ID: "9e95e8e8-ea3e-4424-811e-7f3c6afe5b04",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2023-09-07 14:06:46",
+          MODIFY_TIME: "2023-12-06 16:49:12",
+          CREATER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2023,
+          MONTH: 9,
+          ALLCOUNT: 13,
+          INTTIMECOUNT: 7,
+          OUTTIMECOUNT: 5,
+          NOTFINISHCOUN: 1,
+          FINISHPERCENT: 92.31,
+          ID: "23e4bc28-f5c4-4ae6-827d-a6bd93d65928",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2023-09-07 14:06:46",
+          MODIFY_TIME: "2023-12-31 15:54:46",
+          CREATER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2023,
+          MONTH: 10,
+          ALLCOUNT: 25,
+          INTTIMECOUNT: 19,
+          OUTTIMECOUNT: 3,
+          NOTFINISHCOUN: 3,
+          FINISHPERCENT: 88,
+          ID: "96974083-0e36-4023-a8c8-4db3e403f0fb",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2023-10-01 20:19:57",
+          MODIFY_TIME: "2023-12-31 15:54:46",
+          CREATER_ID: null,
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2023,
+          MONTH: 11,
+          ALLCOUNT: 51,
+          INTTIMECOUNT: 35,
+          OUTTIMECOUNT: 6,
+          NOTFINISHCOUN: 10,
+          FINISHPERCENT: 80.39,
+          ID: "d2714b2d-88a6-431b-8850-82c324cb0f0e",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2023-11-01 20:19:58",
+          MODIFY_TIME: "2024-01-31 15:54:48",
+          CREATER_ID: null,
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2023,
+          MONTH: 12,
+          ALLCOUNT: 17,
+          INTTIMECOUNT: 12,
+          OUTTIMECOUNT: 4,
+          NOTFINISHCOUN: 1,
+          FINISHPERCENT: 94.12,
+          ID: "c16b2d38-5ae0-4b30-98be-7b8dc7724fba",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2023-12-01 20:19:59",
+          MODIFY_TIME: "2024-02-29 15:54:50",
+          CREATER_ID: null,
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2024,
+          MONTH: 1,
+          ALLCOUNT: 69,
+          INTTIMECOUNT: 54,
+          OUTTIMECOUNT: 12,
+          NOTFINISHCOUN: 3,
+          FINISHPERCENT: 95.65,
+          ID: "5abf40f1-8e05-4950-a6bf-1fac6b211b15",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2024-01-01 15:54:46",
+          MODIFY_TIME: "2024-03-05 15:54:51",
+          CREATER_ID: null,
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2024,
+          MONTH: 2,
+          ALLCOUNT: 25,
+          INTTIMECOUNT: 8,
+          OUTTIMECOUNT: 9,
+          NOTFINISHCOUN: 8,
+          FINISHPERCENT: 68,
+          ID: "77108913-f421-4473-b9f6-f6ada933d619",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2024-02-01 15:54:47",
+          MODIFY_TIME: "2024-03-05 15:54:51",
+          CREATER_ID: null,
+          MODIFIER_ID: null,
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          DEPARTMENT_ID: null,
+          YEAR: 2024,
+          MONTH: 3,
+          ALLCOUNT: 3,
+          INTTIMECOUNT: 0,
+          OUTTIMECOUNT: 0,
+          NOTFINISHCOUN: 3,
+          FINISHPERCENT: 0,
+          ID: "d39408aa-01e8-404c-966f-6a41bd7df357",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2024-03-01 15:54:50",
+          MODIFY_TIME: "2024-03-05 15:54:51",
+          CREATER_ID: null,
+          MODIFIER_ID: null,
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+      ],
+      listSafeCheckYear: [
+        {
+          MineType: 0,
+          YEAR: 2024,
+          LEVEL: 3,
+          NAME: "公司级",
+          ROW_NO: 0,
+          COUNTJANUARY: 5,
+          COUNTFEBRUARY: 5,
+          COUNTMARCH: 1,
+          COUNTAPRIL: 0,
+          COUNTMAY: 0,
+          COUNTJUNE: 0,
+          COUNTJULY: 0,
+          COUNTAUGUST: 0,
+          COUNTSEPTEMBER: 0,
+          COUNTOCTOBER: 0,
+          COUNTNOVEMBER: 0,
+          COUNTDECEMBER: 0,
+          COUNTTOTAL: 11,
+          ID: "65c79afa-7a60-48c6-8c22-dcfe823bdbaa",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2024-01-01 15:54:46",
+          MODIFY_TIME: "2024-03-05 15:54:51",
+          CREATER_ID: null,
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          YEAR: 2024,
+          LEVEL: 0,
+          NAME: "部门级",
+          ROW_NO: 1,
+          COUNTJANUARY: 12,
+          COUNTFEBRUARY: 8,
+          COUNTMARCH: 8,
+          COUNTAPRIL: 0,
+          COUNTMAY: 0,
+          COUNTJUNE: 0,
+          COUNTJULY: 0,
+          COUNTAUGUST: 0,
+          COUNTSEPTEMBER: 0,
+          COUNTOCTOBER: 0,
+          COUNTNOVEMBER: 0,
+          COUNTDECEMBER: 0,
+          COUNTTOTAL: 28,
+          ID: "f33f6aca-2708-47ba-8db5-5a9342c1739b",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2024-01-01 15:54:46",
+          MODIFY_TIME: "2024-03-05 15:54:51",
+          CREATER_ID: null,
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          YEAR: 2024,
+          LEVEL: 1,
+          NAME: "车间级",
+          ROW_NO: 2,
+          COUNTJANUARY: 104,
+          COUNTFEBRUARY: 96,
+          COUNTMARCH: 24,
+          COUNTAPRIL: 0,
+          COUNTMAY: 0,
+          COUNTJUNE: 0,
+          COUNTJULY: 0,
+          COUNTAUGUST: 0,
+          COUNTSEPTEMBER: 0,
+          COUNTOCTOBER: 0,
+          COUNTNOVEMBER: 0,
+          COUNTDECEMBER: 0,
+          COUNTTOTAL: 224,
+          ID: "f127b5a9-def9-4125-a372-4f7157a965ee",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2024-01-01 15:54:46",
+          MODIFY_TIME: "2024-03-05 15:54:51",
+          CREATER_ID: null,
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          YEAR: 2024,
+          LEVEL: 2,
+          NAME: "班组级",
+          ROW_NO: 3,
+          COUNTJANUARY: 873,
+          COUNTFEBRUARY: 639,
+          COUNTMARCH: 136,
+          COUNTAPRIL: 0,
+          COUNTMAY: 0,
+          COUNTJUNE: 0,
+          COUNTJULY: 0,
+          COUNTAUGUST: 0,
+          COUNTSEPTEMBER: 0,
+          COUNTOCTOBER: 0,
+          COUNTNOVEMBER: 0,
+          COUNTDECEMBER: 0,
+          COUNTTOTAL: 1648,
+          ID: "82963320-962a-4123-af5c-59e4f3f1138d",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2024-01-01 15:54:46",
+          MODIFY_TIME: "2024-03-05 15:54:51",
+          CREATER_ID: null,
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          MineType: 0,
+          YEAR: 0,
+          LEVEL: 0,
+          NAME: "合计",
+          ROW_NO: 4,
+          COUNTJANUARY: 994,
+          COUNTFEBRUARY: 748,
+          COUNTMARCH: 169,
+          COUNTAPRIL: 0,
+          COUNTMAY: 0,
+          COUNTJUNE: 0,
+          COUNTJULY: 0,
+          COUNTAUGUST: 0,
+          COUNTSEPTEMBER: 0,
+          COUNTOCTOBER: 0,
+          COUNTNOVEMBER: 0,
+          COUNTDECEMBER: 0,
+          COUNTTOTAL: 1911,
+          ID: "4c84b169-c16d-452d-bbd1-df391c412ed3",
+          IS_DELETED: false,
+          ORG_ID: null,
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2024-04-24 15:10:38",
+          MODIFY_TIME: "2024-04-24 15:10:38",
+          CREATER_ID: null,
+          MODIFIER_ID: null,
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+      ],
+      listSummary: [
+        {
+          CODE: "BI051_BSCOMPANYYEAR",
+          PART: 3,
+          NUM: 1,
+          TimeType: 0,
+          MineType: 0,
+          Parameter1: "隐患数",
+          Count1: 97,
+          Parameter2: "超整改数",
+          Count2: 22,
+          Parameter3: "按期整改数",
+          Count3: 62,
+          Parameter4: "整改率",
+          Count4: 0,
+          Count5: 0,
+          Count6: 0,
+          Parameter7: "86.6%",
+          Count7: 0,
+          Count8: 0,
+          Count9: 0,
+          Count10: 0,
+          ID: "494021ca-236c-4669-b4c5-c6d7006ae1c8",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2023-04-12 09:39:50",
+          MODIFY_TIME: "2024-03-05 15:54:51",
+          CREATER_ID: null,
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+        {
+          CODE: "BI051_BSCOMPANYYEAR",
+          PART: 1,
+          NUM: 1,
+          TimeType: 0,
+          MineType: 0,
+          Parameter1: "计划检查数",
+          Count1: 1911,
+          Parameter2: "按时已办",
+          Count2: 1811,
+          Parameter3: "超时已办",
+          Count3: 0,
+          Parameter4: "未完成数",
+          Count4: 100,
+          Parameter5: "完成率",
+          Count5: 0,
+          Parameter6: "及时完成率",
+          Count6: 0,
+          Parameter7: "94.77%",
+          Count7: 0,
+          Parameter8: "94.77%",
+          Count8: 0,
+          Count9: 0,
+          Count10: 0,
+          ID: "c107f8c9-d66e-4981-abdd-f1fbb34b8e0a",
+          IS_DELETED: false,
+          ORG_ID: "a3dce14a-13d9-d879-d9ab-821d4a3f1f93",
+          ENTITY_ORG_TPYE: 0,
+          FORM_ID: null,
+          FLOW_STATUS: 0,
+          FLOW_SEND_STATUS: 0,
+          FLOW_ID: null,
+          CREATE_TIME: "2023-04-12 09:39:50",
+          MODIFY_TIME: "2024-03-05 15:54:51",
+          CREATER_ID: null,
+          MODIFIER_ID: "8f26c255-fdfd-47ff-b83e-6309815958dd",
+          TaskID: "00000000-0000-0000-0000-000000000000",
+        },
+      ],
+    };
+    console.log(
+      data.listSafeCheckYear[data.listSafeCheckYear.length - 1].COUNTTOTAL,
+      "11"
+    );
     var count1 = 0;
     var count2 = 0;
     var count3 = 0;
@@ -114,10 +630,7 @@ class BI051BSCompanyYear extends React.Component {
       });
     }
     var year = new Date().getFullYear();
-          if (
+    if (data.listSafeCheckYear != null && data.listSafeCheckYear.length > 0)
-            data.listSafeCheckYear != null &&
-            data.listSafeCheckYear.length > 0
-          )
       year = data.listSafeCheckYear[0].YEAR;
     var companyName =
       data.NAME == undefined || data.NAME == null ? "公司级" : data.NAME;
@@ -159,16 +672,20 @@ class BI051BSCompanyYear extends React.Component {
       "#7F6AAD",
       "#585247",
     ];
+    console.log(divchekData1, "divchekData1");
+    console.log(divchekData, "divchekData");
     let divcheks = document.getElementById("divchek");
     if (divcheks) {
+      console.log('11111111',divcheks)
       let myChart = echarts.init(divcheks);
 
       myChart.setOption({
         title: {
           text: "年度检查数",
-                subtext:
+          // subtext:
-                  data.listSafeCheckYear[data.listSafeCheckYear.length - 1]
+          //   data.listSafeCheckYear[data.listSafeCheckYear.length - 1]
-                    .COUNTTOTAL,
+          //     .COUNTTOTAL,
+          subtext: 1911,
           textStyle: {
             fontSize: 14,
             color: "#999",
@@ -195,7 +712,8 @@ class BI051BSCompanyYear extends React.Component {
           itemGap: 30,
           selectedMode: false,
           icon: "pin",
-                data: divchekData1,
+          // data: divchekData1,
+          data: ["公司级", "部门级", "车间级", "班组级"],
           textStyle: {
             color: "#77899c",
             rich: {
@@ -231,11 +749,7 @@ class BI051BSCompanyYear extends React.Component {
               position: "outside",
               formatter: (params) => {
                 return (
-                        "{name|" +
+                  "{name|" + params.name + "}\n{value|" + params.value + "}"
-                        params.name +
-                        "}\n{value|" +
-                        params.value +
-                        "}"
                 );
               },
               rich: {
@@ -260,7 +774,25 @@ class BI051BSCompanyYear extends React.Component {
                 },
               },
             },
-                  data: divchekData,
+            // data: divchekData,
+            data: [
+              {
+                name: "公司级",
+                value: 11,
+              },
+              {
+                name: "部门级",
+                value: 28,
+              },
+              {
+                name: "车间级",
+                value: 224,
+              },
+              {
+                name: "班组级",
+                value: 1648,
+              },
+            ],
           },
         ],
       });
@@ -536,9 +1068,9 @@ class BI051BSCompanyYear extends React.Component {
     //     dataXAxis,
     //     dataSeries
     //   );
-        }
+    //     }
-      },
+    //   },
-    });
+    // });
   };
 
   // 搜索
@@ -755,15 +1287,17 @@ class BI051BSCompanyYear extends React.Component {
               // margin:'0px 20px 20px 20px'
             }}
           >
-            <div style={{
+            <div
+              style={{
                 display: "flex",
                 alignItems: "center",
                 justifyContent: "center",
                 //   marginBottom: "20px",
-              width:'1100px',
+                width: "1100px",
-              flexDirection:'row',
+                flexDirection: "row",
                 //   margin:'0px 20px 20px 20px'
-        }}>
+              }}
+            >
               <div
                 style={{
                   display: "flex",
@@ -774,18 +1308,7 @@ class BI051BSCompanyYear extends React.Component {
                   height: "100%",
                 }}
               >
-              {data?.listSafeCheckYear ? (
+                {/* {data?.listSafeCheckYear ? (
-                // <div className={styles.menuPie4}>
-                //   {data.listSafeCheckYear.map((item) => {
-                //     if (item.NAME != "合计") {
-                //       return (
-                //         <li>
-                //           {item.NAME} <br /> {item.COUNTTOTAL}
-                //         </li>
-                //       );
-                //     }
-                //   })}
-                // </div>
                   <div
                     id="divchek"
                     style={{
@@ -804,7 +1327,18 @@ class BI051BSCompanyYear extends React.Component {
                     <li>车间级</li>
                     <li>班组级</li>
                   </ul>
-              )}
+                )} */}
+                 <div
+                    id="divchek"
+                    style={{
+                      width: "500px",
+                      height: "425px",
+                      //   float: "left",
+                      //    marginTop: "20px",
+                      display: "flex",
+                      justifyContent: "center",
+                    }}
+                  ></div>
               </div>
 
               <div
@@ -841,7 +1375,9 @@ class BI051BSCompanyYear extends React.Component {
                             <tr>
                               <td colSpan={2}>{item.NAME}</td>
                               <td>
-                              {item.COUNTJANUARY == 0 ? "" : item.COUNTJANUARY}
+                                {item.COUNTJANUARY == 0
+                                  ? ""
+                                  : item.COUNTJANUARY}
                               </td>
                               <td>
                                 {item.COUNTFEBRUARY == 0
@@ -855,8 +1391,12 @@ class BI051BSCompanyYear extends React.Component {
                                 {item.COUNTAPRIL == 0 ? "" : item.COUNTAPRIL}
                               </td>
                               <td>{item.COUNTMAY == 0 ? "" : item.COUNTMAY}</td>
-                            <td>{item.COUNTJUNE == 0 ? "" : item.COUNTJUNE}</td>
+                              <td>
-                            <td>{item.COUNTJULY == 0 ? "" : item.COUNTJULY}</td>
+                                {item.COUNTJUNE == 0 ? "" : item.COUNTJUNE}
+                              </td>
+                              <td>
+                                {item.COUNTJULY == 0 ? "" : item.COUNTJULY}
+                              </td>
                               <td>
                                 {item.COUNTAUGUST == 0 ? "" : item.COUNTAUGUST}
                               </td>
@@ -866,7 +1406,9 @@ class BI051BSCompanyYear extends React.Component {
                                   : item.COUNTSEPTEMBER}
                               </td>
                               <td>
-                              {item.COUNTOCTOBER == 0 ? "" : item.COUNTOCTOBER}
+                                {item.COUNTOCTOBER == 0
+                                  ? ""
+                                  : item.COUNTOCTOBER}
                               </td>
                               <td>
                                 {item.COUNTNOVEMBER == 0

src/layout/Header.js

@@ -405,10 +405,10 @@ function Header(props) {
           <GuideCode />
           <HeaderNav />
           {/* style={{"color":"#f3eded"}} */}
-          {/* <HeaderUser /> */}
+          <HeaderUser />
-          {/* <b>
+          <b>
             {props.login.user.NAME}({props.login.user.CODE})
-          </b> */}
+          </b>
         </div>
       ) : null}
     </div>

src/layout/header.less

@@ -84,7 +84,7 @@
 
       &-icon {
         font-size: 22px !important;
-        color: #909399 !important; //f3eded
+        // color: #909399 !important; //f3eded
         cursor: pointer;
       }
 

src/layout/main.less

@@ -29,6 +29,8 @@
         flex-direction: column;
         flex: 1;
         width: calc(100% - 100px);
+        // overflow-x: hidden;
+        overflow: auto;
       }
 
       &-sider {

src/routes/Home.js

@@ -108,22 +108,19 @@ const WorkBench = (props) => {
               style={{
                 marginLeft: "20px",
                 marginRight: "20px",
+                whiteSpace: "nowrap",
               }}
             >
               {type}
             </div>
 
-            <div
+            <div className="home-work-title">{item.NOTICE_TITLE}</div>
-              className="home-work-title"
-              style={{ flex: 1, alignItems: "flex-start" }}
-            >
-              {item.NOTICE_TITLE}
-            </div>
             <div
               className="home-work-date"
               style={{
-                width: "200px",
+                // width: "200px",
-                marginRight: "100px",
+                whiteSpace: "nowrap",
+                marginRight: "20px",
               }}
             >
               开始时间：{item.TASK_STARTDT}
@@ -131,8 +128,9 @@ const WorkBench = (props) => {
             <div
               className="home-work-date"
               style={{
-                width: "200px",
+                // width: "200px",
-                marginRight: "50px",
+                whiteSpace: "nowrap",
+                marginRight: "10px",
               }}
             >
               结束时间：{item.TASK_ENDDT}
@@ -1575,10 +1573,10 @@ class Home extends React.Component {
               width: "100%",
               height: "25%",
               display: "flex",
-              padding: "0px 20px",
+              // padding: "0px 20px",
               margin: "0px",
               minHeight: "242px",
-              minWidth: "1704px",
+              minWidth: "1136px",
               // justifyContent: "space-between",
               // backgroundColor: "#fff",
             }}
@@ -1592,7 +1590,7 @@ class Home extends React.Component {
                 flexDirection: "column",
                 padding: "0px 20px",
                 borderRadius: "5px 0px 0px 5px",
-                minWidth: "578px",
+                minWidth: "453px",
               }}
             >
               <div
@@ -1732,14 +1730,14 @@ class Home extends React.Component {
                   </div>
 
                   <div style={{ display: "flex", flexDirection: "row" }}>
-                    <div
+                    {/* <div
                       className="home-userInfo-tabs"
                       style={{
                         marginRight: "10px",
                       }}
                     >
                       工号：{this.state.userInfo.CODE}
-                    </div>
+                    </div> */}
                     <div
                       className="home-userInfo-tabs"
                       style={{
@@ -1759,6 +1757,7 @@ class Home extends React.Component {
                 </div>
               </div>
               <div className="home-userInfo-card">
+                <Col span={6}>
                   <UserInfo
                     data={this.state.workTotal.todoCount}
                     title="待办事项"
@@ -1767,6 +1766,8 @@ class Home extends React.Component {
                       this.showAll("1");
                     }}
                   />
+                </Col>
+                <Col span={6}>
                   <UserInfo
                     data={this.state.workTotal.timeOverCount}
                     title="待办超时"
@@ -1775,6 +1776,8 @@ class Home extends React.Component {
                       this.showAll("4");
                     }}
                   />
+                </Col>
+                <Col span={6}>
                   <UserInfo
                     data={this.state.workTotal.doneCount}
                     title="已办事项"
@@ -1783,6 +1786,8 @@ class Home extends React.Component {
                       this.showAll("2");
                     }}
                   />
+                </Col>
+                <Col span={6}>
                   <UserInfo
                     data={this.state.workTotal.todayNewCount}
                     title="今日提醒"
@@ -1791,6 +1796,7 @@ class Home extends React.Component {
                       this.showAll("3");
                     }}
                   />
+                </Col>
               </div>
             </Col>
             {/* <div style={{ width: "30px" }}></div> */}
@@ -1874,7 +1880,7 @@ class Home extends React.Component {
                 borderRadius: "5px",
                 display: "flex",
                 flexDirection: "column",
-                minWidth: "466px",
+                minWidth: "344px",
               }}
             >
               <div className="home-always-title">
@@ -1955,12 +1961,14 @@ class Home extends React.Component {
               width: "100%",
               height: "40%",
               display: "flex",
-              padding: "0px 20px",
+              // padding: "0px 20px",
               margin: "30px 0px",
-              justifyContent: "space-between",
+              // justifyContent: "space-between",
               alignItems: "center",
               minHeight: "388px",
-              minWidth: "1704px",
+              overflow:'hidden',
+              // minWidth: "1204px",
+              minWidth: "1136px",
               // backgroundColor: "#fff",
             }}
           >
@@ -1973,8 +1981,9 @@ class Home extends React.Component {
                 flexDirection: "column",
                 padding: "0px",
                 borderRadius: "5px",
+                overflow:'hidden',
                 flex: 1,
-                minWidth: "1168px",
+                // minWidth: "768px",
               }}
             >
               <div className="home-always-title">
@@ -2125,7 +2134,7 @@ class Home extends React.Component {
                 borderRadius: "5px",
                 display: "flex",
                 flexDirection: "column",
-                minWidth: "466px",
+                minWidth: "344px",
               }}
             >
               <div className="home-always-title">
@@ -2200,7 +2209,8 @@ class Home extends React.Component {
             style={{
               margin: "0px 0px 10px 0px",
               minHeight: "275px",
-              minWidth: "1704px",
+              // minWidth: "1204px",
+              minWidth: "1136px",
             }}
           >
             <Col
@@ -2285,7 +2295,7 @@ class Home extends React.Component {
                 borderRadius: "5px",
                 display: "flex",
                 flexDirection: "column",
-                minWidth: "466px",
+                minWidth: "344px",
               }}
             >
               <div className="home-always-title">

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;