新增

src/api/Service.js

@@ -20,7 +20,7 @@ export const Service = axios.create({
   baseURL: G ? G.url : process.env.BASE_API, // api的base_url,
   method:'get、post、put、patch、delete',
   headers: {
-    'Content-Type': 'application/json;charset=UTF-8'
+    'Content-Type': 'application/json;charset=UTF-8',
   }
 })
 // 添加请求拦截器

src/api/request.js

@@ -63,7 +63,7 @@ export function setVehicleStatus(data) {//设置车辆
 }
 export function Getorders(data) {//订单列表templateslist
   return Service({
-    url: '/orderlist?page='+data.page+"&filter_by_state="+data.filter_by_state,
+    url: '/Framework/OrderConfig/GetAllList?PageIndex='+data.page+"&PageSize="+data.filter_by_state,
     method: 'get',
 	data:data
   })

src/pages/Common/home.vue

@@ -1101,6 +1101,7 @@
 				//获取全部车辆
 				getVehicles()
 					.then(res => {
+						// console.log(res, '车辆信息')
 						let vehiclesData = JSON.parse(JSON.stringify(res.vehicles));
 						this.vehiclesDatas = vehiclesData;
 						this.carsinfordata = [];
@@ -1154,10 +1155,11 @@
 			Getorder() {
 				let json = {
 					page:this.pageSize,
-					filter_by_state:this.filter_by_state
+					filter_by_state:5
 				}
 				Getorders(json)
 					.then(res => {
+						console.log(res,'red')
 						let orderData = JSON.parse(JSON.stringify(res.orders));
 						this.tableData = [];
 						this.pageCount = res.total;
@@ -1206,7 +1208,6 @@
 							} else {
 								item.Status = "未知 ";
 							}
-
 							if (orderData[index].order_type == "NORMAL") {
 								item.Type = "工作任务";
 							} else if (orderData[index].order_type == "CHARGE") {

static/serve.js

@@ -1,4 +1,4 @@
 window.g = {
-  url: `http://192.168.30.250:3420/api` ,// 配置服务器地址
+  url: `http://139.198.181.133:5000` ,// 配置服务器地址
 	mapURL: `http://192.168.30.250:3420/api` // 地图地址
 }