Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/view/datacollect/index.ejs

@@ -713,8 +713,8 @@
                     },
                     formatter: function(value) {
                         var res = value;
-                        if(res.length > 8) {
-                            res = res.substring(0, 6) + "..";
+                        if(res.length > 6) {
+                            res = res.substring(0, 5) + "..";
                         }
                         return res;
                     }
@@ -838,8 +838,8 @@
                 // },
                 formatter: function(value) {
                     var res = value;
-                    if(res.length > 8) {
-                        res = res.substring(0, 6) + "..";
+                    if(res.length > 6) {
+                        res = res.substring(0, 5) + "..";
                     }
                     return res;
                 }
@@ -1275,7 +1275,6 @@
                 }
             }
             const option5 = myChart5.getOption();
-            console.log(chart_option5_data);
             option5.series[0].data = _.filter(chart_option5_data.data1, function (item) {
                 return item.value !== 0;
             });
@@ -1409,7 +1408,7 @@
                     }
                 }
             }
-            console.log(tenderList);
+            // console.log(tenderList);
             $('.data_tender_num').text(tenderList.length);
             const rate = total_price ? ZhCalc.round(ZhCalc.div(total_stage_price, total_price) * 100, 2) : 0;
             $('.data_tender_rate').text(rate ? rate + '%' : '0%');