fix: 修复大屏权限问题

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: 2024-10-16 17:00:24
+ * @Last Modified time: 2024-11-11 11:29:30
  */
 
 import React, { useState, useEffect, Component } from "react";
@@ -387,17 +387,18 @@ class Gvc extends Component {
           window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
         }
         {/* 右键切换大屏 */}
-        <Tooltip placement="bottom" title={"TLK运营数据中心 / TLK Plant Dashboard"}>
+        {/* <Tooltip placement="bottom" title={"TLK运营数据中心 / TLK Plant Dashboard"}> */}
+        <Tooltip placement="bottom">
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
-            deleteCacheAndChangeUrl("/home/tlk", (url) => {
+            deleteCacheAndChangeUrl("right", (url) => {
               this.props.history.replace(url);
             })
 
           }} />
         </Tooltip>
-        <Tooltip placement="bottom" title={"数据运营中心"}>
+        <Tooltip placement="bottom">
           <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
-            deleteCacheAndChangeUrl("/home/operation", (url) => {
+            deleteCacheAndChangeUrl("left", (url) => {
               this.props.history.replace(url);
             })
           }} />

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-23 16:49:36
+ * @Last Modified time: 2024-11-11 14:28:29
  */
 
 
@@ -39,9 +39,9 @@ class BottomLineForSend extends Component {
         let year = [], missionsIntensity_arr = [],AvgQty = [], factoryProdcution_arr = [];
         data.map((x, i) => {
           const name_ = x.DateId.split('-')[1] + '-' + x.DateId.split('-')[2];
-          year.push(name_);
-          missionsIntensity_arr.push(x.ProdQty);
-          AvgQty.push(x.AvgQty);
+          year.push(name_); 
+          missionsIntensity_arr.push(x.ProdQty ? x.ProdQty.toFixed(2): '0.00');
+          AvgQty.push(x.AvgQty ? x.AvgQty.toFixed(2): '0.00');
           factoryProdcution_arr.push(x.Avg5daysQty)
         });
         this.setState({ year, missionsIntensity_arr, AvgQty,factoryProdcution_arr });
@@ -223,7 +223,7 @@ class BottomLineForSend extends Component {
               normal: {
                 color: '#8D93FF',
                 borderColor: '#8D93FF',
-                borderWidth: 12
+                borderWidth: 2
               }
             },
             data: this.state.AvgQty,

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-23 17:25:46
+ * @Last Modified time: 2024-10-28 13:59:03
  */
 
 
@@ -54,7 +54,7 @@ class LeftMenoyView extends Component {
   async getUrl() {
     let data_style = [
       {
-        value: 55, name: '氢氧化锂（电池级）/ LHM(BG)', itemStyle: {
+        value: 0, name: '氢氧化锂（电池级）/ LHM(BG)', itemStyle: {
           borderRadius: 20,
           normal: {
             color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
@@ -68,7 +68,7 @@ class LeftMenoyView extends Component {
         }
       },
       {
-        value: 38, name: '氢氧化锂（工业级）/ LHM(PG)', itemStyle: {
+        value: 0, name: '氢氧化锂（工业级）/ LHM(PG)', itemStyle: {
           borderRadius: 20,
           normal: {
             color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
@@ -82,7 +82,7 @@ class LeftMenoyView extends Component {
         }
       },
       {
-        value: 32, name: '油氢氧化锂（待检验）/ LHM(PENDING)', itemStyle: {
+        value: 0, name: '油氢氧化锂（待检验）/ LHM(PENDING)', itemStyle: {
           borderRadius: 20,
           normal: {
             color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{

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-23 16:42:30
+ * @Last Modified time: 2024-10-31 09:22:31
  */
 
 
@@ -85,6 +85,7 @@ class BottomLineForSend extends Component {
           padding:5, 
           textStyle:{
             fontSize:10,
+            align:'left',
             color:"#ededed"
           },
           valueFormatter: (value) => {
@@ -170,7 +171,7 @@ class BottomLineForSend extends Component {
             },
             axisTick: { show: false },
             axisLabel: {
-              formatter: "{value}t",
+              formatter: "{value}%",
               textStyle: {
                 color: '#7d7d7d',
                 fontSize: 11

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-23 17:01:41
+ * @Last Modified time: 2024-10-31 09:23:54
  */
 
 
@@ -80,6 +80,7 @@ class OneSendView extends Component {
           padding:5, 
           textStyle:{
             fontSize:10,
+            align:'left',
             color:"#ededed"
           },
           valueFormatter: (value) => {

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-24 11:11:25
+ * @Last Modified time: 2024-10-31 09:41:09
  */
 
 
@@ -37,7 +37,8 @@ class RightBottomView extends Component {
         let year = [], missionsIntensity_arr = [], AccqcRate = [];
         data.map((x, i) => {
           year.push(x.bMonth);
-          missionsIntensity_arr.push(x?.QcRate ? (x?.QcRate * 100).toFixed(1) : 0)
+          const nums = Number(x?.QcRate ? (x?.QcRate * 100).toFixed(1) : 0);
+          missionsIntensity_arr.push(nums)
           AccqcRate.push(x?.AccqcRate ? (x?.AccqcRate*100).toFixed(1) : 0)
         });
         this.setState({ year,AccqcRate,missionsIntensity_arr });
@@ -80,7 +81,7 @@ class RightBottomView extends Component {
         },
         legend: {
           type: 'scroll',
-          data: ['产量一次合格率（First Pass Yield）', '累计一次合格率（Cumulative First Pass Yield）'],
+          data: ['产品一次合格率（First Pass Yield）', '累计一次合格率（Cumulative First Pass Yield）'],
           fontFamily: 'DingTalkJinBuTi',
           padding: [5, 0, 40, 0],
           textStyle: {
@@ -146,7 +147,9 @@ class RightBottomView extends Component {
               fontSize: 11
             },
           },
-
+          min:Number(Math.min(...this.state.missionsIntensity_arr) - 5).toFixed(0),
+          max:100,
+          // splitNumber:5,
           splitLine: {
             lineStyle: {
               color: 'rgba(255,255,255,.1)'
@@ -155,7 +158,7 @@ class RightBottomView extends Component {
         }],
         series: [
           {
-            name: '产量一次合格率（First Pass Yield）',
+            name: '产品一次合格率（First Pass Yield）',
             type: 'line',
             smooth: true,
             symbol: 'circle',

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-28 10:38:17
+ * @Last Modified time: 2024-10-31 09:26:57
  */
 /*
  * @Author: dayan_hjm 
@@ -272,16 +272,16 @@ class Home extends Component {
           window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
         }
         {/* 右键切换大屏 */}
-        <Tooltip placement="bottom" title={"运营数据中心"}>
+        <Tooltip placement="bottom">
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
-            deleteCacheAndChangeUrl("/home/operation", (url) => {
+            deleteCacheAndChangeUrl("right", (url) => {
               this.props.history.replace(url);
             })
           }} />
         </Tooltip>
-        <Tooltip placement="bottom" title={"产供销价值链"}>
+        <Tooltip placement="bottom">
           <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
-            deleteCacheAndChangeUrl("/home/gvc", (url) => {
+            deleteCacheAndChangeUrl("left", (url) => {
               this.props.history.replace(url);
             })
           }} />
@@ -296,7 +296,7 @@ class Home extends Component {
           <div className="leftContent">
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-2s">
               <div className="bottomContent bigDivPd">
-                <Tooltip placement="bottom" title={` ● 近六个月的产量和预算产量的对比，当月的数据计算累计至更新日期。 \n● Comparison of actual and planned production for the last 6 months, with month-to-date data for current month`}>
+                <Tooltip placement="bottom" title={`● 近六个月的产量和预算产量的对比，当月的数据计算累计至更新日期。 \n● Comparison of actual and planned production for the last 6 months, with month-to-date data for current month`}>
                   <p className="topMsg_title">产品月度产量 <span className="topMsg_tips">/ Monthly Net Production</span></p>
                 </Tooltip>
                 <div className="topMsg_content">
@@ -307,7 +307,7 @@ class Home extends Component {
 
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-2s">
               <div className="bottomContent bigDivPd">
-                <Tooltip placement="bottom" title={` ● 近六个月的发货量，当月的数据计算累计至更新日期。\n● Rolling 6 months export volume and month-to-date data for current month`}>
+                <Tooltip placement="bottom" title={`● 近六个月的发货量，当月的数据计算累计至更新日期。\n● Rolling 6 months export volume and month-to-date data for current month`}>
                   <p className="topMsg_title">产品发货量 <span className="topMsg_tips">/ Lithium Shipment</span></p>
                 </Tooltip>
                 <div className="topMsg_content">
@@ -348,7 +348,7 @@ class Home extends Component {
                           changNun && <span className="topMsg_number">{getThousandNum(yearDecline)}</span>
                         }
                         <p className="topMsg_line"></p>
-                        <Tooltip placement="bottom" title={' ● 本年度截止更新日期氢氧化锂产品的发货量合计。\n● Year-to-date total LHM shipments'}>
+                        <Tooltip placement="bottom" title={'● 本年度截止更新日期氢氧化锂产品的发货量合计。\n● Year-to-date total LHM shipments'}>
                           <span className="topMsg_tip">年度发货量/吨</span>
                           <span className="topMsg_tip topMsg_tip2">Annual Shipments / t</span>
                         </Tooltip>
@@ -363,7 +363,7 @@ class Home extends Component {
                           changNun && <span className="topMsg_number">{getThousandNum(productInventory)}</span>
                         }
                         <p className="topMsg_line"></p>
-                        <Tooltip placement="bottom" title={' ● 本年度截止更新日期的氢氧化锂产品的产量合计。\n● Year-to-date total LHM production'}>
+                        <Tooltip placement="bottom" title={'● 本年度截止更新日期的氢氧化锂产品的产量合计。\n● Year-to-date total LHM production'}>
                           <span className="topMsg_tip">年度产量/吨</span>
                           <span className="topMsg_tip topMsg_tip2">Annual Production / t</span>
                         </Tooltip>
@@ -377,7 +377,7 @@ class Home extends Component {
                         changNun && <span className="topMsg_number">{getThousandNum(yearSend, true)}%</span>
                       }
                       <p className="topMsg_line"></p>
-                      <Tooltip placement="bottom" title={' ● 本年度截止更新日期的氢氧化锂产品累计一次合格率。\n● Year-to-date battery grade LHM production rate excluding retreatment'}>
+                      <Tooltip placement="bottom" title={'● 本年度截止更新日期的氢氧化锂产品累计一次合格率。\n● Year-to-date battery grade LHM production rate excluding retreatment'}>
                         <span className="topMsg_tip">年度产品一次合格率</span>
                         <span className="topMsg_tip topMsg_tip2">Annual First Pass Yield</span>
                       </Tooltip>
@@ -388,7 +388,7 @@ class Home extends Component {
             </div>
             <div class="bottomContent3 animate__animated animate__fadeInUp animate__slower animate__delay-1s">
               <div className="bottomContent">
-                <Tooltip placement="bottom" title={` ● 日产量：以更新日期为节点近90天的产量曲线；日产量趋势：以对应日期为节点前5天的平均产量所生成的趋势线；平均产量：近90天日产量的平均值。\n● Daily production: Rolling 90 days daily production | Daily production trend: Rolling 5 days average production    |Average production: Rolling 90 days average production`}>
+                <Tooltip placement="bottom" title={`● 日产量：以更新日期为节点近90天的产量曲线；日产量趋势：以对应日期为节点前5天的平均产量所生成的趋势线；平均产量：近90天日产量的平均值。\n● Daily production: Rolling 90 days daily production | Daily production trend: Rolling 5 days average production    |Average production: Rolling 90 days average production`}>
                   <p className="topMsg_title">近90天产量 <span className="topMsg_tips">/ Net Production in the last 90 days</span></p>
                 </Tooltip>
                 <div className="topMsg_content">
@@ -406,7 +406,7 @@ class Home extends Component {
                       {
                         index != 4 && <div>
                           {
-                            item.totalName && index == 0 && <Tooltip placement="bottom" title={' ● 本年度截止更新日期TLK基地接收的锂辉石数量合计。\n●  Year-to-date spodumeme received at TLK site'}>
+                            item.totalName && index == 0 && <Tooltip placement="bottom" title={'● 本年度截止更新日期TLK基地接收的锂辉石数量合计。\n●  Year-to-date spodumeme received at TLK site'}>
                             <p className="name">{item.totalName}</p>                            </Tooltip>
 
                           }
@@ -441,7 +441,7 @@ class Home extends Component {
                             item.total && <span className="sma">t</span>
                           }
                           {
-                            <Tooltip placement="bottom" title={' ● 截止更新日期TLK基地（含暂存仓）的锂辉石库存总量。\n●  Year-to-date spodumene inventory at all TLK sites (including temporary storage)'}>
+                            <Tooltip placement="bottom" title={'● 截止更新日期TLK基地（含暂存仓）的锂辉石库存总量。\n●  Year-to-date spodumene inventory at all TLK sites (including temporary storage)'}>
                               <p className="name" style={{    position: 'relative',zIndex: 999}}>锂辉石库存总量</p>
                             </Tooltip>
 
@@ -467,7 +467,7 @@ class Home extends Component {
           <div className="rightContent">
             <div class="topMsg2 animate__animated animate__fadeInDown animate__slower">
               <div className="topMsg bigDivPd">
-                <Tooltip placement="bottom" title={' ● 年度产量累计计划完成率：本年度截止到更新日期产量的累计计划完成率；年度锂辉石计划完成率：本年度截止到更新日期锂辉石消耗量累计计划完成率。\n●  Production plan completion rate: Year to date completion rate of production plan | Spodumene consumption plan completion rate: Year to date completion rate of spodumene consumption plan'}>
+                <Tooltip placement="bottom" title={'● 年度产量累计计划完成率：本年度截止到更新日期产量的累计计划完成率；年度锂辉石计划完成率：本年度截止到更新日期锂辉石消耗量累计计划完成率。\n●  Production plan completion rate: Year to date completion rate of production plan | Spodumene consumption plan completion rate: Year to date completion rate of spodumene consumption plan'}>
                   <p className="topMsg_title" style={{marginBottom:'8px'}}>计划完成率 <span className="topMsg_tips">/ Plan Completion Rate</span></p>
                 </Tooltip>
                 <div className={changGif ? "topMsg_content changBg_topMsg_content" : "topMsg_content"} id="manHourBox">
@@ -491,7 +491,7 @@ class Home extends Component {
 
             <div class="topMsg_22 animate__animated animate__fadeInDown animate__slower">
               <div className="topMsg_2">
-                <Tooltip placement="bottom" title={' ● 近六个月的锂辉石消耗量和锂辉石预算消耗量的对比，当月的数据计算累计至更新日期。\n ● Comparison of the last 6 months of actual and planned spodumene consumption, and month-to-date data for current month'}>
+                <Tooltip placement="bottom" title={'● 近六个月的锂辉石消耗量和锂辉石预算消耗量的对比，当月的数据计算累计至更新日期。\n● Comparison of the last 6 months of actual and planned spodumene consumption, and month-to-date data for current month'}>
                   <p className="topMsg_title">锂辉石消耗量 <span className="topMsg_tips">/ Spodumene Consumption</span></p>
                 </Tooltip>
 
@@ -503,7 +503,7 @@ class Home extends Component {
 
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower  animate__delay-1s">
               <div className="bottomContent bigDivPd">
-                <Tooltip placement="bottom" title={' ● 近六个月的氢氧化锂产品一次合格率曲线，当月的数据计算至更新日期。\n ● Month-to-date battery grade LHM production rate excluding retreatment'}>
+                <Tooltip placement="bottom" title={'● 近六个月的氢氧化锂产品一次合格率曲线，当月的数据计算至更新日期。\n● Month-to-date battery grade LHM production rate excluding retreatment'}>
                   <p className="topMsg_title">产品一次合格率 <span className="topMsg_tips">/ First Pass Yield</span></p>
                 </Tooltip>
                 <div className="topMsg_content">

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: 2024-01-22 15:21:55
+ * @Last Modified time: 2024-11-11 14:14:26
  */
 /*
  * @Author: dayan_hjm 
@@ -260,16 +260,16 @@ class Home extends Component {
           window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
         }
         {/* 右键切换大屏 */}
-        <Tooltip placement="bottom" title={"产供销价值链"}>
+        <Tooltip placement="bottom">
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
-            deleteCacheAndChangeUrl("/home/gvc", (url) => {
+            deleteCacheAndChangeUrl("right", (url) => {
               this.props.history.replace(url);
             })
           }} />
         </Tooltip>
-        <Tooltip placement="bottom" title={"TLK运营数据中心 / TLK Plant Dashboard"}>
+        <Tooltip placement="bottom">
           <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
-            deleteCacheAndChangeUrl("/home/tlk", (url) => {
+            deleteCacheAndChangeUrl("left", (url) => {
               this.props.history.replace(url);
             })
           }} />

src/utils/util.js

@@ -997,10 +997,36 @@ export function getThousandNum(num,need100){
 }
 
 //大屏转跳-去除缓存
-export function deleteCacheAndChangeUrl(url,callback){
-  RouterCache.deleteCache(url)
+export function deleteCacheAndChangeUrl(next='left',callback){
+  const screenName = ["/home/operation","/home/gvc","/home/tlk"];
+  const HasScreen = localStorage.getItem("tqcHasScreen").split(",") || [];
+  //排序菜单路径
+  let newHasScreen = [];
+  screenName.map(x=>{
+    if(HasScreen.includes(x)){
+      newHasScreen.push(x)
+    }
+  })
+  console.log(newHasScreen)
+  //找到下一页的大屏
+  const currUrl = window.location.hash.split("#")[1];
+  let ai = 0;
+  for (let index = 0; index < newHasScreen.length; index++) {
+    const element = newHasScreen[index];
+    if(element == currUrl){
+      ai = index
+    }
+  }
+  let newUrl = '';
+  if(next == 'right'){//向右切
+    //当前地址在菜单数组中的index
+    newUrl = newHasScreen[ai+1] || newHasScreen[0]
+  }else{
+    newUrl = newHasScreen[ai-1] || newHasScreen[newHasScreen.length-1]
+  }
+  RouterCache.deleteCache(newUrl)
   setTimeout(()=>{
-    callback && callback(url)
+    callback && callback(newUrl)
   },300)
 }