From cc30168a60631d916d46f0974afdb235ce33cd5a Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Fri, 22 Nov 2024 16:59:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.js | 53 +++++++++++++-------------- pages/home/index.vue | 3 +- pages/my/my.vue | 4 +- pages/order/tasking.vue | 71 ++++++++++++++---------------------- pages/submission/records.vue | 19 +++++----- utils/request.js | 2 + 6 files changed, 68 insertions(+), 84 deletions(-) diff --git a/api/api.js b/api/api.js index 895105f..658f9e0 100644 --- a/api/api.js +++ b/api/api.js @@ -14,13 +14,13 @@ const install = (Vue, vm) => { let logout = () => http.get('/blade-auth/oauth/logout') // 注册 let registerUser = (params) => http.post('/blade-system/user/register/save-user', params, { - authorization: false, + authorizations: true, isparams: true }) // 发送验证码 / let sendVerify = (params) => http.get('/blade-system/user/register/send-verify-code', params, { - authorization: false, + authorizations: true, isparams: true }) @@ -29,7 +29,7 @@ const install = (Vue, vm) => { // 登录记录 let getLoginRecords = (params) => http.get('/blade-log/api/logOnList', params, { - authorization: false, + authorizations: true, isparams: true }) // 修改记录 @@ -40,124 +40,121 @@ const install = (Vue, vm) => { // 业务类型查询 let getChildList = (params) => http.get('/blade-system/dict-biz/child-list', { ...params }, { - authorization: false, + authorizations: true, isparams: true }) // 获取设备列表 let getDeviceList = (params) => http.get('/device/list', { ...params }, { - authorization: false, + authorizations: true, isparams: true }) // 需求提报 提交接口 let workOrderSave = (params) => http.post('/workOrder/save', params, { - authorization: false, + authorizations: true, isparams: false }) // 需求提报 列表 /lab/workOrder/list let getWorkOrderRecords = (params) => http.get('/workOrder/list', { ...params }, { - authorization: false, + authorizations: true, isparams: false }) // 根据id查询故障详情 let getBreakdownInfo = (params) => http.get('/workOrder/detail', { ...params }, { - authorization: false, + authorizations: true, isparams: false }) // 修改白送 /lab/workOrder/update let workOrderupdate = (params) => http.post('/workOrder/update', params, { - authorization: false, + authorizations: true, isparams: true }) // 评价提交 let evaluateSign = (params) => http.post('/workOrder/evaluateSign', params, { - authorization: false, + authorizations: true, isparams: false }) // 获取维修人员 / let getRepairPersons = (params) => http.get('/blade-system/user/repairPersons', { ...params }, { - authorization: false, + authorizations: true, isparams: false }) // 获取物料列表数据 goods/list let getGoodsList = (params) => http.get('/goods/list', params, { - authorization: false, + authorizations: true, isparams: false }) // 巡检计划列表 / let getDictionaryList = (params) => http.get('/blade-system/dict/dictionary?code=flow', params, { - authorization: false, + authorizations: true, isparams: false }) // 获取人员列表 let getUserList = (params) => http.get('/blade-system/user/page', { ...params }, { - authorization: false, + authorizations: true, isparams: true }) // 工作台 // 实验室巡检 /workBenches/workList let workList = (params) => http.get('/workBenches/workList', { ...params }, { - authorization: false, + authorizations: true, isparams: true }) // 设备报警 let deviceList = (params) => http.get('/workBenches/deviceList', { ...params }, { - authorization: false, + authorizations: true, isparams: true }) // 维修柱状图 let upkeepStat = (params) => http.get('/workBenches/upkeepStat', { ...params }, { - authorization: false, + authorizations: true, isparams: true }) // 故障现象分类 workBenches/pieStat let pieStat = (params) => http.get('/workBenches/pieStat', { ...params }, { - authorization: false, + authorizations: true, isparams: true }) // 工作台 workBenches/overview - let overview = (params) => http.get('/workBenches/overview', { ...params }, { - authorization: false, - isparams: true - }) + let overview = (params) => http.get('/workBenches/overview') // 获取用户信息 / let getUserInfo = (params) => http.get('/blade-system/user/info', { ...params }, { - authorization: false, + authorizations: true, isparams: true }) // 派单 /lab/workOrder/update let sendOrders = (params) => http.get('/workOrder/update', { ...params }, { - authorization: false, + authorizations: true, isparams: true }) // 客服关闭接口 / let cloneOrder = (params) => http.post('/workOrder/clone', params, { - authorization: false, + authorizations: true, isparams: false }) // 需求编辑 editData let editData = (params) => http.post('/workOrder/update', params, { - authorization: false, + authorizations: true, isparams: false }) // 维修人员驳回 / let repairReject = (params) => http.post('/workOrder/repairReject', params, { - authorization: false, + authorizations: true, isparams: false }) // 申领单提交 / let applySave = (params) => http.post('/apply/save', params, { - authorization: false, + authorizations: true, isparams: false }) diff --git a/pages/home/index.vue b/pages/home/index.vue index 53f1186..8f56cf4 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -99,8 +99,7 @@ export default { getUserInfo() { this.$u.api.getUserInfo().then(res => { if (res.code == 200) { - - if (res.data.backGroundPic != '') { + if (res.data?.backGroundPic!=undefined) { this.swiperList.push(res.data.backGroundPic) } else { this.swiperList.push(require("@/static/images/home/lab.png")) diff --git a/pages/my/my.vue b/pages/my/my.vue index f28b719..d967666 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -137,8 +137,8 @@ export default { height: 136rpx; margin: 36rpx; border-radius: 50%; - border: 1px solid #000; - + border: 1px solid #ccc; + overflow: hidden; image { width: 100%; height: 100%; diff --git a/pages/order/tasking.vue b/pages/order/tasking.vue index d08258a..b2b7e09 100644 --- a/pages/order/tasking.vue +++ b/pages/order/tasking.vue @@ -33,45 +33,38 @@ export default { this.$nextTick(() => { this.$refs.tablist.getRecordsList() this.$refs.tabbarRef.getPermission(); - // 客服 1839536982874193922 + // 2 客服 3 维修负责人 4 维修人员 if (this.dataTypes == 2) { this.tabList = [ { name: "全部", key: "9999", }, - { - name: "待提报", - key: "-1", - }, { name: "待接单", key: "0", }, { name: "待维修", - key: "2", + key: "1,2,3,4", }, { - name: "维修完成", - key: "4", - }, - { - name: "待评价", + name: "维修中", key: "5", }, { - name: "已完成", + name: "维修完成", key: "6", }, { - name: "已驳回", - key: "7,8", + name: "待付款", + key: "7", }, { - name: "已关闭", - key: "9", + name: "已完成", + key: "8,9", }, + ] } // 维修负责人 1839537055389515777 @@ -82,28 +75,32 @@ export default { key: "9999", }, { - name: "待维修", + name: "已驳回", key: "2", }, { - name: "维修完成", + name: "待审批", + key: "3", + }, + { + name: "已通过", key: "4", }, { - name: "待评价", + name: "维修中", key: "5", }, { - name: "已完成", + name: "维修完成", key: "6", }, { - name: "已驳回", - key: "7,8", + name: "代付款", + key: "7", }, { - name: "已关闭", - key: "9", + name: "已完成", + key: "8,9", }, ] } @@ -115,32 +112,20 @@ export default { key: "9999", }, { - name: "待确认", - key: "1", - }, - { - name: "待维修", - key: "2,3", + name: "待提交", + key: "2", }, { - name: "维修完成", - key: "4", + name: "待审批", + key: "3,4", }, { - name: "待评价", + name: "维修中", key: "5", }, { - name: "已完成", - key: "6", - }, - { - name: "已驳回", - key: "7,8", - }, - { - name: "已关闭", - key: "9", + name: "维修完成", + key: "6,7,8,9", }, ] } diff --git a/pages/submission/records.vue b/pages/submission/records.vue index 0c42375..f34c1c8 100644 --- a/pages/submission/records.vue +++ b/pages/submission/records.vue @@ -27,25 +27,26 @@ export default { name: "待维修", key: "1,2,3", }, + { - name: "已驳回", - key: "7,8", - }, - { - name: "维修完成", + name: "确认方案", key: "4", }, { - name: "待评价", + name: "维修中", key: "5", }, { - name: "已完成", + name: "待评价", key: "6", }, { - name: "已关闭", - key: "9", + name: "代付款", + key: "7", + }, + { + name: "已完成", + key: "8,9", }, ], diff --git a/utils/request.js b/utils/request.js index d789628..8c42b38 100644 --- a/utils/request.js +++ b/utils/request.js @@ -36,6 +36,8 @@ const install = (Vue, vm) => { if (!authorization) { config.header['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`; } + // + config.header['blade-requested-with'] ='BladeHttpRequest' if(config.header.isparams){ config.params = config.data }