From 3a22ee1d77d2c2bd0c54480d1134f57c8cb7a50e Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 21 Feb 2022 09:39:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=83=85=E5=86=B5=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=B7=BB=E5=8A=A0=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/src/js/columns/dataReport/operStatic.js | 6 ++++++ epmet-oper-web/src/views/modules/dataExport/operStatic.vue | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) 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)