feat: 基础页面ui

public/index.html

@@ -169,6 +169,10 @@
     }
 
   </script>
+  <script src="../src/assets/js/jquery-1.11.0.min.js" type="text/javascript"></script>
+  <script src="../src/assets/js/jquery.numscroll.js" type="text/javascript" charset="utf-8"></script>
+  <script src="../src/assets/js/echarts.all.js"></script>
+  <script src="../src/assets/js/echarts.min.js"></script>
   <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script> -->
   <script type="text/javascript" src="<%=htmlWebpackPlugin.options.publicPath%>static/privateConfig.js"></script>
   <script type="text/javascript" src="../src/assets/js/crypto-js.js"></script>

src/assets/css/styleTemplate.less

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 茶百道主题样式
  * @Date: 2022-10-27 10:56:37 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-09-12 17:46:02
+ * @Last Modified time: 2023-10-20 17:47:55
  */
 
 @import url("../../themes/themes.less");
@@ -11,19 +11,25 @@
   #app {
     height: inherit;
   }
+
   .hidetip {
     display: none;
   }
-  .ant-pro-table{
+
+  .ant-pro-table {
     padding-bottom: 40px;
   }
-  .ant-pro-table-list-toolbar-container{
+
+  .ant-pro-table-list-toolbar-container {
     padding: 0px 0 5px;
   }
-  .disabledBtn,.disabledBtn:hover{
-    color:#b0b0b0!important
+
+  .disabledBtn,
+  .disabledBtn:hover {
+    color: #b0b0b0 !important
   }
-  #form1222 .ant-col-19{
+
+  #form1222 .ant-col-19 {
     max-width: 100%;
     margin-left: 80px;
   }
@@ -53,13 +59,14 @@
     cursor: pointer;
   }
 
-  .ant-tabs-content-holder{
+  .ant-tabs-content-holder {
     padding: 10px;
   }
+
   .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
     color: @dy-all-themes;
     text-shadow: 0 0 0.25px currentcolor;
-}
+  }
 
 
   //左侧导航栏 start----------------
