diff --git a/src/utils/httpRequest.js b/src/utils/httpRequest.js index 9d008dd..f5d2150 100644 --- a/src/utils/httpRequest.js +++ b/src/utils/httpRequest.js @@ -5,6 +5,7 @@ import qs from 'qs' import merge from 'lodash/merge' import {clearLoginInfo} from '@/utils' +// axios.defaults.withCredentials = false const http = axios.create({ timeout: 1000 * 300, withCredentials: true, diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 09b472a..1732906 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -21,17 +21,17 @@ - - - - - - - - 帮助 - - - + + + + + + + + + + + @@ -44,8 +44,8 @@ {{ pageLanguage.updatePassword }} - {{ pageLanguage.updateDefaultLanguage }} - + + {{ pageLanguage.cssSetting }} diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue index 5121a72..d66b57f 100644 --- a/src/views/modules/eam/eam_device_list.vue +++ b/src/views/modules/eam/eam_device_list.vue @@ -4075,15 +4075,15 @@ }).catch(() => { }) }, - deleteFile(){ + deleteFile(row){ this.$confirm('确定要删除当前设备?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - deleteEamObject(row).then(({data}) => { + deleteObjectFile(row).then(({data}) => { if (data && data.code === 200) { - this.getDataList() + this.getFileContentData(); this.$message({ message: '操作成功', type: 'success', diff --git a/src/views/modules/eamReport/eamOperatorCheckReport.vue b/src/views/modules/eamReport/eamOperatorCheckReport.vue index 1f9a4d7..1c42ddf 100644 --- a/src/views/modules/eamReport/eamOperatorCheckReport.vue +++ b/src/views/modules/eamReport/eamOperatorCheckReport.vue @@ -299,13 +299,13 @@ },{ userId: this.$store.state.user.name, functionId: 101005004, - serialNumber: '101005004TableQtyUnFinishied', + serialNumber: '101005004TableQtycancelled', tableId: "101005004Table", tableName: "设备点检报表", - columnProp: 'qtyUnFinishied', + columnProp: 'qtycancelled', headerAlign: "center", align: "right", - columnLabel: '未开工数', + columnLabel: '取消数', columnHidden: false, columnImage: false, columnSortable: false, @@ -316,13 +316,13 @@ },{ userId: this.$store.state.user.name, functionId: 101005004, - serialNumber: '101005004TableQtycancelled', + serialNumber: '101005004TableFinishPercent', tableId: "101005004Table", tableName: "设备点检报表", - columnProp: 'qtycancelled', + columnProp: 'finishPercent', headerAlign: "center", align: "right", - columnLabel: '取消数', + columnLabel: '完成比率(%)', columnHidden: false, columnImage: false, columnSortable: false, @@ -333,13 +333,13 @@ },{ userId: this.$store.state.user.name, functionId: 101005004, - serialNumber: '101005004TableFinishPercent', + serialNumber: '101005004TableWorkTime', tableId: "101005004Table", tableName: "设备点检报表", - columnProp: 'finishPercent', + columnProp: 'workTime', headerAlign: "center", align: "right", - columnLabel: '完成比率(%)', + columnLabel: '工作时间', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/eamReport/eamOperatorDefectReport.vue b/src/views/modules/eamReport/eamOperatorDefectReport.vue new file mode 100644 index 0000000..ee7e7ba --- /dev/null +++ b/src/views/modules/eamReport/eamOperatorDefectReport.vue @@ -0,0 +1,462 @@ + + + diff --git a/src/views/modules/eamReport/eamOperatorMaintenanceReport.vue b/src/views/modules/eamReport/eamOperatorMaintenanceReport.vue new file mode 100644 index 0000000..2a3ee71 --- /dev/null +++ b/src/views/modules/eamReport/eamOperatorMaintenanceReport.vue @@ -0,0 +1,462 @@ + + + diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue index 3bec324..332f220 100644 --- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue +++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue @@ -1,22 +1,48 @@ @@ -160,7 +188,11 @@ eamWorkOrderItemSearch, saveCheckOrderReport, } from "@/api/eam/eam.js" + import Chooselist from '@/views/modules/common/Chooselist_eam' export default { + components: { + Chooselist + }, watch: { searchData: { deep: true, @@ -178,6 +210,7 @@ }, data () { return { + tagNo:'', // 导出 start exportData: [], exportName: "点检执行" + this.dayjs().format('YYYYMMDDHHmmss'), @@ -586,6 +619,25 @@ this.getDataList() }, methods: { + // 获取基础数据列表S + getBaseList (val,type) { + this.tagNo = val + this.$nextTick(() => { + let strVal = '' + + if (val === 201) { + strVal = this.searchData.planOperator + this.$refs.baseList.init(val, strVal) + } + }) + }, + /* 列表方法的回调 */ + getBaseData (val) { + if (this.tagNo === 201) { + this.searchData.planOperator = val.AdminID + } + + }, // 获取数据列表 getDataList () { this.searchData.limit = this.pageSize diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index fb1b0e9..7e5c3d1 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -1,7 +1,32 @@ @@ -114,7 +142,11 @@ eamWorkOrderItemSearch, saveOrderReportForDefect, } from "@/api/eam/eam.js" + import Chooselist from '@/views/modules/common/Chooselist_eam' export default { + components: { + Chooselist + }, watch: { searchData: { deep: true, @@ -132,6 +164,7 @@ }, data () { return { + tagNo:'', // 导出 start exportData: [], exportName: "维修执行" + this.dayjs().format('YYYYMMDDHHmmss'), @@ -396,6 +429,25 @@ this.getDataList() }, methods: { + // 获取基础数据列表S + getBaseList (val,type) { + this.tagNo = val + this.$nextTick(() => { + let strVal = '' + + if (val === 201) { + strVal = this.searchData.planOperator + this.$refs.baseList.init(val, strVal) + } + }) + }, + /* 列表方法的回调 */ + getBaseData (val) { + if (this.tagNo === 201) { + this.searchData.planOperator = val.AdminID + } + + }, //导出excel async createExportData() { this.searchData.limit = -1 diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue index 3b587c2..b499a62 100644 --- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue +++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue @@ -1,7 +1,32 @@ @@ -141,7 +169,11 @@ eamWorkOrderItemSearch, saveCheckOrderReport, } from "@/api/eam/eam.js" + import Chooselist from '@/views/modules/common/Chooselist_eam' export default { + components: { + Chooselist + }, watch: { searchData: { deep: true, @@ -159,6 +191,7 @@ }, data () { return { + tagNo:'', // 导出 start exportData: [], exportName: "维保执行" + this.dayjs().format('YYYYMMDDHHmmss'), @@ -567,6 +600,25 @@ this.getDataList() }, methods: { + // 获取基础数据列表S + getBaseList (val,type) { + this.tagNo = val + this.$nextTick(() => { + let strVal = '' + + if (val === 201) { + strVal = this.searchData.planOperator + this.$refs.baseList.init(val, strVal) + } + }) + }, + /* 列表方法的回调 */ + getBaseData (val) { + if (this.tagNo === 201) { + this.searchData.planOperator = val.AdminID + } + + }, // 获取数据列表 getDataList () { this.searchData.limit = this.pageSize @@ -689,7 +741,14 @@ // } // } this.saveData.itemList=JSON.parse(JSON.stringify(this.detailList)) - + for (let i = 0; i { if (data && data.code == '0') { this.getDataList()