diff --git a/config/api.js b/config/api.js index 3a5b033..e24717c 100644 --- a/config/api.js +++ b/config/api.js @@ -101,9 +101,11 @@ export const getContractStatus = (params) => http.get('business/contract/getCont // 1获得模拟预约点 export const simulationPoint = (params) => http.get('business/booking/simulation-point/page', {params}) // 2获得模拟器排课 -export const simulationClass = (params) => http.get('business/booking/simulation-class/get', {params}) +export const simulationClass = (params) => http.get('business/booking/simulation-class/get', {params}) // 3获得模拟器 export const simulationDevices = (params) => http.get('business/booking/simulation-devices/list', {params}) +// 4创建模拟预约 +export const simulationCreate = (data) => http.post('business/booking/simulation-record/create', data) // 1新增实操预约记录 export const masterCreate = (data) => http.post('business/booking/master/create', data) // 1获得考场 @@ -119,7 +121,7 @@ export const examSimulationRecord = (params) => http.get('business/exam-simulati // 6 考场模拟详情 export const examSimulationGet = (params) => http.get('business/exam-simulation-record/get', {params}) // 7取消预约 -export const cancelSimulation = (data) => http.put(`business/exam-simulation-record/cancelSimulation`, data) +export const cancelSimulation = (data) => http.put(`business/exam-simulation-record/cancelSimulation?id=${data.id}`) // 1获得实操预约排课 export const scheduleClass = (params) => http.get('business/booking/schedule-class/get', {params}) diff --git a/pages/carEntry/examineAppointment/comp/pickDate.vue b/pages/carEntry/examineAppointment/comp/pickDate.vue index 9808dea..03823f8 100644 --- a/pages/carEntry/examineAppointment/comp/pickDate.vue +++ b/pages/carEntry/examineAppointment/comp/pickDate.vue @@ -130,8 +130,8 @@ let obj = { "examSiteId": this.FormData.examSiteId, "examCarId": this.FormData.carId, "trainType": this.FormData.trainType, "subject": this.FormData.subject, "classDate": this.chooseDay} const {data: res} = await examSimulationClass(obj) - this.timerArr = res.afternoonSimulationClass - this.timerArr2 = res.morningSimulationClass + this.timerArr2 = res.afternoonSimulationClass + this.timerArr = res.morningSimulationClass // 如果是今天的日期检查有没有过期 if(this.chooseDay==this.dateArr[0][0].date) { let arr = [...this.timerArr,...this.timerArr2] diff --git a/pages/carEntry/simulateAppointment/comp/pickDate.vue b/pages/carEntry/simulateAppointment/comp/pickDate.vue new file mode 100644 index 0000000..ed8e76d --- /dev/null +++ b/pages/carEntry/simulateAppointment/comp/pickDate.vue @@ -0,0 +1,380 @@ + + + + + \ No newline at end of file diff --git a/pages/carEntry/simulateAppointment/comp/step1.vue b/pages/carEntry/simulateAppointment/comp/step1.vue index af094c4..fe80bab 100644 --- a/pages/carEntry/simulateAppointment/comp/step1.vue +++ b/pages/carEntry/simulateAppointment/comp/step1.vue @@ -1,13 +1,13 @@