前端sdy

src/api/V2/transport/index.js

@@ -1,14 +1,10 @@
 // 司机列表
 export const API_GET_TRAN_DRIVERINFO = '/driverViewInfo/selectDriverInfoPage'
-<<<<<<< HEAD
-export const API_POST_TRAN_DRIVERINFOADD = '/driverViewInfo/api/addInfo'
 export const API_GET_TRAN_LIST = '/tranTaskInfo/selectTranTaskInfoPage'
 export const API_POST_TRAN_ADD = '/tranTaskInfo/api/addTranTask'
-=======
 // 司机管理添加
 export const API_POST_TRAN_DRIVERINFOADD = '/driverViewInfo/api/addInfo'
 // 司机管理查看
 export const API_GET_DRIVERINFO_GETDRIVER = '/driverViewInfo/getDriver'
 // 司机管理-删除
 export const API_POST_DELETE_DRIVER = '/driverViewInfo/api/deleteDriver'
->>>>>>> f3ee2240cb2237ad61e6413e006e2b208c9c3038

src/model/transport/index.js

@@ -4,26 +4,20 @@ import { appRx } from '../defalutConfig/indexRx'
 import {
     API_GET_TRAN_DRIVERINFO,
     API_POST_TRAN_DRIVERINFOADD,
-<<<<<<< HEAD
     API_GET_TRAN_LIST,
     API_POST_TRAN_ADD,
-=======
     API_GET_DRIVERINFO_GETDRIVER,
     API_POST_DELETE_DRIVER
->>>>>>> f3ee2240cb2237ad61e6413e006e2b208c9c3038
 } from '@/api/V2/transport'
 // 司机列表
 export const selectDriver = appRx.get(API_GET_TRAN_DRIVERINFO, errorCatcher, errorHandle, filter)
 // 添加司机信息
 export const addDriver = appRx.post(API_POST_TRAN_DRIVERINFOADD, errorCatcher, errorHandle, filter)
-<<<<<<< HEAD
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
 //运输任务添加
 export const addtrantask = appRx.post(API_POST_TRAN_ADD,errorCatcher, errorHandle, filter) 
-=======
 // 司机管理-查看
 export const lookDriver = appRx.get(API_GET_DRIVERINFO_GETDRIVER, errorCatcher, errorHandle, filter)
 // 司机管理-删除
 export const delDriver = appRx.post(API_POST_DELETE_DRIVER, errorCatcher, errorHandle, filter)
->>>>>>> f3ee2240cb2237ad61e6413e006e2b208c9c3038

src/views/tranManagement/component/routers/route.js

@@ -12,7 +12,6 @@ const tranManagementRouter = {
     icon: 'cg'
   },
   children: [
-<<<<<<< HEAD
      
     //运输任务
     {
@@ -89,9 +88,6 @@ const tranManagementRouter = {
       hidden: true
     },
     //汽运调度
-=======
-    //司机管理
->>>>>>> f3ee2240cb2237ad61e6413e006e2b208c9c3038
     {
       path: 'tranManagementVehicle',
       component: () =>
@@ -150,9 +146,6 @@ const tranManagementRouter = {
       },
       hidden: true
     },
-<<<<<<< HEAD
-    
-=======
     //查看司机
     {
       path: 'tranManagementDriverLook',
@@ -169,7 +162,6 @@ const tranManagementRouter = {
       hidden: true
     },
 
->>>>>>> f3ee2240cb2237ad61e6413e006e2b208c9c3038
   ],
 
 };