style: style

src/assets/css/styleTemplate.less

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 茶百道主题样式
  * @Date: 2022-10-27 10:56:37 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-11-16 16:23:00
+ * @Last Modified time: 2023-11-21 17:43:56
  */
 
 @import url("../../themes/themes.less");
@@ -350,8 +350,8 @@
       position: absolute;
       left: 0;
       top: 0;
-      width: 100%;
-      background: url(../imgs/dataVimg/homeBgDataV.png) no-repeat 0 -10em / 100% 120% #041b40;
+      width: 98.5%;
+      background: url(../imgs/dataVimg/homeBgDataV.png) no-repeat 0 -10em / 108% 120% #041b40;
       height: 100%;
       display: flex;
       align-items: center;

src/pages/gvc/api.js

@@ -11,27 +11,29 @@ export function checkToken(params) {
 /**各基地库存明细 */
 export function smallMaterialService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1357515512842851674",
+    url: "/dataengine-center-oneservice/list/1358057393917040084",
     method: "POST",
     data: {
-      "apiId": "1357515512842851674",
+      "apiId": "1358057393917040084",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
       "returnFields": [
-        "factoryNameCode",
+        "factoryCode",
+        "factoryName",
+        "prodCatgoryCode",
         "prodCatgory",
         "indexValue",
       ],
       "pageNum": 1,
-      "pageSize": 10,
+      "pageSize": 50,
       "useResultCache": false
     },
     headers: {
-      sign: '74cd2e9daad07a24d6dd052d0e099a04',
+      sign: 'fdb551d8c6a01d87c58970d519752d81',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1357515512842851674',
+      apiId: '1358057393917040084',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',
@@ -43,14 +45,15 @@ export function smallMaterialService(params) {
 /**各基地日，月累计，年累计产量 */
 export function smallDayService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1357506251394946361",
+    url: "/dataengine-center-oneservice/list/1358059456248976873",
     method: "POST",
     data: {
-      "apiId": "1357506251394946361",
+      "apiId": "1358059456248976873",
       "appKey": "200000135",
       "env": "PROD",
       "reqProtocol": 1,
       "returnFields": [
+        "factoryCode",
         "factoryNameCode",
         "dateType",
         "indexValue"
@@ -60,10 +63,10 @@ export function smallDayService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'a31d189029e2b940a6d5e5188b6b49cf',
+      sign: '5f270b133af668b3631fbe7dbff9ebe4',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1357506251394946361',
+      apiId: '1358059456248976873',
       appKey: '200000135',
       execType: '3',
       env: 'PROD',

src/pages/gvc/mod.js

@@ -55,7 +55,7 @@ const defaultState = {
           indexValue:33,
         },
         {
-          prodCatgory:"产品-氯化锂",
+          prodCatgory:"原料-氯化锂",
           indexValue:44,
         },
         {
@@ -91,7 +91,7 @@ const defaultState = {
           indexValue:33,
         },
         {
-          prodCatgory:"产品-氯化锂",
+          prodCatgory:"原料-氯化锂",
           indexValue:44,
         },
         {
@@ -127,7 +127,7 @@ const defaultState = {
           indexValue:33,
         },
         {
-          prodCatgory:"产品-氯化锂",
+          prodCatgory:"原料-氯化锂",
           indexValue:44,
         },
         {
@@ -163,7 +163,7 @@ const defaultState = {
           indexValue:33,
         },
         {
-          prodCatgory:"产品-氯化锂",
+          prodCatgory:"原料-氯化锂",
           indexValue:44,
         },
         {
@@ -199,7 +199,7 @@ const defaultState = {
           indexValue:33,
         },
         {
-          prodCatgory:"产品-氯化锂",
+          prodCatgory:"原料-氯化锂",
           indexValue:44,
         },
         {

src/pages/gvc/style.less

@@ -3,8 +3,8 @@
 @assetUrl: "../../assets/imgs/home";
 
 .home_box {
-  // background: url(../../assets/imgs/gvc/homeBgDataV.png) no-repeat 0 -10em / 100% 120% #041b40;
-  background: #000;
+  background: url(../../assets/imgs/gvc/homeBgDataV.png) no-repeat 0 -10em / 100% 120% #041b40;
+  // background: #000;
 
   :global {
 
@@ -14,7 +14,7 @@
 
       .gvc_video {
         align-items: flex-start;
-        background: #000;
+        // background: #000;
 
         video {
           width: 100%;
@@ -268,15 +268,16 @@
               align-items: center;
               justify-content: space-between;
               padding: 0 1em;
-              background: linear-gradient(0deg, #ffffff00 20%, #ffffff29 100%);
+              background: 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.7em 1em 0;
+              padding: 0.2em 1em 0;
               color: #d7d7d7;
               align-items: flex-start;
+              height: auto;
 
               >div>span {
                 display: block;
@@ -309,7 +310,8 @@
             color: #F1E9E0;
             margin-bottom: 0.6em;
           }
-          .eacharView{
+
+          .eacharView {
             height: auto;
             overflow: hidden;
           }
@@ -371,14 +373,16 @@
             bottom: 3%;
           }
         }
+
         @media (min-height: 900px) {
           .rightContent {
             bottom: 3%;
           }
         }
+
         @media (min-height: 1000px) {
           .rightContent {
-            bottom:-5%;
+            bottom: -5%;
           }
         }
       }

src/pages/gvc/view.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm  产供销价值链
  * @Date: 2023-11-10 10:19:34 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-11-17 15:52:57
+ * @Last Modified time: 2023-11-21 17:46:28
  */
 
 import React, { useState, useEffect, Component } from "react";
@@ -194,7 +194,7 @@ class Gvc extends Component {
   async getUrl4() {
     await smallShopService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
-        const style__ = [{}, { left: "88%", top: "28%" }, { left: "70%", top: "42%" }, { left: "52%", top: "56%" }, { left: "11%", top: "88%" }, { left: "30%", top: "73%" }]
+        const style__ = [{}, { left: "88%", top: "28%" }, { left: "70%", top: "46%" }, { left: "52%", top: "59%" }, { left: "11%", top: "92%" }, { left: "29%", top: "76%" }]
         data = data.map((x, i) => {
           return {
             ...x,
@@ -208,8 +208,7 @@ class Gvc extends Component {
         const d_1 = data.filter(x => { return x.factoryCode == 4 })[0];
         const d_2 = data.filter(x => { return x.factoryCode == 5 })[0];
         const d_3 = data.filter(x => { return x.factoryCode == 3 })[0];
-        // const d_4 = data.filter(x=>{return x.factoryCode == 2})[0];
-        const d_4 = data.filter(x => { return x.factoryCode == null })[0];
+        const d_4 = data.filter(x=>{return x.factoryCode == 2})[0];
         const d_5 = data.filter(x => { return x.factoryCode == 1 })[0];
         let old_imgMsgData = this.store.state.imgMsgData;
         old_imgMsgData[3] = d_1;
@@ -226,7 +225,7 @@ class Gvc extends Component {
     await smallDayService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
         function getItems(num) {
-          const datas = data.filter(x => { return x.factoryNameCode == num });
+          const datas = data.filter(x => { return x.factoryCode == num });
           const par = {
             day: datas?.filter(x => { return x.dateType == 1 })?.[0]?.indexValue || 0,
             mood: datas?.filter(x => { return x.dateType == 2 })?.[0]?.indexValue || 0,
@@ -257,32 +256,38 @@ class Gvc extends Component {
     await smallMaterialService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
         function getItems(num) {
-          const datas = data.filter(x => { return x.factoryNameCode == num });
-          const par = {
-            rawMaterial: [
-              {
-                prodCatgory: "原料-鲤辉石",
-                indexValue: datas?.filter(x => { return x.prodCatgory == 1 })?.[0]?.indexValue || 0,
-              },
-              {
-                prodCatgory: "产品-碳酸锂",
-                indexValue: datas?.filter(x => { return x.prodCatgory == 2 })?.[0]?.indexValue || 0,
-              },
-              {
-                prodCatgory: "产品-氯化锂",
-                indexValue: datas?.filter(x => { return x.prodCatgory == 3 })?.[0]?.indexValue || 0,
-              },
-              {
-                prodCatgory: "产品-氢氧化锂",
-                indexValue: datas?.filter(x => { return x.prodCatgory == 4 })?.[0]?.indexValue || 0,
-              },
-              {
-                prodCatgory: "产品-金属锂",
-                indexValue: datas?.filter(x => { return x.prodCatgory == 5 })?.[0]?.indexValue || 0,
-              }
-            ]
-          }
-          return par
+          const datas = data.filter(x => { return x.factoryCode == num });
+          const rawMaterial = datas.map((item,index)=>{
+            return {
+              prodCatgory:item.prodCatgory,
+              indexValue:item.indexValue,
+            }
+          })
+          // const par = {
+          //   rawMaterial: [
+          //     {
+          //       prodCatgory: "原料-鲤辉石",
+          //       indexValue: datas?.filter(x => { return x.prodCatgory == 1 })?.[0]?.indexValue || 0,
+          //     },
+          //     {
+          //       prodCatgory: "产品-碳酸锂",
+          //       indexValue: datas?.filter(x => { return x.prodCatgory == 2 })?.[0]?.indexValue || 0,
+          //     },
+          //     {
+          //       prodCatgory: "原料-氯化锂",
+          //       indexValue: datas?.filter(x => { return x.prodCatgory == 3 })?.[0]?.indexValue || 0,
+          //     },
+          //     {
+          //       prodCatgory: "产品-氢氧化锂",
+          //       indexValue: datas?.filter(x => { return x.prodCatgory == 4 })?.[0]?.indexValue || 0,
+          //     },
+          //     {
+          //       prodCatgory: "产品-金属锂",
+          //       indexValue: datas?.filter(x => { return x.prodCatgory == 5 })?.[0]?.indexValue || 0,
+          //     }
+          //   ]
+          // }
+          return {rawMaterial:rawMaterial}
         }
 
         const d_1 = getItems(5);
@@ -414,15 +419,8 @@ class Gvc extends Component {
                         {
                           item.cumulativeProduction !== null && <div className="hoverR">
                             <div className="hoverDiv chanL">
-                              <div style={{ width: "38%" }}>
-                                <p className="title">
-                                  产量/吨
-                                </p>
-                                <span>日：{item.day}</span>
-                                <span>月：{item.mood}</span>
-                                <span>年：{item.year}</span>
-                              </div>
-                              <div style={{ width: "62%" }}>
+                              {/* <div style={{ width: "62%","textAlign":'right' }}> */}
+                              <div style={{ width: "70%"}}>
                                 <p className="title">
                                   库存/吨
                                 </p>
@@ -432,6 +430,14 @@ class Gvc extends Component {
                                   })
                                 }
                               </div>
+                              <div style={{ width: "38%" }}>
+                                <p className="title">
+                                  产量/吨
+                                </p>
+                                <span>日：{item.day}</span>
+                                <span>月：{item.mood}</span>
+                                <span>年：{item.year}</span>
+                              </div>
                             </div>
                           </div>
                         }