@dayan_hjm 1 year ago
parent
commit
1eb3a6c593

+ 1 - 1
src/pages/tlk/api.js

@@ -208,7 +208,7 @@ export function twoService(params) {
208 208
 /**更新日期*/
209 209
 export function updateTimeService(params) {
210 210
   return request({
211
-    url: "dataengine-center-oneservice/list/1387847244910548243",
211
+    url: "/dataengine-center-oneservice/list/1387847244910548243",
212 212
     method: "POST",
213 213
     data: {
214 214
       "apiId": "1387847244910548243",

+ 15 - 11
src/pages/tlk/component/bottomLineForSend.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-17 14:24:52
5
+ * @Last Modified time: 2024-10-23 16:49:36
6 6
  */
7 7
 
8 8
 
@@ -13,6 +13,7 @@ import mod from '../mod';
13 13
 import {
14 14
   mondService,
15 15
 } from "../api";
16
+import { getThousandNum } from "@utils/util";
16 17
 
17 18
 @withRouter
18 19
 
@@ -58,18 +59,21 @@ class BottomLineForSend extends Component {
58 59
       var option = {
59 60
         tooltip: {
60 61
           trigger: 'axis',
61
-          axisPointer: { type: 'shadow' },
62
-          borderColor: "rgba(105, 255, 222, 0.5)",
63
-          borderWidth: 2,
64
-          padding: 5,
65
-          className: 'dyLeft',
66
-          textStyle: {
67
-            fontSize: 12,
68
-            textAlign: "left",
69
-            color: "#ededed"
62
+          axisPointer: {
63
+            type: 'shadow'
64
+          },
65
+          borderColor:"rgba(105, 255, 222, 0.5)",
66
+          borderWidth:2,
67
+          padding:5, 
68
+          textStyle:{
69
+            fontSize:10,
70
+            color:"#ededed"
70 71
           },
71
-          backgroundColor: "#0000008a",
72
+          valueFormatter: (value) => {
73
+            return getThousandNum(Number(value))},
74
+          backgroundColor:"#0000008a"
72 75
         },
76
+
73 77
         // formatter: `日期: {b0}<br />{a0}: {c0}吨<br />{a1}: {c1}吨`,
74 78
         grid: {
75 79
           left: '5%',

+ 2 - 2
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-22 15:06:25
5
+ * @Last Modified time: 2024-10-23 16:39:46
6 6
  */
7 7
 
8 8
 
@@ -118,7 +118,7 @@ class LeftMenoyView extends Component {
118 118
         for (let index = 0; index < data_style.length; index++) {
119 119
           max1.unshift(max_1 / 0.8)
120 120
         }
121
-        this.setState({ missionsIntensity_arr: data_style, total, max1 });
121
+        this.setState({ missionsIntensity_arr: data_style, total:total.toFixed(2), max1 });
122 122
         this.setData();
123 123
         this.setData2();
124 124
       }

+ 5 - 1
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-18 15:17:26
5
+ * @Last Modified time: 2024-10-23 16:42:30
6 6
  */
7 7
 
8 8
 
@@ -13,6 +13,7 @@ import mod from '../mod';
13 13
 import {
14 14
   twoService,
15 15
 } from "../api";
16
+import { getThousandNum } from "@utils/util";
16 17
 
17 18
 @withRouter
18 19
 
@@ -86,6 +87,9 @@ class BottomLineForSend extends Component {
86 87
             fontSize:10,
87 88
             color:"#ededed"
88 89
           },
90
+          valueFormatter: (value) => {
91
+            return this.state.SpodRate.indexOf(value) > -1 && value!=0 ? getThousandNum(Number(value)) + '%' : getThousandNum(Number(value)) 
92
+          },
89 93
           backgroundColor:"#0000008a"
90 94
         },
91 95
         legend: {

+ 10 - 5
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-18 15:13:53
5
+ * @Last Modified time: 2024-10-23 17:01:41
6 6
  */
7 7
 
8 8
 
@@ -13,6 +13,7 @@ import mod from '../mod';
13 13
 import {
14 14
   twoService,
15 15
 } from "../api";
16
+import { getThousandNum } from "@utils/util";
16 17
 
17 18
 @withRouter
18 19
 
@@ -25,7 +26,8 @@ class OneSendView extends Component {
25 26
       proQty:[],
26 27
       year:[],
27 28
       deliveryQty:[],
28
-      ProdRate:[]
29
+      ProdRate:[],
30
+      numTool:1,
29 31
     };
30 32
   }
31 33
 
@@ -39,9 +41,9 @@ class OneSendView extends Component {
39 41
         let year = [], proQty = [], deliveryQty = [],ProdRate= [];
40 42
         data.map((x, i) => {
41 43
           year.push(x.bMonth);
42
-          proQty.push(x?.ProdQty ? x?.ProdQty.toFixed(1) : 0)
43
-          deliveryQty.push(x?.ProdBudgetqty ? x?.ProdBudgetqty.toFixed(1) : 0)
44
-          ProdRate.push(x?.ProdRate ? (x?.ProdRate*100).toFixed(1) : 0)
44
+          proQty.push(x?.ProdQty ? x?.ProdQty.toFixed(2) : 0)
45
+          deliveryQty.push(x?.ProdBudgetqty ? x?.ProdBudgetqty.toFixed(2) : 0)
46
+          ProdRate.push(x?.ProdRate ? (x?.ProdRate*100).toFixed(2) : 0)
45 47
         });
46 48
         this.setState({ year, deliveryQty,ProdRate,proQty });
47 49
         this.setData();
@@ -80,6 +82,9 @@ class OneSendView extends Component {
80 82
             fontSize:10,
81 83
             color:"#ededed"
82 84
           },
85
+          valueFormatter: (value) => {
86
+            return this.state.ProdRate.indexOf(value) > -1 && value!=0 ? getThousandNum(Number(value)) + '%' : getThousandNum(Number(value)) 
87
+          },
83 88
           backgroundColor:"#0000008a"
84 89
         },
85 90
         legend: {

+ 4 - 1
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-18 15:30:14
5
+ * @Last Modified time: 2024-10-23 17:03:23
6 6
  */
7 7
 
8 8
 
@@ -65,6 +65,9 @@ class RightBottomView extends Component {
65 65
             textAlign: "left",
66 66
             color: "#ededed"
67 67
           },
68
+          valueFormatter: (value) => {
69
+            return value + '%';
70
+          },
68 71
           backgroundColor: "#0000008a",
69 72
         },
70 73
         // formatter: `日期: {b0}<br />{a0}: {c0}吨<br />{a1}: {c1}吨`,

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

@@ -105,6 +105,7 @@
105 105
     }
106 106
     .centerCon .bottomContent3{
107 107
       height: 27%;
108
+      z-index: 999;
108 109
     }
109 110
     .centerCon .right_li{
110 111
       margin-top: -27px;
@@ -262,7 +263,7 @@
262 263
   top: -4% !important;
263 264
     }
264 265
   }
265
-  @media (min-height: 1000px) {//横屏大屏
266
+  @media (min-height: 1100px) {//横屏大屏
266 267
     .leftContent .center_box .topMsg_content .eacharView #echarts6_box .guanghuan{
267 268
       top: 4% !important;
268 269
     }

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

@@ -174,9 +174,9 @@ class Home extends Component {
174 174
           datas[0] = changeName({ IndexValue: this.store.state.tailiTotal }, 0);
175 175
           if (x.IndexCode == '22') {
176 176
             datas[1] = changeName(x, 1);
177
-          } else if (x.IndexCode == '23') {
178
-            datas[2] = changeName(x, 2);
179 177
           } else if (x.IndexCode == '21') {
178
+            datas[2] = changeName(x, 2);
179
+          } else if (x.IndexCode == '23') {
180 180
             datas[3] = changeName(x, 3);
181 181
           } else if (x.IndexCode == '24') {
182 182
             datas[4] = changeName(x, 4);