@dayan_hjm лет назад: 2
Родитель
Сommit
4551eadb9c
3 измененных файлов с 180 добавлено и 117 удалено
  1. 6 6
      src/pages/gvc/mod.js
  2. 157 94
      src/pages/gvc/style.less
  3. 17 17
      src/pages/gvc/view.jsx

+ 6 - 6
src/pages/gvc/mod.js

@@ -32,14 +32,14 @@ const defaultState = {
32 32
     {
33 33
       total: 3578,
34 34
       totalName: "锂辉石库存量",
35
-      styles: { left: "32%", top: "27%" },
35
+      styles: { left: "34%", top: "27%" },
36 36
       cumulativeProduction: "",
37 37
       inventory: 0,
38 38
     },
39 39
     {
40 40
       total: 0,
41 41
       totalName: "",
42
-      styles: { left: "10%", top: "88%" },
42
+      styles: { left: "11%", top: "88%" },
43 43
       cumulativeProduction: 1222,
44 44
       inventory: 1000,
45 45
       day:222,
@@ -75,7 +75,7 @@ const defaultState = {
75 75
     {
76 76
       total: 0,
77 77
       totalName: "",
78
-      styles: { left: "27%", top: "73%" },
78
+      styles: { left: "30%", top: "73%" },
79 79
       cumulativeProduction: 1222,
80 80
       inventory: 1000,
81 81
       day:222,
@@ -111,7 +111,7 @@ const defaultState = {
111 111
     {
112 112
       total: 0,
113 113
       totalName: "",
114
-      styles: { left: "49%", top: "56%" },
114
+      styles: { left: "52%", top: "56%" },
115 115
       cumulativeProduction: 1222,
116 116
       inventory: 1000,
117 117
       day:222,
@@ -147,7 +147,7 @@ const defaultState = {
147 147
     {
148 148
       total: 0,
149 149
       totalName: "",
150
-      styles: { left: "66%", top: "42%" },
150
+      styles: { left: "70%", top: "42%" },
151 151
       cumulativeProduction: 1222,
152 152
       inventory: 1000,
153 153
       day:222,
@@ -183,7 +183,7 @@ const defaultState = {
183 183
     {
184 184
       total: 0,
185 185
       totalName: "",
186
-      styles: { left: "83%", top: "28%" },
186
+      styles: { left: "88%", top: "28%" },
187 187
       cumulativeProduction: 1222,
188 188
       inventory: 1000,
189 189
       day:222,

+ 157 - 94
src/pages/gvc/style.less

@@ -7,6 +7,7 @@
7 7
   background: #000;
8 8
 
9 9
   :global {
10
+
10 11
     .all_box {
11 12
       width: 100%;
12 13
       height: 100%;
@@ -29,110 +30,36 @@
29 30
           position: relative;
30 31
         }
31 32
 
32
-        .imgMsg {
33
-          width: 100%;
34
-          position: absolute;
35
-          left: 0;
36
-          top: 0;
37
-          height: 100%;
38
-          color: #fff;
39
-
40
-          li {
41
-            position: absolute;
42
-            width: 14em;
43
-            height: 4em;
44
-            opacity: 1;
45
-            background: linear-gradient(0deg, #42ca9840 0%, #42ca9800 98%);
46
-            ;
47
-            border-radius: 0.5em;
48
-            padding: 0.5em;
49
-            box-sizing: border-box;
50
-            font-size: 0.9em;
51
-            color: #CDF1FF;
52
-
53
-            .nums {
54
-              font-size: 1.3em;
55
-              color: #69FFDE;
56
-              display: inline-block !important;
57
-            }
58
-
59
-            .topMsg_number_2 {
60
-              display: inline-block !important;
61
-            }
62
-
63
-            .sma {
64
-              font-size: 0.7em;
65
-              color: #CDF1FF;
66
-              display: inline-block;
67
-              margin-left: 0.2em;
68
-            }
69
-
70
-            .chanL {
71
-              background: unset;
72
-              font-size: 0.9em;
73
-              color: #CDF1FF;
74
-              height: 4em;
75
-              box-sizing: border-box;
76
-              padding: 0 0.5em;
77
-              display: flex;
78
-              justify-content: space-between;
79
-              >div {
80
-                width: 50%;
81
-              }
82
-            }
83
-            .hoverR{
84
-              width: 100%;
85
-              height: 12em;
86
-              position: absolute;
87
-              left: 0;
88
-              top: -7em;
89
-              padding-top: 11em;
90
-              &:hover {
91
-                background-color: red;
92
-              }
93
-              .hoverDiv{
94
-                // display: none;
95
-              }
96
-            }
97
-            .hoverR:hover{
98
-              background-color: red;
99
-              .hoverDiv{
100
-                display: flex;
101
-              }
102
-            }
103
-
104
-            .hoverDiv {
105
-              display: flex;
106
-              align-items: center;
107
-              justify-content: space-between;
108
-              padding: 0 1em;
109
-              background: linear-gradient(0deg, #ffffff00 20%, #ffffff29 100%);
110
-              width:100%;
111
-              border-radius: 0.5em;
112
-              box-sizing: border-box;
113
-              margin-top: 0.1em;
114
-              font-size: 0.8em;
115
-              padding: 0.7em 1em 0;
116
-              color: #d7d7d7;
117
-              align-items: flex-start;
33
+        @media (min-height: 800px) {
34
+          .alls {
35
+            width: 73%;
36
+          }
37
+        }
38
+        @media (min-height: 900px) {
39
+          .alls {
40
+            width: 64%;
41
+          }
42
+        }
118 43
 
119
-              >div>span {
120
-                display: block;
121
-              }
122
-            }
44
+        @media (min-height: 1000PX) {
45
+          .alls {
46
+            width: 70%;
123 47
           }
124 48
         }
49
+
125 50
       }
126 51
 
127 52
       .gvcHome {
128 53
         height: 100%;
54
+        justify-content: flex-start;
129 55
 
130 56
         .leftContent {
131
-          width: 8%;
57
+          width: 17%;
132 58
           /* padding: 0 1em; */
133 59
           height: 70%;
134 60
           margin-top: 5%;
135 61
           margin-left: 1%;
62
+          padding-right: 8%;
136 63
 
137 64
           >ul {
138 65
             width: 100%;
@@ -196,7 +123,7 @@
196 123
                 color: #CDF1FF;
197 124
                 padding: 0.8em 0.9em 0.2em;
198 125
                 background: linear-gradient(0deg, #ffffff26 0%, #ffffff00 100%);
199
-                border-radius: 0.2em;
126
+                border-radius: 0.5em;
200 127
 
201 128
                 .topMsg_number {
202 129
                   color: #69FFDE;
@@ -209,13 +136,147 @@
209 136
           }
210 137
         }
211 138
 
139
+        .centerCon {
140
+          width: 62%;
141
+          height: 80%;
142
+          padding: 0;
143
+          position: relative;
144
+          margin: 0% 0 0 -1%;
145
+        }
146
+
147
+        @media (min-height: 800px) {
148
+          .centerCon {
149
+            width: 65%;
150
+            height: 78%;
151
+            padding: 0;
152
+            position: relative;
153
+            margin: 0% 0 0 -3%;
154
+          }
155
+        }
156
+        @media (min-height: 900px) {
157
+          .centerCon {
158
+            width: 62%;
159
+            height: 80%;
160
+            padding: 0;
161
+            position: relative;
162
+            margin: 0% 0 0 -1%;
163
+            }
164
+        }
165
+
166
+        @media (min-height: 1000PX) {
167
+          .centerCon {
168
+            width: 63%;
169
+            height: 75%;
170
+            padding: 0;
171
+            position: relative;
172
+            margin: 0% 0 0 -3%;
173
+          }
174
+        }
175
+
176
+
177
+        .imgMsg {
178
+          width: 100%;
179
+          position: absolute;
180
+          left: 0;
181
+          top: 0;
182
+          height: 100%;
183
+          color: #fff;
184
+
185
+          li {
186
+            position: absolute;
187
+            width: 14em;
188
+            height: 4em;
189
+            opacity: 1;
190
+            background: linear-gradient(0deg, #ffffff26 0%, #ffffff00 100%);
191
+            border-radius: 0.5em;
192
+            padding: 0.5em;
193
+            box-sizing: border-box;
194
+            font-size: 0.9em;
195
+            color: #CDF1FF;
196
+            .nums {
197
+              font-size: 1.3em;
198
+              color: #69FFDE;
199
+              display: inline-block !important;
200
+            }
201
+
202
+            .topMsg_number_2 {
203
+              display: inline-block !important;
204
+            }
205
+
206
+            .sma {
207
+              font-size: 0.7em;
208
+              color: #CDF1FF;
209
+              display: inline-block;
210
+              margin-left: 0.2em;
211
+            }
212
+
213
+            .chanL {
214
+              background: unset;
215
+              font-size: 0.9em;
216
+              color: #CDF1FF;
217
+              height: 4em;
218
+              box-sizing: border-box;
219
+              padding: 0 0.5em;
220
+              display: flex;
221
+              justify-content: space-between;
222
+
223
+              >div {
224
+                width: 50%;
225
+              }
226
+            }
227
+
228
+            .hoverR {
229
+              width: 100%;
230
+              height: 12em;
231
+              position: absolute;
232
+              left: 0;
233
+              top: -7em;
234
+              padding-top: 11em;
235
+
236
+
237
+              .hoverDiv {
238
+                display: none;
239
+              }
240
+            }
241
+
242
+            .hoverR:hover {
243
+              .hoverDiv {
244
+                display: flex;
245
+              }
246
+            }
247
+
248
+            .hoverDiv {
249
+              display: flex;
250
+              align-items: center;
251
+              justify-content: space-between;
252
+              padding: 0 1em;
253
+              background: linear-gradient(0deg, #ffffff00 20%, #ffffff29 100%);
254
+              width: 100%;
255
+              border-radius: 0.5em;
256
+              box-sizing: border-box;
257
+              margin-top: 0.1em;
258
+              font-size: 0.8em;
259
+              padding: 0.7em 1em 0;
260
+              color: #d7d7d7;
261
+              align-items: flex-start;
262
+
263
+              >div>span {
264
+                display: block;
265
+              }
266
+            }
267
+          }
268
+          li:hover{
269
+            background: linear-gradient(0deg, #42ca9840 0%, #42ca9800 98%);
270
+          }
271
+        }
272
+
212 273
         .rightContent {
213 274
           width: 15%;
214 275
           position: absolute;
215 276
           right: 0;
216
-          bottom: 9%;
277
+          bottom: 16%;
217 278
           z-index: 9;
218
-          height: 46%;
279
+          height: auto;
219 280
 
220 281
           .title_ {
221 282
             text-align: left;
@@ -282,6 +343,8 @@
282 343
 
283 344
         }
284 345
       }
346
+
285 347
     }
348
+
286 349
   }
287 350
 }

+ 17 - 17
src/pages/gvc/view.jsx

@@ -2,7 +2,7 @@
2 2
  * @Author: dayan_hjm  产供销价值链
3 3
  * @Date: 2023-11-10 10:19:34 
4 4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2023-11-14 17:32:45
5
+ * @Last Modified time: 2023-11-15 16:30:25
6 6
  */
7 7
 
8 8
 import React, { useState, useEffect, Component } from "react";
@@ -272,11 +272,26 @@ class Gvc extends Component {
272 272
             <div className="alls">
273 273
               <video src={require("@assets/imgs/gvc/video2.mp4").default} autoplay="autoplay" loop="loop" class="video2 center_box2 animate__animated animate__fadeIn animate__delay-2s">
274 274
               </video>
275
+            </div>
276
+
277
+          </div>
278
+          <div className={"gvcHome home cbHome"}>
279
+            <div className="leftContent">
280
+              <ul>
281
+                {
282
+                  LeftHtml.map((x, i) => {
283
+                    return this.getLeftHtml(x, i)
284
+                  })
285
+                }
286
+              </ul>
287
+            </div>
288
+
289
+            <div className="centerCon">
275 290
               <ul className="imgMsg">
276 291
                 {
277 292
                   toJS(imgMsgData).map((item, index) => {
278 293
                     return (
279
-                      <li style={{ ...item.styles }}>
294
+                      <li style={{ ...item.styles }} class="animate__animated animate__bounceInUp animate__slower">
280 295
                         {/* 矿产 */}
281 296
                         {
282 297
                           item.totalName && <p className="name">{item.totalName}</p>
@@ -332,21 +347,6 @@ class Gvc extends Component {
332 347
               </ul>
333 348
             </div>
334 349
 
335
-          </div>
336
-          <div className={"gvcHome home cbHome"}>
337
-            <div className="leftContent">
338
-              <ul>
339
-                {
340
-                  LeftHtml.map((x, i) => {
341
-                    return this.getLeftHtml(x, i)
342
-                  })
343
-                }
344
-              </ul>
345
-            </div>
346
-
347
-            <div className="centerCon">
348
-            </div>
349
-
350 350
             {/* 右侧信息栏 */}
351 351
             <div className="rightContent">
352 352