feat: 更新时间联调 / 移上名词解释

src/App/index.less

@@ -10,7 +10,11 @@
 //   font-family: "DINAlternate-Bold";
 //   src: url('../assets/fonts/DIN-Black.otf');
 // }
-
+.ant-tooltip-inner{
+  background-color:#000000d9;
+    border-radius: 2px;
+    border: 1px solid #69FFDE;
+}
 .app {
   color: #000;
 

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-05 09:43:29
+ * @Last Modified time: 2023-11-07 11:02:52
  */
 
 @import url("../../themes/themes.less");
@@ -252,8 +252,16 @@
         width: 4em;
         height: 3em;
         padding-right: 1em;
-        border-right: 1px solid #3d5271;
+        // border-right: 1px solid #3d5271;
+        // margin-right: 1em;
+      }
+
+      >span {
+        width: 1px;
+        height: 1.8em;
+        background: #5d5d5db8;
         margin-right: 1em;
+        margin-top: 0.2em;
       }
 
       >h1 {
@@ -487,18 +495,21 @@
                 width: 45%;
                 height: 90%;
               }
-              #echarts6_box{
+
+              #echarts6_box {
                 margin-top: -2em;
                 position: relative;
+
                 // background: url(../imgs/dataVimg/guanghuan.png) no-repeat left 43% / 102% 120%;
-                .guanghuan{
+                .guanghuan {
                   width: 102%;
-    height: 120%;
-    position: absolute;
-    left: 0;
-    top: -1.5em;
+                  height: 120%;
+                  position: absolute;
+                  left: 0;
+                  top: -1.5em;
                 }
-                #echarts6{
+
+                #echarts6 {
                   width: 100%;
                   height: 100%;
                 }
@@ -1120,7 +1131,8 @@
       text-align: right;
     }
   }
