liyg 2 years ago
parent
commit
d61780224b

+ 5 - 0
src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -206,6 +206,11 @@ export default {
         //这里遍历单元格给单元格对象设置属性,s为控制样式的属性
         Object.keys(table_book.Sheets.Sheet1).forEach((key) => {
           if (key.indexOf('!') < 0 && rangeList.indexOf(this.getCol(key)) >= 0 && filterList.indexOf(key)< 0) {
+            //更改格式
+            if(isNumber(table_book.Sheets.Sheet1[key].v)){
+              table_book.Sheets.Sheet1[key].v=parseFloat(table_book.Sheets.Sheet1[key].v).toFixed(2);
+              console.log(key+":",table_book.Sheets.Sheet1[key].v);
+            }
             table_book.Sheets.Sheet1[key].s = {
               font:{
                 name:"宋体",

+ 11 - 11
src/views/statisticalReport/components/salesLogisticsStatistics/mapTest.vue

@@ -509,16 +509,16 @@ export default {
           element.runRoute[element.runRoute.length - 1].lat
         ])
         //结束标记点
-        if (element.endPoint.lon != '' && element.endPoint.lat != '') {
-          that.initMarkes(
-            20,
-            35,
-            require('@/assets/img/end.png'),
-            element.endPoint.lon,
-            element.endPoint.lat,
-            '终点'
-          )
-        }
+        // if (element.endPoint.lon != '' && element.endPoint.lat != '') {
+        //   that.initMarkes(
+        //     20,
+        //     35,
+        //     require('@/assets/img/end.png'),
+        //     element.endPoint.lon,
+        //     element.endPoint.lat,
+        //     '终点'
+        //   )
+        // }
       })
     },
     //获得结束地址
@@ -566,7 +566,7 @@ export default {
         that.initPathSimplifier()
         that.threeMarker()
         //that.initCustomMarkes(that.capacityNumber+"("+that.listPath[0].miled+")",that.listPath[0].currentPointName,that.listPath[0].currentPoint.lon,that.listPath[0].currentPoint.lat)
-        that.endline()
+        //that.endline()//预估路径
       })
     },
     initCustomMarkes(title, details, lon, lat) {