张延森 3 years ago
parent
commit
d4bf8e15ab

BIN
src/assets/images/screen/bg.png View File


+ 0
- 4
src/components/ECharts/index.jsx View File

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

+ 4
- 0
src/components/ECharts/style.less View File

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

+ 1
- 1
src/components/GeoMap/style.less View File

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

+ 2
- 2
src/pages/MonitoringScreen/components/MachineryStatus.jsx View File

@@ -12,8 +12,8 @@ const colorList = ['#FB9900', '#23E8AE', '#E63404', '#51D4FF', '#B8B2A9', '#C579
12 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 19
       offset: 1,

+ 2
- 2
src/pages/MonitoringScreen/components/MachineryType.jsx View File

@@ -12,8 +12,8 @@ const colorList = ['#FB9900', '#23E8AE', '#E63404'].map((x) => {
12 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 19
       offset: 1,

+ 2
- 2
src/pages/MonitoringScreen/style.less View File

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