张延森 3 年之前
父節點
當前提交
d4bf8e15ab

二進制
src/assets/images/screen/bg.png 查看文件


+ 0
- 4
src/components/ECharts/index.jsx 查看文件

39
 
39
 
40
 import Styles from './style.less';
40
 import Styles from './style.less';
41
 
41
 
42
-
43
-
44
-
45
 export default forwardRef((props, ref) => {
42
 export default forwardRef((props, ref) => {
46
   const domRef = useRef();
43
   const domRef = useRef();
47
   const echartsRef = useRef();
44
   const echartsRef = useRef();
48
 
45
 
49
-
50
   useEffect(() => {
46
   useEffect(() => {
51
     echartsRef.current = echarts.init(domRef.current);
47
     echartsRef.current = echarts.init(domRef.current);
52
 
48
 

+ 4
- 0
src/components/ECharts/style.less 查看文件

2
   width: 100%;
2
   width: 100%;
3
   height: 100%;
3
   height: 100%;
4
   min-height: 100px;
4
   min-height: 100px;
5
+
6
+  & > div {
7
+    height: 100%;
8
+  }
5
 }
9
 }

+ 1
- 1
src/components/GeoMap/style.less 查看文件

1
 .geo-map-container {
1
 .geo-map-container {
2
   width: 100%;
2
   width: 100%;
3
   height: 100%;
3
   height: 100%;
4
-  max-height: 550px;
4
+  // max-height: 550px;
5
   overflow: hidden;
5
   overflow: hidden;
6
   border-top-left-radius: 12px;
6
   border-top-left-radius: 12px;
7
   border-top-right-radius: 12px;
7
   border-top-right-radius: 12px;

+ 2
- 2
src/pages/MonitoringScreen/components/MachineryStatus.jsx 查看文件

12
       color: x, // 0% 处的颜色
12
       color: x, // 0% 处的颜色
13
     },
13
     },
14
     {
14
     {
15
-      offset: 0.5,
16
-      color: x, // 50% 处的颜色
15
+      offset: 0.2,
16
+      color: x, // 20% 处的颜色
17
     },
17
     },
18
     {
18
     {
19
       offset: 1,
19
       offset: 1,

+ 2
- 2
src/pages/MonitoringScreen/components/MachineryType.jsx 查看文件

12
       color: `rgba(${rgb[0]}, ${rgb[1]}, ${rgb[2]}, 0)`, // 0% 处的颜色
12
       color: `rgba(${rgb[0]}, ${rgb[1]}, ${rgb[2]}, 0)`, // 0% 处的颜色
13
     },
13
     },
14
     {
14
     {
15
-      offset: 0.5,
16
-      color: x, // 50% 处的颜色
15
+      offset: 0.8,
16
+      color: x, // 80% 处的颜色
17
     },
17
     },
18
     {
18
     {
19
       offset: 1,
19
       offset: 1,

+ 2
- 2
src/pages/MonitoringScreen/style.less 查看文件

29
     .grail-container {
29
     .grail-container {
30
       display: flex;
30
       display: flex;
31
       flex: 1;
31
       flex: 1;
32
-      align-items: stretch;
33
-      height: 100%;
32
+      overflow: hidden;
34
 
33
 
35
       .grail-left,
34
       .grail-left,
36
       .grail-right {
35
       .grail-right {
37
         flex: 1;
36
         flex: 1;
37
+        overflow: hidden;
38
       }
38
       }
39
 
39
 
40
       .grail-content {
40
       .grail-content {