feat: 大屏全屏 / 右箭头切换 /改文案

src/assets/css/styleTemplate.less

@@ -341,6 +341,14 @@
     width: 100%;
     height: 100%;
     background: url(../imgs/dataVimg/homeBgDataV.png) no-repeat 0 -10em / 100% 120% #041b40;
+    .rightJ_png{
+      position: absolute;
+        z-index: 99;
+        width: 2em;
+        right: 0.8em;
+        top: 48%;
+        opacity: .5;
+    }
 
     .video_box_hide {
       z-index: 12;

src/pages/frame/component/top/style.less

@@ -5,7 +5,7 @@
   width: 100%;
   z-index: 100;
   height: 50px;
-  background:#0a091e;
+  background: #0a091e;
   background-color: #0a091e;
   color: #fff;
   padding: 0 16px;
@@ -16,6 +16,15 @@
   user-select: none;
 
   :global {
+    .allP_png {
+      position: absolute;
+      right: 1em;
+      top: 2em;
+      border: 1px solid #ffffff7a;
+      border-radius: 5px;
+      opacity: .8;
+    }
+
     .logo {
       margin-right: 18px;
 
@@ -24,13 +33,14 @@
         transform: translateY(-3px);
       }
     }
+
     .d_logo {
       height: 28px;
       // border-left: 1px solid #4F5C7D;
       padding-left: 18px;
       vertical-align: top;
       padding-right: 10px;
-      line-height:23px;
+      line-height: 23px;
     }
 
     .user_cont {
@@ -80,13 +90,13 @@
       margin-right: 8px;
       white-space: nowrap;
     }
-    
+
     .menu {
       display: flex;
       font-size: 13px;
       text-align: center;
       // flex-wrap: wrap;
-      
+
       li {
         list-style: none;
         padding: 0;
@@ -95,8 +105,8 @@
         width: 80px;
         white-space: nowrap;
         color: rgba(255, 255, 255, 0.7);
-          overflow: hidden;
-          text-overflow: ellipsis;
+        overflow: hidden;
+        text-overflow: ellipsis;
         // &>span{
         //   display: inline-block;
         //   overflow: hidden;
@@ -119,7 +129,7 @@
         }
       }
     }
