Quellcode durchsuchen

fix: 修复大屏权限问题

@dayan_hjm vor 1 Jahr
Ursprung
Commit
13ac8ba5db

BIN
src/assets/imgs/dataVImg/tlk.mp4


BIN
src/assets/imgs/dataVImg/tlk2.mp4


+ 6 - 5
src/pages/gvc/view.jsx

@@ -2,7 +2,7 @@
2
  * @Author: dayan_hjm  产供销价值链
2
  * @Author: dayan_hjm  产供销价值链
3
  * @Date: 2023-11-10 10:19:34 
3
  * @Date: 2023-11-10 10:19:34 
4
  * @Last Modified by: dayan_hjm
4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-16 17:00:24
5
+ * @Last Modified time: 2024-11-11 11:29:30
6
  */
6
  */
7
 
7
 
8
 import React, { useState, useEffect, Component } from "react";
8
 import React, { useState, useEffect, Component } from "react";
@@ -387,17 +387,18 @@ class Gvc extends Component {
387
           window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
387
           window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
388
         }
388
         }
389
         {/* 右键切换大屏 */}
389
         {/* 右键切换大屏 */}
390
-        <Tooltip placement="bottom" title={"TLK运营数据中心 / TLK Plant Dashboard"}>
390
+        {/* <Tooltip placement="bottom" title={"TLK运营数据中心 / TLK Plant Dashboard"}> */}
391
+        <Tooltip placement="bottom">
391
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
392
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
392
-            deleteCacheAndChangeUrl("/home/tlk", (url) => {
393
+            deleteCacheAndChangeUrl("right", (url) => {
393
               this.props.history.replace(url);
394
               this.props.history.replace(url);
394
             })
395
             })
395
 
396
 
396
           }} />
397
           }} />
397
         </Tooltip>
398
         </Tooltip>
398
-        <Tooltip placement="bottom" title={"数据运营中心"}>
399
+        <Tooltip placement="bottom">
399
           <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
400
           <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
400
-            deleteCacheAndChangeUrl("/home/operation", (url) => {
401
+            deleteCacheAndChangeUrl("left", (url) => {
401
               this.props.history.replace(url);
402
               this.props.history.replace(url);
402
             })
403
             })
403
           }} />
404
           }} />

+ 5 - 5
src/pages/tlk/component/bottomLineForSend.jsx

@@ -2,7 +2,7 @@
2
  * @Author: dayan_hjm 近30天产量
2
  * @Author: dayan_hjm 近30天产量
3
  * @Date: 2023-10-23 09:32:12 
3
  * @Date: 2023-10-23 09:32:12 
4
  * @Last Modified by: dayan_hjm
4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-23 16:49:36
5
+ * @Last Modified time: 2024-11-11 14:28:29
6
  */
6
  */
7
 
7
 
8
 
8
 
@@ -39,9 +39,9 @@ class BottomLineForSend extends Component {
39
         let year = [], missionsIntensity_arr = [],AvgQty = [], factoryProdcution_arr = [];
39
         let year = [], missionsIntensity_arr = [],AvgQty = [], factoryProdcution_arr = [];
40
         data.map((x, i) => {
40
         data.map((x, i) => {
41
           const name_ = x.DateId.split('-')[1] + '-' + x.DateId.split('-')[2];
41
           const name_ = x.DateId.split('-')[1] + '-' + x.DateId.split('-')[2];
42
-          year.push(name_);
43
-          missionsIntensity_arr.push(x.ProdQty);
44
-          AvgQty.push(x.AvgQty);
42
+          year.push(name_); 
43
+          missionsIntensity_arr.push(x.ProdQty ? x.ProdQty.toFixed(2): '0.00');
44
+          AvgQty.push(x.AvgQty ? x.AvgQty.toFixed(2): '0.00');
45
           factoryProdcution_arr.push(x.Avg5daysQty)
45
           factoryProdcution_arr.push(x.Avg5daysQty)
46
         });
46
         });
47
         this.setState({ year, missionsIntensity_arr, AvgQty,factoryProdcution_arr });
47
         this.setState({ year, missionsIntensity_arr, AvgQty,factoryProdcution_arr });
@@ -223,7 +223,7 @@ class BottomLineForSend extends Component {
223
               normal: {
223
               normal: {
224
                 color: '#8D93FF',
224
                 color: '#8D93FF',
225
                 borderColor: '#8D93FF',
225
                 borderColor: '#8D93FF',
226
-                borderWidth: 12
226
+                borderWidth: 2
227
               }
227
               }
228
             },
228
             },
