订单轨迹

src/api/orderManagement.js

@@ -46,6 +46,15 @@ export function batchData(data) {
   return request({
     url: '/orderInfo/api/readXmlManagement',
     method: 'post',
-     data: data,
+    data: data,
   })
 }
+
+// 订单轨迹
+export function travelpath(data) {
+  return request({
+    url: '/hyOrderTravelPath/getInfo',
+    method: 'get',
+    params: data,
+  })
+}

src/components/mapdrag/indexMap.vue

@@ -4,6 +4,9 @@
   </div>
 </template>
 <script>
+  import {
+    travelpath
+  } from '@/api/orderManagement'
   import AMapLoader from "@amap/amap-jsapi-loader";
   export default {
     name: "app",
@@ -41,15 +44,48 @@
         ],
       };
     },
-    props: ['radio'],
+    props: ['radio','orderid'],
     watch: {
       radio: function(val1, val2) {
         if(val1==1) {
-          this.path = this.path1
+          var that=this
+          travelpath({orderId:that.orderid}).then(response => {
+            that.path1=[]
+            var patharr=JSON.parse(response.data.longitudeLatitude)
+            // console.log(JSON.parse(response.data.longitudeLatitude),11111111)
+            for (let i = 0; i < patharr.length; i++) {
+              that.path1.push([patharr[i].longitude,patharr[i].latitude])
+            }
+            that.path = that.path1
+            that.loadmap();
+          })
+          .catch(() => {
+            // console.log(121212)
+          })
+          // this.path = this.path1
         }else{
-          this.path = this.path2
+          var that=this
+          travelpath({orderId:that.orderid}).then(response => {
+            that.path2=[]
+            var patharr=JSON.parse(response.data.longitudeLatitude)
+            // console.log(JSON.parse(response.data.longitudeLatitude),11111111)
+            for (let i = 0; i < patharr.length; i++) {
+              that.path2.push([patharr[i].longitude,patharr[i].latitude])
+            }
+            that.path = that.path2
+            that.loadmap();
+          })
+          .catch(() => {
+            // console.log(121212)
+          })
+          // travelpath({orderId:this.orderid}).then(response => {
+          //   console.log(response)
+          // })
+          // .catch(() => {
+          // })
+          // this.path = this.path2
         }
-        this.loadmap();
+        // this.loadmap();
       }
     },
     methods: {
@@ -130,7 +166,7 @@
           //对第一条线路（即索引 0）创建一个巡航器
           let trajectory = pathSimplifierIns.createPathNavigator(0, {
             loop: true, //循环播放
-            speed: 1000000 //巡航速度，单位千米/小时
+            speed: 100 //巡航速度，单位千米/小时
           });
 
           trajectory.start();
@@ -138,8 +174,26 @@
       }
     },
     mounted() {
-       this.path = this.path1
-      this.loadmap();
+      var that=this
+      // console.log(this.orderid)
+      this.$nextTick(function(){
+        travelpath({orderId:that.orderid}).then(response => {
+            that.path1=[]
+            var patharr=JSON.parse(response.data.longitudeLatitude)
+            // console.log(JSON.parse(response.data.longitudeLatitude),11111111)
+            for (let i = 0; i < patharr.length; i++) {
+              that.path1.push([patharr[i].longitude,patharr[i].latitude])
+            }
+            
+            that.path = that.path1
+            that.loadmap();
+          })
+          .catch(() => {
+            // console.log(121212)
+          })
+      })
+      
+       
     }
   };
 </script>

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -130,7 +130,7 @@
       style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
       layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
-    <el-dialog title="身份信息" :visible.sync="userInfo" width="500px" :before-close="userInfoClose">
+    <el-dialog :close-on-click-modal='false' title="身份信息" :visible.sync="userInfo" width="500px" :before-close="userInfoClose">
       <div class="user">
         <!-- .user -->
         <div class="title_css">姓名</div>
@@ -149,7 +149,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+    <el-dialog :close-on-click-modal='false' title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
       <div>
         <!-- <div><span class="sign">*</span>选择驳回原因</div> -->
         <div class="form_css">
@@ -172,7 +172,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="发送信息" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
+    <el-dialog :close-on-click-modal='false' title="发送信息" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
       <div class="Info_css">
         <div class="Info_title">标题</div>
         <div class="Info_item">

src/views/cargoOwnerManagement/merchantVerification.vue

@@ -62,14 +62,14 @@
 			style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
 			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 		</el-pagination>
-		<el-dialog title="授权书" :visible.sync="lookInfo" width="500px" center :before-close="lookBookClose">
+		<el-dialog :close-on-click-modal='false' title="授权书" :visible.sync="lookInfo" width="500px" center :before-close="lookBookClose">
 			<div class="InfoBook_css">
 					<img :src="bookUrl" class="InfoBook_img">
 
 			</div>
 
 		</el-dialog>
