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

src/views/businessManagement/salesOrder/index.vue

@@ -37,8 +37,12 @@
         </template>
           <!--车号1-->
           <template slot="wagonNumberOne" slot-scope="{ row }">
-              <span style="color: #409EFF;" @click="openTrack(row,1)">{{row.wagonNumberOne}}</span>
+            <span style="color: #409EFF;" @click="openTrack(row,1, row.wagonNumberOne)">{{row.wagonNumberOne}}</span>
           </template>
+        <!--车号2-->
+        <template slot="wagonNumberTwo" slot-scope="{ row }">
+          <span style="color: #409EFF;" @click="openTrack(row,1, row.wagonNumberTwo)">{{row.wagonNumberTwo}}</span>
+        </template>
 
         <template slot-scope="scope" slot="orderNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{scope.row.orgOrderNo}}</span>
@@ -268,12 +272,14 @@ export default {
   },
   methods: {
       // 车号查询位置
-      openTrack(row, index) {
-          location({itemId: row.itemId, plateNo: row.wagonNumberOne, tenantId: this.hctenantId, color: '2'}).then(res => {
+      openTrack(row, index, wagonNumber) {
+        // location({itemId: row.itemId, plateNo: row.wagonNumberOne, tenantId: this.hctenantId, color: '2'}).then(res => {
+        // row.wagonNumberOne = '鲁RM9561'
+        location({itemId: row.id, plateNo: wagonNumber, tenantId: this.hctenantId, color: '2'}).then(res => {
               this.dialogVisible = true
               let this_ = this
               setTimeout(function () {
-                  this_.initMap(res.data.data, row.wagonNumberOne);
+                  this_.initMap(res.data.data, wagonNumber);
               }, 1000)
           })
       },
@@ -839,6 +845,24 @@ export default {
 };
 </script>
 
+
+<style scoped src="@/styles/demo-center.css"></style>
 <style scoped>
+#container {
+  height: 80vh;
+  width: 100%;
+}
+
+.input-card .btn {
+  margin-right: 1.2rem;
+  width: 9rem;
+}
 
+.input-card .btn:last-child {
+  margin-right: 0;
+}
 </style>
+
+<!--<style scoped>-->
+
+<!--</style>-->