feat: tlk联调

config/webpack.dev.js

@@ -135,15 +135,15 @@ module.exports = merge(common, {
       "/api": {
         // target: "http://47.96.100.195:9081"
         // target: "http://dataportal-test.agile.com.cn:8081"
-        // target: "http://10.8.8.173:9081",
-        target:"https://dms.dataportal.tianqilithium.com:9000",
+        target: "http://10.8.8.173:9081",
+        // target:"https://dms.dataportal.tianqilithium.com:9000",
         changeOrigin:true,
 
       },
       "/dataengine-center-oneservice": {
         // target: "http://10.8.8.185:31233",
-        // target: "http://10.8.8.173:9081",
-        target:"https://dms.dataportal.tianqilithium.com:9000",
+        target: "http://10.8.8.173:9081",
+        // target:"https://dms.dataportal.tianqilithium.com:9000",
         changeOrigin:true,
       },
       "/mock":{

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: 2024-10-16 17:08:51
+ * @Last Modified time: 2024-10-17 11:26:42
  */
 
 @import url("../../themes/themes.less");
@@ -14,7 +14,7 @@
   }
 
   #echarts7 {
-    min-width: 600px;
+    min-width: 400px;
     width: 95%;
     height: 90%;
     >div{
@@ -244,6 +244,9 @@
     background-color: #0a091e;
 
   }
+  #app .tlkTop2 {
+    background: url(../imgs/dataVimg/topBg2.png) no-repeat 0 0 / 100% 100% #0a091e!important;
+  }
 
   #app .top {
     background: url(../imgs/dataVimg/topBg.png) no-repeat 0 0 / 100% 100% #0a091e;
@@ -654,6 +657,9 @@
             width: 100%;
             height: 80%;
           }
+          #echarts51{
+            height: 90%;
+          }
         }
       }
 

src/pages/frame/component/top/view.jsx