-		<el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+		<el-dialog :close-on-click-modal='false' title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
 			<div>
 				<!-- <div><span class="sign">*</span>选择驳回原因</div> -->
 				<div class="form_css">

src/views/contractManagement/contractModel.vue

@@ -81,7 +81,7 @@
       layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
     <!-- //消息 -->
-    <el-dialog title="发送信息" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
+    <el-dialog :close-on-click-modal='false' title="发送信息" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
       <div class="Info_css">
         <div class="Info_title">标题</div>
         <div class="Info_item">

src/views/driverManagement/fleetInfo.vue

@@ -85,7 +85,7 @@
       layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
     <!-- //附图 -->
-    <el-dialog title="车队信息" :visible.sync="seeinfo" width="500px" :before-close="seeinfoClose">
+    <el-dialog :close-on-click-modal='false' title="车队信息" :visible.sync="seeinfo" width="500px" :before-close="seeinfoClose">
       <div>{{dataInfo.fleetName}}({{dataInfo.fleetMemberNum}})</div>
       <div>队长： {{dataInfo.driverName}} {{dataInfo.driverNumber}}</div>
       <div>车队简介：</div>

src/views/driverManagement/identityExamine.vue

@@ -165,7 +165,7 @@
       style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
       layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
-    <el-dialog title="车辆信息" :visible.sync="carInfo" width="500px" :before-close="carClose">
+    <el-dialog :close-on-click-modal='false' title="车辆信息" :visible.sync="carInfo" width="500px" :before-close="carClose">
       <!-- <span v-if="carSee.length == 0">暂无车辆</span> -->
       <span class="tips">注：车辆信息不在本页面审核，仅供查看</span>
       <div class="car_css" v-for="(item, index) in carSee" :key="index">
@@ -185,7 +185,7 @@
         <div class="carborder_css"></div>
       </div>
     </el-dialog>
-    <el-dialog title="账户信息" :visible.sync="userInfo" width="500px" :before-close="userClose">
+    <el-dialog :close-on-click-modal='false' title="账户信息" :visible.sync="userInfo" width="500px" :before-close="userClose">
       <div class="user" v-for="(item, index) in paySee" :key="index">
         <div class="name_css">{{ item.payeeName }}</div>
         <div class="id_css">{{ item.bankCard }}</div>
@@ -196,7 +196,7 @@
       <div v-if="paySee.length == 0">暂无账户信息</div>
     </el-dialog>
     <!-- 账单 -->
-    <el-dialog title="账单" :visible.sync="billShow" width="500px" :before-close="billClose">
+    <el-dialog :close-on-click-modal='false' title="账单" :visible.sync="billShow" width="500px" :before-close="billClose">
       <div style="height: 450px" class="bill_css">
         <div class="user" v-for="(item, index) in billInfo" :key="index">
           <div class="flex">
@@ -211,7 +211,7 @@
         <div v-show="billInfo.length == 0">暂无账单信息</div>
       </div>
     </el-dialog>
-    <el-dialog title="附件" :visible.sync="fujianInfo" width="830px" :before-close="fujianClose">
+    <el-dialog :close-on-click-modal='false' title="附件" :visible.sync="fujianInfo" width="830px" :before-close="fujianClose">
       <div class="file">
         <div class="fujian_css">
           <div class="fujian_item" :class="count == 1 ? 'file_btn' : ''" @click="btnChange(1)">
@@ -247,7 +247,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+    <el-dialog :close-on-click-modal='false' title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
       <div>
         <div><span class="sign">*</span>选择驳回原因</div>
         <div class="form_css">
@@ -271,7 +271,7 @@
       </div>
     </el-dialog>
     <!-- //消息 -->
-    <el-dialog title="发送信息" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
+    <el-dialog title="发送信息" :close-on-click-modal='false' :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
       <div class="Info_css">
         <div class="Info_title">标题</div>
         <div class="Info_item">

src/views/driverManagement/vehicleExamine.vue

@@ -101,7 +101,7 @@
       style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
       layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
-    <el-dialog title="车辆信息" :visible.sync="carInfo" width="500px" :before-close="carClose">
+    <el-dialog :close-on-click-modal='false' title="车辆信息" :visible.sync="carInfo" width="500px" :before-close="carClose">
       <div class="car_css">
         <div class="title_css">人车合影</div>
         <img :src="carSee.addressUrl" class="car_item" />
@@ -114,7 +114,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="附件" :visible.sync="fujianInfo" width="830px" :before-close="fujianClose">
+    <el-dialog :close-on-click-modal='false' title="附件" :visible.sync="fujianInfo" width="830px" :before-close="fujianClose">
       <div class="file">
         <div class="fujian_css">
           <div class="fujian_item" :class="count == 1 ? 'file_btn' : ''" @click="btnChange(1)">
