From 043c050d7eab4c7ccde067b86405e0bd6ba9bfb8 Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Mon, 25 Nov 2024 19:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.js | 48 +++- api/maintenance.js | 20 -- main.js | 3 - pages.json | 13 ++ .../inspection/components/detailsCollapse.vue | 11 + pages/inspection/components/plan-list.vue | 216 ++++++++---------- pages/inspection/plan.vue | 12 +- pages/inspection/quest.vue | 99 ++++---- pages/inspection/questDetails.vue | 47 +++- pages/inspection/questOrder.vue | 216 ++++++++++++++++++ store/index.js | 2 + 11 files changed, 482 insertions(+), 205 deletions(-) delete mode 100644 api/maintenance.js create mode 100644 pages/inspection/questOrder.vue diff --git a/api/api.js b/api/api.js index 080088e..1803efc 100644 --- a/api/api.js +++ b/api/api.js @@ -6,7 +6,7 @@ const install = (Vue, vm) => { // 此处没有使用传入的params参数 let getTenantInfo = (params, config = {}) => http.get('/blade-system/tenant/info', params, config) // 此处使用了传入的params参数，一切自定义即可 - let login = (params,data) => http.post('/blade-auth/oauth/token?'+ params,data,{ + let login = (params, data) => http.post('/blade-auth/oauth/token?' + params, data, { authorizations: true, isparams: true }) @@ -17,7 +17,7 @@ const install = (Vue, vm) => { authorizations: true, isparams: true }) - + // 发送验证码 / let sendVerify = (params) => http.get('/blade-system/user/register/send-verify-code', params, { authorizations: true, @@ -70,7 +70,7 @@ const install = (Vue, vm) => { isparams: true }) - + // 获取维修人员 / let getRepairPersons = (params) => http.get('/blade-system/user/repairPersons', { ...params }, { @@ -85,11 +85,7 @@ const install = (Vue, vm) => { isparams: false }) - // 巡检计划列表 / - let getDictionaryList = (params) => http.get('/blade-system/dict/dictionary?code=flow', params, { - authorizations: true, - isparams: false - }) + // 获取人员列表 let getUserList = (params) => http.get('/blade-system/user/page', { ...params }, { @@ -209,13 +205,45 @@ const install = (Vue, vm) => { }) //扫码获取设备id 通过id获取详情 - let getDeviceDetail = (params) => http.get('/device/detail',params, { + let getDeviceDetail = (params) => http.get('/device/detail', params, { + authorizations: true, + isparams: false + }) + + // 维修人员存取经纬度 + let updateCoordinate = (params) => http.post('/blade-system/user/updateCoordinate', params, { + authorizations: true, + isparams: false + }) + // 巡检计划列表 / + let getDictionaryList = (params) => http.get('/lab-ops/maintenance/plan-page', params, { authorizations: true, isparams: false }) + // 获取巡检任务列表 lab-ops/maintenance/task-page + let getTaskPage = (params) => http.get('/lab-ops/maintenance/task-page', params, { + authorizations: true, + isparams: false + }) + // 获取巡检任务详情 lab-ops/maintenance/task-page + let getTaskDetail = (params) => http.get('/lab-ops/maintenance/task-detail', params, { + authorizations: true, + isparams: false + }) + // 主管审核并指定维修人员 + let taskSupervisorconfirm = (params) => http.post('/lab-ops/maintenance/task-supervisor-confirm', params, { + authorizations: true, + isparams: false + }) + //维修人员确认接收 lab-ops/maintenance/task-serviceman-receive + let taskServicemanreceive = (params) => http.post('/lab-ops/maintenance/task-serviceman-receive', params, { + authorizations: true, + isparams: false + }) + // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下 - vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave,sendVerify,serviceman,servicemanReceive,servicemanSubmit,supervisorReject ,supervisorconfirm,customerConfirm,customerReject,servicemanRepairSubmit,evaluateRepairReject,getDeviceDetail}; + vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail,taskSupervisorconfirm,taskServicemanreceive,updateCoordinate }; } export default { diff --git a/api/maintenance.js b/api/maintenance.js deleted file mode 100644 index 8016bf5..0000000 --- a/api/maintenance.js +++ /dev/null @@ -1,20 +0,0 @@ -const http = uni.$u.http - -// 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作，更多内容详见uView对拦截器的介绍部分： -// https://uviewui.com/js/http.html#%E4%BD%95%E8%B0%93%E8%AF%B7%E6%B1%82%E6%8B%A6%E6%88%AA%EF%BC%9F -const install = (Vue, vm) => { - // 获取巡检任务列表 lab-ops/maintenance/task-page - let getTaskPage = (params) => http.get('/device/detail',params, { - authorizations: true, - isparams: false - }) - - - - // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下 - vm.$u.quest = { getTaskPage}; -} - -export default { - install -} \ No newline at end of file diff --git a/main.js b/main.js index 69e03ef..14a132f 100644 --- a/main.js +++ b/main.js @@ -23,7 +23,4 @@ Vue.use(request, app); // http接口API集中管理引入部分 import httpApi from '@/api/api.js' Vue.use(httpApi, app) - -import maintenance from '@/api/api.js' -Vue.use(maintenance, app) // require('@/utils/request.js')(app) \ No newline at end of file diff --git a/pages.json b/pages.json index 37226c7..e69b8ba 100644 --- a/pages.json +++ b/pages.json @@ -165,6 +165,19 @@ } } }, + + { + "path": "pages/inspection/questOrder", + "style": { + "navigationBarTitleText": "巡检任务单", + "enablePullDownRefresh": false, + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#F8F8F8", + "app-plus": { + "titleNView": {} + } + } + }, { "path": "pages/inspection/plan", "style": { diff --git a/pages/inspection/components/detailsCollapse.vue b/pages/inspection/components/detailsCollapse.vue index dd698f2..d710967 100644 --- a/pages/inspection/components/detailsCollapse.vue +++ b/pages/inspection/components/detailsCollapse.vue @@ -57,6 +57,17 @@ \ No newline at end of file diff --git a/pages/inspection/questOrder.vue b/pages/inspection/questOrder.vue new file mode 100644 index 0000000..0a8a580 --- /dev/null +++ b/pages/inspection/questOrder.vue @@ -0,0 +1,216 @@ + + + \ No newline at end of file diff --git a/store/index.js b/store/index.js index 48fc99e..11ec8f9 100644 --- a/store/index.js +++ b/store/index.js @@ -53,7 +53,9 @@ const store = new Vuex.Store({ uni.reLaunch({ url: "/pages/order/tasking", }); + // this.$u.api.updateCoordinate().then(res=>{ + // }) } if (res.role_id == "1839552581620793346") {