@@ -85,7 +92,7 @@
     background-color: @dy-all-themes  !important;
 
     .click_active {
-      background: @dy-all-active!important;
+      background: @dy-all-active  !important;
       border-left: 3px solid @dy-all-active-hover;
 
       .text_over {
@@ -220,9 +227,10 @@
   }
 
   #app .top {
-    height: 56px;
-    background: @dy-bg;
-    box-shadow: 0px 1px 5px #e0e0e0;
+    background: url(../imgs/dataVimg/topBg.png) no-repeat 0 0 / 100% 100% #0a091e;
+    height: 8%;
+    position: unset;
+
 
     .controler .ant-dropdown-link {
       color: @dy-font;
@@ -280,49 +288,59 @@
 
   //首页背景
   .homePage .bottom_body {
-    background-image: linear-gradient(to top, #F8FCFE, #F8FCFE, #F8FCFE);
-    // background: url(../imgs/login/bg@2x.png) no-repeat 0 -47px / 100% 109% #1c45b4;
+    // background-image: linear-gradient(to top, #F8FCFE, #F8FCFE, #F8FCFE);
+    background: linear-gradient(51.4deg, #000308 0%, #041b40 100%);
+    background: url(../imgs/dataVimg/homeBgDataV.png) no-repeat 0 0 / 100% 100% #041b40;
   }
 
   .bottom_body {
     background: #fff;
 
     .home {
-      padding: 16px;
+      padding: 0 16px;
       display: flex;
       align-items: flex-start;
       justify-content: space-between;
       background: unset;
+      flex-wrap: wrap;
+
+      .topMsg_title {
+        background: url(../imgs/dataVimg/tipleBg.png) no-repeat 0 0 / 100% 100%;
+        height: 2em;
+        color: #fff;
+        text-align: left;
+        padding-left: 2em;
+        box-sizing: border-box;
+        line-height: 2.2em;
+        font-weight: 700;
+        font-family: "DingTalk JinBuTi";
+      }
 
       .leftContent {
-        width: 320px;
-        height: 100%;
+        width: 28%;
+        height: 88%;
         z-index: 9;
 
         .topMsg {
           width: 100%;
-          height: 284px;
-          background: #FFFFFF;
+          height: 20%;
           box-shadow: 0 6px 8px 0 rgba(0, 0, 0, 0.04);
-          border-radius: 26px;
-          padding: 16px;
-
-          .hello {
-            font-weight: 600;
-            font-size: 20px;
-            color: @dy-active;
-            line-height: 28px;
-            display: block;
-            padding: 11px 0;
-          }
+          /* border-radius: 26px; */
+          /* padding: 16px; */
+          margin-bottom: 3%;
+
+          .topMsg_content {
+            height: calc(100% - 2em);
+            line-height: 2.8em;
+            font-size: 1.8em;
+            color: #69FFDE;
+            font-weight: 700;
+            background: url(../imgs/dataVimg/zongChanZhi.png) no-repeat 0 bottom / 100% 54%;
+
+            .topMsg_number_2 {
+              font-size: 0.8em;
+            }
 
-          .xFont {
-            height: 20px;
-            font-family: PingFangSC-Regular;
-            font-weight: 400;
-            font-size: 16px;
-            color: rgba(0, 0, 0, 0.45);
-            line-height: 20px;
           }
 
           .msglist {
@@ -351,15 +369,32 @@
           }
         }
 
+        .center_box {
+          width: 100%;
+          height: 30%;
+          box-shadow: 0 6px 8px 0 rgba(0, 0, 0, 0.04);
+          margin-bottom: 3%;
+
+        }
+
 
         .bottomContent {
           width: 100%;
-          height: calc(100% - 300px);
-          background: #FFFFFF;
-          box-shadow: 0 6px 8px 0 rgba(0, 0, 0, 0.04);
-          border-radius: 26px;
-          margin-top: 16px;
-          //min-height: 432px;
+          height: 35%;
+          .topMsg_content {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            #chartmain {
+              width: 80%;
+              height: 80%;
+            }
+
+          }
+
         }
       }
 
@@ -381,9 +416,7 @@
         }
       }
 
-      .bigDivPd {
-        padding: 16px;
-      }
+      .bigDivPd {}
 
       .titleDiv {
         width: 100%;
@@ -424,17 +457,52 @@
 
 
       .rightContent {
-        width: 320px;
-        height: 100%;
+        width: 28%;
+        height: 88%;
         z-index: 9;
 
+        .topMsg_2,
+        .topMsg_3,
+        .topMsg_4 {
+          width: 100%;
+          height: 20%;
+          margin-bottom: 3%;
+        }
+
         .topMsg {
           width: 100%;
-          height: 284px;
-          background: #FFFFFF;
-          box-shadow: 0 6px 8px 0 rgba(0, 0, 0, 0.04);
-          border-radius: 26px;
-          padding: 16px;
+          height: 20%;
+          margin-bottom: 3%;
+
+          .topMsg_content {
+            height: calc(100% - 2em);
+            font-size: 1.8em;
+            color: #69FFDE;
+            font-weight: 700;
+            background: url(../imgs/dataVimg/sunGong.png) 0 0/50% 100%;
+            text-align: center;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            .topMsg_box {
+              width: 52%;
+              height: 71%;
+              background: url(../imgs/dataVimg/sunGongBottom.png) no-repeat 0 0/ 100% 100%;
+
+              .topMsg_number_p {
+                font-size: 0.2em;
+                line-height: 0em;
+                color: #fff;
+                font-weight: 100;
+                margin-top: 0.8em;
+              }
+            }
+
+            .topMsg_number_2 {
+              font-size: 0.2em;
+            }
+          }
 
           .icon_c {
             width: 100%;
@@ -454,6 +522,7 @@
               padding: 2px 0;
               cursor: pointer;
               position: relative;
+
               >i {
                 display: flex;
                 width: 54px;
@@ -475,7 +544,8 @@
                 justify-content: center;
                 margin-top: 5px;
               }
-              .delectt{
+
+              .delectt {
                 display: none;
                 position: absolute;
                 background: #ff3737;
@@ -489,8 +559,9 @@
                 color: #fff;
               }
             }
-            .icon_p:hover{
-              .delectt{
+
+            .icon_p:hover {
+              .delectt {
                 display: block;
               }
             }
@@ -509,78 +580,66 @@
           }
         }
 
-        .bottomContent {
-          width: 100%;
-          height: calc(100% - 300px);
-          background: #FFFFFF;
-          box-shadow: 0 6px 8px 0 rgba(0, 0, 0, 0.04);
-          border-radius: 26px;
-          margin-top: 16px;
-          //min-height: 432px;
-        }
+        .bottomContent {}
       }
 
+      .bottom_box {
+        width: 100%;
+        height: 12%;
+        background: url(../imgs/dataVimg/bottomBg.png) no-repeat 0 0 / 100% 35%;
+        position: absolute;
+        left: 0;
+        bottom: 0;
+      }
 
-      .centerCon {
-        width: calc(100% - 672px);
-        height: 100%;
 
-        .centerContent {
-          width: 100%;
-          height: 56px;
-          background: #FFFFFF;
-          box-shadow: 0 6px 8px 0 rgba(0, 0, 0, 0.04);
-          border-radius: 28px;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          padding: 16px 24px;
+      .centerCon {
+        width: calc(100% - 56%);
+        height: 88%;
+        position: relative;
 
-          .inform {
-            font-size: 18px;
-            color: #1B45B4;
-            font-weight: 700;
-            margin-right: 24px;
-            font-style: italic;
-          }
+        .bottomContent {
+          height: 30%;
+          position: absolute;
+          left: 0;
+          bottom: 0;
+        }
 
-          .ant-carousel {
-            width: 100%;
+        .center_li {
+          width: 33%;
+          background: url(../imgs/dataVimg/zongChanZhi.png) no-repeat 0 bottom / 100% 18%;
+          height: 70%;
+        }
 
-            .slick-dots-bottom {
-              bottom: -10px;
-            }
+        .topMsg {
+          height: 18%;
+          color: #69FFDE;
+          display: flex;
+          justify-content: center;
+          flex-wrap: wrap;
+          font-size: 1.8em;
+          font-weight: 700;
 
-            .slick-dots li button {
-              height: 2px;
-              background: #e4e3e3;
-              border-radius: 10px;
-            }
+          .topMsg_content {
+            width: 80%;
+            display: flex;
+            align-items: center;
+            justify-content: space-around;
 
-            .slick-dots li.slick-active button {
-              background: @dy-active;
+            .topMsg_line {
+              width: 100%;
+              height: 0.2em;
+              background: #878787;
             }
-          }
 
-          .inform_d {
-            width: calc(100% - 65px);
-            display: flex;
-            justify-content: space-between;
-
-            .inform_d_d {
-              display: flex !important;
-              justify-content: space-between;
-              color: rgba(0, 0, 0, 0.6);
+            .topMsg_tip {
+              color: #fff;
+              font-size: 0.2em;
+              font-weight: 100;
             }
           }
         }
 
-        .center_bg {
-          width: 84%;
-          margin-left: 8%;
-          height: calc(100% - 56px);
-          background: url(../imgs/login/bg_s@2x.png) no-repeat 0 center / 100% auto;
-        }
       }
 
     }
@@ -629,7 +688,8 @@
       width: 88px;
     }
   }
-  .tanhao{
+
+  .tanhao {
     border: 2px solid #fdcd60;
     border-radius: 50%;
     display: block;
@@ -643,9 +703,11 @@
     margin-left: 10px;
     cursor: pointer;
   }
-  .lables2{
+
+  .lables2 {
     flex-wrap: wrap;
-    >.ant-select-show-search:first-child{
+
+    >.ant-select-show-search:first-child {
       width: 85%;
       margin-left: 0%;
     }
@@ -683,8 +745,9 @@
     background: @dy-active  !important;
   }
 
-  .ant-checkbox-checked .ant-checkbox-inner::after, .ant-select-tree-checkbox-inner::after{
-    border-color:#f5f5f5 !important
+  .ant-checkbox-checked .ant-checkbox-inner::after,
+  .ant-select-tree-checkbox-inner::after {
+    border-color: #f5f5f5 !important
   }
 
   .ant-steps-item-finish .ant-steps-item-icon,
@@ -721,10 +784,12 @@
     border-color: @dy-all-active-hover  !important;
     color: @dy-all-active-hover  !important;
   }
-  .ant-btn-danger:focus,  .ant-btn-danger:hover{
-    color: #fff!important;
-    border-color: #ff4d4f!important;
-    background: #ff4d4f!important;
+
+  .ant-btn-danger:focus,
+  .ant-btn-danger:hover {
+    color: #fff !important;
+    border-color: #ff4d4f !important;
+    background: #ff4d4f !important;
   }
 
   .ant-select-tree-checkbox-checked .ant-select-tree-checkbox-inner,

src/assets/js/echarts.all.js

@@ -0,0 +1,274 @@
+/*
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+export * from './src/echarts';
+export * from './src/export';
+
+import './src/component/dataset';
+
+
+
+// ----------------------------------------------
+// All of the modules that are allowed to be
+// imported are listed below.
+//
+// Users MUST NOT import other modules that are
+// not included in this list.
+// ----------------------------------------------
+
+
+
+// ----------------
+// Charts (series)
+// ----------------
+
+
+
+// All of the series types, for example:
+// chart.setOption({
+//     series: [{
+//         type: 'line' // or 'bar', 'pie', ...
+//     }]
+// });
+
+import './src/chart/line';
+import './src/chart/bar';
+import './src/chart/pie';
+import './src/chart/scatter';
+import './src/chart/radar';
+import './src/chart/map';
+import './src/chart/tree';
+import './src/chart/treemap';
+import './src/chart/graph';
+import './src/chart/gauge';
+import './src/chart/funnel';
+import './src/chart/parallel';
+import './src/chart/sankey';
+import './src/chart/boxplot';
+import './src/chart/candlestick';
+import './src/chart/effectScatter';
+import './src/chart/lines';
+import './src/chart/heatmap';
+import './src/chart/pictorialBar';
+import './src/chart/themeRiver';
+import './src/chart/sunburst';
+import './src/chart/custom';
+
+
+
+// -------------------
+// Coordinate systems
+// -------------------
+
+
+
+// All of the axis modules have been included in the
+// coordinate system module below, do not need to
+// make extra import.
+
+// `cartesian` coordinate system. For some historical
+// reasons, it is named as grid, for example:
+// chart.setOption({
+//     grid: {...},
+//     xAxis: {...},
+//     yAxis: {...},
+//     series: [{...}]
+// });
+import './src/component/grid';
+
+// `polar` coordinate system, for example:
+// chart.setOption({
+//     polar: {...},
+//     radiusAxis: {...},
+//     angleAxis: {...},
+//     series: [{
+//         coordinateSystem: 'polar'
+//     }]
+// });
+import './src/component/polar';
+
+// `geo` coordinate system, for example:
+// chart.setOption({
+//     geo: {...},
+//     series: [{
+//         coordinateSystem: 'geo'
+//     }]
+// });
+import './src/component/geo';
+
+// `singleAxis` coordinate system (notice, it is a coordinate system
+// with only one axis, work for chart like theme river), for example:
+// chart.setOption({
+//     singleAxis: {...}
+//     series: [{type: 'themeRiver', ...}]
+// });
+import './src/component/singleAxis';
+
+// `parallel` coordinate system, only work for parallel series, for example:
+// chart.setOption({
+//     parallel: {...},
+//     parallelAxis: [{...}, ...],
+//     series: [{
+//         type: 'parallel'
+//     }]
+// });
+import './src/component/parallel';
+
+// `calendar` coordinate system. for example,
+// chart.setOptionp({
+//     calendar: {...},
+//     series: [{
+//         coordinateSystem: 'calendar'
+//     }]
+// );
+import './src/component/calendar';
+
+
+
+// ------------------
+// Other components
+// ------------------
+
+
+
+// `graphic` component, for example:
+// chart.setOption({
+//     graphic: {...}
+// });
+import './src/component/graphic';
+
+// `toolbox` component, for example:
+// chart.setOption({
+//     toolbox: {...}
+// });
+import './src/component/toolbox';
+
+// `tooltip` component, for example:
+// chart.setOption({
+//     tooltip: {...}
+// });
+import './src/component/tooltip';
+
+// `axisPointer` component, for example:
+// chart.setOption({
+//     tooltip: {axisPointer: {...}, ...}
+// });
+// Or
+// chart.setOption({
+//     axisPointer: {...}
+// });
+import './src/component/axisPointer';
+
+// `brush` component, for example:
+// chart.setOption({
+//     brush: {...}
+// });
+// Or
+// chart.setOption({
+//     tooltip: {feature: {brush: {...}}
+// })
+import './src/component/brush';
+
+// `title` component, for example:
+// chart.setOption({
+//     title: {...}
+// });
+import './src/component/title';
+
+// `timeline` component, for example:
+// chart.setOption({
+//     timeline: {...}
+// });
+import './src/component/timeline';
+
+// `markPoint` component, for example:
+// chart.setOption({
+//     series: [{markPoint: {...}}]
+// });
+import './src/component/markPoint';
+
+// `markLine` component, for example:
+// chart.setOption({
+//     series: [{markLine: {...}}]
+// });
+import './src/component/markLine';
+
+// `markArea` component, for example:
+// chart.setOption({
+//     series: [{markArea: {...}}]
+// });
+import './src/component/markArea';
+
+// `legend` component scrollable, for example:
+// chart.setOption({
+//     legend: {type: 'scroll'}
+// });
+import './src/component/legendScroll';
+
+// `legend` component not scrollable. for example:
+// chart.setOption({
+//     legend: {...}
+// });
+import './src/component/legend';
+
+// `dataZoom` component including both `dataZoomInside` and `dataZoomSlider`.
+import './src/component/dataZoom';
+
+// `dataZoom` component providing drag, pinch, wheel behaviors
+// inside coodinate system, for example:
+// chart.setOption({
+//     dataZoom: {type: 'inside'}
+// });
+import './src/component/dataZoomInside';
+
+// `dataZoom` component providing a slider bar, for example:
+// chart.setOption({
+//     dataZoom: {type: 'slider'}
+// });
+import './src/component/dataZoomSlider';
+
+// `dataZoom` component including both `visualMapContinuous` and `visualMapPiecewise`.
+import './src/component/visualMap';
+
+// `visualMap` component providing continuous bar, for example:
+// chart.setOption({
+//     visualMap: {type: 'continuous'}
+// });
+import './src/component/visualMapContinuous';
+
+// `visualMap` component providing pieces bar, for example:
+// chart.setOption({
+//     visualMap: {type: 'piecewise'}
+// });
+import './src/component/visualMapPiecewise';
+
+
+
+// -----------------
+// Render engines
+// -----------------
+
+
+
+// Provide IE 6,7,8 compatibility.
+import 'zrender/src/vml/vml';
+
+// Render via SVG rather than canvas.
+import 'zrender/src/svg/svg';

src/assets/js/jquery.numscroll.js

@@ -0,0 +1,84 @@
+/*!
+ * jquery.numscroll.js -- 数字滚动累加动画插件  (Digital rolling cumulative animation)
+ * version 1.0.0
+ * 2018-09-22
+ * author: KevinTseng < 921435247@qq.com@qq.com >
+ * 文档:  https://github.com/chaorenzeng/jquery.numscroll.js.git
+ * QQ交流群: 739574382
+ */
+
+(function($) {
+	
+	function isInt(num) {
+		//作用:是否为整数
+		//返回:true是 false否
+		var res = false;
+		try {
+			if(String(num).indexOf(".") == -1 && String(num).indexOf(",") == -1) {
+				res = parseInt(num) % 1 === 0 ? true : false;
+			}
+		} catch(e) {
+			res = false;
+		}
+		return res;
+	}
+
+	function isFloat(num) {
+		//作用:是否为小数
+		//返回:小数位数(-1不是小数)
+		var res = -1;
+		try {
+			if(String(num).indexOf(".") != -1) {
+				var index = String(num).indexOf(".") + 1; //获取小数点的位置
+				var count = String(num).length - index; //获取小数点后的个数
+				if(index > 0) {
+					res = count;
+				}
+			}
+		} catch(e) {
+			res = -1;
+		}
+		return res;
+	}
+
+	$.fn.numScroll = function(options) {
+		
+		var settings = $.extend({
+			'time': 1500,
+			'delay': 0
+		}, options);
+		
+		return this.each(function() {
+			var $this = $(this);
+			var $settings = settings;
+			
+			var num = $this.attr("data-num") || $this.text(); //实际值
+			var temp = 0; //初始值
+			$this.text(temp);
+			var numIsInt = isInt(num);
+			var numIsFloat = isFloat(num);
+			var step = (num / $settings.time) * 10; //步长
+			
+			setTimeout(function() {
+				var numScroll = setInterval(function() {
+					if(numIsInt) {
+						$this.text(Math.floor(temp));
+					} else if(numIsFloat != -1) {
+						$this.text(temp.toFixed(numIsFloat));
+					} else {
+						$this.text(num);
+						clearInterval(numScroll);
+						return;
+					}
+					temp += step;
+					if(temp > num) {
+						$this.text(num);
+						clearInterval(numScroll);
+					}
+				}, 1);
+			}, $settings.delay);
+			
+		});
+	};
+
+})(jQuery);

src/pages/chaBaiDaohome/view.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 
  * @Date: 2022-10-27 11:40:02 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-10-09 17:39:27
+ * @Last Modified time: 2023-10-20 17:44:10
  */
 
 import React, { useState, useEffect, Component } from "react";
@@ -12,7 +12,7 @@ import { useHistory, useLocation, withRouter } from "react-router-dom";
 import { observer, observable } from "mobx-react";
 import { message, Space, Form, Popconfirm, Modal, Carousel, Icon, Button } from "antd";
 import Flex from "@components/Space/view";
-import { dealDiffSheetType, crossMenuClick,isTimes } from "@utils/util";
+import { dealDiffSheetType, crossMenuClick, isTimes } from "@utils/util";
 import moment from "moment";
 import {
   getDmpAccessUrl,
@@ -68,362 +68,218 @@ class Home extends Component {
   }
 
   componentDidMount() {
-    this.getCommonReport();
-  }
-
-  handleData = (data) => {
-    let item = [];
-    data.map((list, i) => {
-      let newData = {};
-      newData.id = list.resourceId;
-      newData.value = list.resourceName;
-      newData.title = list.resourceName;
-      newData.children =
-        list.resourceList && list.resourceList.length
-          ? this.handleData(list.resourceList)
-          : []; // 如果还有子集，就再次调用自己
-      newData.disabled =
-        list.resourceList && list.resourceList.length ? true : false;
-      item.push(newData);
-    });
-    return item;
-  }
-
-  // 获取用户常用报表 & 用户信息
-  getCommonReport = () => {
-
-    getAccountComresourcesNew().then((res) => {
-      if (+res.resultCode === 0) {
-        const data = res.data.map((item) => {
-          // id 必须的
-          item.id = item.resourceId;
-          return item;
-        });
-        this.setState({ rightlist: data })
-      }
-
-    });
-    getAccountTypePage(sessionStorage.getItem("accountId")).then((res) => {
-      const { data } = res;
-      this.setState({ userPar: data })
-    })
-    getAccountAllCareResource().then(
-      ({ resultCode, data }) => {
-        if (+resultCode === 0) {
-          let ten_ = [];
-          data.map((item, i) => {
-            item.isCare = true;
-            if (i <= 9) { ten_.push(item); } else { return }
-          });
-          this.setState({ leftCareReport: ten_ })
-        }
-      }
-    );
-    ///获取角色
-    getAllRolesVo().then(({ data, resultCode }) => {
-      if (+resultCode === 0) {
-        $store.app.setRoles(data || []);
-        localStorage.setItem("roles", JSON.stringify(data || []));
+    setTimeout(()=>{
+      $(".shu1").numScroll();
+    },200)
+    setTimeout(()=>{
+      var dataAxis = ['1日', '2日', '3日', '4日', '5日', '6日', '7日', '8日', '9日', '10日', '11日', '12日', '13日', '14日', '15日'];
+      var data = [220, 182, 191, 234, 290, 330, 310, 123, 442, 321, 90, 149, 210, 122, 200];
+      var yMax = 500;
+      var dataShadow = [];
+      for (var i = 0; i < data.length; i++) {
+        dataShadow.push(yMax);
       }
-    });
-    listUserModuleBulletinsNew({
-      pageSize: 2,
-      pageNum: 1,
-      effectStatus: 1,
-      sysUpdateMsgFuncType:'maintain',
-      displayArea: '10000'
-    }).then((res) => {
-      if (res?.data && res?.data?.records) {
-        for (let index = 0; index < 2; index++) {
-          const element = res?.data?.records[index];
-          if(isTimes('',element.effectStartTime,element.effectEndTime)){
-            this.ModelBox.setState({showContactModalVisible:true,activeItem:element});
-            break
+      var	option = {
+        title: {
+          text: '',
+          subtext: ''
+        },
+        grid:{
+          x:40,
+          y:40,
+          x2:20,
+          y2:20,
+  
+        },
+        xAxis: {
+          data: dataAxis,
+          axisLabel: {
+            /*inside: true,*/
+            interval:0,
+            textStyle: {
+              color: '#fff',
+              fontSize: 12
+  
+            }
+          },
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: true,
+            symbol:['none', 'arrow'],
+            symbolOffset: 12,
+            lineStyle:{
+              color: '#fff',
+            }
+          },
+          z: 10
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位：元',
+          axisLine: {
+            show: true,
+            symbol: ['none', 'arrow'],
+            symbolOffset: 12,
+            lineStyle:{
+              color: '#fff',
+            }
+          },
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            textStyle: {
+              color: '#fff',
+              fontSize: 12
+            }
           }
-        }
-      }
-    })
-
-    //知识库
-    getBaselistAll().then((res) => {
-      let { data = [] } = res;
-      let ten_ = [];
-      if (!data || data === null) { data = [] }
-      data.map((item, i) => {
-        if (i <= 9) { ten_.push(item); } else { return }
-      });
-      this.setState({ baselistAll: ten_ })
-    });
-
-  };
-  getLoginUser = () => {
-    getLoginUserFineResourceTree().then((res) => {
-      if (+res.resultCode === 0) {
-        this.setState({ commonReportTreeData: this.handleData(res.data) })
-      }
-    });
-  }
-
-  delectTab = (item) => {
-    deleteById(item.relateId).then((res) => {
-      if (+res.resultCode === 0) {
-        getAccountComresourcesNew().then((res) => {
-          if (+res.resultCode === 0) {
-            const data = res.data.map((item) => {
-              // id 必须的
-              item.id = item.resourceId;
-              return item;
-            });
-            this.setState({ rightlist: data })
+        },
+  
+        dataZoom: [
+          {
+            type: 'inside'
           }
-        });
-      }
-    });
+        ],
+        series: [
+          { // For shadow
+            type: 'bar',
+            itemStyle: {
+              color: 'rgba(0,0,0,0.05)'
+            },
+            barGap: '-100%',
+            barCategoryGap: '40%',
+            data: dataShadow,
+            animation: false
+          },
+          {
+            type: 'bar',
+            itemStyle: {
+              color: new echarts.graphic.LinearGradient(
+                0, 0, 0, 1,
+                [
+                  {offset: 0, color: '#0efdff'},
+                  {offset: 0.5, color: '#188df0'},
+                  {offset: 1, color: '#188df0'}
+                ]
+              )
+            },
+            emphasis: {
+              itemStyle: {
+                color: new echarts.graphic.LinearGradient(
+                  0, 0, 0, 1,
+                  [
+                    {offset: 0, color: '#2378f7'},
+                    {offset: 0.7, color: '#2378f7'},
+                    {offset: 1, color: '#0efdff'}
+                  ]
+                )
+              }
+            },
+            data: data
+          }
+        ]
+      };
+      var myChart = echarts.init(document.getElementById('chartmain'));
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+  
+    },200)
   }
 
-  addCommonReportModal = () => {
-    this.getLoginUser()
-    this.setState({ isModalVisible: true, addReportValue: '' })
-  };
-
   render() {
     const stores = this.store.state;
     const { isModalVisible, commonReportTreeData, addReportValue, userPar } = this.state;
-    // 在驾驶舱或报表中心内打开报表
-    const openReportTab = (item) => {
-      return () => {
-        if (!item.hasPermission) {
-          message.warning('抱歉!您没有此功能权限!');
-          return;
-        }
 
-        $store.app.setNavList({
-          name: item.resourceName || item.modelName,
-          path: item.resourceUrl,
-          type: item.resourceType,
-          openType: item.openType,
-          id: item.resourceId,
-        });
-        $store.app.setCurNav(item.resourceUrl);
-        sessionStorage.setItem("curNodeId", item.resourceId);
-        dealDiffSheetType(item).then((response) => {
-          if (response.type === "sys") {
-            this.props.history.push(response.link);
-          } else {
-            this.props.history.push(`/home/outer/${response.activeItem.resourceId}`);
-          }
-        });
-      };
-    };
 
-    // 添加常用报表 modal - 确认
-    const addCommonReportOk = () => {
-      this.setState({ isModalVisible: false })
-      let params = {
-        resourceId: this.state.addReportValue,
-        sortNo: this.state.rightlist.length + 1,
-      };
-      insertSysComresourceAccountRelationEntityNew(params).then((res) => {
-        if (+res.resultCode === 0) {
-          message.success("添加报表成功!");
-          this.getCommonReport();
-        }
-      });
-    };
 
 
-    const titleDiv = (name, url, cross, order_) => {
-      return (
-        <div className="titleDiv">
-          <span>{name}</span>
-          <a onClick={() => {
-            cross ? crossMenuClick(url.f_url, url.s_url, ((res) => {
-              this.props.history.push(res);
-            })) : this.props.history.push(url)
-          }}>{order_ ? "管理" : '更多 >'} </a>
-        </div>
-      )
-    }
     return (
       <div className={[styles.home + " home cbHome"]}>
         <div className="leftContent">
           <div className="topMsg">
-            <p className="pic">
-              {/* <img src={get(userPar, "accountPicUrl", require("@assets/imgs/default_head.png").default)} width="64" alt="" /> */}
-              <img src={require("@assets/imgs/default_head2.png").default} width="64" alt="" style={{ borderRadius: '50%' }} />
-            </p>
-            <span className="hello">Hello，{userPar ? userPar.account : ''}</span>
-            <span className="xFont">欢迎回来！</span>
-            <ul className="msglist">
-              <li>
-                <img src={require("@assets/imgs/msg1.png").default} width="18" alt="" />
-                <span style={{ whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis" }}>部门&emsp;:&emsp;{userPar ? userPar.jobUnit : ''}</span>
-              </li>
-              <li>
-                <img src={require("@assets/imgs/msg2.png").default} width="18" alt="" />
-                <span style={{ whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis" }}>岗位&emsp;:&emsp;{userPar ? userPar.position : ''}</span>
-              </li>
-            </ul>
+            <p className="topMsg_title">总产值</p>
+            <div className="topMsg_content">
+              <span className="topMsg_number" class="shu1">232425.23</span><span className="topMsg_number_2">万元</span>
+            </div>
+          </div>
+          <div className="center_box">
+            <p className="topMsg_title">库存金额</p>
+            <div className="topMsg_content">
+            </div>
           </div>
           <div className="bottomContent bigDivPd">
-            {titleDiv('个人收藏', '/home/reportForWork', false)}
-            <div className="kbs_c">
-              {
-                toJS(get(this.state, 'leftCareReport', [])).map((item, i) => {
-                  return <p className="listIconFont" onClick={openReportTab(item)}>
-                    {/* <img src={require("@assets/imgs/chaBaiDaotips_ring.png").default} alt="" width="18" /> */}
-                    <StarFilled className="buildStard" />
-                    {/* <Popover content={item.resourceUrl} trigger="hover"> */}
-                    <p>{item.resourceName}</p>
-                    {/* </Popover> */}
-                  </p>
-                })
-              }
+            <p className="topMsg_title">月度产量/发货量</p>
+            <div className="topMsg_content">
+            <div id="chartmain"></div>
+
             </div>
           </div>
         </div>
 
         <div className="centerCon">
-          {/* 通知轮播区 */}
-          <div className="centerContent" style={{display:'none'}}>
-            <span className="inform">通知</span>
-            <div className="inform_d">
-              <Carousel autoplay>
-                {get(this.state, 'showTips', []).map(items => {
-                  return (
-                    <div className="inform_d_d">
-                      <span>{items.sysUpdateMsgContent}</span>
-                      <a onClick={() => { this.setState({ MassagepopPar: items, showMassagepop: true }) }}>查看详情</a>
-                    </div>
-                  )
-                })}
-                {/* <div className="inform_d_d">
-                  <span>百度一下,你就知道</span>
-                  <a>查看详情</a>
-                </div>
-                <div className="inform_d_d">
-                  <span>走马灯Carousel-Ant Design</span>
-                  <a>查看详情</a>
-                </div> */}
-              </Carousel>
+          <div className="topMsg">
+            <div className="topMsg_content">
+            <div className="center_li">
+                <span className="topMsg_number" class="shu1">232425</span>
+                <p className="topMsg_line"></p>
+                <span className="topMsg_tip">年度产量/吨</span>
+              </div>
+              <div className="center_li">
+                <span className="topMsg_number" class="shu1">32425</span>
+                <p className="topMsg_line"></p>
+                <span className="topMsg_tip">年度发货量/吨</span>
+              </div>
+              <div className="center_li">
+                <span className="topMsg_number" class="shu1">13456</span>
+                <p className="topMsg_line"></p>
+                <span className="topMsg_tip">产品库存/吨</span>
+              </div>
             </div>
+
           </div>
-          <div className="center_bg">
+          <div className="bottomContent">
+            <p className="topMsg_title">近30天产量</p>
+            <div className="topMsg_content">
+            </div>
           </div>
+
         </div>
 
         {/* 右侧信息栏 */}
         <div className="rightContent">
           <div className="topMsg bigDivPd">
-            <div className="titleDiv">
-              <span>推荐入口</span>
-              {
-                sessionStorage.getItem("isSuper") === 'true' ?
-                  <a onClick={() => {
-                    this.addCommonReportModal()
-                  }}>管理</a> : null
-              }
+            <p className="topMsg_title">百万工时损工率</p>
+            <div className="topMsg_content">
+              <div className="topMsg_box">
+                <span className="topMsg_number" class="shu1">232425.23</span><span className="topMsg_number_2">%</span>
+                <p className="topMsg_number_p">谢洪</p>
+              </div>
             </div>
+          </div>
 
-            <div className="icon_c">
-              {
-                toJS(get(this.state, 'rightlist', [])).map((item, i) => {
-                  return <p className="icon_p" key={i}>
-                    {
-                      sessionStorage.getItem("isSuper") === 'true' ? 
-                      <Popconfirm
-                      title="是否确认删除?"
-                      onConfirm={()=>{this.delectTab(item)}}
-                      onCancel={()=>{}}
-                      okText="确认"
-                      cancelText="取消"
-                    >
-                      <span className="delectt">-</span>
-                    </Popconfirm>
-                       : null
-                    }
+          <div className="topMsg_2">
+            <p className="topMsg_title">一次合格率</p>
+            <div className="topMsg_content">
+            </div>
+          </div>
 
-                    <i onClick={openReportTab(item)}>{item.resourceName.slice(0, 1)}</i>
-                    <span onClick={openReportTab(item)}>{item.resourceName}</span>
-                  </p>
-                })
-              }
-              {
-                sessionStorage.getItem("isSuper") === 'true' ? <p className="icon_p" onClick={this.addCommonReportModal}>
-                  <i style={{ background: "#fff", color: "#1B45B4", border: "1px solid #1B45B4" }}>+</i>
-                  <span>添加快捷入口</span>
-                </p> : null
-              }
+          <div className="topMsg_3">
+            <p className="topMsg_title">产量计划完成率</p>
+            <div className="topMsg_content">
             </div>
           </div>
+
           <div className="bottomContent bigDivPd">
-            {titleDiv('知识库', { f_url: '/system/center', s_url: '/home/kbs' }, true)}
-            <div className="kbs_c">
-              {
-                toJS(get(this.state, 'baselistAll', [])).map((item, i) => {
-                  return <p className="listIconFont" onClick={() => {
-                    window.open(item.knowledgeUrl)
-                  }}>
-                    <img src={require("@assets/imgs/chaBaiDaotips_ring.png").default} alt="" width="18" />
-                    <span>{item.knowledgeName}</span>
-                  </p>
-                })
-              }
+            <p className="topMsg_title">碳排放</p>
+            <div className="topMsg_content">
             </div>
           </div>
         </div>
+        <div className="bottom_box">
 
-        {/* 版权 */}
-        <p className="bq">Copyright © 四川蜀信致远企业管理咨询有限公司 版权所有</p>
-        <Modal
-          title="添加常用报表"
-          visible={isModalVisible}
-          onOk={addCommonReportOk}
-          onCancel={() => {
-            this.setState({ isModalVisible: false })
-          }}
-        >
-          <div className={styles.add_common_report}>
-            常用报表：
-            <TreeSearch
-              treeData={commonReportTreeData}
-              value={addReportValue}
-              onChange={(val) => {
-                this.setState({ addReportValue: val })
-              }}
-            />
-          </div>
-        </Modal>
-        {/* 查看消息通知 */}
-        <Modal
-          className="xxpop"
-          title="消息通知"
-          visible={this.state.showMassagepop}
-          footer={[
-            <Button
-              type="primary"
-              onClick={() => {
-                this.setState({ showMassagepop: false })
-              }}
-            >
-              确认
-            </Button>,
-          ]}
-          onCancel={() => {
-            this.setState({ showMassagepop: false })
-          }}
-
-        >
-          <div className="xxpop_cont">
-            <div className="xxpop_i">
-              <div className="xxpop_i_left">消息时间：{this.state.MassagepopPar.messageContent}</div>
-              <div className="xxpop_i_right">消息内容：{this.state.MassagepopPar.createTime}</div>
-              <div className="xxpop_i_right">发布人：{this.state.MassagepopPar.createPerson}</div>
-            </div>
-          </div>
-        </Modal>
-        {/* 系统公告box */}
-        <ModelBox onRef={(ref)=>{this.ModelBox=ref}}></ModelBox>
+        </div>
 
       </div>
     )

src/pages/frame/component/top/view.jsx

@@ -796,76 +796,6 @@ export default observer(function (props) {
   } = detailMessage || {}; /**解构 当前点击的详情数据 */
   return (
     <div className={$store.app.styleCommon.theme == 'chaBaiDao' ? [styles.top + ' top'] : styles.top}>
-      {$store.app.styleCommon.theme == 'chaBaiDao' ?
-        <div className="logo" onClick={(() => {
-          let activeTree = utils.findNodeTree($store.sysMenu.menuList, '/home/index', "resourceUrl");
-          handleClickForUtil(activeTree,'item_cust',((res)=>{
-            history.push(res);
-          }),'')
-        })}>
-          <img
-            src={require("@assets/imgs/login/flogo@2x11.png").default}
-            alt=""
-            height="30"
-          />
-        </div>
-
-        : null}
-      {/* <div className="d_logo">
-        <img
-          src={require("@assets/imgs/login/logo_yx.png").default}
-          alt=""
-          height="20"
-        />
-      </div> */}
-      {$store.app.styleCommon.theme == 'chaBaiDao' ? null :
-        <div className="title">运营数据中心</div>
-      }
-      <div
-        className="menu fg1"
-        ref={menuRef}
-        onClick={(e) => {
-          handleClick(e, "cust");
-        }}
-      >
-        {$store.sysMenu.norList.map((menu, index) => {
-          return (
-            <li key={index} data-key={JSON.stringify(menu)}>
-              <span
-                className={
-                  $store.app.activedUrl === menu.resourceUrl || (sessionStorage.getItem("topNavUrl") === menu.resourceUrl)? "actived" : ""
-                }
-                data-key={JSON.stringify(menu)}
-              >
-                {menu.resourceName}
-              </span>
-            </li>
-          );
-        })}
-        {$store.sysMenu.moreList.length > 0 && (
-          <Dropdown
-            overlay={
-              <Menu onClick={handleClick} theme="light">
-                {$store.sysMenu.moreList.map((menu) => (
-                  <Menu.Item
-                    key={JSON.stringify(menu)}
-                    style={{ fontSize: 13 }}
-                  >
-                    {menu.resourceName}
-                  </Menu.Item>
-                ))}
-              </Menu>
-            }
-            placement="bottomCenter"
-            arrow
-            onClick={() => {
-              return false;
-            }}
-          >
-            <div className="show_more">更多 ></div>
-          </Dropdown>
-        )}
-      </div>
       {/* {history.location.pathname === "/home/index" && (
         <>
           <div className="style">
@@ -885,394 +815,8 @@ export default observer(function (props) {
             style={{ "marginRight": "10px" }}
             onClick={changeThemesStyle} />
         </Tooltip> */}
-        <Tooltip placement="bottom" title="问题反馈">
-          {
-            $store.app.styleCommon.theme == 'chaBaiDao' ? <img
-              src={require("@assets/imgs/chaBaiDaodraft-line.png").default}
-              alt=""
-              width="15"
-              onClick={handleContact} /> : <img
-              src={require("@assets/imgs/draft-line.png").default}
-              alt=""
-              width="15"
-              onClick={handleContact} />
-          }
-        </Tooltip>
       </div>
 
-      <Popover
-        overlayClassName="tips_pop"
-        placement="bottomRight"
-        // visible={toppopshow}
-        trigger="click"
-        visible={toppopshow}
-        onVisibleChange={(visible) => {
-          settoppopshow(visible);
-        }}
-        content={
-          <div className="top_tips_area">
-            <div className="top_tips_close" onClick={close_xxpop}>
-              <CloseOutlined />
-            </div>
-            <Tabs defaultActiveKey="1">
-              <TabPane tab={`消息公告（${unReadNum}）`} key="1">
-                <List {...xxOption}></List>
-                <div
-                  className="yjyd_but"
-                  onClick={() => {
-                    handleAllRead();
-                  }}
-                >
-                  一键已读
-                </div>
-                <div
-                  className="yjyd_but"
-                  onClick={() => {
-                    settoppopshow(false);
-                    crossMenuClick('/system/center', '/home/systemNotice', ((res) => {
-                      history.push(res);
-                    }))
-                  }}
-                >
-                  查看全部
-                </div>
-              </TabPane>
-              <TabPane tab={`待办（${$store.app.unDealNum}）`} key="2">
-                <List {...dbOption}></List>
-              </TabPane>
-            </Tabs>
-          </div>
-        }
-        arrowPointAtCenter
-      >
-        <div className="tips_count">
-          <>
-            {
-              $store.app.styleCommon.theme == 'chaBaiDao' ? <img
-                src={require("@assets/imgs/chaBaiDaotips_ring.png").default}
-                alt=""
-                width="16"
-                onClick={seeToppop}
-              /> : <img
-                src={require("@assets/imgs/tips_ring.png").default}
-                alt=""
-                width="16"
-                onClick={seeToppop}
-              />
-            }
-
-            <div className="count_num">{$store.app.newsCount}</div>
-          </>
-        </div>
-      </Popover>
-
-      <div className="controler">
-        <Dropdown overlay={menu} placement="bottomCenter" arrow>
-          <div>
-            <img
-              src={
-                JSON.stringify(sessionStorage.getItem("avator")).includes(null)
-                  ? require("@assets/imgs/default_head2.png").default
-                  : sessionStorage.getItem("avator") ||
-                  $store.app.avator ||
-                  require("@assets/imgs/default_head2.png").default
-              }
-              alt=""
-              style={{
-                width: 24,
-                height: 24,
-                borderRadius: "50%",
-                overflow: "hidden",
-              }}
-            />
-            <a
-              className="ant-dropdown-link"
-              onClick={(e) => e.preventDefault()}
-            >
-              {/* <UserOutlined
-              className="pointer"
-              style={{ color: "#fff", fontSize: 17 }}
-            /> */}
-              {sessionStorage.getItem("userName") || accountName}
-              {userInfo["account"]}
-            </a>
-          </div>
-        </Dropdown>
-      </div>
-
-      {/* 联系我们对话框 */}
-      <Modal
-        className={styles.feedbackModal}
-        title="问题反馈"
-        okText="提交"
-        visible={showContactModalVisible}
-        onOk={handleContactOk}
-        onCancel={() => {
-          form.resetFields();
-          setShowContactModalVisible(false);
-          setProbType(0);
-          setDirectorInfo({
-            director: "叶华东",
-            itManagerAccountId: "",
-          });
-        }}
-      >
-        <Form
-          form={form}
-          {...formItemLayout}
-          initialValues={{
-            problemType: "system",
-            problemContentObjectId: null,
-            problemContent: "",
-            problemChargePersonId: "",
-            problemSendPersonId: [],
-          }}
-        >
-          {/* <Form.Item> */}
-          <Form.Item
-            label="问题类型"
-            name="problemType"
-            rules={[{ required: true, message: "请选择问题类型" }]}
-          >
-            <Select onChange={(val) => setProbType(val)}>
-              <Select.Option value="system">系统问题</Select.Option>
-              <Select.Option value="report">报表问题</Select.Option>
-            </Select>
-          </Form.Item>
-          {probType === "report" && (
-            <Form.Item
-              label="问题报表"
-              name="problemContentObjectId"
-              rules={[{ required: true, message: "请选择或输入问题报表" }]}
-            >
-              <TreeSearch
-                treeData={probReport}
-                value={form.getFieldValue().problemContentObjectId}
-                placeholder="请选择问题报表"
-                onChange={getDirectorId}
-              />
-            </Form.Item>
-          )}
-          <Form.Item
-            name="problemContent"
-            rules={[{ required: true, message: "请输入问题描述" }]}
-            label="问题描述"
-            style={{ marginBottom: 2 }}
-          >
-            <Input.TextArea
-              style={{ resize: "none", height: 150 }}
-              placeholder="请输入问题描述"
-              maxLength={500}
-              onInput={(e) => handleInput(e)}
-            />
-          </Form.Item>
-          <div
-            style={{
-              display: "flex",
-              justifyContent: "flex-end",
-              // marginTop: -15,
-            }}
-          >
-            <span>{iptValue}/500</span>
-          </div>
-          {isShowDirector && probType === "report" ? (
-            <Form.Item name="problemChargePersonId" label="负责人">
-              <span style={{ paddingLeft: 14 }}>{directorInfo.director}</span>
-            </Form.Item>
-          ) : (
-            <Form.Item name="problemChargePersonId" label="负责人">
-              <span style={{ paddingLeft: 14 }}>管理员</span>
-            </Form.Item>
-          )}
-          {probType === "report" && (
-            <Form.Item
-              name="problemSendPersonId"
-              label="抄送"
-              style={{ marginBottom: 16 }}
-            >
-              <span style={{ paddingLeft: 14 }}>管理员</span>
-            </Form.Item>
-          )}
-          {/* </Form.Item> */}
-        </Form>
-      </Modal>
-
-      {/* 重置密码对话框 */}
-      <ResetPassword
-        isResetVisible={isResetVisible}
-        onCancel={() => {
-          setIsResetVisible(false);
-        }}
-      />
-      {/* 查看消息通知 */}
-      <Modal
-        className="xxpop"
-        title="消息通知"
-        okText="去看看"
-        visible={showMassagepop}
-        onOk={handleContactOk}
-        onCancel={() => {
-          setshowMassagepop(false);
-        }}
-      >
-        <div className="xxpop_cont">
-          <div className="xxpop_i">
-            <div className="xxpop_i_left">消息时间：{list_item.time}</div>
-            <div className="xxpop_i_right">消息内容：{list_item.title}</div>
-          </div>
-        </div>
-      </Modal>
-
-      {/* 问题反馈 对话框 */}
-      <Modal
-        width={420}
-        title="问题反馈"
-        visible={isShowFeedback}
-        onCancel={() => {
-          setIsShowFeedback(false);
-        }}
-        footer={[
-          <Button
-            type="primary"
-            key="feedback_1"
-            onClick={() => {
-              setIsShowFeedback(false);
-            }}
-          >
-            保持待办
-          </Button>,
-          <Button
-            type="primary"
-            key="feedback_2"
-            onClick={() => {
-              handleFeedBack();
-            }}
-          >
-            已处理
-          </Button>,
-        ]}
-      >
-        <Form {...formItemLayout}>
-          <Form.Item
-            label="问题类型"
-            style={{ fontWeight: 600, marginBottom: 8 }}
-          >
-            <span style={{ fontWeight: 400, paddingLeft: 10 }}>
-              {dealInfo.messageDetailType === "systemProblem"
-                ? "系统问题"
-                : "报表问题"}
-            </span>
-          </Form.Item>
-          {dealInfo.messageDetailType === "ReportProblem" && (
-            <Form.Item
-              label="问题报表"
-              style={{ fontWeight: 600, marginBottom: 8 }}
-            >
-              <span style={{ fontWeight: 400, paddingLeft: 10 }}>
-                {questionReportName}
-              </span>
-            </Form.Item>
-          )}
-          <Form.Item
-            label="问题描述"
-            style={{ fontWeight: 600, marginBottom: 8 }}
-          >
-            <div
-              style={{
-                whiteSpace: "pre-wrap",
-                fontWeight: 400,
-                padding: "5px 0 5px 10px",
-              }}
-            >
-              {dealInfo.messageContent}
-            </div>
-          </Form.Item>
-          <Form.Item
-            label="提交人"
-            style={{ fontWeight: 600, marginBottom: 8 }}
-          >
-            <span style={{ fontWeight: 400, paddingLeft: 10 }}>
-              {dealInfo.messageSourceName}
-            </span>
-          </Form.Item>
-          <Form.Item
-            label="提交时间"
-            style={{ fontWeight: 600, marginBottom: 8 }}
-          >
-            <span style={{ fontWeight: 400, paddingLeft: 10 }}>
-              {dealInfo.createTime}
-            </span>
-          </Form.Item>
-        </Form>
-      </Modal>
-
-      {/* 点击消息详情 对话框 */}
-      <Modal
-        title="消息通知"
-        visible={isShowDetail}
-        onCancel={() => {
-          setIsShowDetail(false);
-          getUnReadNum();
-          messageTipList();
-        }}
-        footer={
-          detailInfo.messageDetailType == "update_system" || detailInfo.messageDetailType == 'module_bulletin'? <Button
-            type="primary"
-            onClick={() => {
-              setIsShowDetail(false)
-            }}
-          >确定</Button> : <Button
-            type="primary"
-            key="goHandle"
-            onClick={goHandleMessage}
-            disabled={
-              detailInfo.messageDetailType === "newResourceMsg" ||
-                detailInfo.messageDetailType === "permissionOverDueSoon"
-                ? true
-                : false
-            }
-          >
-            {detailInfo.messageDetailType === "newResourceMsg"
-              ? "申请权限"
-              : detailInfo.messageDetailType === "permissionOverDueSoon"
-                ? "续期"
-                : "去看看"}
-          </Button>
-        }
-      >
-        <Form {...formItemLayout}>
-          <Form.Item
-            label="消息时间"
-            style={{ fontWeight: 600, marginBottom: 8 }}
-          >
-            <span style={{ fontWeight: 400 }}>{detailInfo.createTime}</span>
-          </Form.Item>
-
-          {detailInfo.messageDetailType === "fineReportChange" && (
-            <Form.Item
-              label="相关报表"
-              style={{ fontWeight: 600, marginBottom: 8 }}
-            >
-              <span style={{ fontWeight: 400 }}>{reportName}</span>
-            </Form.Item>
-          )}
-
-          <Form.Item
-            label="消息内容"
-            style={{ fontWeight: 600, marginBottom: 8 }}
-          >
-            <div
-              style={{
-                fontWeight: 400,
-                whiteSpace: "pre-wrap",
-                padding: "5px 0",
-              }}
-            >
-              {detailInfo.messageContent}
-            </div>
-          </Form.Item>
-        </Form>
-      </Modal>
     </div>
   );
 });

src/pages/frame/style.less

@@ -433,10 +433,10 @@
         margin-top: 0px!important;
         &>div:last-child {
           flex-grow: 1;
-          height: calc(100% - 56px);
+          // height: calc(100% - 56px);
           overflow-y: auto;
           background: #1c45b4;
-          margin-top: 56px;
+          // margin-top: 56px;
           padding-bottom:0;
         }
       }