-  .testDiv{
+
+  .testDiv {
     width: 4em;
     display: flex;
     align-items: center;
@@ -1128,29 +1140,33 @@
     flex-wrap: wrap;
     margin-left: -2.2em;
     margin-top: -1.5em;
-    .p3{
+
+    .p3 {
       font-size: 0.4em;
-    margin-left: 0.2em;
-    display: inline-block;
+      margin-left: 0.2em;
+      display: inline-block;
     }
-    .p2{
+
+    .p2 {
       font-size: 0.5em;
       text-align: center;
       width: 100%;
-      color:#CDF1FF;
+      color: #CDF1FF;
       line-height: 0.3em;
       margin-top: 0.2em;
     }
-    .p1{
+
+    .p1 {
       text-align: center;
-    width: 100%;
-    display: flex;
-    align-items: baseline;
-    justify-content: center;
-    font-size: 1.6em;
-  
+      width: 100%;
+      display: flex;
+      align-items: baseline;
+      justify-content: center;
+      font-size: 1.6em;
+
     }
   }
+
   .leftContent .bottomContent {
     height: 100% !important;
 

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

@@ -715,6 +715,7 @@ export default observer(function (props) {
             src={require("@assets/imgs/dataVimg/logo.png").default}
             width="17"
           />
+          <span></span>
           <h1>运营数据中心</h1>
         </div>
         {/* {history.location.pathname === "/home/index" && (

src/pages/tqcDataVHome/api.js

@@ -37,10 +37,10 @@ export function dataengineCenterOneservice(params) {
 /**库存金额 */
 export function momeyService(params) {
   return request({
-    url: "/data-screen/dataengine-center-oneservice/list/1356247728606450795",
+    url: "/data-screen/dataengine-center-oneservice/list/1356776817075459329",
     method: "POST",
     data: {
-      "apiId": "1356247728606450795",
+      "apiId": "1356776817075459329",
       "appKey": "200000134",
       "env": "PROD",
       "reqProtocol": 1,
@@ -54,10 +54,10 @@ export function momeyService(params) {
       "useResultCache": false
     },
     headers: {
-      sign: 'c8c1b40b31930c3fd50214bf3e02ee0f',
+      sign: 'd58de970856e583f126d186662251024',
       account: 'yunxi_fuxue',
       'Cache-Control': 'no-cache',
-      apiId: '1356247728606450795',
+      apiId: '1356776817075459329',
       appKey: '200000134',
       execType: '3',
       env: 'PROD',
@@ -192,4 +192,33 @@ export function twoService(params) {
   });
 }
 
+/**更新时间*/
+export function updateTimeService(params) {
+  return request({
+    url: "/data-screen/dataengine-center-oneservice/list/1356778817327502618",
+    method: "POST",
+    data: {
+      "apiId": "1356778817327502618",
+      "appKey": "200000134",
+      "env": "PROD",
+      "reqProtocol": 1,
+      "returnFields": [
+        "etlTime"
+      ],
+      "pageNum": 1,
+      "pageSize": 10,
+      "useResultCache": false
+    },
+    headers: {
+      sign: '4365b6564b25c852fcf0228188f48114',
+      account: 'yunxi_fuxue',
+      'Cache-Control': 'no-cache',
+      apiId: '1356778817327502618',
+      appKey: '200000134',
+      execType: '3',
+      env: 'PROD',
+    }
+  });
+}
+
 

src/pages/tqcDataVHome/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: 2023-11-05 10:03:24
+ * @Last Modified time: 2023-11-06 15:18:24
  */
 
 
@@ -134,14 +134,12 @@ class LeftMenoyView extends Component {
       if (+resultCode === 0) {
         let year = [], missionsIntensity_arr = [];
         data.map((x, i) => {
-          year.push(x.indexName);
+          year.push(x.prodCatgory);
           data_style[i].value = x.indexValue;
-          data_style[i].name = x.indexName;
+          data_style[i].name = x.prodCatgory;
           missionsIntensity_arr.push(data_style[i])
         });
         this.setState({ year, missionsIntensity_arr });
-        debugger
-
         this.setData();
         this.setData2();
       }
@@ -407,7 +405,7 @@ class LeftMenoyView extends Component {
         <ul className={"name_ul"}>
           {
             this.state.year.map(x=>{
-              return (<li>x</li>)
+              return <li>{x}</li>
             })
           }
         </ul>

src/pages/tqcDataVHome/view.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 
  * @Date: 2023-10-25 10:32:44 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-11-05 11:14:56
+ * @Last Modified time: 2023-11-07 11:26:49
  */
 /*
  * @Author: dayan_hjm 
@@ -15,7 +15,7 @@ import React, { useState, useEffect, Component } from "react";
 import styles from "./style.less";
 import { useHistory, useLocation, withRouter } from "react-router-dom";
 import { observer, observable } from "mobx-react";
-import { message, Space, Form, Popconfirm, Modal, Carousel, Icon, Button } from "antd";
+import { message, Space, Form, Popconfirm, Modal, Tooltip, Icon, Button } from "antd";
 import mod from './mod';
 import { toJS } from "mobx";
 import BottomLineForSend from "./component/bottomLineForSend.jsx";
@@ -27,6 +27,7 @@ import MapView from "./component/mapView.jsx";
 import {
   timeService,
   numberService,
+  updateTimeService
 } from "./api";
 
 import 'animate.css';
@@ -38,21 +39,22 @@ class Home extends Component {
     super(props, context);
     this.store = mod;
     this.state = {
+      updateTime: '',
       changGif: false,
-      plannedCompletionData:[
-        {name:'射洪',value:78.1},
-        {name:'广东',value:12},
-        {name:'珠海',value:65},
-        {name:'潮汕',value:45},
+      plannedCompletionData: [
+        { name: '射洪', value: 78.1 },
+        { name: '广东', value: 12 },
+        { name: '珠海', value: 65 },
+        { name: '潮汕', value: 45 },
       ],
-      plannedCompletionNum:1,
-      manHourData:[
-        {name:'射洪',value:0.2},
-        {name:'广东',value:33},
-        {name:'珠海',value:65},
-        {name:'潮汕',value:65},
+      plannedCompletionNum: 1,
+      manHourData: [
+        { name: '射洪', value: 0.2 },
+        { name: '广东', value: 33 },
+        { name: '珠海', value: 65 },
+        { name: '潮汕', value: 65 },
       ],
-      manHourNum:1,
+      manHourNum: 1,
     };
     this.timer = null //定时器，用于检测同步状态
   }
@@ -61,6 +63,7 @@ class Home extends Component {
     this.fontMsgChange();
     this.getUrl();
     this.getUrl2()
+    this.getUrl3();
     setTimeout(() => {
       this.videoStart();
     }, 200)
@@ -125,81 +128,88 @@ class Home extends Component {
 
   }
 
-  async getUrl(){
-    await timeService().then(({ data=[], resultCode }) => {
+  async getUrl() {
+    await timeService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
-        let plannedCompletionData = [],manHourData = [];
-        data.map((x,i)=>{
-          if(x.indexName == '产量计划完成率'){
+        let plannedCompletionData = [], manHourData = [];
+        data.map((x, i) => {
+          if (x.indexName == '产量计划完成率') {
             plannedCompletionData.push({
-              name:x.factoryName,
-              value:x.indexValue*100,
+              name: x.factoryName,
+              value: x.indexValue * 100,
             })
-          }else{
+          } else {
             manHourData.push({
-              name:x.factoryName,
-              value:x.indexValue*100,
+              name: x.factoryName,
+              value: x.indexValue * 100,
             })
           }
         });
-        this.setState({plannedCompletionData,manHourData,plannedCompletionNum:1,manHourNum:1});
+        this.setState({ plannedCompletionData, manHourData, plannedCompletionNum: 1, manHourNum: 1 });
       }
     });
   }
-  async getUrl2(){
-    await numberService().then(({ data=[], resultCode }) => {
+  async getUrl2() {
+    await numberService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
-        let totalValue = 0,yearDecline = 0,yearSend=0,productInventory=0;
-        data.map((x,i)=>{
-          if(x.indexName == '产值'){
+        let totalValue = 0, yearDecline = 0, yearSend = 0, productInventory = 0;
+        data.map((x, i) => {
+          if (x.indexName == '产值') {
             totalValue = x.indexValue
-          }else if(x.indexName == '年度产量'){
+          } else if (x.indexName == '年度产量') {
             yearDecline = x.indexValue
-          }else if(x.indexName == '产品库存'){
+          } else if (x.indexName == '产品库存') {
             yearSend = x.indexValue
-          }else if(x.indexName == '年度产量'){
+          } else if (x.indexName == '年度产量') {
             productInventory = x.indexValue
           }
         });
-        this.store.saveState({totalValue,yearDecline,yearSend,productInventory});
+        this.store.saveState({ totalValue, yearDecline, yearSend, productInventory });
         setTimeout(() => {
           $(".shu1").numScroll();
         }, 2500)
       }
     });
   }
+  async getUrl3() {
+    await updateTimeService().then(({ data = [], resultCode }) => {
+      if (+resultCode === 0) {
+        this.setState({ updateTime: data?.[0]?.etlTime || '' })
+      }
+    });
+  }
 
-  componentDidCatch(){
+  componentDidCatch() {
     clearInterval(this.timer);
     this.timer = null;
   }
 
-  fontMsgChange(){
+  fontMsgChange() {
     this.timer = setInterval(() => {
-      const { plannedCompletionData,plannedCompletionNum,manHourData,manHourNum } = this.state;
+      const { plannedCompletionData, plannedCompletionNum, manHourData, manHourNum } = this.state;
 
       //产量计划完成率
       var p1 = document.getElementById('plannedCompletionBox');
-      const datas_ = plannedCompletionData[plannedCompletionNum-1];
-      var res = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_.value + '</span><span class="topMsg_number_2" style={{fontSize: "0.75em",color: "#fff"}}>%</span><p class="topMsg_number_p">'+datas_.name+'</p></div>';
+      const datas_ = plannedCompletionData[plannedCompletionNum - 1];
+      var res = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_.value + '</span><span class="topMsg_number_2" style={{fontSize: "0.75em",color: "#fff"}}>%</span><p class="topMsg_number_p">' + datas_.name + '</p></div>';
       p1.innerHTML = res;
 
       //百万工时损工率
       var p2 = document.getElementById('manHourBox');
-      const datas_2 = manHourData[manHourNum-1];
-      var res2 = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_2.value + '</span><span class="topMsg_number_2">%</span><p class="topMsg_number_p">'+datas_2.name+'</p></div>';
+      const datas_2 = manHourData[manHourNum - 1];
+      var res2 = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_2.value + '</span><span class="topMsg_number_2">%</span><p class="topMsg_number_p">' + datas_2.name + '</p></div>';
       p2.innerHTML = res2;
 
-      const num_ = plannedCompletionNum+1 >= plannedCompletionData.length ? 1 : plannedCompletionNum+1;
-      const num_2 = manHourNum+1 >= manHourData.length ? 1 : manHourNum+1;
-      this.setState({plannedCompletionNum:num_,manHourNum:num_2})
+      const num_ = plannedCompletionNum + 1 >= plannedCompletionData.length ? 1 : plannedCompletionNum + 1;
+      const num_2 = manHourNum + 1 >= manHourData.length ? 1 : manHourNum + 1;
+      this.setState({ plannedCompletionNum: num_, manHourNum: num_2 })
     }, 4000)
   }
 
   render() {
     const stores = this.store.state;
-    const {totalValue,yearDecline,yearSend,productInventory} = this.store.state;
-    let { changGif,plannedCompletionData, } = this.state;
+    const { totalValue, yearDecline, yearSend, productInventory } = this.store.state;
+    let { changGif, updateTime, } = this.state;
     return (
       <div className={"home_box"}>
         {/* 视频播放器 */}
@@ -212,7 +222,9 @@ class Home extends Component {
 
             <div class="topMsg2 animate__animated animate__fadeInDown animate__slower">
               <div className="topMsg">
-                <p className="topMsg_title">总产值</p>
+                <Tooltip placement="bottom" title={' ● 从1月至m-1月的产值累计，产值计算方式：销售单价*产量'}>
+                  <p className="topMsg_title">总产值</p>
+                </Tooltip>
                 <div className={changGif ? "topMsg_content changBg_topMsg_content" : "topMsg_content"}>
                   <span className="topMsg_number" class="shu1">{totalValue}</span><span className="topMsg_number_2">万元</span>
                 </div>
@@ -221,7 +233,9 @@ class Home extends Component {
 
             <div class="center_box2 animate__animated animate__fadeInDown animate__slower animate__delay-1s">
               <div className="center_box">
-                <p className="topMsg_title">库存金额</p>
+                <Tooltip placement="bottom" title={' ● 即为 t-1天的库存金额，百分比即为产品库存金额占总体金额的百分比'}>
+                  <p className="topMsg_title" style={{position: "relative",zIndex: 999999}}>库存金额</p>
+                </Tooltip>
                 <div className="topMsg_content">
                   <LeftMenoyView></LeftMenoyView>
                 </div>
@@ -230,7 +244,9 @@ class Home extends Component {
 
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-1s">
               <div className="bottomContent bigDivPd">
-                <p className="topMsg_title">月度产量/发货量</p>
+                <Tooltip placement="bottom" title={' ● m-6至m月的产量和发货量的对比数据（含外加工）当月的数据计算至t-1天'}>
+                  <p className="topMsg_title">月度产量/发货量</p>
+                </Tooltip>
                 <div className="topMsg_content">
                   <MoodSendView></MoodSendView>
                 </div>
@@ -248,20 +264,26 @@ class Home extends Component {
                       <div className="right_li">
                         <span className="topMsg_number" class="shu1">{yearDecline}</span>
                         <p className="topMsg_line"></p>
-                        <span className="topMsg_tip">年度产量/吨</span>
+                        <Tooltip placement="bottom" title={' ● 即为从1/1至t-1天的产量之和（含外加工）'}>
+                          <span className="topMsg_tip">年度产量/吨</span>
+                        </Tooltip>
                       </div>
                     </div>
                     <div className="center_li">
                       <div className="right_li">
                         <span className="topMsg_number" class="shu1">{yearSend}</span>
                         <p className="topMsg_line"></p>
-                        <span className="topMsg_tip">年度发货量/吨</span>
+                        <Tooltip placement="bottom" title={' ● 即为从当年1/1至t-1天的发货量之和（含外加工）'}>
+                          <span className="topMsg_tip">年度发货量/吨</span>
+                        </Tooltip>
                       </div>
                     </div>
                     <div className="center_li">
                       <span className="topMsg_number" class="shu1">{productInventory}</span>
                       <p className="topMsg_line"></p>
-                      <span className="topMsg_tip">产品库存/吨</span>
+                      <Tooltip placement="bottom" title={' ● t-1天的产品库存数量（含外加工）'}>
+                        <span className="topMsg_tip">产品库存/吨</span>
+                      </Tooltip>
                     </div>
                   </div>
                 </div>
@@ -269,7 +291,9 @@ class Home extends Component {
             </div>
             <div class="bottomContent3 animate__animated animate__fadeInUp animate__slower">
               <div className="bottomContent">
-                <p className="topMsg_title">近30天产量</p>
+                <Tooltip placement="bottom" title={' ● t-31 至t-1 天的产量（含外加工）'}>
+                  <p className="topMsg_title">近30天产量</p>
+                </Tooltip>
                 <div className="topMsg_content">
                   <BottomLineForSend></BottomLineForSend>
                 </div>
@@ -282,7 +306,9 @@ class Home extends Component {
           <div className="rightContent">
             <div class="topMsg2 animate__animated animate__fadeInDown animate__slower">
               <div className="topMsg bigDivPd">
-                <p className="topMsg_title">百万工时损工率</p>
+                <Tooltip placement="bottom" title={' ● 即为m-1月的百万工时损工率'}>
+                  <p className="topMsg_title">百万工时损工率</p>
+                </Tooltip>
                 <div className={changGif ? "topMsg_content changBg_topMsg_content" : "topMsg_content"} id="manHourBox">
                   <div className="topMsg_box">
                     <span className="topMsg_number" class="shu1"></span><span className="topMsg_number_2"></span>
@@ -294,7 +320,10 @@ class Home extends Component {
 
             <div class="topMsg_22 animate__animated animate__fadeInDown animate__slower">
               <div className="topMsg_2">
-                <p className="topMsg_title">一次合格率</p>
+                <Tooltip placement="bottom" title={' ● m-6至m月\n近六个月的产品一次合格率和目标值合格率；\n当月的数据计算至t-1天'}>
+                  <p className="topMsg_title">一次合格率</p>
+                </Tooltip>
+
                 <div className="topMsg_content">
                   <OneQualified></OneQualified>
                 </div>
@@ -303,7 +332,9 @@ class Home extends Component {
 
             <div class="topMsg_33 animate__animated animate__fadeInDown animate__slower animate__delay-1s">
               <div className="topMsg_3">
-                <p className="topMsg_title">产量计划完成率</p>
+                <Tooltip placement="bottom" title={' ● 即为从当年1月至m-1月的累计产量计划完成率；'}>
+                  <p className="topMsg_title">产量计划完成率</p>
+                </Tooltip>
                 <div className={changGif ? "topMsg_content changBg_topMsg_content" : "topMsg_content"} id="plannedCompletionBox">
                   <div className="topMsg_box">
                     <span className="topMsg_number" class="shu1"></span><span className="topMsg_number_2"></span>
@@ -312,10 +343,12 @@ class Home extends Component {
                 </div>
               </div>
             </div>
-            
+
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower  animate__delay-1s">
               <div className="bottomContent bigDivPd">
-                <p className="topMsg_title">碳排放</p>
+                <Tooltip placement="bottom" title={' ● 近三年的碳排放强度、碳排放总量数据'}>
+                  <p className="topMsg_title">碳排放</p>
+                </Tooltip>
                 <div className="topMsg_content">
                   <RightBottomView></RightBottomView>
                 </div>
@@ -323,9 +356,9 @@ class Home extends Component {
             </div>
           </div>
           <div className="bottom_box">
-              <p style={{color:"#6a818d"}}>
-                更新时间:2023-10-18
-              </p>
+            <p style={{ color: "#6a818d" }}>
+              更新时间 : {updateTime}
+            </p>
           </div>
 
         </div>