From 0219621c54359b1965588ae38c3c4accfe9b798a Mon Sep 17 00:00:00 2001 From: gongdi <410827992@qq.com> Date: Thu, 2 Sep 2021 17:26:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=9E=E5=85=AC=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/newsRecord/newsRecordLarge.vue | 40 +- .../moduleCom/oa/planQuery/planQuery.vue | 12 +- .../moduleCom/oa/planQuery/planQueryLarge.vue | 16 +- .../moduleCom/oa/planRecord/interConfig.js | 26 + .../moduleCom/oa/planRecord/planRecord.vue | 1001 ++++++++++++++++- .../oa/scheduleRecord/scheduleRecord.vue | 241 ++-- .../oa/scheduleRecord/scheduleRecordLarge.vue | 44 +- 7 files changed, 1230 insertions(+), 150 deletions(-) diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/newsRecord/newsRecordLarge.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/newsRecord/newsRecordLarge.vue index 1e1172d..add75e0 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/newsRecord/newsRecordLarge.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/newsRecord/newsRecordLarge.vue @@ -41,7 +41,7 @@ diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planQuery/planQuery.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planQuery/planQuery.vue index 209f094..d76a0a6 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planQuery/planQuery.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planQuery/planQuery.vue @@ -249,12 +249,12 @@ if (result[0].status === 200) { if (resData.code === 2000) { this.$set(this.planList[index], "finish_flag", 1); - Modal.success({ - title: "计划已完成", - content: "", - centered: true, - zIndex: 100000 - }) +// Modal.success({ +// title: "计划已完成", +// content: "", +// centered: true, +// zIndex: 100000 +// }) //this.getListSuperfusionWorkPlan(); } } diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planQuery/planQueryLarge.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planQuery/planQueryLarge.vue index 0a7e637..3cf60f7 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planQuery/planQueryLarge.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planQuery/planQueryLarge.vue @@ -24,12 +24,12 @@
{{t_item.category_type == 2 ? '部门下发' : (t_item.category_type == 3 ? '机构下发' : '')}} -
+
关联我的 -
+
完成 @@ -50,12 +50,12 @@
{{r_item.category_type == 2 ? '部门下发' : (r_item.category_type == 3 ? '机构下发' : '')}} -
+
关联我的 -
+
完成 @@ -85,12 +85,12 @@
{{b_item.category_type == 2 ? '部门下发' : (b_item.category_type == 3 ? '机构下发' : '')}} -
+
关联我的 -
+
完成 @@ -117,12 +117,12 @@
{{l_item.category_type == 2 ? '部门下发' : (l_item.category_type == 3 ? '机构下发' : '')}} -
+
关联我的 -
+
完成 diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planRecord/interConfig.js b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planRecord/interConfig.js index b77a6f6..2a690a3 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planRecord/interConfig.js +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planRecord/interConfig.js @@ -7,4 +7,30 @@ export default { method:'get', isTestLogin:true }, + /* + * 个人工作计划统计——饼图、柱状图 + * */ + "listSuperfusionPersonalStatisticsWorkPlan":{ + url:'/intellioa/workPlan/listSuperfusionPersonalStatisticsWorkPlan', + method:'get', + isTestLogin:true + }, + + /* + * 部门工作计划统计——饼、条、柱 + * */ + "listSuperfusionDeptStatisticsWorkPlan":{ + url:'/intellioa/workPlan/listSuperfusionDeptStatisticsWorkPlan', + method:'get', + isTestLogin:true + }, + + /* + * 机构工作计划统计——饼、条、柱 + * */ + "listSuperfusionOrgStatisticsWorkPlan":{ + url:'/intellioa/workPlan/listSuperfusionOrgStatisticsWorkPlan', + method:'get', + isTestLogin:true + }, } diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planRecord/planRecord.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planRecord/planRecord.vue index b4ab9bd..900d591 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planRecord/planRecord.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/planRecord/planRecord.vue @@ -1,17 +1,1004 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecord.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecord.vue index 4a9b6b9..e50ee97 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecord.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecord.vue @@ -9,30 +9,28 @@
-
累计：{{this.all_num}}
-
已完成：{{this.complete_num}}
-
未完成：{{this.uncomplete_num}}
+
累计：{{all_num}}
+
已完成：{{complete_num}}
+
未完成：{{uncomplete_num}}
-
我创建：{{this.all_personal_num}}
-
已完成：{{this.complete_personal_num}}
-
未完成：{{this.uncomplete_personal_num}}
+
我创建：{{all_personal_num}}
+
已完成：{{complete_personal_num}}
+
未完成：{{uncomplete_personal_num}}
-
关联我：{{this.all_relation_num}}
-
已完成：{{this.complete_relation_num}}
-
未完成：{{this.uncomplete_relation_num}}
+
关联我：{{all_relation_num}}
+
已完成：{{complete_relation_num}}
+
未完成：{{uncomplete_relation_num}}
每日对比
- -
- +
@@ -65,9 +63,7 @@
成员对比
- -
- +
@@ -83,7 +79,7 @@ import TabComp from '../common/tabComp.vue'; import DateChoose from '../common/dateChoose.vue'; import OfficeMenuConfig from '../../../../../../../../src/utils/officeMenuConfig'; - import {Spin,Progress,Modal,Icon} from 'ant-design-vue'; + import {Spin, Progress, Modal, Icon} from 'ant-design-vue'; import interConfig from './interConfig'; import moment from 'moment'; import _ from 'lodash'; @@ -102,29 +98,29 @@ tabIndex: 0, begin_date: null, end_date: null, - start:"", - end:"", - currentDate:"", - all_num:0,//累计数量 - complete_num:0,//已完成数量 - uncomplete_num:0,//未完成数量 - all_personal_num:0,//我创建的累计数量 - complete_personal_num:0,//我创建的已完成数量 - uncomplete_personal_num:0,//我创建的未完成数量 - all_relation_num:0,//关联我的累计数量 - complete_relation_num:0,//关联我的已完成数量 - uncomplete_relation_num:0,//关联我的未完成数量 - showPanel:false, - depId:this.BaseConfig.person_info_my.dep_id, - depName:this.BaseConfig.person_info_my.dep_name, - depAdmin:false, + start: "", + end: "", + currentDate: "", + all_num: 0,//累计数量 + complete_num: 0,//已完成数量 + uncomplete_num: 0,//未完成数量 + all_personal_num: 0,//我创建的累计数量 + complete_personal_num: 0,//我创建的已完成数量 + uncomplete_personal_num: 0,//我创建的未完成数量 + all_relation_num: 0,//关联我的累计数量 + complete_relation_num: 0,//关联我的已完成数量 + uncomplete_relation_num: 0,//关联我的未完成数量 + showPanel: false, + depId: this.BaseConfig.person_info_my.dep_id, + depName: this.BaseConfig.person_info_my.dep_name, + depAdmin: false, /* - * 部门统计使用 - * */ - dept_person_num:0, - all_dept_num:0, - all_dept_finish_num:0, - all_dept_un_finish_num:0, + * 部门统计使用 + * */ + dept_person_num: 0, + all_dept_num: 0, + all_dept_finish_num: 0, + all_dept_un_finish_num: 0, } }, created(){ @@ -135,19 +131,19 @@ } this.getNowTime(); }, - computed:{ - all_complete_percent:function () { - return Math.ceil(this.complete_num/this.all_num * 100) ; + computed: { + all_complete_percent: function () { + return Math.ceil(this.complete_num / this.all_num * 100); }, - person_complete_percent:function () { - return Math.ceil(this.complete_personal_num/this.all_personal_num * 100) ; + person_complete_percent: function () { + return Math.ceil(this.complete_personal_num / this.all_personal_num * 100); }, - relation_complete_percent:function () { - return Math.ceil(this.complete_relation_num/this.all_relation_num * 100) ; + relation_complete_percent: function () { + return Math.ceil(this.complete_relation_num / this.all_relation_num * 100); } }, methods: { - getNowTime:function () { + getNowTime: function () { this.InterfaceConfig.callInterface([{ url: interConfig.getNowTime.url, params: {}, @@ -162,9 +158,9 @@ let day = resData.data.day; this.begin_date = moment(year + "-" + month + "-01"); this.end_date = moment(year + "-" + month + "-" + day); - if(this.tabIndex == 0){ + if (this.tabIndex == 0) { this.workSchedulePersonStatistics(); - }else { + } else { this.workScheduleDeptStatistics(); } @@ -247,15 +243,15 @@ } }) }, - buildEchart:function (data) { + buildEchart: function (data) { // 基于准备好的dom，初始化echarts实例 let myChart = echarts.init(document.getElementById('dayCompareId')); // 绘制图表 let yData = [];//y轴数据 let completedArr = [];//已完成 let unCompletedArr = [];//未完成 - if(data){ - data.forEach(item=>{ + if (data) { + data.forEach(item => { yData.push(item.day) completedArr.push(item.finish_num); unCompletedArr.push(item.un_finish_num); @@ -278,21 +274,28 @@ bottom: '3%', containLabel: true }, -// dataZoom : {//实现缩放功能 -// show : true, -// realtime : true, -// start : 0, -// end : 70 -// }, xAxis: { type: 'value' }, yAxis: { type: 'category', - data: yData + data: yData, // data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] - }, + }, + dataZoom: [ + { + type: 'slider', //滑动条 + show: true, //开启 + yAxisIndex: [0], + left: '93%', //滑动条位置 + start: 1, //初始化时，滑动条宽度开始标度 + end: 50 //初始化时，滑动条宽度结束标度
},
//y轴内置滑动 + }, { + type: 'inside', //内置滑动，随鼠标滚轮展示 + yAxisIndex: [0], + start: 1,//初始化时，滑动条宽度开始标度
end: 50 //初始化时，滑动条宽度结束标度 + }], series: [ { name: '已完成', @@ -301,12 +304,12 @@ label: { show: true }, - barWidth:'10', + barWidth: '10', emphasis: { focus: 'series' }, //data: [320, 302, 301, 334, 390, 330, 320] - data:completedArr + data: completedArr }, { name: '未完成', @@ -315,30 +318,28 @@ label: { show: false }, - barWidth:'10', + barWidth: '10', emphasis: { focus: 'series' }, //data: [120, 132, 101, 134, 90, 230, 210] - data:unCompletedArr + data: unCompletedArr }, ] } ); - let autoHeight = yData.length * 35 + 50; // counst.length为柱状图的条数，即数据长度。35为我给每个柱状图的高度，50为柱状图x轴内容的高度(大概的)。 - myChart.resize({height:autoHeight}); }, - buildDeptEchart:function (data) { + buildDeptEchart: function (data) { let chartData = []; let compareData = []; let compareCompletedArr = []; let compareUnCompletedArr = []; - data.forEach(item=>{ + data.forEach(item => { let chart = { - value:parseInt(item.finish_num) + parseInt(item.un_finish_num), - name:item.person_name, + value: parseInt(item.finish_num) + parseInt(item.un_finish_num), + name: item.person_name, } - if(chart.value > 0){ + if (chart.value > 0) { chartData.push(chart) } @@ -419,7 +420,19 @@ data: compareData // data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] }, - + dataZoom: [ + { + type: 'slider', //滑动条 + show: true, //开启 + yAxisIndex: [0], + left: '93%', //滑动条位置 + start: 1, //初始化时，滑动条宽度开始标度 + end: 50 //初始化时，滑动条宽度结束标度
},
//y轴内置滑动 + }, { + type: 'inside', //内置滑动，随鼠标滚轮展示 + yAxisIndex: [0], + start: 1,//初始化时，滑动条宽度开始标度
end: 50 //初始化时，滑动条宽度结束标度 + }], series: [ { name: '已完成', @@ -428,12 +441,12 @@ label: { show: true }, - barWidth:'10', + barWidth: '10', emphasis: { focus: 'series' }, //data: [320, 302, 301, 334, 390, 330, 320] - data:compareCompletedArr + data: compareCompletedArr }, { name: '未完成', @@ -442,67 +455,67 @@ label: { show: false }, - barWidth:'10', + barWidth: '10', emphasis: { focus: 'series' }, //data: [120, 132, 101, 134, 90, 230, 210] - data:compareUnCompletedArr + data: compareUnCompletedArr }, ] } ); - let autoHeight = compareData.length * 35 + 50; // counst.length为柱状图的条数，即数据长度。35为我给每个柱状图的高度，50为柱状图x轴内容的高度(大概的)。 - compareChart.resize({height:autoHeight}); + //let autoHeight = compareData.length * 35 + 50; // counst.length为柱状图的条数，即数据长度。35为我给每个柱状图的高度，50为柱状图x轴内容的高度(大概的)。 + //compareChart.resize({height: autoHeight}); }, flushDate: function (param) { this.begin_date = param.beginDate; this.end_date = param.endDate; - if(this.tabIndex == 0){ + if (this.tabIndex == 0) { this.workSchedulePersonStatistics(); - }else { + } else { this.workScheduleDeptStatistics(); } }, - chooseDep:function () { - if(!this.showPanel){ - this.showPanel = true; - } + chooseDep: function () { + if (!this.showPanel) { + this.showPanel = true; + } }, - cloneData:function () { + cloneData: function () { return _.cloneDeep([{ - id:this.depId, - name:this.depName + id: this.depId, + name: this.depName }]) }, - closePanel:function () { + closePanel: function () { this.showPanel = false; }, - selectComplete:function (selectedData) { - if(selectedData.length > 0){ + selectComplete: function (selectedData) { + if (selectedData.length > 0) { this.depId = selectedData[0].id; this.depName = selectedData[0].name; this.showPanel = false; - }else { + } else { Modal.warning({ - title:"请选择一个部门", - content:"", - centered:true, - zIndex:100000 + title: "请选择一个部门", + content: "", + centered: true, + zIndex: 100000 }) } } }, mounted(){ - // this.workSchedulePersonStatistics(); + // this.workSchedulePersonStatistics(); }, components: { TabComp, ASpin: Spin, DateChoose, - AProgress:Progress, + AProgress: Progress, SelectDepartment, - AIcon:Icon + AIcon: Icon } } @@ -511,15 +524,16 @@ width: 100%; min-height: 20rem; padding: 0.5rem; - .part-record-div{ + .part-record-div { min-height: 10rem; - border:2px solid rgba(144, 202, 249, 1); + border: 2px solid rgba(144, 202, 249, 1); border-radius: 5px; position: relative; margin-top: 1.5rem; display: flex; - justify-content: center;padding: 1rem 0; - .part-title{ + justify-content: center; + padding: 1rem 0; + .part-title { position: absolute; top: -16px; padding: 0.2rem 1rem; @@ -528,12 +542,12 @@ color: white; font-size: 1rem; } - .part-content{ + .part-content { display: flex; width: 100%; min-height: 10rem; padding: 1rem 0.5rem 0.5rem 0.5rem; - .part-content-item{ + .part-content-item { font-size: 14px; width: 33%; height: 100%; @@ -542,49 +556,50 @@ justify-content: center; align-items: center; } - .border-right{ + .border-right { border-right: 1px solid rgba(144, 202, 249, 1); } - .dep-schedule-record-echart{ + .dep-schedule-record-echart { width: 60%; } - .dep-schedule-record-info{ + .dep-schedule-record-info { width: 40%; display: flex; flex-direction: column; justify-content: center; align-items: center; - .info-row{ + .info-row { margin-top: 0.5rem; } } } - .day-compare-div{ + .day-compare-div { width: 90%; + height: 15rem; /*height: 10rem;*/ /*overflow: auto;*/ /*min-height: 15rem;*/ } } - .param-query-div{ + .param-query-div { display: flex; justify-content: center; align-items: center; - .dep-choose-div{ + .dep-choose-div { width: 15%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - .change-dep-icon{ + .change-dep-icon { color: #31a8fa; cursor: pointer; } - span{ + span { color: #31a8fa; cursor: pointer; } } - .dep-date-choose-div{ + .dep-date-choose-div { width: 85%; } } diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecordLarge.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecordLarge.vue index 4141d7d..e4b8474 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecordLarge.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecordLarge.vue @@ -94,17 +94,13 @@
成员对比
- -
- +
每日对比
- -
- +
@@ -626,7 +622,19 @@ data: compareData // data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] }, - + dataZoom: [ + { + type: 'slider', //滑动条 + show: true, //开启 + yAxisIndex: [0], + left: '93%', //滑动条位置 + start: 1, //初始化时，滑动条宽度开始标度 + end: 50 //初始化时，滑动条宽度结束标度
},
//y轴内置滑动 + },{ + type: 'inside', //内置滑动，随鼠标滚轮展示 + yAxisIndex: [0], + start: 1,//初始化时，滑动条宽度开始标度
end: 50 //初始化时，滑动条宽度结束标度 + }], series: [ { name: '已完成', @@ -659,8 +667,8 @@ ] } ); - let autoHeight = compareData.length * 35 + 50; // counst.length为柱状图的条数，即数据长度。35为我给每个柱状图的高度，50为柱状图x轴内容的高度(大概的)。 - compareChart.resize({height: autoHeight}); +// let autoHeight = compareData.length * 35 + 50; // counst.length为柱状图的条数，即数据长度。35为我给每个柱状图的高度，50为柱状图x轴内容的高度(大概的)。 +// compareChart.resize({height: autoHeight}); let day_list = data.day_list; this.buildDayListEchart(day_list); @@ -711,7 +719,19 @@ data: yData // data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] }, - + dataZoom: [ + { + type: 'slider', //滑动条 + show: true, //开启 + yAxisIndex: [0], + left: '93%', //滑动条位置 + start: 1, //初始化时，滑动条宽度开始标度 + end: 50 //初始化时，滑动条宽度结束标度
},
//y轴内置滑动 + },{ + type: 'inside', //内置滑动，随鼠标滚轮展示 + yAxisIndex: [0], + start: 1,//初始化时，滑动条宽度开始标度
end: 50 //初始化时，滑动条宽度结束标度 + }], series: [ { name: '已完成', @@ -744,8 +764,8 @@ ] } ); - let autoHeight = yData.length * 35 + 50; // counst.length为柱状图的条数，即数据长度。35为我给每个柱状图的高度，50为柱状图x轴内容的高度(大概的)。 - myChart.resize({height:autoHeight}); +// let autoHeight = yData.length * 35 + 50; // counst.length为柱状图的条数，即数据长度。35为我给每个柱状图的高度，50为柱状图x轴内容的高度(大概的)。 +// myChart.resize({height:autoHeight}); }, chooseDep: function () { if (!this.showPanel) { From f0cb8bf450e6e93365fa3320ce5a943b529a7519 Mon Sep 17 00:00:00 2001 From: gongdi <410827992@qq.com> Date: Thu, 2 Sep 2021 17:26:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=9E=E5=85=AC=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainPlatform/moduleAndLayout/moduleAndLaySettingConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleAndLaySettingConfig.js b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleAndLaySettingConfig.js index cc07417..d081981 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleAndLaySettingConfig.js +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleAndLaySettingConfig.js @@ -67,7 +67,7 @@ export const moduleData=[{ purview_code:"hbg_rcbg",menu_name:["newPlanConclusion","work_summary"],show_oneLevel:false}, {module_id:'planning_statistics', module_name:'计划统计', relative_crm:['daliyOffice','newPlanConclusion','plan_summary_statistics'],icon:"icon-jihuatongji", - module_url_small:'',module_url_large:'', + module_url_small:'oa/planRecord/planRecord.vue',module_url_large:'oa/planRecord/planRecordLarge.vue', purview_code:"hbg_rcbg",menu_name:["newPlanConclusion","plan_summary_statistics"],show_oneLevel:false}, {module_id:'summary_statistics', module_name:'总结统计', relative_crm:['daliyOffice','newPlanConclusion','plan_summary_statistics'],icon:"icon-zongjietongji",