diff --git a/aircraft/server/index/index.vue b/aircraft/server/index/index.vue
index 1f45369..cbcb454 100644
--- a/aircraft/server/index/index.vue
+++ b/aircraft/server/index/index.vue
@@ -72,7 +72,8 @@ export default {
{
name: '路线',
icon: 'route.png',
- select: 'route-select.png'
+ select: 'route-select.png',
+ navTitle: '路线'
},
{
name: '我的',
diff --git a/aircraft/server/order/detail.vue b/aircraft/server/order/detail.vue
index f12ca76..b6cd13c 100644
--- a/aircraft/server/order/detail.vue
+++ b/aircraft/server/order/detail.vue
@@ -376,7 +376,7 @@ export default {
else this.$refs.uToast.show({type: 'error',title: "订单详情获取失败!"});
let resp = await this.$api.allRoutesByScenicId(res.attractionId);
if(resp){
- this.routes = resp || [];
+ this.routes = resp.filter(item=>this.orderDetail.routeIds.includes(item.key)) || [];
} else {
this.$refs.uToast.show({type: 'error',title: "景区路线获取失败!"});
}
diff --git a/aircraft/server/route/components/search-combox.vue b/aircraft/server/route/components/search-combox.vue
new file mode 100644
index 0000000..030b6e8
--- /dev/null
+++ b/aircraft/server/route/components/search-combox.vue
@@ -0,0 +1,352 @@
+
+
+
+ {{label}}
+
+
+
+
+
+
+
+
+
+
+ {{emptyTips}}
+
+
+ {{isJSON?item[keyName]?item[keyName]:'字段'+keyName+'不存在':item}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/aircraft/server/route/detail.vue b/aircraft/server/route/detail.vue
new file mode 100644
index 0000000..f6823c7
--- /dev/null
+++ b/aircraft/server/route/detail.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+ 起飞点
+
+
+ 经纬度:{{ form.startPoint || '暂无' }}
+
+
+
+
+
+ 降落点
+
+
+ 经纬度:{{ form.endPoint || '暂无' }}
+
+
+
+ 备注信息
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/aircraft/server/route/route.vue b/aircraft/server/route/route.vue
index 87221a4..bd4e697 100644
--- a/aircraft/server/route/route.vue
+++ b/aircraft/server/route/route.vue
@@ -1,25 +1,89 @@
-
+
路线
+
+
\ No newline at end of file
diff --git a/common/http.api.js b/common/http.api.js
index 52bc942..eb9d199 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -31,6 +31,10 @@ const install = (Vue, vm) => {
vm.$api.deleteOrderTask = async (orderTaskId) => await vm.$u.delete(`/api/order/deleteOrderTask/${orderTaskId}`);// 删除飞行任务
vm.$api.editOrderStatus = async (orderTaskId,taskStatus) => await vm.$u.put(`/api/order/editOrderStatus/${orderTaskId}/${taskStatus}`);// 编辑订单飞行任务状态
+ // 路线管理
+ vm.$api.getRoutes = async (params = {}) => await vm.$u.get('/cpRoute',params);// 获取路线列表
+ vm.$api.singleRoute = async (id) => await vm.$u.get(`/cpRoute/${id}`);// 查询单个路线
+
// 设备管理
vm.$api.obtainDeviceList = async (params = {}) => await vm.$u.get('/api/dataDropdown/obtainDeviceList',params);// 获取设备下拉列表
diff --git a/pages.json b/pages.json
index fb231e5..1c4cd7c 100644
--- a/pages.json
+++ b/pages.json
@@ -74,6 +74,12 @@
"navigationBarTitleText": "新增订单"
}
},
+ {
+ "path": "route/detail",
+ "style": {
+ "navigationBarTitleText": "路线详情"
+ }
+ },
{
"path": "my/child_pages/history",
"style": {