Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-admin

src/components/ECharts/index.jsx

 
 import Styles from './style.less';
 
-
-
-
 export default forwardRef((props, ref) => {
   const domRef = useRef();
   const echartsRef = useRef();
 
-
   useEffect(() => {
     echartsRef.current = echarts.init(domRef.current);
 

src/components/ECharts/style.less

   width: 100%;
   height: 100%;
   min-height: 100px;
+
+  & > div {
+    height: 100%;
+  }
 }

src/components/GeoMap/style.less

 .geo-map-container {
   width: 100%;
   height: 100%;
-  max-height: 550px;
+  // max-height: 550px;
   overflow: hidden;
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;

src/pages/MonitoringScreen/components/MachineryStatus.jsx

       color: x, // 0% 处的颜色
     },
     {
-      offset: 0.5,
-      color: x, // 50% 处的颜色
+      offset: 0.2,
+      color: x, // 20% 处的颜色
     },
     {
       offset: 1,
 const defaultOpt = {
   tooltip: {},
   grid: {
+    top: 20,
+    right: 10,
+    bottom: 10,
     left: 10,
     containLabel: true,
   },

src/pages/MonitoringScreen/components/MachineryType.jsx

       color: `rgba(${rgb[0]}, ${rgb[1]}, ${rgb[2]}, 0)`, // 0% 处的颜色
     },
     {
-      offset: 0.5,
-      color: x, // 50% 处的颜色
+      offset: 0.8,
+      color: x, // 80% 处的颜色
     },
     {
       offset: 1,
   tooltip: {},
   legend: {},
   grid: {
+    top: 20,
+    right: 40,
+    bottom: 20,
     left: 10,
     containLabel: true,
   },

src/pages/MonitoringScreen/components/WorkArea.jsx

     {
       type: 'pie',
       radius: ['30%', '60%'],
+      center: ['40%', '50%'],
       roseType: 'area',
       itemStyle: {
         borderRadius: 5,

src/pages/MonitoringScreen/style.less

     .grail-container {
       display: flex;
       flex: 1;
-      align-items: stretch;
-      height: 100%;
+      overflow: hidden;
 
       .grail-left,
       .grail-right {
         flex: 1;
+        overflow: hidden;
       }
 
       .grail-content {