229
             data: this.state.AvgQty,
229
             data: this.state.AvgQty,

+ 4 - 4
src/pages/tlk/component/leftMenoyView.jsx

@@ -2,7 +2,7 @@
2
  * @Author: dayan_hjm 库存金额
2
  * @Author: dayan_hjm 库存金额
3
  * @Date: 2023-10-23 09:32:12 
3
  * @Date: 2023-10-23 09:32:12 
4
  * @Last Modified by: dayan_hjm
4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-23 17:25:46
5
+ * @Last Modified time: 2024-10-28 13:59:03
6
  */
6
  */
7
 
7
 
8
 
8
 
@@ -54,7 +54,7 @@ class LeftMenoyView extends Component {
54
   async getUrl() {
54
   async getUrl() {
55
     let data_style = [
55
     let data_style = [
56
       {
56
       {
57
-        value: 55, name: '氢氧化锂(电池级)/ LHM(BG)', itemStyle: {
57
+        value: 0, name: '氢氧化锂(电池级)/ LHM(BG)', itemStyle: {
58
           borderRadius: 20,
58
           borderRadius: 20,
59
           normal: {
59
           normal: {
60
             color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
60
             color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
@@ -68,7 +68,7 @@ class LeftMenoyView extends Component {
68
         }
68
         }
69
       },
69
       },
70
       {
70
       {
71
-        value: 38, name: '氢氧化锂(工业级)/ LHM(PG)', itemStyle: {
71
+        value: 0, name: '氢氧化锂(工业级)/ LHM(PG)', itemStyle: {
72
           borderRadius: 20,
72
           borderRadius: 20,
73
           normal: {
73
           normal: {
74
             color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
74
             color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
@@ -82,7 +82,7 @@ class LeftMenoyView extends Component {
82
         }
82
         }
83
       },
83
       },
84
       {
84
       {
85
-        value: 32, name: '油氢氧化锂(待检验)/ LHM(PENDING)', itemStyle: {
85
+        value: 0, name: '油氢氧化锂(待检验)/ LHM(PENDING)', itemStyle: {
86
           borderRadius: 20,
86
           borderRadius: 20,
87
           normal: {
87
           normal: {
88
             color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
88
             color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{

+ 3 - 2
src/pages/tlk/component/oneQualified.jsx

@@ -2,7 +2,7 @@
2
  * @Author: dayan_hjm 一次合格率
2
  * @Author: dayan_hjm 一次合格率
3
  * @Date: 2023-10-23 09:32:12 
3
  * @Date: 2023-10-23 09:32:12 
4
  * @Last Modified by: dayan_hjm
4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-23 16:42:30
5
+ * @Last Modified time: 2024-10-31 09:22:31
6
  */
6
  */
7
 
7
 
8
 
8
 
@@ -85,6 +85,7 @@ class BottomLineForSend extends Component {
85
           padding:5, 
85
           padding:5, 
86
           textStyle:{
86
           textStyle:{
87
             fontSize:10,
87
             fontSize:10,
88
+            align:'left',
88
             color:"#ededed"
89
             color:"#ededed"
89
           },
90
           },
90
           valueFormatter: (value) => {
91
           valueFormatter: (value) => {
@@ -170,7 +171,7 @@ class BottomLineForSend extends Component {
170
             },
171
             },
171
             axisTick: { show: false },
172
             axisTick: { show: false },
172
             axisLabel: {
173
             axisLabel: {
173
-              formatter: "{value}t",
174
+              formatter: "{value}%",
174
               textStyle: {
175
               textStyle: {
175
                 color: '#7d7d7d',
176
                 color: '#7d7d7d',
176
                 fontSize: 11
177
                 fontSize: 11

+ 2 - 1
src/pages/tlk/component/oneSendView.jsx

@@ -2,7 +2,7 @@
2
  * @Author: dayan_hjm 月度产量/发货量
2
  * @Author: dayan_hjm 月度产量/发货量
3
  * @Date: 2023-10-23 09:32:12 
3
  * @Date: 2023-10-23 09:32:12 
4
  * @Last Modified by: dayan_hjm
4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-23 17:01:41
5
+ * @Last Modified time: 2024-10-31 09:23:54
6
  */
6
  */
7
 
7
 
8
 
8
 
@@ -80,6 +80,7 @@ class OneSendView extends Component {
80
           padding:5, 
80
           padding:5, 
81
           textStyle:{
81
           textStyle:{
82
             fontSize:10,
82
             fontSize:10,
83
+            align:'left',
83
             color:"#ededed"
84
             color:"#ededed"
84
           },
85
           },
85
           valueFormatter: (value) => {
86
           valueFormatter: (value) => {

+ 8 - 5
src/pages/tlk/component/rightBottomView.jsx

@@ -2,7 +2,7 @@
2
  * @Author: dayan_hjm 近30天产量
2
  * @Author: dayan_hjm 近30天产量
3
  * @Date: 2023-10-23 09:32:12 
3
  * @Date: 2023-10-23 09:32:12 
4
  * @Last Modified by: dayan_hjm
4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-24 11:11:25
5
+ * @Last Modified time: 2024-10-31 09:41:09
6
  */
6
  */
7
 
7
 
8
 
8
 
@@ -37,7 +37,8 @@ class RightBottomView extends Component {
37
         let year = [], missionsIntensity_arr = [], AccqcRate = [];
37
         let year = [], missionsIntensity_arr = [], AccqcRate = [];
38
         data.map((x, i) => {
38
         data.map((x, i) => {
39
           year.push(x.bMonth);
39
           year.push(x.bMonth);
40
-          missionsIntensity_arr.push(x?.QcRate ? (x?.QcRate * 100).toFixed(1) : 0)
40
+          const nums = Number(x?.QcRate ? (x?.QcRate * 100).toFixed(1) : 0);
41
+          missionsIntensity_arr.push(nums)
41
           AccqcRate.push(x?.AccqcRate ? (x?.AccqcRate*100).toFixed(1) : 0)
42
           AccqcRate.push(x?.AccqcRate ? (x?.AccqcRate*100).toFixed(1) : 0)
42
         });
43
         });
43
         this.setState({ year,AccqcRate,missionsIntensity_arr });
44
         this.setState({ year,AccqcRate,missionsIntensity_arr });
@@ -80,7 +81,7 @@ class RightBottomView extends Component {
80
         },
81
         },
81
         legend: {
82
         legend: {
82
           type: 'scroll',
83
           type: 'scroll',
83
-          data: ['产一次合格率(First Pass Yield)', '累计一次合格率(Cumulative First Pass Yield)'],
84
+          data: ['产一次合格率(First Pass Yield)', '累计一次合格率(Cumulative First Pass Yield)'],
84
           fontFamily: 'DingTalkJinBuTi',
85
           fontFamily: 'DingTalkJinBuTi',
85
           padding: [5, 0, 40, 0],
86
           padding: [5, 0, 40, 0],
86
           textStyle: {
87
           textStyle: {
@@ -146,7 +147,9 @@ class RightBottomView extends Component {
146
               fontSize: 11
147
               fontSize: 11
147
             },
148
             },
148
           },
149
           },
149
-
150
+          min:Number(Math.min(...this.state.missionsIntensity_arr) - 5).toFixed(0),
151
+          max:100,
152
+          // splitNumber:5,
150
           splitLine: {
153
           splitLine: {
151
             lineStyle: {
154
             lineStyle: {
152
               color: 'rgba(255,255,255,.1)'
155
               color: 'rgba(255,255,255,.1)'
@@ -155,7 +158,7 @@ class RightBottomView extends Component {
155
         }],
158
         }],
156
         series: [
159
         series: [
157
           {
160
           {
158
-            name: '产一次合格率(First Pass Yield)',
161
+            name: '产一次合格率(First Pass Yield)',
159
             type: 'line',
162
             type: 'line',
160
             smooth: true,
163
             smooth: true,
161
             symbol: 'circle',
164
             symbol: 'circle',

+ 16 - 16
src/pages/tlk/view.jsx

@@ -2,7 +2,7 @@
2
  * @Author: dayan_hjm 
2
  * @Author: dayan_hjm 
3
  * @Date: 2023-10-25 10:32:44 
3
  * @Date: 2023-10-25 10:32:44 
4
  * @Last Modified by: dayan_hjm
4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-28 10:38:17
5
+ * @Last Modified time: 2024-10-31 09:26:57
6
  */
6
  */
7
 /*
7
 /*
8
  * @Author: dayan_hjm 
8
  * @Author: dayan_hjm 
@@ -272,16 +272,16 @@ class Home extends Component {
272
           window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
272
           window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
273
         }
273
         }
274
         {/* 右键切换大屏 */}
274
         {/* 右键切换大屏 */}
275
-        <Tooltip placement="bottom" title={"运营数据中心"}>
275
+        <Tooltip placement="bottom">
276
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
276
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
277
-            deleteCacheAndChangeUrl("/home/operation", (url) => {
277
+            deleteCacheAndChangeUrl("right", (url) => {
278
               this.props.history.replace(url);
278
               this.props.history.replace(url);
279
             })
279
             })
280
           }} />
280
           }} />
281
         </Tooltip>
281
         </Tooltip>
282
-        <Tooltip placement="bottom" title={"产供销价值链"}>
282
+        <Tooltip placement="bottom">
283
           <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
283
           <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
284
-            deleteCacheAndChangeUrl("/home/gvc", (url) => {
284
+            deleteCacheAndChangeUrl("left", (url) => {
285
               this.props.history.replace(url);
285
               this.props.history.replace(url);
286
             })
286
             })
287
           }} />
287
           }} />
@@ -296,7 +296,7 @@ class Home extends Component {
296
           <div className="leftContent">
296
           <div className="leftContent">
297
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-2s">
297
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-2s">
298
               <div className="bottomContent bigDivPd">
298
               <div className="bottomContent bigDivPd">
299
-                <Tooltip placement="bottom" title={` ● 近六个月的产量和预算产量的对比,当月的数据计算累计至更新日期。 \n● Comparison of actual and planned production for the last 6 months, with month-to-date data for current month`}>
299
+                <Tooltip placement="bottom" title={`● 近六个月的产量和预算产量的对比,当月的数据计算累计至更新日期。 \n● Comparison of actual and planned production for the last 6 months, with month-to-date data for current month`}>
300
                   <p className="topMsg_title">产品月度产量 <span className="topMsg_tips">/ Monthly Net Production</span></p>
300
                   <p className="topMsg_title">产品月度产量 <span className="topMsg_tips">/ Monthly Net Production</span></p>
301
                 </Tooltip>
301
                 </Tooltip>
302
                 <div className="topMsg_content">
302
                 <div className="topMsg_content">
@@ -307,7 +307,7 @@ class Home extends Component {
307
 
307
 
308
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-2s">
308
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-2s">
309
               <div className="bottomContent bigDivPd">
309
               <div className="bottomContent bigDivPd">
310
-                <Tooltip placement="bottom" title={` ● 近六个月的发货量,当月的数据计算累计至更新日期。\n● Rolling 6 months export volume and month-to-date data for current month`}>
310
+                <Tooltip placement="bottom" title={`● 近六个月的发货量,当月的数据计算累计至更新日期。\n● Rolling 6 months export volume and month-to-date data for current month`}>
311
                   <p className="topMsg_title">产品发货量 <span className="topMsg_tips">/ Lithium Shipment</span></p>
311
                   <p className="topMsg_title">产品发货量 <span className="topMsg_tips">/ Lithium Shipment</span></p>
312
                 </Tooltip>
312
                 </Tooltip>
313
                 <div className="topMsg_content">
313
                 <div className="topMsg_content">
@@ -348,7 +348,7 @@ class Home extends Component {
348
                           changNun && <span className="topMsg_number">{getThousandNum(yearDecline)}</span>
348
                           changNun && <span className="topMsg_number">{getThousandNum(yearDecline)}</span>
349
                         }
349
                         }
350
                         <p className="topMsg_line"></p>
350
                         <p className="topMsg_line"></p>
351
-                        <Tooltip placement="bottom" title={' ● 本年度截止更新日期氢氧化锂产品的发货量合计。\n● Year-to-date total LHM shipments'}>
351
+                        <Tooltip placement="bottom" title={'● 本年度截止更新日期氢氧化锂产品的发货量合计。\n● Year-to-date total LHM shipments'}>
352
                           <span className="topMsg_tip">年度发货量/吨</span>
352
                           <span className="topMsg_tip">年度发货量/吨</span>
353
                           <span className="topMsg_tip topMsg_tip2">Annual Shipments / t</span>
353
                           <span className="topMsg_tip topMsg_tip2">Annual Shipments / t</span>
354
                         </Tooltip>
354
                         </Tooltip>
@@ -363,7 +363,7 @@ class Home extends Component {
363
                           changNun && <span className="topMsg_number">{getThousandNum(productInventory)}</span>
363
                           changNun && <span className="topMsg_number">{getThousandNum(productInventory)}</span>
364
                         }
364
                         }
365
                         <p className="topMsg_line"></p>
365
                         <p className="topMsg_line"></p>
366
-                        <Tooltip placement="bottom" title={' ● 本年度截止更新日期的氢氧化锂产品的产量合计。\n● Year-to-date total LHM production'}>
366
+                        <Tooltip placement="bottom" title={'● 本年度截止更新日期的氢氧化锂产品的产量合计。\n● Year-to-date total LHM production'}>
367
                           <span className="topMsg_tip">年度产量/吨</span>
367
                           <span className="topMsg_tip">年度产量/吨</span>
368
                           <span className="topMsg_tip topMsg_tip2">Annual Production / t</span>
368
                           <span className="topMsg_tip topMsg_tip2">Annual Production / t</span>
369
                         </Tooltip>
369
                         </Tooltip>
@@ -377,7 +377,7 @@ class Home extends Component {
377
                         changNun && <span className="topMsg_number">{getThousandNum(yearSend, true)}%</span>
377
                         changNun && <span className="topMsg_number">{getThousandNum(yearSend, true)}%</span>
378
                       }
378
                       }
379
                       <p className="topMsg_line"></p>
379
                       <p className="topMsg_line"></p>
380
-                      <Tooltip placement="bottom" title={' ● 本年度截止更新日期的氢氧化锂产品累计一次合格率。\n● Year-to-date battery grade LHM production rate excluding retreatment'}>
380
+                      <Tooltip placement="bottom" title={'● 本年度截止更新日期的氢氧化锂产品累计一次合格率。\n● Year-to-date battery grade LHM production rate excluding retreatment'}>
381
                         <span className="topMsg_tip">年度产品一次合格率</span>
381
                         <span className="topMsg_tip">年度产品一次合格率</span>
382
                         <span className="topMsg_tip topMsg_tip2">Annual First Pass Yield</span>
382
                         <span className="topMsg_tip topMsg_tip2">Annual First Pass Yield</span>
383
                       </Tooltip>
383
                       </Tooltip>
@@ -388,7 +388,7 @@ class Home extends Component {
388
             </div>
388
             </div>
389
             <div class="bottomContent3 animate__animated animate__fadeInUp animate__slower animate__delay-1s">
389
             <div class="bottomContent3 animate__animated animate__fadeInUp animate__slower animate__delay-1s">
390
               <div className="bottomContent">
390
               <div className="bottomContent">
391
-                <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`}>
391
+                <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`}>
392
                   <p className="topMsg_title">近90天产量 <span className="topMsg_tips">/ Net Production in the last 90 days</span></p>
392
                   <p className="topMsg_title">近90天产量 <span className="topMsg_tips">/ Net Production in the last 90 days</span></p>
393
                 </Tooltip>
393
                 </Tooltip>
394
                 <div className="topMsg_content">
394
                 <div className="topMsg_content">
@@ -406,7 +406,7 @@ class Home extends Component {
406
                       {
406
                       {
407
                         index != 4 && <div>
407
                         index != 4 && <div>
408
                           {
408
                           {
409
-                            item.totalName && index == 0 && <Tooltip placement="bottom" title={' ● 本年度截止更新日期TLK基地接收的锂辉石数量合计。\n●  Year-to-date spodumeme received at TLK site'}>
409
+                            item.totalName && index == 0 && <Tooltip placement="bottom" title={'● 本年度截止更新日期TLK基地接收的锂辉石数量合计。\n●  Year-to-date spodumeme received at TLK site'}>
410
                             <p className="name">{item.totalName}</p>                            </Tooltip>
410
                             <p className="name">{item.totalName}</p>                            </Tooltip>
411
 
411
 
412
                           }
412
                           }
@@ -441,7 +441,7 @@ class Home extends Component {
441
                             item.total && <span className="sma">t</span>
441
                             item.total && <span className="sma">t</span>
442
                           }
442
                           }
443
                           {
443
                           {
444
-                            <Tooltip placement="bottom" title={' ● 截止更新日期TLK基地(含暂存仓)的锂辉石库存总量。\n●  Year-to-date spodumene inventory at all TLK sites (including temporary storage)'}>
444
+                            <Tooltip placement="bottom" title={'● 截止更新日期TLK基地(含暂存仓)的锂辉石库存总量。\n●  Year-to-date spodumene inventory at all TLK sites (including temporary storage)'}>
445
                               <p className="name" style={{    position: 'relative',zIndex: 999}}>锂辉石库存总量</p>
445
                               <p className="name" style={{    position: 'relative',zIndex: 999}}>锂辉石库存总量</p>
446
                             </Tooltip>
446
                             </Tooltip>
447
 
447
 
@@ -467,7 +467,7 @@ class Home extends Component {
467
           <div className="rightContent">
467
           <div className="rightContent">
468
             <div class="topMsg2 animate__animated animate__fadeInDown animate__slower">
468
             <div class="topMsg2 animate__animated animate__fadeInDown animate__slower">
469
               <div className="topMsg bigDivPd">
469
               <div className="topMsg bigDivPd">
470
-                <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'}>
470
+                <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'}>
471
                   <p className="topMsg_title" style={{marginBottom:'8px'}}>计划完成率 <span className="topMsg_tips">/ Plan Completion Rate</span></p>
471
                   <p className="topMsg_title" style={{marginBottom:'8px'}}>计划完成率 <span className="topMsg_tips">/ Plan Completion Rate</span></p>
472
                 </Tooltip>
472
                 </Tooltip>
473
                 <div className={changGif ? "topMsg_content changBg_topMsg_content" : "topMsg_content"} id="manHourBox">
473
                 <div className={changGif ? "topMsg_content changBg_topMsg_content" : "topMsg_content"} id="manHourBox">
@@ -491,7 +491,7 @@ class Home extends Component {
491
 
491
 
492
             <div class="topMsg_22 animate__animated animate__fadeInDown animate__slower">
492
             <div class="topMsg_22 animate__animated animate__fadeInDown animate__slower">
493
               <div className="topMsg_2">
493
               <div className="topMsg_2">
494
-                <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'}>
494
+                <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'}>
495
                   <p className="topMsg_title">锂辉石消耗量 <span className="topMsg_tips">/ Spodumene Consumption</span></p>
495
                   <p className="topMsg_title">锂辉石消耗量 <span className="topMsg_tips">/ Spodumene Consumption</span></p>
496
                 </Tooltip>
496
                 </Tooltip>
497
 
497
 
@@ -503,7 +503,7 @@ class Home extends Component {
503
 
503
 
504
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower  animate__delay-1s">
504
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower  animate__delay-1s">
505
               <div className="bottomContent bigDivPd">
505
               <div className="bottomContent bigDivPd">
506
-                <Tooltip placement="bottom" title={' ● 近六个月的氢氧化锂产品一次合格率曲线,当月的数据计算至更新日期。\n ● Month-to-date battery grade LHM production rate excluding retreatment'}>
506
+                <Tooltip placement="bottom" title={'● 近六个月的氢氧化锂产品一次合格率曲线,当月的数据计算至更新日期。\n● Month-to-date battery grade LHM production rate excluding retreatment'}>
507
                   <p className="topMsg_title">产品一次合格率 <span className="topMsg_tips">/ First Pass Yield</span></p>
507
                   <p className="topMsg_title">产品一次合格率 <span className="topMsg_tips">/ First Pass Yield</span></p>
508
                 </Tooltip>
508
                 </Tooltip>
509
                 <div className="topMsg_content">
509
                 <div className="topMsg_content">

+ 5 - 5
src/pages/tqcDataVHome/view.jsx

@@ -2,7 +2,7 @@
2
  * @Author: dayan_hjm 
2
  * @Author: dayan_hjm 
3
  * @Date: 2023-10-25 10:32:44 
3
  * @Date: 2023-10-25 10:32:44 
4
  * @Last Modified by: dayan_hjm
4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-01-22 15:21:55
5
+ * @Last Modified time: 2024-11-11 14:14:26
6
  */
6
  */
7
 /*
7
 /*
8
  * @Author: dayan_hjm 
8
  * @Author: dayan_hjm 
@@ -260,16 +260,16 @@ class Home extends Component {
260
           window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
260
           window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
261
         }
261
         }
262
         {/* 右键切换大屏 */}
262
         {/* 右键切换大屏 */}
263
-        <Tooltip placement="bottom" title={"产供销价值链"}>
263
+        <Tooltip placement="bottom">
264
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
264
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
265
-            deleteCacheAndChangeUrl("/home/gvc", (url) => {
265
+            deleteCacheAndChangeUrl("right", (url) => {
266
               this.props.history.replace(url);
266
               this.props.history.replace(url);
267
             })
267
             })
268
           }} />
268
           }} />
269
         </Tooltip>
269
         </Tooltip>
270
-        <Tooltip placement="bottom" title={"TLK运营数据中心 / TLK Plant Dashboard"}>
270
+        <Tooltip placement="bottom">
271
           <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
271
           <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
272
-            deleteCacheAndChangeUrl("/home/tlk", (url) => {
272
+            deleteCacheAndChangeUrl("left", (url) => {
273
               this.props.history.replace(url);
273
               this.props.history.replace(url);
274
             })
274
             })
275
           }} />
275
           }} />

+ 29 - 3
src/utils/util.js

@@ -997,10 +997,36 @@ export function getThousandNum(num,need100){
997
 }
997
 }
998
 
998
 
999
 //大屏转跳-去除缓存
999
 //大屏转跳-去除缓存
1000
-export function deleteCacheAndChangeUrl(url,callback){
1001
-  RouterCache.deleteCache(url)
1000
+export function deleteCacheAndChangeUrl(next='left',callback){
1001
+  const screenName = ["/home/operation","/home/gvc","/home/tlk"];
1002
+  const HasScreen = localStorage.getItem("tqcHasScreen").split(",") || [];
1003
+  //排序菜单路径
1004
+  let newHasScreen = [];
1005
+  screenName.map(x=>{
1006
+    if(HasScreen.includes(x)){
1007
+      newHasScreen.push(x)
1008
+    }
1009
+  })
1010
+  console.log(newHasScreen)
1011
+  //找到下一页的大屏
1012
+  const currUrl = window.location.hash.split("#")[1];
1013
+  let ai = 0;
1014
+  for (let index = 0; index < newHasScreen.length; index++) {
1015
+    const element = newHasScreen[index];
1016
+    if(element == currUrl){
1017
+      ai = index
1018
+    }
1019
+  }
1020
+  let newUrl = '';
1021
+  if(next == 'right'){//向右切
1022
+    //当前地址在菜单数组中的index
1023
+    newUrl = newHasScreen[ai+1] || newHasScreen[0]
1024
+  }else{
1025
+    newUrl = newHasScreen[ai-1] || newHasScreen[newHasScreen.length-1]
1026
+  }
1027
+  RouterCache.deleteCache(newUrl)
1002
   setTimeout(()=>{
1028
   setTimeout(()=>{
1003
-    callback && callback(url)
1029
+    callback && callback(newUrl)
1004
   },300)
1030
   },300)
1005
 }
1031
 }
1006
 
1032