Ver código fonte

style: style

@dayan_hjm 1 ano atrás
pai
commit
29a49e3726

+ 7 - 7
src/assets/css/styleTemplate.less

@@ -2,7 +2,7 @@
2 2
  * @Author: dayan_hjm 茶百道主题样式
3 3
  * @Date: 2022-10-27 10:56:37 
4 4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-14 17:23:10
5
+ * @Last Modified time: 2024-10-16 17:08:51
6 6
  */
7 7
 
8 8
 @import url("../../themes/themes.less");
@@ -527,13 +527,13 @@
527 527
               }
528 528
 
529 529
 
530
-              #echarts4,
530
+              #echarts4,#echarts41,
531 531
               #echarts6_box {
532 532
                 width: 45%;
533 533
                 height: 90%;
534 534
               }
535 535
 
536
-              #echarts4 {
536
+              #echarts4,#echarts41 {
537 537
                 width: 55%;
538 538
               }
539 539
 
@@ -568,7 +568,7 @@
568 568
                   }
569 569
                 }
570 570
 
571
-                #echarts6 {
571
+                #echarts6,#echarts61 {
572 572
                   width: 100%;
573 573
                   height: 100%;
574 574
                 }
@@ -604,7 +604,7 @@
604 604
             align-items: center;
605 605
             justify-content: center;
606 606
 
607
-            #chartmain {
607
+            #chartmain,#chartmain2 {
608 608
               min-width: 300px;
609 609
               width: 90%;
610 610
               height: 100%;
@@ -649,7 +649,7 @@
649 649
           display: flex;
650 650
           align-items: center;
651 651
 
652
-          #echarts5 {
652
+          #echarts5,#echarts51 {
653 653
             min-width: 400px;
654 654
             width: 100%;
655 655
             height: 80%;
@@ -928,7 +928,7 @@
928 928
               justify-content: center;
929 929
             }
930 930
 
931
-            #echarts2 {
931
+            #echarts2,#echarts21 {
932 932
               min-width: 600px;
933 933
               width: 95%;
934 934
               height: 90%;

+ 3 - 3
src/pages/gvc/view.jsx

@@ -2,7 +2,7 @@
2 2
  * @Author: dayan_hjm  产供销价值链
3 3
  * @Date: 2023-11-10 10:19:34 
4 4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-08-14 16:41:44
5
+ * @Last Modified time: 2024-10-16 17:00:24
6 6
  */
7 7
 
8 8
 import React, { useState, useEffect, Component } from "react";
