Skip to content

A
attendance-performance-platform
Commit 3903b240 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents aec7ad61 7121fd99
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 144 deletions
attendance-performance-manager-ui/admin/src/views/Home.vue
View file @ 3903b240
......@@ -118,18 +118,18 @@ export default {
desc: '根据部门/个人承担的目标和任务完成情况以及工作<br>评价结果、加减分纪实现考核结果自动生成。',
navList: []
},
{
icon: require('@/assets/images/u167.png'),
barName: 'OA审批',
desc: '无纸化审批流程，轻松完成打卡请假、移动审批等<br>操作，审批资料查找方便',
navList: []
},
{
icon: require('@/assets/images/u172.png'),
barName: '数据分析',
desc: '完整团队经营状态的数字化，人财物事数据分析<br>展示，为管理提供智能决策依据',
navList: []
},
// {
// icon: require('@/assets/images/u167.png'),
// barName: 'OA审批',
// desc: '无纸化审批流程，轻松完成打卡请假、移动审批等<br>操作，审批资料查找方便',
// navList: []
// },
// {
// icon: require('@/assets/images/u172.png'),
// barName: '数据分析',
// desc: '完整团队经营状态的数字化，人财物事数据分析<br>展示，为管理提供智能决策依据',
// navList: []
// },
{
icon: require('@/assets/images/u177.png'),
barName: '系统设置',
......
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/components/BarCharts.vue
View file @ 3903b240
......@@ -21,8 +21,12 @@ export default {
},
styleObj: {
type: Object,
default: () => {},
default: () => { },
},
chartsData: {
type: Array,
default: ""
}
},
data() {
return {};
......@@ -32,6 +36,9 @@ export default {
console.log(val);
this.drawLine();
},
chartsData(val) {
this.drawLine();
}
},
mounted() {
this.drawLine();
......@@ -50,7 +57,7 @@ export default {
fontSize: this.legendName == "旷工率" ? 24 : 18,
},
},
color:'#6e98ed',
color: '#6e98ed',
legend: {
orient: "horizontal",
right: "50px",
......@@ -65,75 +72,77 @@ export default {
},
tooltip: {},
xAxis: {
data:
this.title == "申诉次数部门排名TOP20"
? [
"部门1",
"部门2",
"部门3",
"部门4",
"部门5",
"部门6",
"部门7",
"部门8",
"部门9",
"部门10",
"部门11",
"部门12",
"部门13",
"部门14",
"部门15",
"部门16",
"部门17",
"部门18",
"部门19",
"部门20",
]
: this.title == "申诉次数个人排名TOP20"
? [
"个人1",
"个人2",
"个人3",
"个人4",
"个人5",
"个人6",
"个人7",
"个人8",
"个人9",
"个人10",
"个人11",
"个人12",
"个人13",
"个人14",
"个人15",
"个人16",
"个人17",
"个人18",
"个人19",
"个人20",
]
: [
"规则1",
"规则2",
"规则3",
"规则4",
"规则5",
"规则6",
"规则7",
"规则8",
"规则9",
"规则10",
"规则11",
"规则12",
"规则13",
"规则14",
"规则15",
"规则16",
"规则17",
"规则18",
"规则19",
"规则20",
],
data: this.chartsData.map(i => {
return i.ruleName || i.deptName || i.staffName
})
// this.title == "申诉次数部门排名TOP20"
// ? [
// "部门1",
// "部门2",
// "部门3",
// "部门4",
// "部门5",
// "部门6",
// "部门7",
// "部门8",
// "部门9",
// "部门10",
// "部门11",
// "部门12",
// "部门13",
// "部门14",
// "部门15",
// "部门16",
// "部门17",
// "部门18",
// "部门19",
// "部门20",
// ]
// : this.title == "申诉次数个人排名TOP20"
// ? [
// "个人1",
// "个人2",
// "个人3",
// "个人4",
// "个人5",
// "个人6",
// "个人7",
// "个人8",
// "个人9",
// "个人10",
// "个人11",
// "个人12",
// "个人13",
// "个人14",
// "个人15",
// "个人16",
// "个人17",
// "个人18",
// "个人19",
// "个人20",
// ]
// : [
// "规则1",
// "规则2",
// "规则3",
// "规则4",
// "规则5",
// "规则6",
// "规则7",
// "规则8",
// "规则9",
// "规则10",
// "规则11",
// "规则12",
// "规则13",
// "规则14",
// "规则15",
// "规则16",
// "规则17",
// "规则18",
// "规则19",
// "规则20",
// ],
},
grid: {
left: "5%",
......@@ -147,28 +156,9 @@ export default {
{
name: this.legendName,
type: "bar",
data: [
1200,
1100,
900,
800,
1122,
1234,
1050,
1155,
1120,
1136,
1110,
1110,
1120,
1020,
1212,
1233,
1111,
1000,
1111,
1024,
],
data: this.chartsData.map(i => {
return i.number
}),
itemStyle: {
// normal: {
// //这里是重点
......
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue
View file @ 3903b240
......@@ -13,48 +13,27 @@
<div class="content">
<div class="search_box">
<div class="search">
<el-select
v-model="dateValue"
placeholder="请选择"
style="margin: 0 10px;"
>
<el-option
v-for="item in optionsMonths"
:key="item.value"
:label="item.label"
:value="item.value"
>
<el-select v-model="dateValue" placeholder="请选择" style="margin: 0 10px;">
<el-option v-for="item in optionsMonths" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-button type="primary">搜索</el-button>
<el-button type="primary" @click="getChartsData">搜索</el-button>
</div>
</div>
<div class="data_box">
<div class="top">
<div class="box">
<bar-charts
:title="'申诉次数部门排名TOP20'"
:id="'dept_20'"
:legendName="'申诉次数'"
:styleObj="{ width: '800px', height: '360px' }"
/>
<bar-charts :title="'申诉次数部门排名TOP20'" :id="'dept_20'" :legendName="'申诉次数'"
:styleObj="{ width: '800px', height: '360px' }" :chartsData="depChartsData" />
</div>
<div class="box">
<bar-charts
:title="'申诉次数个人排名TOP20'"
:id="'person_20'"
:legendName="'申诉次数'"
:styleObj="{ width: '800px', height: '360px' }"
/>
<bar-charts :title="'申诉次数个人排名TOP20'" :id="'person_20'" :legendName="'申诉次数'"
:styleObj="{ width: '800px', height: '360px' }" :chartsData="personChartsData" />
</div>
</div>
<div class="down">
<bar-charts
:title="'申诉次数规则排名TOP20'"
:id="'rule_20'"
:legendName="'申诉次数'"
:styleObj="{ width: '1800px', height: '320px' }"
/>
<bar-charts :title="'申诉次数规则排名TOP20'" :id="'rule_20'" :legendName="'申诉次数'"
:styleObj="{ width: '1800px', height: '320px' }" :chartsData="depChartsData" />
</div>
</div>
</div>
......@@ -92,14 +71,28 @@ export default {
getData() {
this.activeName == 1 || this.activeName == 2
? this.$post("/perform/attend/appeal/list", {
processStatus: this.activeName,
}).then((res) => {
console.log(res);
if (res.code == 1) {
this.tableData = res.data;
}
})
: "";
processStatus: this.activeName,
}).then((res) => {
console.log(res);
if (res.code == 1) {
this.tableData = res.data;
}
})
: this.getChartsData();
},
getChartsData() {
this.$post('/perform/attend/appeal/stat', { appealTimeStart: this.dateValue, statType: 1 }).then(res => {
console.log(res)
this.depChartsData = res.data
})
this.$post('/perform/attend/appeal/stat', { appealTimeStart: this.dateValue, statType: 2 }).then(res => {
console.log(res)
this.personChartsData = res.data
})
this.$post('/perform/attend/appeal/stat', { appealTimeStart: this.dateValue, statType: 3 }).then(res => {
console.log(res)
this.ruleChartsData = res.data
})
},
renderTable(tableData) {
return (
......@@ -133,6 +126,9 @@ export default {
},
data() {
return {
depChartsData: [],
personChartsData: [],
ruleChartsData: [],
/** 子表列元素 */
columnSet: [
{ label: "申诉Id", prop: "appealId", formatter: this.formatter },
......@@ -246,7 +242,57 @@ export default {
],
},
activeName: "1",
dateValue: "2023-01-00 00:00:00",
optionsMonths: [
{
value: "2023-01-01 00:00:00",
label: "1月",
},
{
value: "2023-02-01 00:00:00",
label: "2月",
},
{
value: "2023-03-01 00:00:00",
label: "3月",
},
{
value: "2023-04-01 00:00:00",
label: "4月",
},
{
value: "2023-05-01 00:00:00",
label: "5月",
},
{
value: "2023-06-01 00:00:00",
label: "6月",
},
{
value: "2023-07-01 00:00:00",
label: "7月",
},
{
value: "2023-08-01 00:00:00",
label: "8月",
},
{
value: "2023-09-01 00:00:00",
label: "9月",
},
{
value: "2023-10-01 00:00:00",
label: "10月",
},
{
value: "2023-11-01 00:00:00",
label: "11月",
},
{
value: "2023-12-01 00:00:00",
label: "12月",
},
],
dateValue: '2023-07-01 00:00:00',
};
},
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment