diff --git a/src/api/eam/eam_object_list.js b/src/api/eam/eam_object_list.js index 1bdf5d0..6ac18e9 100644 --- a/src/api/eam/eam_object_list.js +++ b/src/api/eam/eam_object_list.js @@ -1,21 +1,25 @@ import { createAPI } from "@/utils/httpRequest.js"; /*查询设备清单*/ -export const getEamObjectList = data => createAPI('/pms/eamObject/getEamObjectList','post',data) +export const getEamObjectList = data => createAPI('api/pms/eamObject/getEamObjectList','post',data) /*查询设备的文件内容*/ -export const getFileContentList = data => createAPI('/sys/file/getSysFileByOrderRef2','post',data) +export const getFileContentList = data => createAPI('api/sys/file/getSysFileByOrderRef2','post',data) /*查询设备的备件清单*/ -export const getDevicePartList = data => createAPI('/pms/resourcespare/getResourceSpareListByResourceId','post',data) +export const getDevicePartList = data => createAPI('api/pms/resourcespare/getResourceSpareListByResourceId','post',data) /*查询设备的点检项目列表*/ -export const getCheckItemList = data => createAPI('/pms/eamObject/getCheckItemList','post',data) +export const getCheckItemList = data => createAPI('api/pms/eamObject/getCheckItemList','post',data) /*查询设备的维保项目列表*/ -export const getMaintenanceItemList = data => createAPI('/pms/eamObject/getMaintenanceItemList','post',data) +export const getMaintenanceItemList = data => createAPI('api/pms/eamObject/getMaintenanceItemList','post',data) /*查询设备的维保计划列表*/ -export const getMaintenancePlanList = data => createAPI('/pms/eamObject/getMaintenancePlanList','post',data) +export const getMaintenancePlanList = data => createAPI('api/pms/eamObject/getMaintenancePlanList','post',data) /*查询设备的历史工单列表*/ -export const getHistoryOrderList = data => createAPI('/pms/eamObject/getHistoryOrderList','post',data) +export const getHistoryOrderList = data => createAPI('api/pms/eamObject/getHistoryOrderList','post',data) /*查询设备的故障现象列表*/ -export const getFaultBehaviorList = data => createAPI('/pms/eamObject/getFaultBehaviorList','post',data) +export const getFaultBehaviorList = data => createAPI('api/pms/eamObject/getFaultBehaviorList','post',data) /*删除当前设备*/ -export const deleteEamObject = data => createAPI('/pms/eamObject/deleteEamObject','post',data) +export const deleteEamObject = data => createAPI('api/pms/eamObject/deleteEamObject','post',data) +/*图片上传*/ +export const uploadEamObjectFile = data => createAPI('/api/sys/file/upload','post',data) + + diff --git a/src/views/common/login.vue b/src/views/common/login.vue index 319bec3..fc8e1bf 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -76,7 +76,7 @@ this.$refs['dataForm'].validate((valid) => { if (valid) { this.$http({ - url: this.$http.adornUrl('/sys/login'), + url: this.$http.adornUrl('/api/sys/login'), method: 'post', data: this.$http.adornData({ 'username': this.dataForm.userName, @@ -91,7 +91,7 @@ localStorage.setItem('locale', data.language) localStorage.setItem('refresh', "0") localStorage.setItem('userName', this.dataForm.userName) - localStorage.setItem('menuType', 'pc') + //this.getConfigParams() } else { this.$message.error(data.msg) } diff --git a/src/views/modules/eam/com_eam_object_upload_file.vue b/src/views/modules/eam/com_eam_object_upload_file.vue new file mode 100644 index 0000000..5e1299e --- /dev/null +++ b/src/views/modules/eam/com_eam_object_upload_file.vue @@ -0,0 +1,322 @@ + + + + + diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue index b7361cf..4acc716 100644 --- a/src/views/modules/eam/eam_device_list.vue +++ b/src/views/modules/eam/eam_device_list.vue @@ -84,9 +84,9 @@
将文件拖到此处，或点击上传
@@ -385,6 +385,7 @@ getHistoryOrderList, getFaultBehaviorList, deleteEamObject, + uploadEamObjectFile,/*图片上传*/ } from '@/api/eam/eam_object_list.js'; import { @@ -2372,59 +2373,6 @@ } }, - // 上传之前 - beforeUploadHandle(file) { - if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif' && file.type !== 'application/pdf') { - this.$message.error('只支持图片和PDF文档！') - return false - } - this.num++ - }, - - // 上传成功 - successHandle(response, file, fileList) { - this.fileList = fileList - this.successNum++ - if (response && response.code === 0) { - // 回写文件的订单属性 - this.ossRet = response.ossEntity; - } else { - this.$message.error(response.msg) - } - }, - - /*保修当前的数据*/ - saveUploadFile(){ - let remark = this.fileRemark; - if(null === remark || '' === remark){ - this.$message.error("请输入文件备注!"); - return false; - } - /*判断文件是否上传*/ - if(null == this.ossRet || {} == this.ossRet){ - this.$message.error("请先上传文件!"); - return false; - } - //设置备注 - this.ossRet.orderRef1 = this.currentRow.site; - this.ossRet.orderRef3 = remark; - updateOssRef(this.ossRet).then(({data}) => { - if (data.code === 0) { - this.$message.success(data.msg); - //刷新当前的清单 - this.getFileContentData(); - //清空文件上传记录 - this.$refs.uploadFile.clearFiles(); - this.ossRet = null; - this.fileRemark = ''; - }else { - this.$message.warning(data.msg); - } - }) - - - } - } }