@dayan_hjm vor 2 Jahren
Ursprung
Commit
b4148a7f96

+ 5 - 5
config/webpack.common.js

@@ -71,8 +71,8 @@ module.exports = {
71 71
         use: /* 使用loader */[{
72 72
           loader: "url-loader",
73 73
           options: /* 加载器相关的配置项 */ {
74
-            name: name_+'static/[name].[ext]',
75
-            limit: /* <=limit的图片转换成base64 */ 8196,
74
+            name: 'static/[name].[ext]',
75
+            limit: /* <=limit的图片转换成base64 */ 10000,
76 76
             mimetype: "image/jpg|image|gif/png|image/ico",
77 77
             fallback: 'file-loader',
78 78
             publicPath: '../../' //采用根路径
@@ -87,7 +87,7 @@ module.exports = {
87 87
           loader: "url-loader",
88 88
           options: /* 加载器相关的配置项 */ {
89 89
             name: 'static/[name].[ext]',
90
-            limit: /* <=limit的图片转换成base64 */ 8196,
90
+            limit: /* <=limit的图片转换成base64 */ 10000,
91 91
             mimetype: "gif",
92 92
             fallback: 'file-loader',
93 93
             publicPath: '../../' //采用根路径
@@ -101,7 +101,7 @@ module.exports = {
101 101
         use: /* 使用loader */[{
102 102
           loader: "file-loader",
103 103
           options: /* 加载器相关的配置项 */ {
104
-            name: name_+'static/[name].[ext]',
104
+            name: 'static/[name].[ext]',
105 105
             publicPath: '../../' //采用根路径
106 106
           },
107 107
         },
@@ -113,7 +113,7 @@ module.exports = {
113 113
         use: [{
114 114
           loader: 'file-loader',
115 115
           options: {
116
-            name: name_+'static/[name].[ext]',
116
+            name: 'static/[name].[ext]',
117 117
             publicPath: '../../'
118 118
           },
119 119
         }],

+ 2 - 2
config/webpack.prod.js

@@ -139,8 +139,8 @@ module.exports = merge(common, {
139 139
         // to: '../dist/static/privateConfig.js' 
140 140
       },
141 141
       { 
142
-        from: path.resolve(__dirname, '../src/assets/js/privateConfig.js'), 
143
-        to:path.resolve(__dirname, '../dist/static/privateConfig.js'),
142
+        from: path.resolve(__dirname, '../src/assets/js/crypto-js.js'), 
143
+        to:path.resolve(__dirname, '../dist/static/crypto-js.js'),
144 144
         // to: '../dist/static/privateConfig.js' 
145 145
       },
146 146
       { 

+ 6 - 7
src/assets/css/styleTemplate.less

@@ -2,7 +2,7 @@
2 2
  * @Author: dayan_hjm 茶百道主题样式
3 3
  * @Date: 2022-10-27 10:56:37 
4 4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2023-11-21 17:43:56
5
+ * @Last Modified time: 2023-11-22 15:53:50
6 6
  */
7 7
 
8 8
 @import url("../../themes/themes.less");
@@ -554,7 +554,7 @@
554 554
 
555 555
         .bottomContent2 {
556 556
           width: 100%;
557
-          height: 28%;
557
+          height: 40%;
558 558
         }
559 559
 
560 560
         .bottomContent {
@@ -596,10 +596,6 @@
596 596
         }
597 597
       }
598 598
 
599
-      .rightContent .bottomContent2 {
600
-        width: 100%;
601
-        height: 100%;
602
-      }
603 599
 
604 600
       .rightContent .bottomContent {
605 601
         width: 100%;
@@ -667,6 +663,10 @@
667 663
         width: 28%;
668 664
         height: 88%;
669 665
         z-index: 9;
666
+        .bottomContent2{
667
+          width: 100%;
668
+          height: 28%;
669
+        }
670 670
 
671 671
         .topMsg_2 .topMsg_content {
672 672
           height: 80%;
@@ -842,7 +842,6 @@
842 842
           }
843 843
         }
844 844
 
845
-        .bottomContent {}
846 845
       }
847 846
 
848 847
       .bottom_box {

BIN
src/assets/imgs/dataVImg/qiu1.png


BIN
src/assets/imgs/dataVImg/qiu2.png


BIN
src/assets/imgs/dataVImg/qiu3.png


BIN
src/assets/imgs/dataVImg/qiu4.png


BIN
src/assets/imgs/dataVImg/wuQuanXuan.png


+ 3 - 3
src/pages/gvc/component/mapView2.jsx

@@ -14,7 +14,7 @@
14 14
         preload 属性 :
15 15
         设置 auto , 表示 预先加载视频 ;
16 16
         设置 none , 表示 不预先加载视频 ;
17
- * @Last Modified time: 2023-11-22 09:52:11
17
+ * @Last Modified time: 2023-11-22 16:15:21
18 18
  */
19 19
 import React, { useState, useEffect, Component } from "react";
20 20
 import { useHistory, useLocation, withRouter } from "react-router-dom";
@@ -54,7 +54,7 @@ class MapViewTwo extends Component {
54 54
         媒体参与度(Media Engagement)是指用户与媒体内容进行互动的程度,可以通过多个指标来衡量。这些指标主要包括观看时间、观看率、转化率、交互行为等。
55 55
         可以通过:chrome://media-engagement/ 查看
56 56
      */
57
-    const video = document.querySelector('.video_box');
57
+    const video = document.querySelector('.videoBoxViem');
58 58
     console.log(video.play());
59 59
 
60 60
     const model = document.querySelector('.model')
@@ -102,7 +102,7 @@ class MapViewTwo extends Component {
102 102
     return (
103 103
       <div class="video_box video_box_hide gvc_video animate__animated animate__fadeOut animate__delay-2s animate__slower">
104 104
         <div className="alls">
105
-        <video src={require("@assets/imgs/dataVimg/videoGvc.mp4").default} autoplay="autoplay" class="video_box"></video>
105
+        <video src={require("@assets/imgs/dataVimg/videoGvc.mp4").default} autoplay="autoplay" class="videoBoxViem"></video>
106 106
         </div>
107 107
       </div>
108 108
     )

+ 4 - 0
src/pages/gvc/style.less

@@ -7,6 +7,10 @@
7 7
   // background: #000;
8 8
 
9 9
   :global {
10
+    .rightContent .bottomContent3{
11
+      width: 100%;
12
+      height: 100%;
13
+    }
10 14
 
11 15
     .all_box {
12 16
       width: 100%;

+ 4 - 3
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-22 10:27:07
5
+ * @Last Modified time: 2023-11-22 16:24:19
6 6
  */
7 7
 
8 8
 import React, { useState, useEffect, Component } from "react";
@@ -403,8 +403,9 @@ class Gvc extends Component {
403 403
               <ul className="imgMsg">
404 404
                 {
405 405
                   toJS(imgMsgData).map((item, index) => {
406
+                    if(!item){return}
406 407
                     return (
407
-                      <li style={{ ...item.styles }} class="animate__animated animate__bounceInUp animate__slower">
408
+                      <li style={{ ...item?.styles }} class="animate__animated animate__bounceInUp animate__slower">
408 409
                         {/* 矿产 */}
409 410
                         {
410 411
                           item.totalName && <p className="name">{item.totalName}</p>
@@ -464,7 +465,7 @@ class Gvc extends Component {
464 465
             {/* 右侧信息栏 */}
465 466
             <div className="rightContent">
466 467
 
467
-              <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower  animate__delay-1s">
468
+              <div class="bottomContent3 animate__animated animate__fadeInDown animate__slower  animate__delay-1s">
468 469
                 <div className="bottomContent bigDivPd">
469 470
                   <div className="topMsg_content">
470 471
                     <RightBottomView></RightBottomView>