diff --git a/epmet-oper-web/src/js/columns/dataReport/operStatic.js b/epmet-oper-web/src/js/columns/dataReport/operStatic.js index e63b828..955c8f3 100644 --- a/epmet-oper-web/src/js/columns/dataReport/operStatic.js +++ b/epmet-oper-web/src/js/columns/dataReport/operStatic.js @@ -71,5 +71,11 @@ export default [ title: '巡查时长', display: ['formA', 'formU', 'table', 'model'], width: width + }, + { + key: 'patrolRoutineWorkTimes', + title: '例行工作次数', + display: ['formA', 'formU', 'table', 'model'], + width: width } ] diff --git a/epmet-oper-web/src/views/modules/dataExport/operStatic.vue b/epmet-oper-web/src/views/modules/dataExport/operStatic.vue index 876d26c..cec9873 100644 --- a/epmet-oper-web/src/views/modules/dataExport/operStatic.vue +++ b/epmet-oper-web/src/views/modules/dataExport/operStatic.vue @@ -421,8 +421,8 @@ export default { require.ensure([], () => { const multiHeader = [title, '', '', '', '', '', '', '', '', '', ''] - const tHeader = ['组织', '用户数', '居民数', '党员数', '小组数', '话题数', '议题数', '项目数', '结案项目数', '巡查人数', '巡查次数', '巡查时长'] - const filterVal = ['orgName', 'userCount', 'residentCount', 'partyMemberCount', 'groupCount', 'topicCount', 'issueCount', 'projectCount', 'closedProjectCount', 'patrolPeopleCount', 'patrolCount', 'patrolDuration'] + const tHeader = ['组织', '用户数', '居民数', '党员数', '小组数', '话题数', '议题数', '项目数', '结案项目数', '巡查人数', '巡查次数', '巡查时长', '例行工作次数'] + const filterVal = ['orgName', 'userCount', 'residentCount', 'partyMemberCount', 'groupCount', 'topicCount', 'issueCount', 'projectCount', 'closedProjectCount', 'patrolPeopleCount', 'patrolCount', 'patrolDuration', 'patrolRoutineWorkTimes'] const list = this.tableData const data = this.formatJson(filterVal, list) export_json_to_excel(multiHeader, tHeader, data, title)