Bladeren bron

修改起始点及终点坐标显示

zhuyongjie 1 week geleden
bovenliggende
commit
431dccb956
4 gewijzigde bestanden met toevoegingen van 9 en 13 verwijderingen
  1. 0 2
      src/request/api.js
  2. 5 8
      src/request/apiConfig.js
  3. 4 2
      src/views/trackManager/mapTrack.vue
  4. 0 1
      src/views/trackManager/waybillManager.vue

+ 0 - 2
src/request/api.js

@@ -1,7 +1,6 @@
 
 import * as apiUser from './modules/apiUser'    //用户服务系统
 import * as apiContent  from './modules/apiContent' //内容服务系统
-import * as apiCow  from './modules/apiCow' //牛只管理
 import * as apiOrder  from './modules/apiOrder' //牛只订单
 import * as apiEcontract  from './modules/apiEcontract'
 import * as apiItem  from './modules/apiItem'
@@ -9,7 +8,6 @@ import * as apiTms from './modules/apiTms'
 
 export const user = apiUser
 export const content  = apiContent
-export const cow  = apiCow
 export const order  = apiOrder
 export const econtract  = apiEcontract
 export const item  = apiItem

+ 5 - 8
src/request/apiConfig.js

@@ -6,7 +6,6 @@ if (env === 'development') {  //开发环境
     apiUser: 'http://account2.aiyangniu.net',
     apiContent: 'http://contents2.aiyangniu.net',
     apiManager: 'http://manager2.aiyangniu.net',
-    apiCow: 'http://cow.aiyangniu.net',
     apiOrder: 'http://orders2.aiyangniu.net',
     apiEcontract:'http://econtracts.aiyangniu.net',
     apiItem: 'http://items2.aiyangniu.net',
@@ -17,7 +16,6 @@ if (env === 'development') {  //开发环境
     apiUser: 'http://account2.aiyangniu.net',
     apiContent: 'http://contents2.aiyangniu.net',
     apiManager: 'http://manager2.aiyangniu.net', 
-    apiCow: 'http://cow.aiyangniu.net',
     apiOrder: 'http://orders2.aiyangniu.net',
     apiEcontract:'http://econtracts.aiyangniu.net',
     apiItem: 'http://items2.aiyangniu.net',
@@ -25,12 +23,11 @@ if (env === 'development') {  //开发环境
   }
 } else { //生产环境
   api = {
-    apiUser: 'http://account.aiyangniu.cn',
-    apiContent: 'http://contents.aiyangniu.cn',
-    apiManager: 'http://manager.aiyangniu.cn',
-    apiCow: 'http://cow.aiyangniu.cn',
-    apiOrder: 'http://orders.aiyangniu.cn',
-    apiEcontract:'http://econtracts.aiyangniu.cn',
+    apiUser: 'https://account.aiyangniu.cn',
+    apiContent: 'https://contents.aiyangniu.cn',
+    apiManager: 'https://manager.aiyangniu.cn',
+    apiOrder: 'https://orders.aiyangniu.cn',
+    apiEcontract:'https://econtracts.aiyangniu.cn',
     apiItem: 'https://items.aiyangniu.cn',
     apiTms:'https://tms.aiyangniu.cn',
   }

+ 4 - 2
src/views/trackManager/mapTrack.vue

@@ -94,14 +94,16 @@ export default defineComponent({
             // 起点
             var marker = new AMap.Marker({
               map: map,
-              position: [props.waybill.originLng, props.waybill.originLat],
+              // position: [props.waybill.originLng, props.waybill.originLat],
+              position: [trajectory.value[0][0], trajectory.value[0][1]],
               icon: require('@/assets/images/qidian.png'), // 自定义图标
               offset: new AMap.Pixel(-13, -26),
             })
             // 终点
             var markerEnd = new AMap.Marker({
               map: map,
-              position: [props.waybill.destinationLng, props.waybill.destinationLat],
+              // position: [props.waybill.destinationLng, props.waybill.destinationLat],
+              position: [trajectory.value[trajectory.value.length - 1][0], trajectory.value[trajectory.value.length - 1][1]],
               icon: require('@/assets/images/zhongdian.png'), // 自定义图标
               offset: new AMap.Pixel(-13, -26),
             })

+ 0 - 1
src/views/trackManager/waybillManager.vue

@@ -102,7 +102,6 @@ import { tms } from '@/request/api'
 import { Message, Modal, Spin, Input } from 'view-ui-plus'
 import moment from 'moment'
 import { useRouter, useRoute } from 'vue-router'
-import AMapLoader from '@amap/amap-jsapi-loader'
 import mapTrack from './mapTrack.vue'
 import api from '@/request/apiConfig'
 import { wayBillStatus, plateColorFilter } from '@/utils/system/filters'