@@ -387,9 +387,9 @@ class Gvc extends Component {
387 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={"数据运营中心"}>
390
+        <Tooltip placement="bottom" title={"TLK运营数据中心 / TLK Plant Dashboard"}>
391 391
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
392
-            deleteCacheAndChangeUrl("/home/operation", (url) => {
392
+            deleteCacheAndChangeUrl("/home/tlk", (url) => {
393 393
               this.props.history.replace(url);
394 394
             })
395 395
 

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

@@ -51,7 +51,7 @@ class BottomLineForSend extends Component {
51 51
   setData() {
52 52
     setTimeout(() => {
53 53
       // 基于准备好的dom,初始化echarts实例
54
-      var myChart = echarts.init(document.getElementById('echarts2'));
54
+      var myChart = echarts.init(document.getElementById('echarts21'));
55 55
 
56 56
       var option = {
57 57
         tooltip: {
@@ -136,10 +136,10 @@ class BottomLineForSend extends Component {
136 136
             },
137 137
           },
138 138
           axisLabel: {
139
-            formatter: "{value}",
139
+            formatter: "{value}t",
140 140
             textStyle: {
141 141
               color: '#7d7d7d',
142
-              fontSize: 13
142
+              fontSize: 11
143 143
             },
144 144
           },
145 145
 
@@ -237,7 +237,7 @@ class BottomLineForSend extends Component {
237 237
 
238 238
     return (
239 239
       <div className={["eacharView cbBottomLineForSend"]}>
240
-        <div id="echarts2"></div>
240
+        <div id="echarts21"></div>
241 241
       </div>
242 242
     )
243 243
   }

+ 178 - 193
src/pages/tlk/component/leftMenoyView.jsx

@@ -2,7 +2,7 @@
2 2
  * @Author: dayan_hjm 库存金额
3 3
  * @Date: 2023-10-23 09:32:12 
4 4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-14 16:31:03
5
+ * @Last Modified time: 2024-10-16 16:54:35
6 6
  */
7 7
 
8 8
 
@@ -24,12 +24,12 @@ class LeftMenoyView extends Component {
24 24
     super(props, context);
25 25
     this.store = mod;
26 26
     this.state = {
27
-      max1:[],
28
-      year:["氢氧化锂(电池级)/ LHM(BG)","氢氧化锂(工业级)/ LHM(PG)",'氢氧化锂(待检验)/ LHM(PENDING)'],
29
-      missionsIntensity_arr:[
30
-        {value:0,name:"氢氧化锂(电池级)/ LHM(BG)"},
31
-        {value:0,name:"氢氧化锂(工业级)/ LHM(PG)"},
32
-        {value:0,name:'氢氧化锂(待检验)/ LHM(PENDING)'},
27
+      max1: [],
28
+      year: ["氢氧化锂(电池级)/ LHM(BG)", "氢氧化锂(工业级)/ LHM(PG)", '氢氧化锂(待检验)/ LHM(PENDING)'],
29
+      missionsIntensity_arr: [
30
+        { value: 0, name: "氢氧化锂(电池级)/ LHM(BG)" },
31
+        { value: 0, name: "氢氧化锂(工业级)/ LHM(PG)" },
32
+        { value: 0, name: '氢氧化锂(待检验)/ LHM(PENDING)' },
33 33
       ],
34 34
     };
35 35
   }
@@ -39,116 +39,116 @@ class LeftMenoyView extends Component {
39 39
   }
40 40
 
41 41
   async getUrl() {
42
-    let data_style= [{
43
-            value: 25, name: '', itemStyle: {
44
-              normal: {
45
-                // barBorderRadius: 15,
46
-                // borderColor: "rgba(141, 147, 255, 1)",
47
-                // borderWidth: 1,
48
-                color: {
49
-                  // 完成的圆环的颜色
50
-                  colorStops: [
51
-                    {
52
-                      offset: 0,
53
-                      color: '#8D93FF', // 0% 处的颜色
54
-                    },
55
-                    {
56
-                      offset: 1,
57
-                      color: '#8D93FF', // 100% 处的颜色
58
-                    },
59
-                  ],
60
-                },
42
+    let data_style = [{
43
+      value: 25, name: '', itemStyle: {
44
+        normal: {
45
+          // barBorderRadius: 15,
46
+          // borderColor: "rgba(141, 147, 255, 1)",
47
+          // borderWidth: 1,
48
+          color: {
49
+            // 完成的圆环的颜色
50
+            colorStops: [
51
+              {
52
+                offset: 0,
53
+                color: '#8D93FF', // 0% 处的颜色
61 54
               },
62
-            },
63
-
64
-          }, {
65
-            value: 33, name: '', itemStyle: {
66
-              normal: {
67
-                // barBorderRadius: 15,
68
-                // borderColor: "rgba(105, 255, 222, 1)",
69
-                // borderWidth: 1,
70
-
71
-                color: {
72
-                  // 完成的圆环的颜色
73
-                  colorStops: [
74
-                    {
75
-                      offset: 0,
76
-                      color: '#FFCE00', // 0% 处的颜色
77
-                    },
78
-                    {
79
-                      offset: 1,
80
-                      color: '#FFCE00', // 100% 处的颜色
81
-                    },
82
-                  ],
83
-                },
55
+              {
56
+                offset: 1,
57
+                color: '#8D93FF', // 100% 处的颜色
84 58
               },
85
-            },
86
-
87
-          }, {
88
-            value: 35, name: '', itemStyle: {
89
-              normal: {
90
-                // barBorderRadius: 15,
91
-                // borderColor: "rgba(47, 210, 255, 1)",
92
-                // borderWidth: 1,
93
-
94
-                color: {
95
-                  // 完成的圆环的颜色
96
-                  colorStops: [
97
-                    {
98
-                      offset: 0,
99
-                      color: '#69FFDE', // 0% 处的颜色
100
-                    },
101
-                    {
102
-                      offset: 1,
103
-                      color: '#69FFDE', // 100% 处的颜色
104
-                    },
105
-                  ],
106
-                },
59
+            ],
60
+          },
61
+        },
62
+      },
63
+
64
+    }, {
65
+      value: 33, name: '', itemStyle: {
66
+        normal: {
67
+          // barBorderRadius: 15,
68
+          // borderColor: "rgba(105, 255, 222, 1)",
69
+          // borderWidth: 1,
70
+
71
+          color: {
72
+            // 完成的圆环的颜色
73
+            colorStops: [
74
+              {
75
+                offset: 0,
76
+                color: '#FFCE00', // 0% 处的颜色
107 77
               },
108
-            },
109
-
110
-          }, {
111
-            value: 40, name: '', itemStyle: {
112
-              normal: {
113
-                // barBorderRadius: 15,
114
-                // borderColor: "rgba(255, 206, 0, 1)",
115
-                // borderWidth: 1,
116
-
117
-                color: {
118
-                  // 完成的圆环的颜色
119
-                  colorStops: [
120
-                    {
121
-                      offset: 0,
122
-                      color: '#8D93FF', // 0% 处的颜色
123
-                    },
124
-                    {
125
-                      offset: 1,
126
-                      color: '#8D93FF', // 100% 处的颜色
127
-                    },
128
-                  ],
129
-                },
78
+              {
79
+                offset: 1,
80
+                color: '#FFCE00', // 100% 处的颜色
130 81
               },
131
-            },
82
+            ],
83
+          },
84
+        },
85
+      },
86
+
87
+    }, {
88
+      value: 35, name: '', itemStyle: {
89
+        normal: {
90
+          // barBorderRadius: 15,
91
+          // borderColor: "rgba(47, 210, 255, 1)",
92
+          // borderWidth: 1,
93
+
94
+          color: {
95
+            // 完成的圆环的颜色
96
+            colorStops: [
97
+              {
98
+                offset: 0,
99
+                color: '#69FFDE', // 0% 处的颜色
100
+              },
101
+              {
102
+                offset: 1,
103
+                color: '#69FFDE', // 100% 处的颜色
104
+              },
105
+            ],
106
+          },
107
+        },
108
+      },
109
+
110
+    }, {
111
+      value: 40, name: '', itemStyle: {
112
+        normal: {
113
+          // barBorderRadius: 15,
114
+          // borderColor: "rgba(255, 206, 0, 1)",
115
+          // borderWidth: 1,
116
+
117
+          color: {
118
+            // 完成的圆环的颜色
119
+            colorStops: [
120
+              {
121
+                offset: 0,
122
+                color: '#8D93FF', // 0% 处的颜色
123
+              },
124
+              {
125
+                offset: 1,
126
+                color: '#8D93FF', // 100% 处的颜色
127
+              },
128
+            ],
129
+          },
130
+        },
131
+      },
132 132
 
133
-          }]
133
+    }]
134 134
     await momeyService().then(({ data = [], resultCode }) => {
135
-      
135
+
136 136
       if (+resultCode === 0) {
137
-        let year = [], missionsIntensity_arr = [],max1=[],num=[];
137
+        let year = [], missionsIntensity_arr = [], max1 = [], num = [];
138 138
         data.map((x, i) => {
139
-          if(i > 2){return}
139
+          if (i > 2) { return }
140 140
           num.push(x.indexValue)
141 141
           // year.unshift(x.prodCatgory);
142 142
           data_style[i].value = x.indexValue;
143
-          data_style[i].name =  this.state.year[i]// x.prodCatgory;
143
+          data_style[i].name = this.state.year[i]// x.prodCatgory;
144 144
           missionsIntensity_arr.push(data_style[i])
145 145
         });
146 146
         const max_1 = getArrMax(num);
147 147
         for (let index = 0; index < data.length; index++) {
148
-          if(index > 2){break}
149
-          max1.unshift(max_1/0.7)
148
+          if (index > 2) { break }
149
+          max1.unshift(max_1 / 0.7)
150 150
         }
151
-        this.setState({  missionsIntensity_arr,max1 });
151
+        this.setState({ missionsIntensity_arr, max1 });
152 152
         this.setData();
153 153
         this.setData2();
154 154
       }
@@ -160,7 +160,7 @@ class LeftMenoyView extends Component {
160 160
   setData() {
161 161
     setTimeout(() => {
162 162
       // 基于准备好的dom,初始化echarts实例
163
-      var myChart = echarts.init(document.getElementById('echarts4'));
163
+      var myChart = echarts.init(document.getElementById('echarts41'));
164 164
       var option = {
165 165
 
166 166
         grid: {
@@ -271,110 +271,88 @@ class LeftMenoyView extends Component {
271 271
   }
272 272
 
273 273
   setData2() {
274
+    var data = [
275
+      {
276
+        value: 55, name: '氢氧化锂(电池级)/ LHM(BG)', itemStyle: {
277
+          borderRadius: '30%',
278
+          normal: {
279
+            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
280
+              offset: 0,
281
+              color: 'rgba(105, 255, 222, 0.3)'
282
+            }, {
283
+              offset: 1,
284
+              color: 'rgba(105, 255, 222, 1)'
285
+            }]),
286
+          }
287
+        }
288
+      },
289
+      {
290
+        value: 38, name: '氢氧化锂(工业级)/ LHM(PG)', itemStyle: {
291
+          borderRadius: '30%',
292
+          normal: {
293
+            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
294
+              offset: 0,
295
+              color: 'rgba(141, 147, 255, 0.3)'
296
+            }, {
297
+              offset: 1,
298
+              color: 'rgba(141, 147, 255, 1)'
299
+            }]),
300
+          }
301
+        }
302
+      },
303
+      {
304
+        value: 32, name: '油氢氧化锂(待检验)/ LHM(PENDING)', itemStyle: {
305
+          borderRadius: '30%',
306
+          normal: {
307
+            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
308
+              offset: 0,
309
+              color: 'rgba(255, 206, 0, 0.3)'
310
+            }, {
311
+              offset: 1,
312
+              color: 'rgba(255, 206, 0, 1)'
313
+            }]),
314
+          }
315
+        }
316
+      },
317
+    ];
318
+
274 319
     setTimeout(() => {
275 320
       // 基于准备好的dom,初始化echarts实例
276
-      var myChart = echarts.init(document.getElementById('echarts6'));
277
-      let index = 0;
278
-      function fun() {
279
-        var timer = setInterval(function () {
280
-          myChart.dispatchAction({
281
-            type: 'hideTip',
282
-            seriesIndex: 0,
283
-            dataIndex: index,
284
-          });
285
-          // 显示提示框
286
-          myChart.dispatchAction({
287
-            type: 'showTip',
288
-            seriesIndex: 0,
289
-            dataIndex: index,
290
-          });
291
-          // 取消高亮指定的数据图形
292
-          myChart.dispatchAction({
293
-            type: 'downplay',
294
-            seriesIndex: 0,
295
-            dataIndex: index == 0 ? 3 : index - 1,
296
-          });
297
-          myChart.dispatchAction({
298
-            type: 'highlight',
299
-            seriesIndex: 0,
300
-            dataIndex: index,
301
-          });
302
-          index++;
303
-          if (index >= 4) {
304
-            index = 0;
305
-          }
306
-        }, 2000);
307
-      }
308
-      // fun();
309
-      // setTimeout(function () {
310
-      //   fun();
311
-      // }, 3000);
321
+      var myChart = echarts.init(document.getElementById('echarts61'));
312 322
       var option = {
313
-        // //标题
314
-        // title: {
315
-        //   text: '16%',
316
-        //   subtext: '氢氧化锂',
317
-        //   x: 'center',
318
-        //   y: '40%',
319
-        //   textStyle: {
320
-        //     color: '#fff',
321
-        //     fontSize: 20,
322
-        //     lineHeight: 10,
323
+        // title:{
324
+        // text: '208768t\n总库存',
325
+        //     top: '45%',
326
+        //     textAlign: 'center',
327
+        //     left: '50%',
328
+        //     textStyle: {
329
+        //         color: ' #fff',
330
+        //         fontSize: 22,
331
+        //         fontWeight: '600',
332
+        //         lineHeight: 60,
333
+        //     },
323 334
         //   },
324
-        //   subtextStyle: {
325
-        //     color: 'rgba(205, 241, 255, 1)',
326
-        //     fontSize: 14,
327
-        //     lineHeight: 10,
328
-        //     marginTop: 15,
329
-        //   },
330
-        // },
331
-
332
-        //图例组件
333
-
334
-        tooltip: {
335
-          trigger: 'item',
336
-          position: ['50%', '50%'],
337
-          formatter: function (params, ticket, callback) {
338
-            // $.get('detail?name=' + params.name, function (content) {
339
-            //   callback(ticket, toHTML(content));
340
-            // });
341
-            return `<div class="testDiv"><p class="p1">
342
-              ${params.percent ? params.percent.toFixed() : 0}<spanp class="p3">%</span>
343
-            </p>
344
-            <p class="p2">${params.name}</p>
345
-            </div>`;
346
-          },
347
-          backgroundColor: 'rgba(0,0,0,0)',
348
-
349
-          textStyle: {
350
-            color: '#fff',
351
-            fontSize: 20,
352
-            lineHeight: 10,
353
-          },
354
-        },
335
+        calculable: true,
355 336
         series: [
356 337
           {
357 338
             type: 'pie',
358 339
             radius: ['50%', '65%'],
359 340
             center: ['50%', '50%'],
360
-            roseType: 'area',
361
-            //标题与数字一行显示
362
-            label: {
363
-              show: false,
341
+            // roseType: 'radius',
342
+            data: data,
343
+            itemStyle: {
344
+              borderRadius: 70,
364 345
             },
365 346
             labelLine: {
366
-              show: false
367
-            },
368
-            itemStyle:{
369
-              borderRadius: 100
347
+              show: false,
348
+            }, label: {
349
+              show: false,
350
+              position: 'center',
370 351
             },
371
-            data: this.state.missionsIntensity_arr,
372 352
           },
373 353
         ],
374 354
       };
375 355
 
376
-
377
-
378 356
       // 使用刚指定的配置项和数据显示图表。
379 357
       myChart.setOption(option);
380 358
       window.addEventListener("resize", function () {
@@ -395,16 +373,23 @@ class LeftMenoyView extends Component {
395 373
             class="guanghuan animate__animated animate__pulse animate__infinite animate__slower"
396 374
           />
397 375
 
398
-          <div id="echarts6"></div>
376
+          <div id="echarts61"></div>
377
+          <div className="text_total">
378
+              <p>
379
+                    <span className="topMsg_number" class="shu1">445677</span>
380
+                    <span className="topMsg_number_2">t</span>
381
+              </p>
382
+              <span className="topMsg_number_3">总库存</span>
383
+          </div>
399 384
         </div>
400 385
         <ul className={"name_ul"}>
401 386
           {
402
-            this.state.year.map(x=>{
387
+            this.state.year.map(x => {
403 388
               return <li>{x}</li>
404 389
             })
405 390
           }
406 391
         </ul>
407
-        <div id="echarts4"></div>
392
+        <div id="echarts41"></div>
408 393
       </div>
409 394
     )
410 395
   }

+ 5 - 44
src/pages/tlk/component/moodSendView.jsx

@@ -2,7 +2,7 @@
2 2
  * @Author: dayan_hjm 月度产量/发货量
3 3
  * @Date: 2023-10-23 09:32:12 
4 4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-14 15:37:01
5
+ * @Last Modified time: 2024-10-16 10:56:56
6 6
  */
7 7
 
8 8
 
@@ -80,45 +80,6 @@ class MoodSendView extends Component {
80 80
           },
81 81
           backgroundColor:"#0000008a"
82 82
         },
83
-        // legend: {
84
-        //   data: ['发货量', '产量'],
85
-        //   fontFamily:'DingTalkJinBuTi',
86
-        //   padding: [25, 0, 0, 10],
87
-        //   textStyle:{
88
-        //     color:"#fff"
89
-        //   },
90
-        //   itemWidth: 11,
91
-        //   itemHeight: 11,
92
-        // },
93
-        // toolbox: {
94
-        //   show: true,
95
-        //   orient: 'vertical',
96
-        //   left: 'right',
97
-        //   top: 'center',
98
-        //   feature: {
99
-        //     mark: { show: true },
100
-        //     dataView: { show: true, readOnly: false },
101
-        //     magicType: { show: true, type: ['line', 'bar', 'stack'] },
102
-        //     restore: { show: true },
103
-        //     saveAsImage: { show: true }
104
-        //   }
105
-        // },
106
-        //   xAxis: {
107
-        //     data: dataAxis,
108
-        //     axisTick: {
109
-        //       show: false,
110
-        //     },
111
-        //     axisLine: {
112
-        //       show: true,
113
-        //       symbol: ['none', 'arrow'],
114
-        //       symbolOffset: 12,
115
-        //       lineStyle: {
116
-        //         color: '#fff',
117
-        //       }
118
-        //     },
119
-        //     z: 10
120
-        //   },
121
-
122 83
         xAxis: [
123 84
           {
124 85
             type: 'category',
@@ -160,10 +121,10 @@ class MoodSendView extends Component {
160 121
             },
161 122
             axisTick: { show: false },
162 123
             axisLabel: {
163
-              formatter: "{value}",
124
+              formatter: "{value}t",
164 125
               textStyle: {
165 126
                 color: '#7d7d7d',
166
-                fontSize: 12
127
+                fontSize: 11
167 128
               }
168 129
             },
169 130
             splitLine:{
@@ -203,7 +164,7 @@ class MoodSendView extends Component {
203 164
           }
204 165
         ]
205 166
       }
206
-      var myChart = echarts.init(document.getElementById('chartmain'));
167
+      var myChart = echarts.init(document.getElementById('chartmain2'));
207 168
       // 使用刚指定的配置项和数据显示图表。
208 169
       myChart.setOption(option);
209 170
     }, 3000)
@@ -213,7 +174,7 @@ class MoodSendView extends Component {
213 174
 
214 175
     return (
215 176
       <div className={["eacharView cbMoodSendView"]}>
216
-        <div id="chartmain"></div>
177
+        <div id="chartmain2"></div>
217 178
       </div>
218 179
     )
219 180
   }

+ 23 - 52
src/pages/tlk/component/oneQualified.jsx

@@ -2,7 +2,7 @@
2 2
  * @Author: dayan_hjm 一次合格率
3 3
  * @Date: 2023-10-23 09:32:12 
4 4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-14 17:19:34
5
+ * @Last Modified time: 2024-10-16 10:56:28
6 6
  */
7 7
 
8 8
 
@@ -66,7 +66,7 @@ class BottomLineForSend extends Component {
66 66
       var option = {
67 67
         grid: {
68 68
           left: '2%',
69
-          top: '18%',
69
+          top: '30%',
70 70
           right: '0%',
71 71
           bottom: '0%',
72 72
           containLabel: true
@@ -87,45 +87,16 @@ class BottomLineForSend extends Component {
87 87
           backgroundColor:"#0000008a"
88 88
         },
89 89
         legend: {
90
-          data: ['锂辉石消耗量', '锂辉石计划消耗量','锂辉石计划执行率'],
90
+          data: ['锂辉石消耗量\n(Spodunene Consumption)', '锂辉石计划消耗量\n(Spodumene Consumption Plan)','锂辉石计划执行率\n(Execution rate of spodumene plan)'],
91 91
           fontFamily:'DingTalkJinBuTi',
92
-          padding: [20, 0, 0, 10],
92
+          padding: [15, 0, 20, 0],
93 93
           textStyle:{
94
-            color:"#CDF1FF",
95
-            fontSize:10
94
+            color: "#CDF1FF",
95
+            fontSize:9,
96 96
           },
97
-          itemWidth: 8,
98
-          itemHeight: 8,
97
+          itemWidth: 6,
98
+          itemHeight: 6,
99 99
         },
100
-        // toolbox: {
101
-        //   show: true,
102
-        //   orient: 'vertical',
103
-        //   left: 'right',
104
-        //   top: 'center',
105
-        //   feature: {
106
-        //     mark: { show: true },
107
-        //     dataView: { show: true, readOnly: false },
108
-        //     magicType: { show: true, type: ['line', 'bar', 'stack'] },
109
-        //     restore: { show: true },
110
-        //     saveAsImage: { show: true }
111
-        //   }
112
-        // },
113
-        //   xAxis: {
114
-        //     data: dataAxis,
115
-        //     axisTick: {
116
-        //       show: false,
117
-        //     },
118
-        //     axisLine: {
119
-        //       show: true,
120
-        //       symbol: ['none', 'arrow'],
121
-        //       symbolOffset: 12,
122
-        //       lineStyle: {
123
-        //         color: '#fff',
124
-        //       }
125
-        //     },
126
-        //     z: 10
127
-        //   },
128
-
129 100
         xAxis: [
130 101
           {
131 102
             type: 'category',
@@ -167,10 +138,10 @@ class BottomLineForSend extends Component {
167 138
             },
168 139
             axisTick: { show: false },
169 140
             axisLabel: {
170
-              formatter: "{value}",
141
+              formatter: "{value}t",
171 142
               textStyle: {
172 143
                 color: '#7d7d7d',
173
-                fontSize: 12
144
+                fontSize: 11
174 145
               }
175 146
             },
176 147
             splitLine:{
@@ -192,10 +163,10 @@ class BottomLineForSend extends Component {
192 163
             },
193 164
             axisTick: { show: false },
194 165
             axisLabel: {
195
-              formatter: "{value}%",
166
+              formatter: "{value}t",
196 167
               textStyle: {
197 168
                 color: '#7d7d7d',
198
-                fontSize: 12
169
+                fontSize: 11
199 170
               }
200 171
             },
201 172
             splitLine:{
@@ -210,7 +181,7 @@ class BottomLineForSend extends Component {
210 181
         ],
211 182
         series: [
212 183
           {
213
-            name: '锂辉石计划消耗量',
184
+            name: '锂辉石计划消耗量\n(Spodumene Consumption Plan)',
214 185
             type: 'bar',
215 186
             animation:true,
216 187
             animationDuration:3000,
@@ -219,27 +190,27 @@ class BottomLineForSend extends Component {
219 190
             emphasis: {
220 191
               focus: 'series'
221 192
             },
222
-            barWidth: 10,
193
+            barWidth: 7,
223 194
 
224 195
             itemStyle: {
225 196
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
226 197
                 { offset: 0, color: 'rgba(255, 206, 0, 1)' },
227
-                { offset: 0.7, color: 'rgba(255, 206, 0, 1)' },
228
-                { offset: 1, color: 'rgba(255, 206, 0, 0.3)' },
198
+                { offset: 0.7, color: 'rgba(255, 206, 0, 0.5)' },
199
+                { offset: 1, color: 'rgba(255, 206, 0, 0.2)' },
229 200
               ])
230 201
             },
231 202
 
232 203
             data:this.state.proQty
233 204
           },
234 205
           {
235
-            name: '锂辉石消耗量',
206
+            name: '锂辉石消耗量\n(Spodunene Consumption)',
236 207
             type: 'bar',
237 208
             animation:true,
238 209
             animationDuration:3000,
239 210
             "smooth": true,
240 211
   
241 212
             barGap: 0,
242
-            barWidth: 10,
213
+            barWidth: 7,
243 214
             emphasis: {
244 215
               focus: 'series'
245 216
             },
@@ -249,8 +220,8 @@ class BottomLineForSend extends Component {
249 220
               },
250 221
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
251 222
                 { offset: 0, color: 'rgba(105, 255, 222, 1)' },
252
-                { offset: 0.7, color: 'rgba(105, 255, 222, 1)' },
253
-                { offset: 1, color: 'rgba(105, 255, 222, 0.3)' },
223
+                { offset: 0.7, color: 'rgba(105, 255, 222, 0.5)' },
224
+                { offset: 1, color: 'rgba(105, 255, 222, 0.2)' },
254 225
               ])
255 226
             },
256 227
             data: this.state.deliveryQty
@@ -260,7 +231,7 @@ class BottomLineForSend extends Component {
260 231
             showAllSymbol: true,
261 232
             yAxisIndex: 1,
262 233
             symbolSize: 6,
263
-            name: '锂辉石计划执行率',
234
+            name: '锂辉石计划执行率\n(Execution rate of spodumene plan)',
264 235
             itemStyle: {
265 236
                 normal: {
266 237
                     color: "#8D93FF",
@@ -269,7 +240,7 @@ class BottomLineForSend extends Component {
269 240
         }
270 241
         ]
271 242
       }
272
-      var myChart = echarts.init(document.getElementById('echarts5'));
243
+      var myChart = echarts.init(document.getElementById('echarts51'));
273 244
       // 使用刚指定的配置项和数据显示图表。
274 245
       myChart.setOption(option);
275 246
     }, 3000)
@@ -279,7 +250,7 @@ class BottomLineForSend extends Component {
279 250
 
280 251
     return (
281 252
       <div className={["eacharView cbBottomLineForSend"]}>
282
-        <div id="echarts5"></div>
253
+        <div id="echarts51"></div>
283 254
       </div>
284 255
     )
285 256
   }

+ 14 - 43
src/pages/tlk/component/oneSendView.jsx

@@ -2,7 +2,7 @@
2 2
  * @Author: dayan_hjm 月度产量/发货量
3 3
  * @Date: 2023-10-23 09:32:12 
4 4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-14 15:36:11
5
+ * @Last Modified time: 2024-10-16 10:55:36
6 6
  */
7 7
 
8 8
 
@@ -83,43 +83,14 @@ class OneSendView extends Component {
83 83
         legend: {
84 84
           data: ['预算产量(Monthly Budget)', '产量(Net Production)','计划完成率(Prodction Efflciebcy)'],
85 85
           fontFamily:'DingTalkJinBuTi',
86
-          padding: [10, 0, 0, 10],
86
+          padding: [15, 0, 0, 0],
87 87
           textStyle:{
88 88
             color:"#CDF1FF",
89
-            fontSize:10
89
+            fontSize:9
90 90
           },
91
-          itemWidth: 8,
92
-          itemHeight: 8,
91
+          itemWidth: 6,
92
+          itemHeight: 6,
93 93
         },
94
-        // toolbox: {
95
-        //   show: true,
96
-        //   orient: 'vertical',
97
-        //   left: 'right',
98
-        //   top: 'center',
99
-        //   feature: {
100
-        //     mark: { show: true },
101
-        //     dataView: { show: true, readOnly: false },
102
-        //     magicType: { show: true, type: ['line', 'bar', 'stack'] },
103
-        //     restore: { show: true },
104
-        //     saveAsImage: { show: true }
105
-        //   }
106
-        // },
107
-        //   xAxis: {
108
-        //     data: dataAxis,
109
-        //     axisTick: {
110
-        //       show: false,
111
-        //     },
112
-        //     axisLine: {
113
-        //       show: true,
114
-        //       symbol: ['none', 'arrow'],
115
-        //       symbolOffset: 12,
116
-        //       lineStyle: {
117
-        //         color: '#fff',
118
-        //       }
119
-        //     },
120
-        //     z: 10
121
-        //   },
122
-
123 94
         xAxis: [
124 95
           {
125 96
             type: 'category',
@@ -161,10 +132,10 @@ class OneSendView extends Component {
161 132
             },
162 133
             axisTick: { show: false },
163 134
             axisLabel: {
164
-              formatter: "{value}",
135
+              formatter: "{value}t",
165 136
               textStyle: {
166 137
                 color: '#7d7d7d',
167
-                fontSize: 12
138
+                fontSize: 11
168 139
               }
169 140
             },
170 141
             splitLine:{
@@ -189,7 +160,7 @@ class OneSendView extends Component {
189 160
               formatter: "{value}%",
190 161
               textStyle: {
191 162
                 color: '#7d7d7d',
192
-                fontSize: 12
163
+                fontSize: 11
193 164
               }
194 165
             },
195 166
             splitLine:{
@@ -213,13 +184,13 @@ class OneSendView extends Component {
213 184
             emphasis: {
214 185
               focus: 'series'
215 186
             },
216
-            barWidth: 10,
187
+            barWidth: 7,
217 188
 
218 189
             itemStyle: {
219 190
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
220 191
                 { offset: 0, color: 'rgba(255, 206, 0, 1)' },
221
-                { offset: 0.7, color: 'rgba(255, 206, 0, 1)' },
222
-                { offset: 1, color: 'rgba(255, 206, 0, 0.3)' },
192
+                { offset: 0.7, color: 'rgba(255, 206, 0, 0.5)' },
193
+                { offset: 1, color: 'rgba(255, 206, 0, 0.2)' },
223 194
               ])
224 195
             },
225 196
 
@@ -233,7 +204,7 @@ class OneSendView extends Component {
233 204
             "smooth": true,
234 205
   
235 206
             barGap: 0,
236
-            barWidth: 10,
207
+            barWidth: 7,
237 208
             emphasis: {
238 209
               focus: 'series'
239 210
             },
@@ -243,8 +214,8 @@ class OneSendView extends Component {
243 214
               },
244 215
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
245 216
                 { offset: 0, color: 'rgba(105, 255, 222, 1)' },
246
-                { offset: 0.7, color: 'rgba(105, 255, 222, 1)' },
247
-                { offset: 1, color: 'rgba(105, 255, 222, 0.3)' },
217
+                { offset: 0.7, color: 'rgba(105, 255, 222, 0.5)' },
218
+                { offset: 1, color: 'rgba(105, 255, 222, 0.2)' },
248 219
               ])
249 220
             },
250 221
             data: this.state.deliveryQty

+ 3 - 3
src/pages/tlk/component/rightBottomView.jsx

@@ -2,7 +2,7 @@
2 2
  * @Author: dayan_hjm 近30天产量
3 3
  * @Date: 2023-10-23 09:32:12 
4 4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-14 17:32:33
5
+ * @Last Modified time: 2024-10-16 10:57:51
6 6
  */
7 7
 
8 8
 
@@ -136,10 +136,10 @@ class RightBottomView extends Component {
136 136
             },
137 137
           },
138 138
           axisLabel: {
139
-            formatter: "{value}",
139
+            formatter: "{value}t",
140 140
             textStyle: {
141 141
               color: '#7d7d7d',
142
-              fontSize: 13
142
+              fontSize: 11
143 143
             },
144 144
           },
145 145
 

+ 65 - 2
src/pages/tlk/style.less

@@ -38,14 +38,77 @@
38 38
       height: 30%!important;
39 39
     }
40 40
     .centerCon .bottomContent3{
41
-      bottom: 10%!important;
41
+      bottom: 7%!important;
42 42
     }
43
+    .leftContent .bottomContent2{
44
+      margin-bottom: 3%!important;
45
+    }
46
+    .leftContent .center_box2{
47
+      margin-bottom: 0%!important;
48
+    }
49
+    
43 50
     .rightContent .topMsg_22{
44
-      height: 30%!important;
51
+      height: 31%!important;
52
+      margin-bottom: 3%;
45 53
       #echarts5{
46 54
         height: 100%!important;
47 55
       }
48 56
     }
57
+    .bottom_body .home .rightContent .topMsg_2 .topMsg_content {
58
+        height: 95%;
59
+    }
60
+    .rightContent{
61
+      width: 25%!important;
62
+      margin-right: 1%;
63
+    }
64
+    .leftContent{
65
+      width: 25%!important;
66
+      margin-left: 1%;
67
+    }
68
+    .rightContent .topMsg .topMsg_content .topMsg_box .topMsg_number_p{
69
+      margin-bottom: 0.1rem;
70
+      color: #84b8dc!important;
71
+      font-size: 0.4em!important;
72
+    }
73
+    .rightContent .topMsg .topMsg_content .topMsg_box .topMsg_number_p_big{
74
+      color: #CDF1FF!important;
75
+      font-size: 0.5em!important;
76
+      margin-bottom: 0.13rem;
77
+    }
78
+    .rightContent .topMsg .topMsg_content .topMsg_box{
79
+      width: 32%!important;
80
+    }
81
+    .topMsg_title{
82
+      color: #e0f6ff!important;
83
+      .topMsg_tips{
84
+        font-size: 0.7em;
85
+      }
86
+    }
87
+    .leftContent .center_box .topMsg_content .eacharView #echarts6_box .guanghuan {
88
+      top: -4%!important;
89
+      left: 2px!important;
90
+  }
91
+  .leftContent .center_box .topMsg_content .eacharView .name_ul {
92
+    width: 65%!important;
93
+  }
94
+    .text_total{
95
+      top: 37%;
96
+      position: absolute;
97
+      left: 50%;
98
+      color: #fff;
99
+      width: 0.5rem;
100
+      margin-left: -0.25rem;
101
+      font-size: 1.2em;
102
+      .topMsg_number_2{
103
+        font-size: 0.6em;
104
+      }
105
+      .topMsg_number_3{
106
+        color: rgba(205, 241, 255, 1);
107
+        font-size: 0.8em;
108
+        display: block;
109
+      }
110
+    }
111
+
49 112
   }
50 113
 }
51 114
 .home {

+ 29 - 20
src/pages/tlk/view.jsx

@@ -2,7 +2,7 @@
2 2
  * @Author: dayan_hjm 
3 3
  * @Date: 2023-10-25 10:32:44 
4 4
  * @Last Modified by: dayan_hjm
5
- * @Last Modified time: 2024-10-14 17:16:34
5
+ * @Last Modified time: 2024-10-16 17:00:52
6 6
  */
7 7
 /*
8 8
  * @Author: dayan_hjm 
@@ -261,9 +261,9 @@ class Home extends Component {
261 261
           window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
262 262
         }
263 263
         {/* 右键切换大屏 */}
264
-        <Tooltip placement="bottom" title={"产供销价值链"}>
264
+        <Tooltip placement="bottom" title={"运营数据中心"}>
265 265
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
266
-            deleteCacheAndChangeUrl("/home/gvc", (url) => {
266
+            deleteCacheAndChangeUrl("/home/operation", (url) => {
267 267
               this.props.history.replace(url);
268 268
             })
269 269
           }} />
@@ -286,7 +286,7 @@ class Home extends Component {
286 286
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-2s">
287 287
               <div className="bottomContent bigDivPd">
288 288
                 <Tooltip placement="bottom" title={' ● 近六个月的产量和发货量的对比数据(含外加工),当月的数据计算至更新日期。'}>
289
-                  <p className="topMsg_title">产品月度产量 / Monthly Net Production</p>
289
+                  <p className="topMsg_title">产品月度产量 <span className="topMsg_tips">/ Monthly Net Production</span></p>
290 290
                 </Tooltip>
291 291
                 <div className="topMsg_content">
292 292
                   <OneSendView></OneSendView>
@@ -297,7 +297,7 @@ class Home extends Component {
297 297
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-2s">
298 298
               <div className="bottomContent bigDivPd">
299 299
                 <Tooltip placement="bottom" title={' ● 近六个月的产量和发货量的对比数据(含外加工),当月的数据计算至更新日期。'}>
300
-                  <p className="topMsg_title">产品发货量 / Lithium Shipment</p>
300
+                  <p className="topMsg_title">产品发货量 <span className="topMsg_tips">/ Lithium Shipment</span></p>
301 301
                 </Tooltip>
302 302
                 <div className="topMsg_content">
303 303
                   <MoodSendView></MoodSendView>
@@ -313,7 +313,7 @@ class Home extends Component {
313 313
                   <img src={require("@assets/imgs/dataVimg/gongshi2.png").default} alt="" style={{ width: "1.3em", margin: " -0.3em 0.5em 0 0em" }} />
314 314
                   物料1库存数*物料1移动平均价+物料2*物料2移动平均价+…
315 315
                 </p>}>
316
-                  <p className="topMsg_title" style={{ position: "relative", zIndex: 999999 }}>产品库存 / Lithium Inventory</p>
316
+                  <p className="topMsg_title" style={{ position: "relative", zIndex: 999999 }}>产品库存 <span className="topMsg_tips">/ Lithium Inventory</span></p>
317 317
                 </Tooltip>
318 318
                 <div className="topMsg_content">
319 319
                   <LeftMenoyView></LeftMenoyView>
@@ -339,8 +339,8 @@ class Home extends Component {
339 339
                         }
340 340
                         <p className="topMsg_line"></p>
341 341
                         <Tooltip placement="bottom" title={' ● 本年度截止更新日期的主产品(含外加工)的产量合计'}>
342
-                        <span className="topMsg_tip">年度发货量/吨</span>
343
-                        <span className="topMsg_tip topMsg_tip2">Annual Shipments / t</span>
342
+                          <span className="topMsg_tip">年度发货量/吨</span>
343
+                          <span className="topMsg_tip topMsg_tip2">Annual Shipments / t</span>
344 344
                         </Tooltip>
345 345
                       </div>
346 346
                     </div>
@@ -354,12 +354,12 @@ class Home extends Component {
354 354
                         }
355 355
                         <p className="topMsg_line"></p>
356 356
                         <Tooltip placement="bottom" title={' ● 本年度截止更新日期的主产品(含外加工)的发货量合计。'}>
357
-                        <span className="topMsg_tip">年度产量/吨</span>
358
-                        <span className="topMsg_tip topMsg_tip2">Annual Production / t</span>
357
+                          <span className="topMsg_tip">年度产量/吨</span>
358
+                          <span className="topMsg_tip topMsg_tip2">Annual Production / t</span>
359 359
                         </Tooltip>
360 360
                       </div>
361 361
                     </div>
362
-                    <div className="center_li" style={{marginTop:'-24px',height:'78%'}}>
362
+                    <div className="center_li" style={{ marginTop: '-24px', height: '78%' }}>
363 363
                       {
364 364
                         !changNun && <span className="topMsg_number" class="shu1">{yearSend}</span>
365 365
                       }
@@ -368,8 +368,8 @@ class Home extends Component {
368 368
                       }
369 369
                       <p className="topMsg_line"></p>
370 370
                       <Tooltip placement="bottom" title={' ● 截止更新日期的主产品库存数量。'}>
371
-                      <span className="topMsg_tip">年度产品一次合格率</span>
372
-                      <span className="topMsg_tip topMsg_tip2">Annual First Pass Yield</span>
371
+                        <span className="topMsg_tip">年度产品一次合格率</span>
372
+                        <span className="topMsg_tip topMsg_tip2">Annual First Pass Yield</span>
373 373
                       </Tooltip>
374 374
                     </div>
375 375
                   </div>
@@ -379,7 +379,7 @@ class Home extends Component {
379 379
             <div class="bottomContent3 animate__animated animate__fadeInUp animate__slower animate__delay-1s">
380 380
               <div className="bottomContent">
381 381
                 <Tooltip placement="bottom" title={' ● 以更新日期为节点近30天的产量数据(含外加工)。'}>
382
-                  <p className="topMsg_title">近90天产量 / Net Production in the last 90 days</p>
382
+                  <p className="topMsg_title">近90天产量 <span className="topMsg_tips">/ Net Production in the last 90 days</span></p>
383 383
                 </Tooltip>
384 384
                 <div className="topMsg_content">
385 385
                   <BottomLineForSend></BottomLineForSend>
@@ -394,13 +394,22 @@ class Home extends Component {
394 394
             <div class="topMsg2 animate__animated animate__fadeInDown animate__slower">
395 395
               <div className="topMsg bigDivPd">
396 396
                 <Tooltip placement="bottom" title={' ● 近一年的百万工时损工率。'}>
397
-                  <p className="topMsg_title">百万工时损工率</p>
397
+                  <p className="topMsg_title">计划完成率 <span className="topMsg_tips">/ Plan Completion Rate</span></p>
398 398
                 </Tooltip>
399 399
                 <div className={changGif ? "topMsg_content changBg_topMsg_content" : "topMsg_content"} id="manHourBox">
400 400
                   <div className="topMsg_box">
401
-                    <span className="topMsg_number" class="shu1"></span>
402
-                    <span className="topMsg_number_2"></span>
403
-                    <p className="topMsg_number_p"></p>
401
+                    <p className="topMsg_number_p topMsg_number_p_big">年度产量计划完成率</p>
402
+                    <p className="topMsg_number_p">Completion rate of</p>
403
+                    <p className="topMsg_number_p" style={{marginBottom:'0.05rem'}}>annual production plan</p>
404
+                    <span className="topMsg_number" class="shu1">445677</span>
405
+                    <span className="topMsg_number_2">%</span>
406
+                  </div>
407
+                  <div className="topMsg_box">
408
+                    <p className="topMsg_number_p topMsg_number_p_big">年度锂辉石计划执行率</p>
409
+                    <p className="topMsg_number_p">Annual lithium pyroxene</p>
410
+                    <p className="topMsg_number_p" style={{marginBottom:'0.05rem'}}>plan execution rate</p>
411
+                    <span className="topMsg_number" class="shu1">97.89</span>
412
+                    <span className="topMsg_number_2">%</span>
404 413
                   </div>
405 414
                 </div>
406 415
               </div>
@@ -409,7 +418,7 @@ class Home extends Component {
409 418
             <div class="topMsg_22 animate__animated animate__fadeInDown animate__slower">
410 419
               <div className="topMsg_2">
411 420
                 <Tooltip placement="bottom" title={' ● 近六个月的主产品一次合格率,当月的数据计算至更新日期。'}>
412
-                  <p className="topMsg_title">锂辉石消耗量 / Spodumene Consumption</p>
421
+                  <p className="topMsg_title">锂辉石消耗量 <span className="topMsg_tips">/ Spodumene Consumption</span></p>
413 422
                 </Tooltip>
414 423
 
415 424
                 <div className="topMsg_content">
@@ -421,7 +430,7 @@ class Home extends Component {
421 430
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower  animate__delay-1s">
422 431
               <div className="bottomContent bigDivPd">
423 432
                 <Tooltip placement="bottom" title={' ● 近三年的碳排放总量、碳排放强度数据'}>
424
-                  <p className="topMsg_title">产品一次合格率 / First Pass Yield</p>
433
+                  <p className="topMsg_title">产品一次合格率 <span className="topMsg_tips">/ First Pass Yield</span></p>
425 434
                 </Tooltip>
426 435
                 <div className="topMsg_content">
427 436
                   <RightBottomView></RightBottomView>

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

@@ -267,9 +267,9 @@ class Home extends Component {
267 267
             })
268 268
           }} />
269 269
         </Tooltip>
270
-        <Tooltip placement="bottom" title={"产供销价值链"}>
270
+        <Tooltip placement="bottom" title={"TLK运营数据中心 / TLK Plant Dashboard"}>
271 271
           <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
272
-            deleteCacheAndChangeUrl("/home/gvc", (url) => {
272
+            deleteCacheAndChangeUrl("/home/tlk", (url) => {
273 273
               this.props.history.replace(url);
274 274
             })
275 275
           }} />