Przeglądaj źródła

feat: 所有数字保留2位小数

@dayan_hjm 2 lat temu
rodzic
commit
155f244d6c

+ 8 - 6
src/pages/tqcDataVHome/component/rightBottomView.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: 2023-11-08 16:05:47
5
+ * @Last Modified time: 2023-12-07 10:29:58
6
  */
6
  */
7
 
7
 
8
 
8
 
@@ -40,14 +40,16 @@ class RightBottomView extends Component {
40
   async getUrl(){
40
   async getUrl(){
41
     await dataengineCenterOneservice().then(({ data=[], resultCode }) => {
41
     await dataengineCenterOneservice().then(({ data=[], resultCode }) => {
42
       if (+resultCode === 0) {
42
       if (+resultCode === 0) {
43
-        let year = [],missionsIntensity_arr = [],missionsTotal_arr = [],max1=[],max2=[];
43
+        let year = [],missionsIntensity_arr = [],missionsTotal_arr = [],max1=[],max2=[],arr_1=[],arr_2=[];
44
         data.map((x,i)=>{
44
         data.map((x,i)=>{
45
           year.unshift(x.byear)
45
           year.unshift(x.byear)
46
-          missionsIntensity_arr.unshift(x.missionsIntensity)
47
-          missionsTotal_arr.unshift(x.missionsTotal)
46
+          missionsIntensity_arr.unshift(x.missionsIntensity);
47
+          arr_1.unshift(x.missionsIntensity);
48
+          missionsTotal_arr.unshift(x.missionsTotal);
49
+          arr_2.unshift(x.missionsTotal);
48
         });
50
         });
49
-        const max_1 = getArrMax(missionsIntensity_arr);
50
-        const max_2 = getArrMax(missionsTotal_arr);
51
+        const max_1 = getArrMax(arr_1);
52
+        const max_2 = getArrMax(arr_2);
51
         for (let index = 0; index < data.length; index++) {
53
         for (let index = 0; index < data.length; index++) {
52
           max1.unshift(max_1/0.8)
54
           max1.unshift(max_1/0.8)
53
           max2.unshift(max_2/0.8)
55
           max2.unshift(max_2/0.8)

+ 3 - 3
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: 2023-12-06 14:50:55
5
+ * @Last Modified time: 2023-12-07 10:11:17
6
  */
6
  */
7
 /*
7
 /*
8
  * @Author: dayan_hjm 
8
  * @Author: dayan_hjm 
@@ -225,9 +225,9 @@ class Home extends Component {
225
       var res2;
225
       var res2;
226
       
226
       
227
       if (type) {
227
       if (type) {
228
-        res2 = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number">' + getThousandNum(datas_2?.value) + '</span><p class="topMsg_number_p">' + datas_2.name + '</p></div>';//<span class="topMsg_number_2">%</span>
228
+        res2 = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number">' + getThousandNum(datas_2?.value.toFixed(2)) + '</span><p class="topMsg_number_p">' + datas_2.name + '</p></div>';//<span class="topMsg_number_2">%</span>
229
       } else {
229
       } else {
230
-        res2 = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_2?.value + '</span><p class="topMsg_number_p">' + datas_2.name + '</p></div>';
230
+        res2 = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_2?.value.toFixed(2) + '</span><p class="topMsg_number_p">' + datas_2.name + '</p></div>';
231
       }
231
       }
232
       p2.innerHTML = res2;
232
       p2.innerHTML = res2;
233
 
233
 

+ 3 - 0
src/utils/util.js

@@ -982,6 +982,9 @@ export function mapTree2(tree, c_name, la_name, isChildren = false, fathers) {
982
 
982
 
983
 export function getThousandNum(num){
983
 export function getThousandNum(num){
984
   if(!num){return 0}
984
   if(!num){return 0}
985
+  //统一保留2位小数
986
+  // num = Math.floor(num*100)/100;
987
+  num = num.toFixed(2);
985
   var TextBox8_all = num+"";
988
   var TextBox8_all = num+"";
986
   var text8_sum = TextBox8_all.replace(/(\d{1,3})(?=(\d{3})+(?:$|\.))/g,'$1,');
989
   var text8_sum = TextBox8_all.replace(/(\d{1,3})(?=(\d{3})+(?:$|\.))/g,'$1,');
987
   return text8_sum;
990
   return text8_sum;