diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue index d3dcf33..2a18235 100644 --- a/src/views/modules/eam/eam_device_list.vue +++ b/src/views/modules/eam/eam_device_list.vue @@ -94,18 +94,21 @@ - - - - - 上传文件 - - - + + + + + + + + + + 上传文件 + @@ -830,7 +833,7 @@ 保存 - 关闭 + 关闭 diff --git a/src/views/modules/eamReport/eamObjectCheckReport.vue b/src/views/modules/eamReport/eamObjectCheckReport.vue index 7619668..88046c6 100644 --- a/src/views/modules/eamReport/eamObjectCheckReport.vue +++ b/src/views/modules/eamReport/eamObjectCheckReport.vue @@ -1,25 +1,47 @@ @@ -84,7 +106,11 @@ import { searchEamObjectSumReport } from "@/api/eam/eamReport.js" + import Chooselist from '@/views/modules/common/Chooselist_eam' export default { + components: { + Chooselist + }, watch: { searchData: { deep: true, @@ -102,6 +128,7 @@ }, data () { return { + tagNo:'', // 导出 start exportData: [], exportName: "设备点检报表" + this.dayjs().format('YYYYMMDDHHmmss'), @@ -111,8 +138,13 @@ // 导出 end searchData: { site: this.$store.state.user.site, + objectID: '', + objectDesc: '', familyID: '', - familyDesc: '', + groupID: '', + functionType:'A', + startDate: '', + endDate: '', active: 'Y', page: 1, limit: 10, @@ -346,6 +378,38 @@ this.getDataList() }, methods: { + // 获取基础数据列表S + getBaseList (val,type) { + this.tagNo = val + this.$nextTick(() => { + let strVal = '' + if (val === 200 ) { + strVal = this.searchData.objectID + this.$refs.baseList.init(val, strVal) + } + + if (val === 1027) { + strVal = this.searchData.familyID + this.$refs.baseList.init(val, strVal) + } + if (val === 1028) { + strVal = this.searchData.groupID + this.$refs.baseList.init(val, strVal) + } + }) + }, + /* 列表方法的回调 */ + getBaseData (val) { + if (this.tagNo === 200) { + this.searchData.objectID = val.ObjectID + } + if (this.tagNo === 1027) { + this.searchData.familyID = val.FamilyID + } + if (this.tagNo === 1028) { + this.searchData.groupID = val.GroupID + } + }, // 获取数据列表 getDataList () { this.searchData.limit = this.pageSize diff --git a/src/views/modules/eamReport/eamObjectDefectReport.vue b/src/views/modules/eamReport/eamObjectDefectReport.vue new file mode 100644 index 0000000..26bc8a3 --- /dev/null +++ b/src/views/modules/eamReport/eamObjectDefectReport.vue @@ -0,0 +1,478 @@ + + + diff --git a/src/views/modules/eamReport/eamObjectMaintenanceReport.vue b/src/views/modules/eamReport/eamObjectMaintenanceReport.vue new file mode 100644 index 0000000..1ef5c7b --- /dev/null +++ b/src/views/modules/eamReport/eamObjectMaintenanceReport.vue @@ -0,0 +1,478 @@ + + +