首页细节调整

src/components/CustomPages/BI/BI001HomeDetail.js

@@ -192,6 +192,7 @@ class BI001HomeDetail extends React.Component {
         {
           title: "车间",
           dataIndex: "shopName",
+          onCell: () => this.renderSpeedColumn(),
           render: (value, record, index) => {
             const obj = {
               children: value,

src/components/CustomPages/BI/BI054HomeDetail.js

@@ -72,17 +72,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "穿爆车间",
             RowCount: 2,
-            listCount: [51, 751, 0, 0, 0],
+            listCount: [51, 751, 0, 0],
           },
           Percent: 0,
           RowCount: 1,
-          listCount: [0, 350, 0, 0, 0],
+          listCount: [0, 350, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         {
@@ -92,17 +91,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "穿爆车间",
             RowCount: 2,
-            listCount: [51, 751, 0, 0, 0],
+            listCount: [51, 751, 0, 0],
           },
           Percent: 0,
           RowCount: 1,
-          listCount: [0, 350, 0, 0, 0],
+          listCount: [0, 350, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         {
@@ -114,17 +112,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "生产技术科",
             RowCount: 1,
-            listCount: [51, 522, 0, 0, 0],
+            listCount: [51, 522, 0, 0],
           },
           Percent: 0,
           RowCount: 1,
-          listCount:  [0, 349, 0, 0, 0],
+          listCount:  [0, 349, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         {
@@ -134,17 +131,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "综合组",
             RowCount: 1,
-            listCount: [0, 349, 0, 0, 0],
+            listCount: [0, 349, 0, 0],
           },
           Percent: 0,
           RowCount: 1,
-          listCount:  [0, 349, 0, 0, 0],
+          listCount:  [0, 349, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         {
@@ -154,17 +150,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "试验化验室",
             RowCount: 2,
-            listCount: [0, 0, 0, 0, 0],
+            listCount: [0, 0, 0, 0],
           },
           Percent: 0,
           RowCount: 1,
-          listCount: [0, 0, 0, 0, 0],
+          listCount: [0, 0, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         {
@@ -176,17 +171,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "试验化验室",
             RowCount: 2,
-            listCount: [0, 0, 0, 0, 0],
+            listCount: [0, 0, 0, 0],
           },
           Percent: 0,
           RowCount: 1,
-          listCount:[0, 0, 0, 0, 0],
+          listCount:[0, 0, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         {
@@ -198,17 +192,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "金宇宁化分公司",
             RowCount: 4,
-            listCount: [51, 1452, 0, 0, 0],
+            listCount: [51, 1452, 0, 0],
           },
           Percent: 0,
           RowCount: 1,
-          listCount: [0, 351, 0, 0, 0],
+          listCount: [0, 351, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         {
@@ -220,17 +213,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "金宇宁化分公司",
             RowCount: 4,
-            listCount: [51, 1452, 0, 0, 0],
+            listCount: [51, 1452, 0, 0],
           },
           Percent: 0,
           RowCount: 1,
-          listCount: [0, 350, 0, 0, 0],
+          listCount: [0, 350, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         {
@@ -242,17 +234,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "金宇宁化分公司",
             RowCount: 4,
-            listCount: [51, 1452, 0, 0, 0],
+            listCount: [51, 1452, 0, 0],
           },
           Percent: 0,
           RowCount: 1,
-          listCount: [0, 350, 0, 0, 0],
+          listCount: [0, 350, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         {
@@ -264,17 +255,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "金宇宁化分公司",
             RowCount: 4,
-            listCount: [51, 1452, 0, 0, 0],
+            listCount: [51, 1452, 0, 0],
           },
           Percent: 0,
           RowCount: 1,
-          listCount: [0, 350, 0, 0, 0],
+          listCount: [0, 350, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         {
@@ -286,17 +276,16 @@ class BI054HomeDetail extends React.Component {
           Parent: {
             DepartmentName: "安环科",
             RowCount: 1,
-            listCount: [52, 400, 2, 1, 1],
+            listCount: [52, 400, 2, 1],
           },
           Percent: 0,
           RowCount: 1,
-          listCount: [0, 349, 0, 0, 0],
+          listCount: [0, 349, 0, 0],
           listName: [
             "巡回检查",
             "例行检查",
             "专业检查",
             "综合检查",
-            "综合检查",
           ],
         },
         
@@ -585,7 +574,6 @@ class BI054HomeDetail extends React.Component {
         [317, 330, 316, 330, 292, 286, 299, 286, 295, 299, 223, 201],
         [0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0],
         [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-        [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
       ];
       for (let i = 0; i < 12; i++) {
         xData.unshift(getSixMonth(-i, "-", ""));
@@ -595,7 +583,6 @@ class BI054HomeDetail extends React.Component {
         "例行检查",
         "专业检查",
         "综合检查",
-        "综合检查",
       ];
       // data.map((item) => {
       //   if (item.MONTH>9){

src/components/CustomPages/BI/BI055HomeDetail.js

@@ -621,9 +621,9 @@ class BI055HomeDetail extends React.Component {
         "100.00",
       ],
     ];
-    let sourceName = [
+    let sourceName = 
-      ["按时整改隐患", "超期整改隐患", "未整改隐患", "隐患整改率"],
+      ["按时整改隐患", "超期整改隐患", "未整改隐患", "隐患整改率"];
-    ];
+    
     // if (this.state.ListC) {
     // this.state.ListC.map((item) => {
     //   let name = item.NAME.split(",");
@@ -673,8 +673,8 @@ class BI055HomeDetail extends React.Component {
             },
           },
           grid: {
-            left: "10%",
+            left: "5%",
-            // right: "10%",
+            right: "5%",
             bottom: "15%",
             top: "5%",
             containLabel: true,

src/layout/Header.js

@@ -390,9 +390,10 @@ function Header(props) {
                 : "header__left-slogan"
             }`}
           >
-            矿山安全生产标准化系统
+            安全管理系统
             <span style={{ color: "#c99d03" }}>（SMS）</span>
-            {baseConfig.SYS_NAME}{" "}
+            {/* {baseConfig.SYS_NAME}{" "} */}
+            -宁化行洛坑
           </span>
         )}
       </div>

src/layout/Sider.js

@@ -232,7 +232,9 @@ const Sider = (props) => {
                           : "sider__shortMenuShowoverca-overc"
                       }
                     ></Icon>
-                    <div className="sider__shortMenuShowoverca-title">{menu.Node.NAME}</div>
+                    <div className="sider__shortMenuShowoverca-title">
+                      {menu.Node.NAME}
+                    </div>
                   </div>
                 );
               })}
@@ -242,7 +244,8 @@ const Sider = (props) => {
                 className="sider__shortMenuShowovercae"
                 onClick={() => {
                   setMenuShow(!MenuShow);
-                  if(mainSilder == 1){   //禁止mainsilder为1--首页状态
+                  if (mainSilder == 1) {
+                    //禁止mainsilder为1--首页状态
                     setMainSilder(2);
                   }
                   // if (MenuShow) {
@@ -252,10 +255,18 @@ const Sider = (props) => {
                   // }
                 }}
               >
+                {MenuShow == true ? (
                   <Icon
                     type="import"
                     className="sider__shortMenuShowoverca-overcd"
                   ></Icon>
+                ) : (
+                  <Icon
+                    type="import"
+                    className="sider__shortMenuShowoverca-overcd"
+                     style={{transform:'scaleX(-1)'}}
+                  ></Icon>
+                )}
               </div>
             </div>
           </div>
@@ -354,8 +365,6 @@ const Sider = (props) => {
                             );
                           })}
                         </div>
-
-                          
                       </div>
                     );
                   })}

src/routes/Home.js

@@ -10,7 +10,7 @@ import {
   extendRule,
   extend,
   extendOrder,
-  getSixMonth
+  getSixMonth,
 } from "../utils/common";
 import "./home.less";
 // 组件库
@@ -197,35 +197,35 @@ class Home extends React.Component {
       },
       completeName: [
         {
-          name: "张森友",
+          name: "运输二班",
           value: 100,
         },
         {
-          name: "李友军",
+          name: "综合班组",
           value: 99,
         },
         {
-          name: "洪虎林",
+          name: "生产班",
           value: 97,
         },
         {
-          name: "李彦斌",
+          name: "维修班组",
           value: 95,
         },
         {
-          name: "王志文",
+          name: "民爆储存库班组",
           value: 93,
         },
         {
-          name: "黄海林",
+          name: "爆破班组",
           value: 90,
         },
         {
-          name: "赵无极",
+          name: "运输一班",
           value: 67,
         },
         {
-          name: "林佑君",
+          name: "金宇现场",
           value: 43,
         },
       ],
@@ -1214,7 +1214,7 @@ class Home extends React.Component {
   };
   ExpandCancel = () => {};
   showDetailModal = (formCode) => {
-    var titleTemp =''
+    var titleTemp = "";
 
     if (formCode == "BI054_HOMEDETAIL") {
       titleTemp += "安全检查次数统计（近12月）";
@@ -2114,12 +2114,13 @@ class Home extends React.Component {
                 style={{
                   flex: 1,
                   height: "100%",
-                  padding: "15px 20px 15px 50px",
+                  padding: "15px 40px 15px 40px",
                 }}
               >
                 {this.state.completeName.map((item, index) => {
                   return (
                     <div className="home-rank">
+                      <div className="home-ranks">
                         {index == 0 ? (
                           <img
                             src={require("./../assets/home/4-1.png")}
@@ -2143,10 +2144,12 @@ class Home extends React.Component {
                         )}
 
                         <div className="home-rank-name">{item.name}</div>
+                      </div>
+
                       <Progress
                         percent={item.value}
                         status="active"
-                        style={{ width: "50%" }}
+                        style={{ width: "48%" }}
                       ></Progress>
                     </div>
                   );

src/routes/dashboard.css

@@ -1,10 +1,32 @@
 /* 工作台调整样式 */
+:global(.redTableCell) {
+  background: #e6f7ff;
+}
+:global(.redTableCell):hover {
+  background: #e6f7ff !important;
+}
+:global(.bi001-table) {
+  :global(
+      .ant-table-tbody
+        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+        > td
+    ) {
+    background: #fff;
+  }
+}
+:global(.bi001-table) {
+  :global(.ant-table-row:hover) {
+    :global(.redTableCell) {
+      background: #e6f7ff !important;
+    }
+  }
+}
 :global(.home-rate) {
   width: calc(50% - 10px);
   height: 100%;
   display: flex;
   flex-direction: column;
-  min-Width: "220px",
+  min-width: "220px";
 }
 :global(.home-userInfo-tabs) {
   background-color: #eefff8;
@@ -54,7 +76,7 @@
   white-space: nowrap;
   /* margin-right: 20px; */
 }
-:global(.home-rate-divider){
+:global(.home-rate-divider) {
   height: 80%;
 }
 :global(.home-always-title) {
@@ -104,7 +126,7 @@
   background-color: #fafafa;
   padding: 8px;
   border-radius: 10px;
-  box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.12) ;
+  box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.12);
 }
 :global(.home-tech-icon) {
   font-size: 30px;
@@ -130,11 +152,18 @@
   flex-direction: row;
   align-items: center;
   margin-bottom: 10px;
+  justify-content: space-between;
+}
+:global(.home-ranks) {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  
 }
 :global(.home-rank-index) {
   width: 30px;
   height: 30px;
-  margin-right: 40px;
+  margin-right: 30px;
   color: #eac088;
   font-size: 12px;
   display: flex;
@@ -151,7 +180,7 @@
   object-fit: contain;
   width: 30px;
   height: 30px;
-  margin-right: 40px;
+  margin-right: 30px;
 }
 :global(.home-rank > .ant-progress .ant-progress-text) {
   margin-left: 30px;
@@ -245,8 +274,8 @@
   margin-left: 5px;
 }
 :global(.home-work-back):hover {
-background-color: #eef5ff;
+  background-color: #eef5ff;
-cursor: pointer;
+  cursor: pointer;
 }
 :global(.home-work-icon) {
   padding: 3px 5px;
@@ -345,8 +374,8 @@ cursor: pointer;
   border-radius: 5px;
 }
 :global(.risk-chart) {
-display: flex;
+  display: flex;
-flex-direction: column;
+  flex-direction: column;
 }
 :global(.risk-model-tab) {
   display: flex;
@@ -371,9 +400,8 @@ flex-direction: column;
   font-size: 12px;
   margin: 0px 5px;
   cursor: pointer;
-  background-color:#3c9cff ;
+  background-color: #3c9cff;
   color: #fff;
 }
 :global() {
-  
 }