fix

config/webpack.common.js

@@ -72,7 +72,7 @@ module.exports = {
           loader: "url-loader",
           options: /* 加载器相关的配置项 */ {
             name: 'static/[name].[ext]',
-            limit: /* <=limit的图片转换成base64 */ 0,
+            limit: /* <=limit的图片转换成base64 */ 10000,
             mimetype: "image/jpg|image|gif/png|image/ico",
             fallback: 'file-loader',
             publicPath: '../../' //采用根路径

src/assets/css/styleTemplate.less

@@ -413,6 +413,7 @@
       justify-content: center;
       flex-wrap: wrap;
       pointer-events: none;
+      z-index: 1;
 
       video {
         width: 40%;

src/pages/gvc/api.js

@@ -11,10 +11,10 @@ export function checkToken(params) {
 /**各基地库存明细 */
 export function smallMaterialService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431155205925726276",
+    url: "/dataengine-center-oneservice/list/1358057393917040084",
     method: "POST",
     data: {
-      "apiId": "1431155205925726276",
+      "apiId": "1358057393917040084",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -30,10 +30,10 @@ export function smallMaterialService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '5de9f29632bf379f46b1a0d1c5a85112',
+      sign: 'fdb551d8c6a01d87c58970d519752d81',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431155205925726276',
+      apiId: '1358057393917040084',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -45,10 +45,10 @@ export function smallMaterialService(params) {
 /**各基地日，月累计，年累计产量 */
 export function smallDayService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431155399122708561",
+    url: "/dataengine-center-oneservice/list/1358059456248976873",
     method: "POST",
     data: {
-      "apiId": "1431155399122708561",
+      "apiId": "1358059456248976873",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -63,10 +63,10 @@ export function smallDayService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'df5c9e31ae6544ae9561c2d2a9f89702',
+      sign: '5f270b133af668b3631fbe7dbff9ebe4',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431155399122708561',
+      apiId: '1358059456248976873',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -78,10 +78,10 @@ export function smallDayService(params) {
 /**左侧数据*/
 export function leftService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431155462568896598",
+    url: "/dataengine-center-oneservice/list/1357592107129541992",
     method: "POST",
     data: {
-      "apiId": "1431155462568896598",
+      "apiId": "1357592107129541992",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -95,10 +95,10 @@ export function leftService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'a1288953bd76d9f0b202280c84062f60',
+      sign: '2d35f0b798fe2cc8443f95aed6da466a',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431155462568896598',
+      apiId: '1357592107129541992',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -109,10 +109,10 @@ export function leftService(params) {
 /**累计销量客户*/
 export function rollService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431155512914176090",
+    url: "/dataengine-center-oneservice/list/1357509594900108615",
     method: "POST",
     data: {
-      "apiId": "1431155512914176090",
+      "apiId": "1357509594900108615",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -125,10 +125,10 @@ export function rollService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '7e13e57d4d3b4430dad7eedaaf5fe668',
+      sign: '839f9217d1cf81ec03ff6ccf54c86e37',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431155512914176090',
+      apiId: '1357509594900108615',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -140,10 +140,10 @@ export function rollService(params) {
 /**锂辉石库存*/
 export function bigShopService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431155276398422090",
+    url: "/dataengine-center-oneservice/list/1357489941160170789",
     method: "POST",
     data: {
-      "apiId": "1431155276398422090",
+      "apiId": "1357489941160170789",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -156,10 +156,10 @@ export function bigShopService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '253c1c9594881b0724b3403e9ea78527',
+      sign: 'ae4c520da5ae882455307324f75f5277',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431155276398422090',
+      apiId: '1357489941160170789',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -170,10 +170,10 @@ export function bigShopService(params) {
 /**个基地年累计产量，库存*/
 export function smallShopService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431155337148721229",
+    url: "/dataengine-center-oneservice/list/1357592780709598582",
     method: "POST",
     data: {
-      "apiId": "1431155337148721229",
+      "apiId": "1357592780709598582",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -187,10 +187,10 @@ export function smallShopService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'ae68ccba4a6c70600cd9c75be6eb8264',
+      sign: 'a842b5c5c462d7cacd2baad402ea94a7',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431155337148721229',
+      apiId: '1357592780709598582',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',

src/pages/gvc/api2.js

@@ -11,10 +11,10 @@ export function checkToken(params) {
 /**各基地库存明细 */
 export function smallMaterialService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1358057393917040084",
+    url: "/dataengine-center-oneservice/list/1431155205925726276",
     method: "POST",
     data: {
-      "apiId": "1358057393917040084",
+      "apiId": "1431155205925726276",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -30,10 +30,10 @@ export function smallMaterialService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'fdb551d8c6a01d87c58970d519752d81',
+      sign: '5de9f29632bf379f46b1a0d1c5a85112',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1358057393917040084',
+      apiId: '1431155205925726276',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -45,10 +45,10 @@ export function smallMaterialService(params) {
 /**各基地日，月累计，年累计产量 */
 export function smallDayService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1358059456248976873",
+    url: "/dataengine-center-oneservice/list/1431155399122708561",
     method: "POST",
     data: {
-      "apiId": "1358059456248976873",
+      "apiId": "1431155399122708561",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -63,10 +63,10 @@ export function smallDayService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '5f270b133af668b3631fbe7dbff9ebe4',
+      sign: 'df5c9e31ae6544ae9561c2d2a9f89702',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1358059456248976873',
+      apiId: '1431155399122708561',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -78,10 +78,10 @@ export function smallDayService(params) {
 /**左侧数据*/
 export function leftService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1357592107129541992",
+    url: "/dataengine-center-oneservice/list/1431155462568896598",
     method: "POST",
     data: {
-      "apiId": "1357592107129541992",
+      "apiId": "1431155462568896598",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -95,10 +95,10 @@ export function leftService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '2d35f0b798fe2cc8443f95aed6da466a',
+      sign: 'a1288953bd76d9f0b202280c84062f60',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1357592107129541992',
+      apiId: '1431155462568896598',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -109,10 +109,10 @@ export function leftService(params) {
 /**累计销量客户*/
 export function rollService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1357509594900108615",
+    url: "/dataengine-center-oneservice/list/1431155512914176090",
     method: "POST",
     data: {
-      "apiId": "1357509594900108615",
+      "apiId": "1431155512914176090",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -125,10 +125,10 @@ export function rollService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '839f9217d1cf81ec03ff6ccf54c86e37',
+      sign: '7e13e57d4d3b4430dad7eedaaf5fe668',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1357509594900108615',
+      apiId: '1431155512914176090',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -140,10 +140,10 @@ export function rollService(params) {
 /**锂辉石库存*/
 export function bigShopService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1357489941160170789",
+    url: "/dataengine-center-oneservice/list/1431155276398422090",
     method: "POST",
     data: {
-      "apiId": "1357489941160170789",
+      "apiId": "1431155276398422090",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -156,10 +156,10 @@ export function bigShopService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'ae4c520da5ae882455307324f75f5277',
+      sign: '253c1c9594881b0724b3403e9ea78527',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1357489941160170789',
+      apiId: '1431155276398422090',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -170,10 +170,10 @@ export function bigShopService(params) {
 /**个基地年累计产量，库存*/
 export function smallShopService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1357592780709598582",
+    url: "/dataengine-center-oneservice/list/1431155337148721229",
     method: "POST",
     data: {
-      "apiId": "1357592780709598582",
+      "apiId": "1431155337148721229",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
@@ -187,10 +187,10 @@ export function smallShopService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'a842b5c5c462d7cacd2baad402ea94a7',
+      sign: 'ae68ccba4a6c70600cd9c75be6eb8264',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1357592780709598582',
+      apiId: '1431155337148721229',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',

src/pages/gvc/style.less

@@ -20,12 +20,18 @@
       .gvc_video {
         background: url(../../assets/imgs/dataVimg/gvcBgDataV.png) no-repeat 0 -10em / 100% 120% #041b40 !important;
         align-items: flex-start;
-        // background: #000;
+        justify-content: center;
+        box-sizing: border-box;
+        overflow: visible;
 
         video {
+          display: block;
           width: 100%;
-          height: unset;
+          height: auto;
+          max-height: min(96vh, 100dvh);
           padding: 0;
+          object-fit: contain;
+          pointer-events: none;
         }
 
         img {
@@ -38,33 +44,251 @@
         .alls {
           width: 80%;
           height: unset;
-          padding: 2% 0% 0% 2%;
+          padding: 1% 0% 0% 2%;
           position: relative;
+          box-sizing: border-box;
+          z-index: 1;
+          overflow: visible;
         }
 
-        // @media (min-height: 800px) {
-        //   .alls {
-        //     width: 73%;
-        //   }
-        // }
+        // 仅主视频接收点击；片头 MapViewTwo 同带 .gvc_video 且 z-index:12，否则会盖住下层热点
+        &:not(.video_box_hide) .alls {
+          pointer-events: auto;
+        }
 
-        // @media (min-height: 900px) {
-        //   .alls {
-        //     width: 64%;
-        //   }
-        // }
+        &.video_box_hide,
+        &.video_box_hide * {
+          pointer-events: none !important;
+        }
 
-        // @media (min-height: 1000PX) {
-        //   .alls {
-        //     width: 70%;
-        //   }
-        // }
+        // 热点与视频同层：百分比相对视频显示区域，缩屏时与画面一起变
+        .imgMsg {
+          list-style: none;
+          margin: 0;
+          padding: 0;
+          width: 100%;
+          position: absolute;
+          left: 0;
+          top: 0;
+          height: 100%;
+          color: #fff;
+          pointer-events: none;
+          z-index: 2;
+          overflow: visible;
+
+          li {
+            position: absolute;
+            width: 20em;
+            z-index: 10;
+            height: 4em;
+            opacity: 1;
+            overflow: visible;
+            background: linear-gradient(0deg, #ffffff26 0%, #ffffff00 100%);
+            border-radius: 0.5em;
+            padding: 0.5em;
+            box-sizing: border-box;
+            font-size: 0.9em;
+            color: #CDF1FF;
+            pointer-events: auto;
+
+            .nums {
+              font-size: 1.3em;
+              color: #69FFDE;
+              display: inline-block !important;
+            }
+
+            .topMsg_number_2 {
+              display: inline-block !important;
+            }
+
+            .sma {
+              font-size: 0.7em;
+              color: #CDF1FF;
+              display: inline-block;
+              margin-left: 0.2em;
+            }
+
+            .chanL {
+              background: unset;
+              font-size: 0.9em;
+              color: #CDF1FF;
+              // height: 4em;
+              box-sizing: border-box;
+              padding: 0 0.5em;
+              display: flex;
+              justify-content: space-between;
+
+              >div {
+                width: 50%;
+              }
+            }
+
+            .hoverR {
+              width: 100%;
+              height: 12em;
+              position: absolute;
+              left: 0;
+              top: -7em;
+              padding-top: 11em;
+              overflow: visible;
+
+
+              .hoverDiv {
+                display: none;
+              }
+            }
+
+            .hoverDiv {
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              padding: 0 1em;
+              background: linear-gradient(0deg, #292929f2 0%, #25252540 100%);
+              width: 100%;
+              border-radius: 0.5em;
+              box-sizing: border-box;
+              margin-top: 0.1em;
+              font-size: 0.8em;
+              padding: 0.2em 0em 0 1em;
+              color: #d7d7d7;
+              align-items: flex-start;
+              height: auto;
+
+              >div>span {
+                display: block;
+              }
+            }
+
+            // 必须压过 .hoverR .hoverDiv{display:none} 的单条选择器优先级
+            &:hover .hoverR .hoverDiv {
+              display: flex !important;
+            }
+          }
+
+          @media (max-height: 900px) {
+            li .hoverDiv {
+              background: linear-gradient(0deg, #292929 0%, #252525 100%) !important;
+            }
+          }
+
+          li:hover {
+            background: linear-gradient(0deg, #42ca9840 0%, #42ca9800 98%);
+          }
+        }
+
+        @media (max-height: 1000px) {
+          video {
+            max-height: min(82vh, 100dvh);
+          }
+
+          .alls {
+            width: 74%;
+          }
+
+
+        }
+
+
+        @media (max-height: 1050px) {
+          video {
+            max-height: min(82vh, 100dvh);
+          }
+
+          .alls {
+            width: 77%;
+            padding: 1.1% 0 0 1.1%;
+          }
+
+          .imgMsg {
+            top: -1em;
+          }
+
+          .imgMsg li {
+            font-size: 0.82em;
+            width: 21em;
+            height: 3.75em;
+            padding: 0.4em;
+
+            .chanL {
+              // height: 3.75em;
+              font-size: 0.85em;
+            }
+          }
+        }
+
+        @media (min-width: 2560px) {
+          .alls {
+            width: 82%;
+          }
+
+          video {
+            max-height: min(88vh, 100dvh);
+          }
+        }
+
+        @media (min-width: 2240px) and (max-width: 2559px) {
+          .alls {
+            width: 81%;
+          }
+
+          video {
+            max-height: min(90vh, 100dvh);
+          }
+        }
+
+        @media (min-width: 1760px) and (max-width: 2239px) {
+          .alls {
+            width: 80%;
+          }
+
+          video {
+            max-height: min(92vh, 100dvh);
+          }
+        }
+
+        @media (min-width: 1441px) and (max-width: 1759px) {
+          .alls {
+            width: 79%;
+          }
+
+          video {
+            max-height: min(93vh, 100dvh);
+          }
+        }
+
+        @media (max-width: 1440px) {
+          .alls {
+            width: 78%;
+          }
+
+          video {
+            max-height: min(94vh, 100dvh);
+          }
+        }
+
+        @media (max-width: 1280px) {
+          .alls {
+            width: 76%;
+          }
+
+          video {
+            max-height: min(90vh, 100dvh);
+          }
+        }
 
       }
 
       .gvcHome {
         height: 100%;
         justify-content: flex-start;
+        // 中间区域需穿透到下层视频热点；否则 hoverR 向上伸出 centerCon 后无法触发 hover
+        pointer-events: none;
+
+        .leftContent,
+        .rightContent,
+        .bottom_box {
+          pointer-events: auto;
+        }
 
         .leftContent {
           width: 17%;
@@ -177,6 +401,7 @@
           padding: 0;
           position: relative;
           margin: 0% 0 0 -1%;
+          pointer-events: none;
 
           .rightCar {
             width: 4.5em;
@@ -252,122 +477,6 @@
         //   }
         // }
 
-
-        .imgMsg {
-          width: 100%;
-          position: absolute;
-          left: 0;
-          top: 0;
-          height: 100%;
-          color: #fff;
-
-          li {
-            position: absolute;
-            width: 25em;
-            z-index: 10;
-            height: 4em;
-            opacity: 1;
-            background: linear-gradient(0deg, #ffffff26 0%, #ffffff00 100%);
-            border-radius: 0.5em;
-            padding: 0.5em;
-            box-sizing: border-box;
-            font-size: 0.9em;
-            color: #CDF1FF;
-
-            .nums {
-              font-size: 1.3em;
-              color: #69FFDE;
-              display: inline-block !important;
-            }
-
-            .topMsg_number_2 {
-              display: inline-block !important;
-            }
-
-            .sma {
-              font-size: 0.7em;
-              color: #CDF1FF;
-              display: inline-block;
-              margin-left: 0.2em;
-            }
-
-            .chanL {
-              background: unset;
-              font-size: 0.9em;
-              color: #CDF1FF;
-              height: 4em;
-              box-sizing: border-box;
-              padding: 0 0.5em;
-              display: flex;
-              justify-content: space-between;
-
-              >div {
-                width: 50%;
-              }
-            }
-
-            .hoverR {
-              width: 100%;
-              height: 12em;
-              position: absolute;
-              left: 0;
-              top: -7em;
-              padding-top: 11em;
-
-
-              .hoverDiv {
-                display: none;
-              }
-            }
-
-            .hoverR:hover {
-              .hoverDiv {
-                display: flex;
-              }
-            }
-
-            .hoverDiv {
-              display: flex;
-              align-items: center;
-              justify-content: space-between;
-              padding: 0 1em;
-              background: linear-gradient(0deg, #292929f2 0%, #25252540 100%);
-              // linear-gradient(0deg, #ffffff00 20%, #7a7a7a29 100%);
-              width: 100%;
-              border-radius: 0.5em;
-              box-sizing: border-box;
-              margin-top: 0.1em;
-              font-size: 0.8em;
-              padding: 0.2em 0em 0 1em;
-              color: #d7d7d7;
-              align-items: flex-start;
-              height: auto;
-
-              >div>span {
-                display: block;
-              }
-            }
-          }
-
-          @media (max-height: 900px) {
-            li .hoverDiv {
-              background: linear-gradient(0deg, #292929 0%, #252525 100%) !important;
-            }
-
-          }
-
-
-          li:hover {
-            background: linear-gradient(0deg, #42ca9840 0%, #42ca9800 98%);
-          }
-        }
-
-        @media (max-height: 900px) {
-          .imgMsg {
-            top: -1.5em;
-          }
-        }
-
         .rightContent {
           width: 15%;
           position: absolute;

src/pages/gvc/view.jsx

@@ -191,7 +191,7 @@ class Gvc extends Component {
       if (+resultCode === 0) {
         console.log('getUrl2', data)
         const name_ = ["", "锂辉石(化学级)库存量", "锂辉石(化学级)库存量", "累计运输锂辉石(化学级)", "", "锂辉石(化学级)在途库存"];
-        const style__ = [{}, { left: "28%", top: "40%", width: '12em' }, { left: "3%", top: "57%", width: '12em' }, { left: "-6%", top: "29%", width: '12em' }, "", { left: "12%", top: "30%", width: '12em' }]
+        const style__ = [{}, { left: "32%", top: "38%", width: '12em' }, { left: "13%", top: "53%", width: '12em' }, { left: "5%", top: "27%", width: '12em' }, "", { left: "20%", top: "25%", width: '12em' }]
         data = data.map((x, i) => {
           return {
             ...x,
@@ -224,7 +224,7 @@ class Gvc extends Component {
     await smallShopService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
         console.log('getUrl4', data)
-        const style__ = [{}, { left: "47%", top: "25%" }, { left: "33%", top: "72%" }, { left: "52%", top: "57%" }, { left: "71%", top: "44%" }, { left: "14%", top: "86%" }, { left: "-4%", top: "100%" }, { left: "90%", top: "31%" }]
+        const style__ = [{}, { left: "47%", top: "23%" }, { left: "36%", top: "64%" }, { left: "52%", top: "52%" }, { left: "65%", top: "41%" }, { left: "21%", top: "76%" }, { left: "7%", top: "89%" }, { left: "80%", top: "28%" }]
         data = data.map((x, i) => {
           return {
             ...x,
@@ -437,32 +437,13 @@ class Gvc extends Component {
             <div className="alls">
               <video src={mpVideoGvc} playbackRate={0.5} autoplay="autoplay" loop="loop" class="video_box_2 animate__animated animate__fadeIn animate__delay-2s">
               </video>
-              {/* <img src={require("@assets/imgs/dataVimg/gvcbg.png").default} alt="" class="video_box_2 center_box2 animate__animated animate__fadeIn animate__delay-2s" /> */}
-            </div>
-
-          </div>
-          <div className={"gvcHome home cbHome"}>
-            <div className="leftContent">
-              <ul>
-                {
-                  LeftHtml.map((x, i) => {
-                    return this.getLeftHtml(x, i)
-                  })
-                }
-              </ul>
-            </div>
-
-            <div className="centerCon">
-              {/* <p className="rightCar">
-                <img src={require("@assets/imgs/gvc/car.png").default} alt="" />
-              </p> */}
               <ul className="imgMsg">
                 {
                   toJS(imgMsgData).map((item, index) => {
-                    if (!item) { return }
+                    if (!item) { return null }
                     return (
                       <li style={{ ...item?.styles }} class="animate__animated animate__bounceInUp animate__slower">
-                        {/* 矿产 */}
+
                         {
                           item.totalName && <p className="name">{item.totalName}</p>
                         }
@@ -475,11 +456,9 @@ class Gvc extends Component {
                         {
                           item.totalName && <span className="sma">吨</span>
                         }
-                        {/* 基地 */}
                         {
                           (item.cumulativeProduction !== null || item.showDetail) && <div className="hoverR">
-                            <div className="hoverDiv chanL">
-                              {/* <div style={{ width: "62%","textAlign":'right' }}> */}
+                            <div className="hoverDiv chanL" >
                               {
                                 item.cumulativeProduction !== null && <div style={{ width: "38%" }}>
                                   <p className="title">
@@ -497,7 +476,7 @@ class Gvc extends Component {
                                 </p>
                                 {
                                   get(item, "rawMaterial", []).map((ra, rai) => {
-                                    return <span>{ra.prodCatgory}:{ra.indexValue}</span>
+                                    return <span key={rai}>{ra.prodCatgory}:{ra.indexValue}</span>
                                   })
                                 }
                               </div>
@@ -531,6 +510,20 @@ class Gvc extends Component {
               </ul>
             </div>
 
+          </div>
+          <div className={"gvcHome home cbHome"}>
+            <div className="leftContent">
+              <ul>
+                {
+                  LeftHtml.map((x, i) => {
+                    return this.getLeftHtml(x, i)
+                  })
+                }
+              </ul>
+            </div>
+
+            <div className="centerCon" />
+
             {/* 右侧信息栏 */}
             <div className="rightContent">
 

src/pages/sial/style.less

@@ -464,7 +464,7 @@
       left: 0;
       top: 0;
       height: 100%;
-      color: #ff0;
+      z-index: 100;
 
       li {
         position: absolute;

src/pages/tqcDataVHome/api.js

@@ -44,10 +44,10 @@ export function dataengineCenterOneservice(params) {
 /**库存金额 */
 export function momeyService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431063632208685082",
+    url: "/dataengine-center-oneservice/list/1356776817075459329",
     method: "POST",
     data: {
-      "apiId": "1431063632208685082",
+      "apiId": "1356776817075459329",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -61,10 +61,10 @@ export function momeyService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '6203b66920c569f8228c3cb921f3ffb8',
+      sign: 'd58de970856e583f126d186662251024',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431063632208685082',
+      apiId: '1356776817075459329',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',
@@ -76,10 +76,10 @@ export function momeyService(params) {
 /**百万工时损工率   产量计划完成率*/
 export function timeService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431063077222574093",
+    url: "/dataengine-center-oneservice/list/1356250124518724729",
     method: "POST",
     data: {
-      "apiId": "1431063077222574093",
+      "apiId": "1356250124518724729",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -93,10 +93,10 @@ export function timeService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '9ab2d57a785c513f84cd0c5fb4fad7da',
+      sign: '46847fe90889330f13cdc3318d848d45',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431063077222574093',
+      apiId: '1356250124518724729',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',
@@ -107,10 +107,10 @@ export function timeService(params) {
 /**产值+发货量+产量+库存*/
 export function numberService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431049820141217793",
+    url: "/dataengine-center-oneservice/list/1356243326548087867",
     method: "POST",
     data: {
-      "apiId": "1431049820141217793",
+      "apiId": "1356243326548087867",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -123,10 +123,10 @@ export function numberService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '915848290d3e70a7b8e7fbe911e12725',
+      sign: '2f079b53e1e63b753bb6f9807f6c6818',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431049820141217793',
+      apiId: '1356243326548087867',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',
@@ -138,10 +138,10 @@ export function numberService(params) {
 /**近30天产量*/
 export function mondService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431065871110334506",
+    url: "/dataengine-center-oneservice/list/1356244872119751767",
     method: "POST",
     data: {
-      "apiId": "1431065871110334506",
+      "apiId": "1356244872119751767",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -156,10 +156,10 @@ export function mondService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'f84acfc47847e71c67be5569b9289291',
+      sign: 'ef3ecc442896d925cc02d36f1107d9e3',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431065871110334506',
+      apiId: '1356244872119751767',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',
@@ -170,10 +170,10 @@ export function mondService(params) {
 /**月度产量/发货量+一次合格率*/
 export function twoService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1431065780441016356",
+    url: "/dataengine-center-oneservice/list/1356411403496625359",
     method: "POST",
     data: {
-      "apiId": "1431065780441016356",
+      "apiId": "1356411403496625359",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -189,10 +189,10 @@ export function twoService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '178ae23014a9fecad15ffa9a88ed84f1',
+      sign: '9c472223a9acbdb9f16bebb7002e0c40',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1431065780441016356',
+      apiId: '1356411403496625359',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',

src/pages/tqcDataVHome/api3.js

@@ -44,10 +44,10 @@ export function dataengineCenterOneservice(params) {
 /**库存金额 */
 export function momeyService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1356776817075459329",
+    url: "/dataengine-center-oneservice/list/1431063632208685082",
     method: "POST",
     data: {
-      "apiId": "1356776817075459329",
+      "apiId": "1431063632208685082",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -61,10 +61,10 @@ export function momeyService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'd58de970856e583f126d186662251024',
+      sign: '6203b66920c569f8228c3cb921f3ffb8',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356776817075459329',
+      apiId: '1431063632208685082',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',
@@ -76,10 +76,10 @@ export function momeyService(params) {
 /**百万工时损工率   产量计划完成率*/
 export function timeService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1356250124518724729",
+    url: "/dataengine-center-oneservice/list/1431063077222574093",
     method: "POST",
     data: {
-      "apiId": "1356250124518724729",
+      "apiId": "1431063077222574093",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -93,10 +93,10 @@ export function timeService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '46847fe90889330f13cdc3318d848d45',
+      sign: '9ab2d57a785c513f84cd0c5fb4fad7da',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356250124518724729',
+      apiId: '1431063077222574093',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',
@@ -107,10 +107,10 @@ export function timeService(params) {
 /**产值+发货量+产量+库存*/
 export function numberService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1356243326548087867",
+    url: "/dataengine-center-oneservice/list/1431049820141217793",
     method: "POST",
     data: {
-      "apiId": "1356243326548087867",
+      "apiId": "1431049820141217793",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -123,10 +123,10 @@ export function numberService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '2f079b53e1e63b753bb6f9807f6c6818',
+      sign: '915848290d3e70a7b8e7fbe911e12725',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356243326548087867',
+      apiId: '1431049820141217793',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',
@@ -138,10 +138,10 @@ export function numberService(params) {
 /**近30天产量*/
 export function mondService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1356244872119751767",
+    url: "/dataengine-center-oneservice/list/1431065871110334506",
     method: "POST",
     data: {
-      "apiId": "1356244872119751767",
+      "apiId": "1431065871110334506",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -156,10 +156,10 @@ export function mondService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'ef3ecc442896d925cc02d36f1107d9e3',
+      sign: 'f84acfc47847e71c67be5569b9289291',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356244872119751767',
+      apiId: '1431065871110334506',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',
@@ -170,10 +170,10 @@ export function mondService(params) {
 /**月度产量/发货量+一次合格率*/
 export function twoService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1356411403496625359",
+    url: "/dataengine-center-oneservice/list/1431065780441016356",
     method: "POST",
     data: {
-      "apiId": "1356411403496625359",
+      "apiId": "1431065780441016356",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -189,10 +189,10 @@ export function twoService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: '9c472223a9acbdb9f16bebb7002e0c40',
+      sign: '178ae23014a9fecad15ffa9a88ed84f1',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356411403496625359',
+      apiId: '1431065780441016356',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',