Merge remote-tracking branch 'origin/dev' into dev

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -58,6 +58,16 @@
             </el-table-column>
             <el-table-column
               align="center"
+              label="车号"
+              show-overflow-tooltip
+              prop="billNo">
+              <template slot-scope="{row}">
+                <span class="el-button--text" style="cursor: pointer"
+                      @click="openTrack(row)">{{ row.plateNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
               label="场站"
               show-overflow-tooltip
               prop="station"
@@ -184,20 +194,19 @@ export default {
   methods: {
     openTrack(row){
       this.dialogVisible = true
-      this.initMap();
-      // gaude({itemId: row.id,plateNo:'陕YH0008'}).then(res => {
-      //   console.log(res)
-        // this.lineArr = res.data.data
-        // this.initMap();
-      // })
-      // location({itemId: row.id,plateNo:'陕YH0008'}).then(res => {
-      //   console.log(res)
-      // })
+      gaude({itemId: row.id,plateNo:row.plateNo}).then(res => {
+        this.lineArr = res.data.data
+        this.initMap();
+      })
+      location({itemId: row.id,plateNo:'陕YH0008'}).then(res => {
+        // console.log(res.data.data)
+        // console.log(this.lineArr[this.lineArr.length - 1])
+      })
     },
     initMap() {
       this.map = new AMap.Map("container", {
         resizeEnable: true,
-        center: [116.397428, 39.90923],
+        center: [120.382891,36.066460],
         zoom: 17
       });
       let icon = new AMap.Icon({