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