@@ -590,7 +590,8 @@ export default observer(function (props) {
   };
   return (
     <div class="top2 animate__animated animate__fadeInDown animate__delay-1s animate__slower">
-      <div className={$store.app.styleCommon.theme == 'chaBaiDao' ? [styles.top + ' top'] : styles.top}>
+      {/* <div className={$store.app.styleCommon.theme == 'chaBaiDao' ? [styles.top + ' top'] : (window.location.host.indexOf("home/tlk") > -1 ? styles.tlkTop2 : styles.top)}> */}
+      <div className={window.location.hash.indexOf("home/tlk") > -1 ? [styles.top + ' top tlkTop2'] : ($store.app.styleCommon.theme == 'chaBaiDao' ? [styles.top + ' top'] : styles.top)}>
         {/* 全屏按钮 */}
         <Tooltip placement="bottom" title={iptValue == 1 ? "全屏" : "退出全屏"}>
           <div className={"allP_png"}>

src/pages/tlk/api.js

@@ -44,28 +44,28 @@ export function dataengineCenterOneservice(params) {
 /**库存金额 */
 export function momeyService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1356776817075459329",
+    url: "/dataengine-center-oneservice/list/1387384636193494241",
     method: "POST",
     data: {
-      "apiId": "1356776817075459329",
-      "appKey": "200000134",
+      "apiId": "1387384636193494241",
+      "appKey": "200000137",
       "env": "PROD",
       "reqProtocol": 1,
       "returnFields": [
-        "indexName",
+        "IndexCode",
         "prodCatgory",
-        "indexValue"
+        "IndexValue"
       ],
       "pageNum": 1,
       "pageSize": 10,
       "useResultCache": false
     },
     headers: {
-      sign: 'd58de970856e583f126d186662251024',
+      sign: '850f99fb60cf4deb3aaf3b11d8f41a98',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356776817075459329',
-      appKey: '200000134',
+      apiId: '1387384636193494241',
+      appKey: '200000137',
       execType: '3',
       env: 'PROD',
     }
@@ -107,27 +107,27 @@ export function timeService(params) {
 /**产值+发货量+产量+库存*/
 export function numberService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1356243326548087867",
+    url: "/dataengine-center-oneservice/list/1385953029203023057",
     method: "POST",
     data: {
-      "apiId": "1356243326548087867",
-      "appKey": "200000134",
+      "apiId": "1385953029203023057",
+      "appKey": "200000137",
       "env": "PROD",
       "reqProtocol": 1,
       "returnFields": [
-        "indexName",
-        "indexValue"
+        "IndexCode",
+        "IndexValue"
       ],
       "pageNum": 1,
       "pageSize": 10,
       "useResultCache": false
     },
     headers: {
-      sign: '2f079b53e1e63b753bb6f9807f6c6818',
+      sign: '057cc9b7a42bbfa5177b22f75a6858d3',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356243326548087867',
-      appKey: '200000134',
+      apiId: '1385953029203023057',
+      appKey: '200000137',
       execType: '3',
       env: 'PROD',
     }
@@ -138,29 +138,29 @@ export function numberService(params) {
 /**近30天产量*/
 export function mondService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1356244872119751767",
+    url: "/dataengine-center-oneservice/list/1387839381046678787",
     method: "POST",
     data: {
-      "apiId": "1356244872119751767",
-      "appKey": "200000134",
+      "apiId": "1387839381046678787",
+      "appKey": "200000137",
       "env": "PROD",
       "reqProtocol": 1,
       "returnFields": [
-        "indexName",
-        "indexDate",
-        "indexValue",
-        "factoryProdcution"
+        "DateId",
+        "ProdQty",
+        "Avg5daysQty",
+        "AvgQty"
       ],
       "pageNum": 1,
-      "pageSize": 30,
+      "pageSize": 90,
       "useResultCache": false
     },
     headers: {
-      sign: 'ef3ecc442896d925cc02d36f1107d9e3',
+      sign: '4995cb5ad27388171ede287e7e7d32b7',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356244872119751767',
-      appKey: '200000134',
+      apiId: '1387839381046678787',
+      appKey: '200000137',
       execType: '3',
       env: 'PROD',
     }
@@ -170,30 +170,35 @@ export function mondService(params) {
 /**月度产量/发货量+一次合格率*/
 export function twoService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1356411403496625359",
+    url: "/dataengine-center-oneservice/list/1387386363429901547",
     method: "POST",
     data: {
-      "apiId": "1356411403496625359",
-      "appKey": "200000134",
+      "apiId": "1387386363429901547",
+      "appKey": "200000137",
       "env": "PROD",
       "reqProtocol": 1,
       "returnFields": [
         "bMonth",
-        "proQty",
-        "deliveryQty",
-        "qcRate",
-        "targeRate",
+        "ProdQty",
+        "ProdBudgetqty",
+        "ProdRate",
+        "DeliveryQty",
+        "QcRate",
+        "AccqcRate",
+        "ComsumptionQty",
+        "SpodBugetqty",
+        "SpodRate"
       ],
       "pageNum": 1,
       "pageSize": 10,
       "useResultCache": false
     },
     headers: {
-      sign: '9c472223a9acbdb9f16bebb7002e0c40',
+      sign: 'ed0cafc5563550631d66b42fc356ce5b',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356411403496625359',
-      appKey: '200000134',
+      apiId: '1387386363429901547',
+      appKey: '200000137',
       execType: '3',
       env: 'PROD',
     }
@@ -203,26 +208,26 @@ export function twoService(params) {
 /**更新日期*/
 export function updateTimeService(params) {
   return request({
-    url: "/dataengine-center-oneservice/list/1356778817327502618",
+    url: "dataengine-center-oneservice/list/1387847244910548243",
     method: "POST",
     data: {
-      "apiId": "1356778817327502618",
-      "appKey": "200000134",
+      "apiId": "1387847244910548243",
+      "appKey": "200000137",
       "env": "PROD",
       "reqProtocol": 1,
       "returnFields": [
-        "etlTime"
+        "etlTime",
       ],
       "pageNum": 1,
       "pageSize": 10,
       "useResultCache": false
     },
     headers: {
-      sign: '4365b6564b25c852fcf0228188f48114',
+      sign: '35efbe9a508f01e197849bd17c467d42',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356778817327502618',
-      appKey: '200000134',
+      apiId: '1387847244910548243',
+      appKey: '200000137',
       execType: '3',
       env: 'PROD',
     }

src/pages/tlk/component/bottomLineForSend.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 近30天产量
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2024-10-14 17:29:25
+ * @Last Modified time: 2024-10-17 14:24:52
  */
 
 
@@ -25,6 +25,7 @@ class BottomLineForSend extends Component {
       factoryProdcution_arr: [],
       missionsIntensity_arr: [],
       year: [],
+      AvgQty:[],
     };
   }
 
@@ -34,14 +35,15 @@ class BottomLineForSend extends Component {
   async getUrl() {
     await mondService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
-        let year = [], missionsIntensity_arr = [], factoryProdcution_arr = [];
+        let year = [], missionsIntensity_arr = [],AvgQty = [], factoryProdcution_arr = [];
         data.map((x, i) => {
-          const name_ = x.indexDate.split('-')[1] + '-' + x.indexDate.split('-')[2];
+          const name_ = x.DateId.split('-')[1] + '-' + x.DateId.split('-')[2];
           year.push(name_);
-          missionsIntensity_arr.push(x.indexValue);
-          factoryProdcution_arr.push(x.factoryProdcution)
+          missionsIntensity_arr.push(x.ProdQty);
+          AvgQty.push(x.AvgQty);
+          factoryProdcution_arr.push(x.Avg5daysQty)
         });
-        this.setState({ year, missionsIntensity_arr, factoryProdcution_arr });
+        this.setState({ year, missionsIntensity_arr, AvgQty,factoryProdcution_arr });
         this.setData();
       }
     });
@@ -92,7 +94,7 @@ class BottomLineForSend extends Component {
           type: 'category',
           // boundaryGap: ['20%', '20%'],
           axisLabel: {
-            interval: 0,
+            // interval: 0,//设置是否展示全部数据在x轴
             rotate: -60,
             textStyle: {
               color: '#7d7d7d',
@@ -198,7 +200,7 @@ class BottomLineForSend extends Component {
                 width: 2
               }
             },
-            data: [445, 89, 34, 357, 234, 333, 566, 443, 233, 444, 445, 889, 34, 367, 234, 333, 566, 443, 233, 444],//this.state.factoryProdcution_arr,
+            data: this.state.factoryProdcution_arr,
           },
           {
             name: '平均产量(Average Net Production)',
@@ -220,7 +222,7 @@ class BottomLineForSend extends Component {
                 borderWidth: 12
               }
             },
-            data: [889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889, 889,],//this.state.factoryProdcution_arr,
+            data: this.state.AvgQty,
             "smooth": true
           },
         ]

src/pages/tlk/component/leftMenoyView.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 库存金额
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2024-10-16 16:54:35
+ * @Last Modified time: 2024-10-17 15:09:42
  */
 
 
@@ -25,7 +25,20 @@ class LeftMenoyView extends Component {
     this.store = mod;
     this.state = {
       max1: [],
-      year: ["氢氧化锂（电池级）/ LHM(BG)", "氢氧化锂（工业级）/ LHM(PG)", '氢氧化锂（待检验）/ LHM(PENDING)'],
+      total:0,
+      year: [
+        {
+          name:"氢氧化锂（电池级）",
+          tips:'/ LHM(BG)',
+        },
+        {
+          name:"氢氧化锂（工业级）",
+          tips:'/ LHM(PG)',
+        },
+        {
+          name:"氢氧化锂（待检验）",
+          tips:'/ LHM(PENDING)',
+        },],
       missionsIntensity_arr: [
         { value: 0, name: "氢氧化锂（电池级）/ LHM(BG)" },
         { value: 0, name: "氢氧化锂（工业级）/ LHM(PG)" },
@@ -39,116 +52,73 @@ class LeftMenoyView extends Component {
   }
 
   async getUrl() {
-    let data_style = [{
-      value: 25, name: '', itemStyle: {
-        normal: {
-          // barBorderRadius: 15,
-          // borderColor: "rgba(141, 147, 255, 1)",
-          // borderWidth: 1,
-          color: {
-            // 完成的圆环的颜色
-            colorStops: [
-              {
-                offset: 0,
-                color: '#8D93FF', // 0% 处的颜色
-              },
-              {
-                offset: 1,
-                color: '#8D93FF', // 100% 处的颜色
-              },
-            ],
-          },
-        },
-      },
-
-    }, {
-      value: 33, name: '', itemStyle: {
-        normal: {
-          // barBorderRadius: 15,
-          // borderColor: "rgba(105, 255, 222, 1)",
-          // borderWidth: 1,
-
-          color: {
-            // 完成的圆环的颜色
-            colorStops: [
-              {
-                offset: 0,
-                color: '#FFCE00', // 0% 处的颜色
-              },
-              {
-                offset: 1,
-                color: '#FFCE00', // 100% 处的颜色
-              },
-            ],
-          },
-        },
+    let data_style = [
+      {
+        value: 55, name: '氢氧化锂（电池级）/ LHM(BG)', itemStyle: {
+          borderRadius: '30%',
+          normal: {
+            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+              offset: 0,
+              color: 'rgba(141, 147, 255, 0.7)'
+            }, {
+              offset: 1,
+              color: 'rgba(141, 147, 255, 1)'
+            }]),
+          }
+        }
       },
-
-    }, {
-      value: 35, name: '', itemStyle: {
-        normal: {
-          // barBorderRadius: 15,
-          // borderColor: "rgba(47, 210, 255, 1)",
-          // borderWidth: 1,
-
-          color: {
-            // 完成的圆环的颜色
-            colorStops: [
-              {
-                offset: 0,
-                color: '#69FFDE', // 0% 处的颜色
-              },
-              {
-                offset: 1,
-                color: '#69FFDE', // 100% 处的颜色
-              },
-            ],
-          },
-        },
+      {
+        value: 38, name: '氢氧化锂（工业级）/ LHM(PG)', itemStyle: {
+          borderRadius: '30%',
+          normal: {
+            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+              offset: 0,
+              color: 'rgba(255, 206, 0, 0.7)'
+            }, {
+              offset: 1,
+              color: 'rgba(255, 206, 0, 1)'
+            }]),
+          }
+        }
       },
-
-    }, {
-      value: 40, name: '', itemStyle: {
-        normal: {
-          // barBorderRadius: 15,
-          // borderColor: "rgba(255, 206, 0, 1)",
-          // borderWidth: 1,
-
-          color: {
-            // 完成的圆环的颜色
-            colorStops: [
-              {
-                offset: 0,
-                color: '#8D93FF', // 0% 处的颜色
-              },
-              {
-                offset: 1,
-                color: '#8D93FF', // 100% 处的颜色
-              },
-            ],
-          },
-        },
+      {
+        value: 32, name: '油氢氧化锂（待检验）/ LHM(PENDING)', itemStyle: {
+          borderRadius: '30%',
+          normal: {
+            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+              offset: 0,
+              color: 'rgba(105, 255, 222, 0.7)'
+            }, {
+              offset: 1,
+              color: 'rgba(105, 255, 222, 1)'
+            }]),
+          }
+        }
       },
-
-    }]
+    ]
     await momeyService().then(({ data = [], resultCode }) => {
-
       if (+resultCode === 0) {
-        let year = [], missionsIntensity_arr = [], max1 = [], num = [];
+        let total = 0, max1 = [], num = [];
         data.map((x, i) => {
-          if (i > 2) { return }
-          num.push(x.indexValue)
-          // year.unshift(x.prodCatgory);
-          data_style[i].value = x.indexValue;
-          data_style[i].name = this.state.year[i]// x.prodCatgory;
-          missionsIntensity_arr.push(data_style[i])
+            if(x.IndexCode == '11'){
+              data_style[0].value = x.IndexValue;
+              num.push(x.IndexValue)
+              total += Number(x.IndexValue || 0)
+            }else if(x.IndexCode == '12'){
+              num.push(x.IndexValue)
+              data_style[1].value = x.IndexValue;
+              total += Number(x.IndexValue || 0)
+            }else if(x.IndexCode == '13'){
+              num.push(x.IndexValue)
+              data_style[2].value = x.IndexValue;
+              total += Number(x.IndexValue || 0)
+            }
         });
         const max_1 = getArrMax(num);
-        for (let index = 0; index < data.length; index++) {
-          if (index > 2) { break }
-          max1.unshift(max_1 / 0.7)
+        for (let index = 0; index < data_style.length; index++) {
+          max1.unshift(max_1/0.7)
         }
-        this.setState({ missionsIntensity_arr, max1 });
+        this.setState({ missionsIntensity_arr:data_style,total,max1 });
         this.setData();
         this.setData2();
       }
@@ -158,6 +128,7 @@ class LeftMenoyView extends Component {
 
 
   setData() {
+    const new_arr = this.state.missionsIntensity_arr.reverse();
     setTimeout(() => {
       // 基于准备好的dom，初始化echarts实例
       var myChart = echarts.init(document.getElementById('echarts41'));
@@ -203,13 +174,13 @@ class LeftMenoyView extends Component {
           name: '条',
           type: 'bar',
           yAxisIndex: 0,
-          data: this.state.missionsIntensity_arr,
+          data: new_arr,
           label: {
             normal: {
               show: true,
               position: 'right',
               formatter: function (param) {
-                return getThousandNum(param.value) + '万元';
+                return getThousandNum(param.value) + 't';
                 // return param.name+"："+param.value + '万元';
 
               },
@@ -271,75 +242,18 @@ class LeftMenoyView extends Component {
   }
 
   setData2() {
-    var data = [
-      {
-        value: 55, name: '氢氧化锂（电池级）/ LHM(BG)', itemStyle: {
-          borderRadius: '30%',
-          normal: {
-            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-              offset: 0,
-              color: 'rgba(105, 255, 222, 0.3)'
-            }, {
-              offset: 1,
-              color: 'rgba(105, 255, 222, 1)'
-            }]),
-          }
-        }
-      },
-      {
-        value: 38, name: '氢氧化锂（工业级）/ LHM(PG)', itemStyle: {
-          borderRadius: '30%',
-          normal: {
-            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-              offset: 0,
-              color: 'rgba(141, 147, 255, 0.3)'
-            }, {
-              offset: 1,
-              color: 'rgba(141, 147, 255, 1)'
-            }]),
-          }
-        }
-      },
-      {
-        value: 32, name: '油氢氧化锂（待检验）/ LHM(PENDING)', itemStyle: {
-          borderRadius: '30%',
-          normal: {
-            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-              offset: 0,
-              color: 'rgba(255, 206, 0, 0.3)'
-            }, {
-              offset: 1,
-              color: 'rgba(255, 206, 0, 1)'
-            }]),
-          }
-        }
-      },
-    ];
 
     setTimeout(() => {
       // 基于准备好的dom，初始化echarts实例
       var myChart = echarts.init(document.getElementById('echarts61'));
       var option = {
-        // title:{
-        // text: '208768t\n总库存',
-        //     top: '45%',
-        //     textAlign: 'center',
-        //     left: '50%',
-        //     textStyle: {
-        //         color: ' #fff',
-        //         fontSize: 22,
-        //         fontWeight: '600',
-        //         lineHeight: 60,
-        //     },
-        //   },
         calculable: true,
         series: [
           {
             type: 'pie',
             radius: ['50%', '65%'],
             center: ['50%', '50%'],
-            // roseType: 'radius',
-            data: data,
+            data: this.state.missionsIntensity_arr,
             itemStyle: {
               borderRadius: 70,
             },
@@ -363,7 +277,7 @@ class LeftMenoyView extends Component {
   }
 
   render() {
-
+    const { total } = this.state;
     return (
       <div className={["eacharView cbLeftMenoyView"]}>
         <div id="echarts6_box">
@@ -376,7 +290,7 @@ class LeftMenoyView extends Component {
           <div id="echarts61"></div>
           <div className="text_total">
               <p>
-                    <span className="topMsg_number" class="shu1">445677</span>
+                    <span className="topMsg_number" class="shu1">{total}</span>
                     <span className="topMsg_number_2">t</span>
               </p>
               <span className="topMsg_number_3">总库存</span>
@@ -385,7 +299,7 @@ class LeftMenoyView extends Component {
         <ul className={"name_ul"}>
           {
             this.state.year.map(x => {
-              return <li>{x}</li>
+              return (<li>{x.name}<span style={{fontSize:"0.7em"}}>{x.tips}</span></li>)
             })
           }
         </ul>

src/pages/tlk/component/mapView.jsx

@@ -101,7 +101,7 @@ class MapView extends Component {
     const { changGif } = this.state;
     return (
       <div class="video_box video_box_hide animate__animated animate__fadeOut animate__delay-2s animate__slower">
-          <video src={require("@assets/imgs/dataVImg/homeVideo.mp4").default} autoplay="autoplay" class="video1"></video>
+          <video src={require("@assets/imgs/dataVImg/tlk.mp4").default} autoplay="autoplay" class="video1"></video>
       </div>
     )
   }

src/pages/tlk/component/moodSendView.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 月度产量/发货量
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2024-10-16 10:56:56
+ * @Last Modified time: 2024-10-17 11:05:49
  */
 
 
@@ -38,10 +38,10 @@ class MoodSendView extends Component {
         let year = [], proQty = [], deliveryQty = [];
         data.map((x, i) => {
           year.push(x.bMonth);
-          proQty.push(x.proQty)
-          deliveryQty.push(x.deliveryQty)
+          // proQty.push(x.proQty)
+          deliveryQty.push(x?.DeliveryQty ? x?.DeliveryQty.toFixed(1) : 0)
         });
-        this.setState({ year, deliveryQty,proQty });
+        this.setState({ year, deliveryQty });
         this.setData();
       }
     });

src/pages/tlk/component/oneQualified.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 一次合格率
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2024-10-16 10:56:28
+ * @Last Modified time: 2024-10-17 11:28:28
  */
 
 
@@ -25,6 +25,7 @@ class BottomLineForSend extends Component {
       proQty:[],
       year:[],
       deliveryQty:[],
+      SpodRate:[]
     };
   }
 
@@ -35,13 +36,14 @@ class BottomLineForSend extends Component {
   async getUrl() {
     await twoService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
-        let year = [], proQty = [], deliveryQty = [];
+        let year = [], proQty = [], deliveryQty = [], SpodRate = [];
         data.map((x, i) => {
           year.push(x.bMonth);
-          proQty.push(x.proQty)
-          deliveryQty.push(x.deliveryQty)
+          proQty.push(x?.SpodBugetqty ? x?.SpodBugetqty.toFixed(1) : 0)
+          deliveryQty.push(x?.ComsumptionQty ? x?.ComsumptionQty.toFixed(1) : 0)
+          SpodRate.push(x?.SpodRate ? (x?.SpodRate*100).toFixed(1) : 0)
         });
-        this.setState({ year, deliveryQty,proQty });
+        this.setState({ year, deliveryQty,proQty,SpodRate });
         this.setData();
       }
     });
@@ -66,9 +68,9 @@ class BottomLineForSend extends Component {
       var option = {
         grid: {
           left: '2%',
-          top: '30%',
+          top: '15%',
           right: '0%',
-          bottom: '0%',
+          bottom: '5%',
           containLabel: true
         },
 
@@ -89,7 +91,7 @@ class BottomLineForSend extends Component {
         legend: {
           data: ['锂辉石消耗量\n(Spodunene Consumption)', '锂辉石计划消耗量\n(Spodumene Consumption Plan)','锂辉石计划执行率\n(Execution rate of spodumene plan)'],
           fontFamily:'DingTalkJinBuTi',
-          padding: [15, 0, 20, 0],
+          padding: [0, 0, 10, 0],
           textStyle:{
             color: "#CDF1FF",
             fontSize:9,
@@ -226,7 +228,8 @@ class BottomLineForSend extends Component {
             },
             data: this.state.deliveryQty
           },
-          {data: [8000, 16000, 20000,45566,3345,33445],
+          {
+            data: this.state.SpodRate,
             type: 'line',
             showAllSymbol: true,
             yAxisIndex: 1,

src/pages/tlk/component/oneSendView.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 月度产量/发货量
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2024-10-16 10:55:36
+ * @Last Modified time: 2024-10-17 11:01:37
  */
 
 
@@ -25,6 +25,7 @@ class OneSendView extends Component {
       proQty:[],
       year:[],
       deliveryQty:[],
+      ProdRate:[]
     };
   }
 
@@ -35,13 +36,14 @@ class OneSendView extends Component {
   async getUrl() {
     await twoService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
-        let year = [], proQty = [], deliveryQty = [];
+        let year = [], proQty = [], deliveryQty = [],ProdRate= [];
         data.map((x, i) => {
           year.push(x.bMonth);
-          proQty.push(x.proQty)
-          deliveryQty.push(x.deliveryQty)
+          proQty.push(x?.ProdQty ? x?.ProdQty.toFixed(1) : 0)
+          deliveryQty.push(x?.ProdBudgetqty ? x?.ProdBudgetqty.toFixed(1) : 0)
+          ProdRate.push(x?.ProdRate ? (x?.ProdRate*100).toFixed(1) : 0)
         });
-        this.setState({ year, deliveryQty,proQty });
+        this.setState({ year, deliveryQty,ProdRate,proQty });
         this.setData();
       }
     });
@@ -220,7 +222,8 @@ class OneSendView extends Component {
             },
             data: this.state.deliveryQty
           },
-          {data: [8000, 16000, 20000,45566,3345,33445],
+          {
+            data: this.state.ProdRate,
             type: 'line',
             showAllSymbol: true,
             yAxisIndex: 1,

src/pages/tlk/component/rightBottomView.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 近30天产量
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2024-10-16 10:57:51
+ * @Last Modified time: 2024-10-17 11:30:23
  */
 
 
@@ -11,7 +11,7 @@ import styles from "../style.less";
 import { useHistory, useLocation, withRouter } from "react-router-dom";
 import mod from '../mod';
 import {
-  mondService,
+  twoService,
 } from "../api";
 
 @withRouter
@@ -22,7 +22,7 @@ class RightBottomView extends Component {
     super(props, context);
     this.store = mod;
     this.state = {
-      factoryProdcution_arr: [],
+      AccqcRate: [],
       missionsIntensity_arr: [],
       year: [],
     };
@@ -32,16 +32,15 @@ class RightBottomView extends Component {
     this.getUrl()
   }
   async getUrl() {
-    await mondService().then(({ data = [], resultCode }) => {
+    await twoService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
-        let year = [], missionsIntensity_arr = [], factoryProdcution_arr = [];
+        let year = [], missionsIntensity_arr = [], AccqcRate = [];
         data.map((x, i) => {
-          const name_ = x.indexDate.split('-')[1] + '-' + x.indexDate.split('-')[2];
-          year.push(name_);
-          missionsIntensity_arr.push(x.indexValue);
-          factoryProdcution_arr.push(x.factoryProdcution)
+          year.push(x.bMonth);
+          missionsIntensity_arr.push(x?.QcRate ? (x?.QcRate * 100).toFixed(1) : 0)
+          AccqcRate.push(x?.AccqcRate ? (x?.AccqcRate*100).toFixed(1) : 0)
         });
-        this.setState({ year, missionsIntensity_arr, factoryProdcution_arr });
+        this.setState({ year,AccqcRate,missionsIntensity_arr });
         this.setData();
       }
     });
@@ -70,9 +69,9 @@ class RightBottomView extends Component {
         },
         // formatter: `日期: {b0}<br />{a0}: {c0}吨<br />{a1}: {c1}吨`,
         grid: {
-          left: '5%',
+          left: '0%',
           top: '15%',
-          right: '4%',
+          right: '0%',
           bottom: '10%',
           containLabel: true
         },
@@ -92,15 +91,16 @@ class RightBottomView extends Component {
           type: 'category',
           // boundaryGap: ['20%', '20%'],
           axisLabel: {
+            /*inside: true,*/
+            color: "rgba(255,255,255,.6)",
             interval: 0,
-            rotate: -60,
             textStyle: {
               color: '#7d7d7d',
-              fontSize: 11,
+              fontSize: 10
+
             },
-            showMaxLabel: true,//关键部分，显示最后一个label
           },
-          axisLine: {
+        axisLine: {
             lineStyle: {
               color: 'rgba(255,255,255,.1)',
               type: 'dashed',
@@ -136,7 +136,7 @@ class RightBottomView extends Component {
             },
           },
           axisLabel: {
-            formatter: "{value}t",
+            formatter: "{value}%",
             textStyle: {
               color: '#7d7d7d',
               fontSize: 11
@@ -186,7 +186,7 @@ class RightBottomView extends Component {
                 width: 2
               }
             },
-            data: [445, 89, 34, 357, 234, 333, 566, 443, 233, 444, 445, 889, 34, 367, 234, 333, 566, 443, 233, 444],//this.state.factoryProdcution_arr,
+            data: this.state.AccqcRate,
           },
         ]
       };

src/pages/tlk/mod.js

@@ -17,6 +17,8 @@ const defaultState = {
   totalValue:0,
   yearDecline:0,
   yearSend:0,
+  implementationOfThePlan:0,
+  annualPlan:0,
   productInventory:0,
   list:[{name:'营运数据大屏'},{name:'经营大盘'},{name:'到家专题'},{name:'门店大盘'},{name:'自助跑数SQL平台'},{name:'月度包材预警跑数模板'}],
   rightlist:[],

src/pages/tlk/style.less

@@ -10,9 +10,13 @@
   width: 100%;
   height: 10px;
 }
-
 .tlk_box{
+  background: url(../../assets/imgs/dataVImg/homeBgDataV2.jpg) no-repeat 0 -10% #041b40!important;
   :global {
+    .video_box {
+      width: 100% !important;
+      background: url(../../assets/imgs/dataVImg/homeBgDataV2.jpg) no-repeat 0 -10em / 108% 120% #041b40!important;
+    }
     .leftContent .bottomContent2{
       height: 31%!important;
       .topMsg_content{
@@ -48,8 +52,8 @@
     }
     
     .rightContent .topMsg_22{
-      height: 31%!important;
-      margin-bottom: 3%;
+      height: 30%!important;
+      margin-bottom: 5%;
       #echarts5{
         height: 100%!important;
       }
@@ -65,6 +69,11 @@
       width: 25%!important;
       margin-left: 1%;
     }
+    .video_box video{
+      width: 100%!important;
+      height: 70%!important;
+      padding: 0 0 9% 0!important;
+    }
     .rightContent .topMsg .topMsg_content .topMsg_box .topMsg_number_p{
       margin-bottom: 0.1rem;
       color: #84b8dc!important;
@@ -75,10 +84,14 @@
       font-size: 0.5em!important;
       margin-bottom: 0.13rem;
     }
+    .rightContent .topMsg_2 .topMsg_content{
+      height: 100%!important;
+    }
     .rightContent .topMsg .topMsg_content .topMsg_box{
       width: 32%!important;
     }
     .topMsg_title{
+      background: url(../../assets/imgs/dataVimg/tipleBg2.png) no-repeat 0 0 / 100% 100%!important;
       color: #e0f6ff!important;
       .topMsg_tips{
         font-size: 0.7em;

src/pages/tlk/view.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 
  * @Date: 2023-10-25 10:32:44 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2024-10-16 17:00:52
+ * @Last Modified time: 2024-10-17 10:46:43
  */
 /*
  * @Author: dayan_hjm 
@@ -182,19 +182,21 @@ class Home extends Component {
   async getUrl2() {
     await numberService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
-        let totalValue = 0, yearDecline = 0, yearSend = 0, productInventory = 0;
+        let totalValue = 0, productInventory=0,yearDecline = 0, yearSend = 0, annualPlan = 0, implementationOfThePlan = 0;
         data.map((x, i) => {
-          if (x.indexName == '产值') {
-            totalValue = x.indexValue
-          } else if (x.indexName == '年度产量') {
-            yearDecline = x.indexValue
-          } else if (x.indexName == '产品库存') {
-            yearSend = x.indexValue
-          } else if (x.indexName == '年度发货量') {
-            productInventory = x.indexValue
+          if (x.IndexCode == '1') {
+            yearDecline = x.IndexValue
+          } else if (x.IndexCode == '2') {
+            productInventory = x.IndexValue
+          } else if (x.IndexCode == '3') {
+            yearSend = x.IndexValue
+          } else if (x.IndexCode == '4') {
+            annualPlan = x.IndexValue //年度产量完成率
+          } else if (x.IndexCode == '5') {
+            implementationOfThePlan = x.IndexValue //年度锂辉石执行率
           }
         });
-        this.store.saveState({ totalValue, yearDecline, yearSend, productInventory });
+        this.store.saveState({ totalValue, yearDecline, yearSend, productInventory,annualPlan,implementationOfThePlan });
         setTimeout(() => {
           $(".shu1").numScroll();
         }, 2500)
@@ -252,7 +254,7 @@ class Home extends Component {
 
   render() {
     const stores = this.store.state;
-    let { totalValue, yearDecline, yearSend, productInventory } = this.store.state;
+    let { totalValue, yearDecline, yearSend, productInventory,annualPlan,implementationOfThePlan } = this.store.state;
     let { changGif, updateTime, changNun } = this.state;
     return (
       <div className={[styles.tlk_box + ' home_box ']}>
@@ -279,7 +281,7 @@ class Home extends Component {
         {/* 视频播放器 */}
         <MapView></MapView>
         <div className={"video_box"}>
-          <video src={require("@assets/imgs/dataVImg/homeVideo2.mp4").default} autoplay="autoplay" loop="loop" class="video2 center_box2 animate__animated animate__fadeIn animate__delay-1s"></video>
+          <video src={require("@assets/imgs/dataVImg/tlk2.mp4").default} autoplay="autoplay" loop="loop" class="video2 center_box2 animate__animated animate__fadeIn animate__delay-1s"></video>
         </div>
         <div className={[styles.home + " home cbHome"]}>
           <div className="leftContent">
@@ -364,7 +366,7 @@ class Home extends Component {
                         !changNun && <span className="topMsg_number" class="shu1">{yearSend}</span>
                       }
                       {
-                        changNun && <span className="topMsg_number">{getThousandNum(yearSend)}</span>
+                        changNun && <span className="topMsg_number">{getThousandNum(yearSend,true)}%</span>
                       }
                       <p className="topMsg_line"></p>
                       <Tooltip placement="bottom" title={' ● 截止更新日期的主产品库存数量。'}>
@@ -401,14 +403,14 @@ class Home extends Component {
                     <p className="topMsg_number_p topMsg_number_p_big">年度产量计划完成率</p>
                     <p className="topMsg_number_p">Completion rate of</p>
                     <p className="topMsg_number_p" style={{marginBottom:'0.05rem'}}>annual production plan</p>
-                    <span className="topMsg_number" class="shu1">445677</span>
+                    <span className="topMsg_number" class="shu1">{getThousandNum(annualPlan,true)}</span>
                     <span className="topMsg_number_2">%</span>
                   </div>
                   <div className="topMsg_box">
                     <p className="topMsg_number_p topMsg_number_p_big">年度锂辉石计划执行率</p>
                     <p className="topMsg_number_p">Annual lithium pyroxene</p>
                     <p className="topMsg_number_p" style={{marginBottom:'0.05rem'}}>plan execution rate</p>
-                    <span className="topMsg_number" class="shu1">97.89</span>
+                    <span className="topMsg_number" class="shu1">{getThousandNum(implementationOfThePlan,true)}</span>
                     <span className="topMsg_number_2">%</span>
                   </div>
                 </div>

src/utils/util.js

@@ -981,11 +981,11 @@ export function mapTree2(tree, c_name, la_name, isChildren = false, fathers) {
   return par;
 }
 
-export function getThousandNum(num){
+export function getThousandNum(num,need100){
   if(!num){return 0}
   //统一保留2位小数
   // num = Math.floor(num*100)/100;
-  num = Number(num.toFixed(2));
+  num = Number(need100 ? (num*100).toFixed(2) : num.toFixed(2));
   var TextBox8_all = num.toLocaleString();
   // var text8_sum = TextBox8_all.replace(/(\d{1,3})(?=(\d{3})+(?:$|\.))/g,'$1,');
   if(TextBox8_all.split('.')[1] && TextBox8_all.split('.')[1].length == 1){