diff --git a/App.vue b/App.vue index 858352a..a09fe77 100644 --- a/App.vue +++ b/App.vue @@ -54,13 +54,13 @@ export default { success: (res) => { let query = { id: userInfo.user_id, - // "addressLon": res.longitude, - // "addressLat": res.latitude - "addressLon": 120.4732160947301, - "addressLat": 36.17767397801995 + addressLon: res.longitude, + addressLat: res.latitude + // "addressLon": 120.4732160947301, + // "addressLat": 36.17767397801995 } this.$u.api.updatePosition(query).then(res => { - + console.log(333333,query) }) }, fail: (err) => { diff --git a/api/api.js b/api/api.js index 7599637..efa5bf3 100644 --- a/api/api.js +++ b/api/api.js @@ -406,8 +406,14 @@ const install = (Vue, vm) => { authorizations: true, isparams: false }) + // 下载文件 + let downLoadFile = (url, params) => http.post(url, params, { + authorizations: true, + isparams: false, + responseType: "blob", + }) // 将各个定义的接口名称，统一放进对象挂载到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, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit, repairConfirmFinish, repairRefuseFinish, confirmPayment, getPosition, getRepairDetail, updatePosition, resetPwd, getNoticeList, updateSign, getMesseageList, getMesseageAll, updateMesseageStatus, getMesseageTotal, closeService, workOrderLog,urgentRepairConfirm,urgentRepairReject }; + 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, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit, repairConfirmFinish, repairRefuseFinish, confirmPayment, getPosition, getRepairDetail, updatePosition, resetPwd, getNoticeList, updateSign, getMesseageList, getMesseageAll, updateMesseageStatus, getMesseageTotal, closeService, workOrderLog, urgentRepairConfirm, urgentRepairReject, downLoadFile }; } export default { diff --git a/config/status.js b/config/status.js index a1b1593..25d272f 100644 --- a/config/status.js +++ b/config/status.js @@ -8,7 +8,7 @@ export const tabList = { }, { name: "待接单", - key: "101", + key: "101,205", }, { name: "待确认", @@ -37,7 +37,7 @@ export const tabList = { }, { name: "待评价", - key: "403,202,406", + key: "403,406", }, { name: "待付款", @@ -60,7 +60,7 @@ export const tabList = { { name: "待接单", - key: "101", + key: "101,205", }, { name: "待维修", @@ -104,7 +104,7 @@ export const tabList = { { name: "维修中", - key: "103,404", + key: "103,404,401", }, { name: "已通过", diff --git a/manifest.json b/manifest.json index 73625d5..e932a00 100644 --- a/manifest.json +++ b/manifest.json @@ -15,6 +15,8 @@ "distribute" : { "android" : { "permissions" : [ + "", + "", "", "", "", diff --git a/pages/home/components/alarm.vue b/pages/home/components/alarm.vue index dca7b28..d9918d4 100644 --- a/pages/home/components/alarm.vue +++ b/pages/home/components/alarm.vue @@ -73,7 +73,10 @@ export default { }); this.list = res.data // list赋值后调用初始化 - this.init() + if(this.list.length>1){ + this.init() + } + } }) }, diff --git a/pages/home/components/swiper.vue b/pages/home/components/swiper.vue index e3e1d6c..2666899 100644 --- a/pages/home/components/swiper.vue +++ b/pages/home/components/swiper.vue @@ -1,31 +1,20 @@ diff --git a/pages/submission/records.vue b/pages/submission/records.vue index a6d44af..975ba4a 100644 --- a/pages/submission/records.vue +++ b/pages/submission/records.vue @@ -44,7 +44,8 @@ 查看 - + 报告 日志 @@ -58,10 +59,11 @@ 确认 - 查看位置 - 查看位置 + 评价 @@ -96,7 +98,7 @@ 提交 维修完成 @@ -219,6 +221,7 @@ export default { requirementCode: '',//单号 repairTypeList: [],//维修类型列表 repairConfirmShow: false,//客户确认维修效果弹框 + userInfo: {},//用户信息 }; }, computed: { @@ -227,6 +230,11 @@ export default { }, dataTypes() { this.tabList = tabList[this.$store.state.dataType] + + if (this.requirementCode != '') { + this.current = this.tabList.length-1 + + } return this.$store.state.dataType }, tagColor() { @@ -249,22 +257,27 @@ export default { onLoad(options) { this.type = options.type ? options.type : '' this.requirementCode = options.requirementCode ? options.requirementCode : '' - + this.userInfo = uni.getStorageSync("userinfo"); }, onShow() { + this.$nextTick(() => { this.getMesseageTotal() if (this.type == '') { this.$refs.tabbarRef.getPermission(); } if (this.requirementCode != '') { - this.current = 0 this.searchInfo.requirementCode = this.requirementCode } else { - // this.current = 1 - // this.changeTab(1) + if(this.searchInfo.statusSearch == ''){ + this.searchInfo.statusSearch = this.tabList[0].key == '9999' ? '' : this.tabList[0].key + }else{ + this.searchInfo.statusSearch = this.tabList[0].key == '9999' ? '' : this.searchInfo.statusSearch + } + } + this.getType() this.getRecordsList() }); @@ -277,7 +290,7 @@ export default { let query = { current: this.page.currentPage, //页数 size: this.page.pageSize, //条数 - dataType: this.dataTypes,//数据权限 + dataType:this.userInfo.role_id=='1123598816738675201'?'': this.dataTypes,//数据权限 ...this.searchInfo } this.$u.api.getWorkOrderRecords(query).then(res => { @@ -405,7 +418,7 @@ export default { }) }, - // 客服关闭 + // 弹框 openModel(item, type) { if (type == 'close') { this.cloneVisible = true @@ -555,6 +568,7 @@ export default { goPageLocation(item) { let param = { userid: item.repairPerson, + repairPerson: item.repairPerson } //查看位置 uni.navigateTo({ @@ -620,12 +634,12 @@ export default { }, // 客户确认维修效果 驳回 repairCancelFn() { - let query={ + let query = { id: this.rowInfo.id, - repairType:this.rowInfo.repairType + repairType: this.rowInfo.repairType } this.$u.api.urgentRepairReject(query).then(res => { - if(res.code==200){ + if (res.code == 200) { uni.showToast({ title: "操作成功", icon: "none" }); this.repairConfirmShow = false this.getRecordsList() @@ -634,17 +648,91 @@ export default { }, // 客户确认维修效果 确认 repairConfirmFn() { - let query={ + let query = { id: this.rowInfo.id, - repairType:this.rowInfo.repairType + repairType: this.rowInfo.repairType } this.$u.api.urgentRepairConfirm(query).then(res => { - if(res.code==200){ + if (res.code == 200) { uni.showToast({ title: "操作成功", icon: "none" }); this.repairConfirmShow = false this.getRecordsList() } }) + }, + // 导出报告 + handleExport(item) { + this.$u.api.downLoadFile('lab-ops/work-order/report-service', item).then(res => { + + const blob = new Blob([res]); + // this.downloadXls(blob) + }) + }, + uploadFile(filePath) { + const token = uni.getStorageSync("token") + uni.uploadFile({ + url: website.baseUrl + "/blade-resource/oss/endpoint/put-file", // 服务器上传接口 + filePath: filePath, + name: "file", // 必须填写，后台用来接收文件 + header: { + 'Blade-Auth': 'bearer ' + token, + 'Authorization': `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`, + 'blade-requested-with': 'BladeHttpRequest' //自定义请求头 + }, + formData: {}, + success: (res) => { + let info = JSON.parse(res.data); + console.log("上传成功", info); // 上传成功后的操作 + + this.fileList.push({ + 'link': info.data.link, + 'name': info.data.name + }); + this.$emit('changeFile', this.fileList, this.formIndex) + this.$refs.BetLoading.hide() + }, + error: (uploadFileRes) => { + // console.log("上传失败", uploadFileRes.data); // 上传成功后的操作 + this.$refs.BetLoading.hide() + }, + }); + }, + downloadXls(data) { + + //获取当前设备的默认环境路径 + const Environment = plus.android.importClass('android.os.Environment') + let filePathTemp = 'file://' + Environment.getExternalStorageDirectory() + '/Download/siyu-logs/' + // 创建临时文件路径 http://124.221.142.15:9000/laboratory/upload/20241231/57faa52e4fdf02f94a3b40d0c7089b29.pdf + console.log('filePathTemp', filePathTemp) + // 获取文件系统管理器 + const fileManager = uni.getFileSystemManager(); + console.log('data', data) + // 写入文件 + fileManager.writeFile({ + filePath: filePathTemp, + data: data, + encoding: 'binary', + success: (res) => { + console.log('文件写入成功'); + + // 保存文件到本地 + uni.saveFile({ + tempFilePath: filePath, + success: (saveRes) => { + console.log('文件保存成功', saveRes.savedFilePath); + // 文件保存成功后的路径 + const savedFilePath = saveRes.savedFilePath; + // 可以执行后续操作，比如提示用户文件保存位置等 + }, + fail: (err) => { + console.error('文件保存失败', err); + } + }); + }, + fail: (err) => { + console.error('文件写入失败', err); + } + }); } }, }; diff --git a/utils/website.js b/utils/website.js index 84f51f6..3d8117f 100644 --- a/utils/website.js +++ b/utils/website.js @@ -2,11 +2,12 @@ * 全局配置文件 */ export default { - // baseUrl: 'http://124.221.142.15:8088/lab', + // baseUrl: 'http://192.168.1.4:10001', // baseUrl:'http://192.168.0.118:80', //李庆坤 // baseUrl:'http://192.168.1.103:10001', //李涛 // baseUrl:'http://192.168.1.12:80', //李涛 - baseUrl:'http://124.221.142.15:8088/api',//远程测试地址 + baseUrl:'http://192.168.0.108:10001', //李庆坤 + // baseUrl:'http://124.221.142.15:8088/api',//远程测试地址 indexTitle: "科研医疗建筑运维平台", clientId: "saber", // 客户端id clientSecret: "saber_secret", // 客户端密钥