-   
+
     //联系我们
     .contact {
       display: flex;
@@ -134,6 +144,7 @@
       margin-right: 15px;
       cursor: pointer;
       position: relative;
+
       .count_num {
         border-radius: 8px;
         height: 16px;
@@ -153,9 +164,9 @@
       width: 50px;
       color: #1c45b4;
       cursor: pointer;
-      min-width: 50px!important;
+      min-width: 50px !important;
       line-height: 48px;
-      margin-left: 0!important;
+      margin-left: 0 !important;
     }
 
     .controler {
@@ -180,46 +191,53 @@
     .senior {
       margin-right: 12px;
     }
+
     .iconfont {
       font-size: 12px;
     }
+
     .style {
       color: rgba(255, 255, 255, 0.5);
       font-size: 12px;
+
       .style_change {
         padding-left: 5px;
         cursor: pointer;
       }
     }
+
     .split_line {
       color: rgba(255, 255, 255, 0.5);
       padding: 0 15px;
     }
   }
+
   // .ant-menu>[role="menuitem"]:last-child{
   //   display: none;
   // }
 }
 
 :global {
-  .ant-menu > [data-menu-id*="alipay"] {
+  .ant-menu>[data-menu-id*="alipay"] {
     display: none;
   }
+
   // .ant-dropdown-arrow{
   //   border-color: #000 transparent transparent #000!important;
   // }
-  .ant-dropdown-menu{
+  .ant-dropdown-menu {
     // opacity: 0.8;
-    border-radius: 7px!important;
+    border-radius: 7px !important;
   }
 
-    //下拉(个人中心、修改密码、退出登录)
-    .dropSelect {
-      .ant-dropdown-menu-item-active {
-        color: #009F95;
-      }
+  //下拉(个人中心、修改密码、退出登录)
+  .dropSelect {
+    .ant-dropdown-menu-item-active {
+      color: #009F95;
     }
+  }
 }
+
 .feedbackModal {
   :global {
     .ant-modal-body {

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

@@ -132,7 +132,7 @@ export default observer(function (props) {
   const menuRef = useRef(null);
   const [form] = Form.useForm();
   const numRef = useRef();
-  const [iptValue, setIptValue] = useState(0);
+  const [iptValue, setIptValue] = useState(1);
   const [showContactModalVisible, setShowContactModalVisible] = useState(false); //控制联系我们对话框弹出
   const [probType, setProbType] = useState(
     0
@@ -589,13 +589,45 @@ export default observer(function (props) {
     // });
   };
   const name_arr = {
-    "#/home/gvc":"产供销价值链",
-    "#/home/operation":"运营数据中心",
+    "#/home/gvc": "产供销价值链",
+    "#/home/operation": "运营数据中心",
   }
-   window.lo
+  window.lo
   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}>
+        {/* 全屏按钮 */}
+        <Tooltip placement="bottom" title={ iptValue == 1 ? "全屏" : "退出全屏"}>
+          {
+            iptValue == 1 ? <img src={require("@assets/imgs/iconJpg/allP.png").default} alt="" style={{ width: "2em" }} className={"allP_png"} onClick={() => {
+              var element = document.documentElement;
+              if (element.requestFullscreen) {
+                element.requestFullscreen();
+              } else if (element.mozRequestFullScreen) {   // 兼容火狐
+                element.mozRequestFullScreen();
+              } else if (element.webkitRequestFullscreen) {    // 兼容谷歌
+                element.webkitRequestFullscreen();
+              } else if (element.msRequestFullscreen) {   // 兼容IE
+                element.msRequestFullscreen();
+              }
+              setIptValue(2)
+            }} /> : <img src={require("@assets/imgs/iconJpg/allP2.png").default} alt="" style={{ width: "2em" }} className={"allP_png"} onClick={() => {
+              var element = document.documentElement;
+              if(document.exitFullscreen) {
+                document.exitFullscreen();
+            } else if (document.mozCancelFullScreen) {
+                document.mozCancelFullScreen();
+            } else if (document.webkitCancelFullScreen) {
+                document.webkitCancelFullScreen();
+            } else if (document.msExitFullscreen) {
+                document.msExitFullscreen();
+            }
+              setIptValue(1)
+            }} />
+          }
+          
+        </Tooltip>
+
         <div className="title_box">
           <img
             src={require("@assets/imgs/dataVimg/logo.png").default}

src/pages/gvc/style.less

@@ -332,7 +332,7 @@
         .rightContent {
           width: 15%;
           position: absolute;
-          right: 0;
+          right: 1.5em;
           bottom: 15%;
           z-index: 9;
           height: 45%;

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-12-06 14:45:11
+ * @Last Modified time: 2023-12-19 11:30:37
  */
 
 import React, { useState, useEffect, Component } from "react";
@@ -80,7 +80,7 @@ class Gvc extends Component {
     }, 200)
     setTimeout(() => {
       //替换gif
-      $(".shu1").numScroll({time:3000});
+      $(".shu1").numScroll({ time: 3000 });
       // this.changeAllShu()
     }, 3000)
     setTimeout(() => {
@@ -88,11 +88,11 @@ class Gvc extends Component {
     }, 4500)
   }
 
-  changeAllShu(){
+  changeAllShu() {
     const stu_input = document.getElementsByClassName("shu1");
-    for(var i=0;i<stu_input.length;i++){
-      console.log(stu_input[i],"arr_")
-      console.log(stu_input[i].value,"arr_")
+    for (var i = 0; i < stu_input.length; i++) {
+      console.log(stu_input[i], "arr_")
+      console.log(stu_input[i].value, "arr_")
     }
   }
 
@@ -203,7 +203,8 @@ class Gvc extends Component {
     await smallShopService().then(({ data = [], resultCode }) => {
       if (+resultCode === 0) {
         const style__ = [{}, { left: "87%", top: "28%" }, { left: "69%", top: "46%" }, { left: "52%", top: "59%" }, { left: "29%", top: "76%" }, { left: "11%", top: "89%" }]
-        data = data.map((x, i) => {0
+        data = data.map((x, i) => {
+          0
           return {
             ...x,
             total: 0,
@@ -224,7 +225,7 @@ class Gvc extends Component {
         old_imgMsgData[5] = d_3;
         old_imgMsgData[6] = d_4;
         old_imgMsgData[7] = d_5;
-        
+
 
         console.log(old_imgMsgData, "old_imgMsgData")
         this.store.saveState({ imgMsgData: old_imgMsgData });
@@ -244,7 +245,7 @@ class Gvc extends Component {
           }
           return par
         }
-        
+
         const d_1 = getItems(5);
         const d_2 = getItems(4);
         const d_3 = getItems(3);
@@ -308,7 +309,7 @@ class Gvc extends Component {
         const d_3 = getItems(3);
         const d_4 = getItems(2);
         const d_5 = getItems(1);
-        
+
 
         let old_imgMsgData = this.store.state.imgMsgData;
         old_imgMsgData[3] = { ...old_imgMsgData[3], ...d_1 };
@@ -358,7 +359,7 @@ class Gvc extends Component {
             {
               !changGif ? <span class="topMsg_number shu1">{x.num1}</span> : <span class="topMsg_number">{getThousandNum(x.num1)}</span>
             }
-            
+
             <span class="topMsg_number_2" style={{ fontSize: "0.75em", color: "#fff" }}>吨</span>
           </div>
           <div>
@@ -377,9 +378,26 @@ class Gvc extends Component {
   render() {
     const stores = this.store.state;
     let { totalValue, yearDecline, yearSend, imgMsgData } = this.store.state;
-    let { LeftHtml, updateTime,changGif } = this.state;
+    let { LeftHtml, updateTime, changGif } = this.state;
     return (
       <div className={[styles.gvc_home + ' home_box ']}>
+        {/* 右键切换大屏 */}
+        <Tooltip placement="bottom" title={"数据运营中心"}>
+          <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
+            if (document.exitFullscreen) {
+              document.exitFullscreen();
+            } else if (document.mozCancelFullScreen) {
+              document.mozCancelFullScreen();
+            } else if (document.webkitCancelFullScreen) {
+              document.webkitCancelFullScreen();
+            } else if (document.msExitFullscreen) {
+              document.msExitFullscreen();
+            }
+
+            this.props.history.replace("/home/operation");
+          }} />
+        </Tooltip>
+
         <div className={"all_box"}>
           {/* 视频播放器 */}
           <MapViewTwo></MapViewTwo>
@@ -457,7 +475,7 @@ class Gvc extends Component {
                               {
                                 !changGif ? <span class="nums shu1">{item.cumulativeProduction}</span> : <span class="nums">{getThousandNum(item.cumulativeProduction)}</span>
                               }
-                              
+
                               <span class="topMsg_number_2" style={{ fontSize: "0.75em", color: "#fff" }}>吨</span>
                             </div>
                             <div>
@@ -490,7 +508,7 @@ class Gvc extends Component {
             </div>
             <div className="bottom_box">
               <p style={{ color: "#6a818d", lineHeight: '2px', width: '100%', textAlign: "center" }}>
-                更新日期 : {updateTime?updateTime.split(" ")[0]:updateTime}
+                更新日期 : {updateTime ? updateTime.split(" ")[0] : updateTime}
               </p>
             </div>
           </div>

src/pages/tqcDataVHome/component/oneQualified.jsx

@@ -94,7 +94,7 @@ class BottomLineForSend extends Component {
           "left": "10%",
         },
         legend: {
-          data: ['目标一次及格率', '实际一次及格率'],
+          data: ['目标一次合格率', '实际一次合格率'],
           right: 'center',
           padding: [10, 0, 0, 5],
           top: 0,
@@ -156,7 +156,7 @@ class BottomLineForSend extends Component {
         ],
         "series": [
           {
-            "name": "目标一次及格率",
+            "name": "目标一次合格率",
             "type": "line",
             data: this.state.targeRate,
             lineStyle: {
@@ -173,7 +173,7 @@ class BottomLineForSend extends Component {
             "smooth": true
           },
           {
-            "name": "实际一次及格率",
+            "name": "实际一次合格率",
             "type": "line",
             data: this.state.qcRate,
             lineStyle: {

src/pages/tqcDataVHome/style.less

@@ -11,6 +11,7 @@
   height: 10px;
 }
 
+
 .home {
   position: relative;
   .insert {

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-12-07 10:11:17
+ * @Last Modified time: 2023-12-19 11:32:14
  */
 /*
  * @Author: dayan_hjm 
@@ -31,6 +31,9 @@ import {
   updateTimeService
 } from "./api";
 import { getThousandNum } from "@utils/util";
+import {
+  fullscreen,
+} from "@ant-design/icons";
 
 import 'animate.css';
 @withRouter
@@ -223,7 +226,7 @@ class Home extends Component {
       var p2 = document.getElementById('manHourBox');
       const datas_2 = manHourData[manHourNum - 1];
       var res2;
-      
+
       if (type) {
         res2 = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number">' + getThousandNum(datas_2?.value.toFixed(2)) + '</span><p class="topMsg_number_p">' + datas_2.name + '</p></div>';//<span class="topMsg_number_2">%</span>
       } else {
@@ -243,6 +246,21 @@ class Home extends Component {
     let { changGif, updateTime, changNun } = this.state;
     return (
       <div className={"home_box"}>
+        {/* 右键切换大屏 */}
+        <Tooltip placement="bottom" title={"产供销价值链"}>
+          <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
+            if (document.exitFullscreen) {
+              document.exitFullscreen();
+            } else if (document.mozCancelFullScreen) {
+              document.mozCancelFullScreen();
+            } else if (document.webkitCancelFullScreen) {
+              document.webkitCancelFullScreen();
+            } else if (document.msExitFullscreen) {
+              document.msExitFullscreen();
+            }
+            this.props.history.replace("/home/gvc");
+          }} />
+        </Tooltip>
         {/* 视频播放器 */}
         <MapView></MapView>
         <div className={"video_box"}>
@@ -250,12 +268,11 @@ class Home extends Component {
         </div>
         <div className={[styles.home + " home cbHome"]}>
           <div className="leftContent">
-
             <div class="topMsg2 animate__animated animate__fadeInDown animate__slower">
               <div className="topMsg">
                 <Tooltip placement="bottom" title={<p className="titpeP">
                   ● 本年度截止到最新结账月的主产品的产值合计，计算：
-                  <img src={require("@assets/imgs/dataVimg/gongshi.png").default} alt="" style={{width: "1.5em",margin:" 0 0.5em 0 0em"}}/>
+                  <img src={require("@assets/imgs/dataVimg/gongshi.png").default} alt="" style={{ width: "1.5em", margin: " 0 0.5em 0 0em" }} />
                   产品1月产量*产品1月平均销售单价+产品2月产量* 产品2月平均销售单价+...
                 </p>}>
                   <p className="topMsg_title">总产值</p>
@@ -276,7 +293,7 @@ class Home extends Component {
               <div className="center_box">
                 <Tooltip placement="bottom" title={<p className="titpeP">
                   <p>● 截止更新日期的主产品库存金额，计算：</p>
-                  <img src={require("@assets/imgs/dataVimg/gongshi.png").default} alt="" style={{width: "1.5em",margin:" 0 0.5em 0 0em"}}/>
+                  <img src={require("@assets/imgs/dataVimg/gongshi2.png").default} alt="" style={{ width: "1.3em", margin: " -0.3em 0.5em 0 0em" }} />
                   物料1库存数*物料1移动平均价+物料2*物料2移动平均价+…
                 </p>}>
                   <p className="topMsg_title" style={{ position: "relative", zIndex: 999999 }}>产品库存金额</p>
@@ -314,7 +331,7 @@ class Home extends Component {
                           changNun && <span className="topMsg_number">{getThousandNum(yearDecline)}</span>
                         }
                         <p className="topMsg_line"></p>
-                        <Tooltip placement="bottom" title={' ● 本年度截止更新日期的主产品（含外加工）的产量合计。'}>
+                        <Tooltip placement="bottom" title={' ● 本年度截止更新日期前一天的主产品（含外加工）的产量合计'}>
                           <span className="topMsg_tip">年度产量/吨</span>
                         </Tooltip>
                       </div>