@@ -153,7 +153,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+    <el-dialog :close-on-click-modal='false' title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
       <div>
         <!-- <div><span class="sign">*</span>选择驳回原因</div> -->
         <div class="form_css">

src/views/feedbackManagement/userFeedback.vue

@@ -82,7 +82,7 @@
       layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
     <!-- //消息 -->
-    <el-dialog :title="titleInfo" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
+    <el-dialog :close-on-click-modal='false' :title="titleInfo" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
       <div class="Info_css">
         <div class="Info_title">
           {{ Info.initiator }}
@@ -107,7 +107,7 @@
       </div>
     </el-dialog>
     <!-- //附图 -->
-     <el-dialog title="附图" :visible.sync="seePicture" width="500px" :before-close="seePictureClose">
+     <el-dialog :close-on-click-modal='false' title="附图" :visible.sync="seePicture" width="500px" :before-close="seePictureClose">
         <img :src="dataInfo.url" class="user_item" style="width:100%;" @click="enlarge(dataInfo.url)"/>
     </el-dialog>
     <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />

src/views/orderManagement/orderAudit.vue

@@ -158,7 +158,7 @@
       style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
       layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
-    <el-dialog title="超期费用" :visible.sync="costInfo" width="500px" :before-close="costClose">
+    <el-dialog :close-on-click-modal='false' title="超期费用" :visible.sync="costInfo" width="500px" :before-close="costClose">
       <div class="cost_css">
         <div class="cost_item">
           <div class="cost_title">起计日期</div>
@@ -186,7 +186,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="账户信息" :visible.sync="userInfo" width="500px" :before-close="userClose">
+    <el-dialog :close-on-click-modal='false' title="账户信息" :visible.sync="userInfo" width="500px" :before-close="userClose">
       <div class="user" v-for="(item,index) in 2" :key="index">
         <div class="user_id">
           <div class="id_css">12121212121212121212</div>
@@ -352,6 +352,15 @@
           path: 'trajectory',
           query: {
             id: row.id,
+            orderNo:row.orderNo,
+            sendPrivate:row.sendPrivate,
+            sendCity:row.sendCity,
+            sendArea:row.sendArea,
+            sendDetailedAddress:row.sendDetailedAddress,
+            unloadPrivate:row.unloadPrivate,
+            unloadCity:row.unloadCity,
+            unloadArea:row.unloadArea,
+            unloadDetailedAddress:row.unloadDetailedAddress
           }
         })
       },

src/views/orderManagement/trajectory.vue

@@ -2,34 +2,50 @@
   <div class="center">
     <div class="center_css">
       <div class="top_css">
-         <el-radio v-model="radio" label="1" @change="change">北斗导航</el-radio>
-          <el-radio v-model="radio" label="2" @change="change">平台绘制</el-radio>
+         <el-radio v-model="radio" label="1" @change="change('1')">北斗导航</el-radio>
+          <el-radio v-model="radio" label="2" @change="change('2')">平台绘制</el-radio>
         <div class="order-detail">
-          <div>订单：123123123</div>
-          <div>发货地：辽宁省营口市鲅鱼圈红的储运库</div>
-          <div>发货地：黑龙江省齐齐哈尔市红的储运库</div>
+          <div>订单：{{querydata.orderNo}}</div>
+          <div>发货地：{{querydata.sendPrivate}}{{querydata.sendCity}}{{querydata.sendArea}}{{querydata.sendDetailedAddress}}</div>
+          <div>卸货地：{{querydata.unloadPrivate}}{{querydata.unloadCity}}{{querydata.unloadArea}}{{querydata.unloadDetailedAddress}}</div>
         </div>
       </div>
       <div class="map">
-        <map-drag :radio=' radio'></map-drag>
+        <map-drag :radio=' radio' :orderid='querydata.id'></map-drag>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+  import {
+    travelpath
+  } from '@/api/orderManagement'
   import mapDrag from '@/components/mapdrag/indexMap'
   export default {
     data() {
       return {
         radio: '1',
+        querydata:{}
       }
     },
     components: {
       mapDrag
     },
+    mounted() {
+      this.querydata=this.$route.query
+      //  let _obj = {}
+      //   _obj.orderId = this.querydata.id
+      //     travelpath(_obj).then(response => {
+      //       console.log(response)
+      //     })
+      //     .catch(() => {
+      //     })
+    },
     methods:{
       change(val){
+       
+        this.radio=val
       }
     }
   }

src/views/platformManagement/specifiedRecords.vue

@@ -53,7 +53,7 @@
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
-    <el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+    <el-dialog :close-on-click-modal='false' title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
       <div>
         <div><span class="sign">*</span>选择驳回原因</div>
         <div class="form_css">