Skip to content

A
attendance-performance-platform
Commit 72c6da3f authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b0fa7252 028824c4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 649 additions and 125 deletions
attendance-performance-manager-ui/admin/src/views/Home.vue
View file @ 72c6da3f
...@@ -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/feedback/list.vue
View file @ 72c6da3f
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" noDel :config="tableConfig"> <LayoutTable :data="tableData" notDel :config="tableConfig">
</LayoutTable> </LayoutTable>
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
...@@ -87,28 +87,28 @@ export default { ...@@ -87,28 +87,28 @@ export default {
{ label: "反馈人数", prop: "feedbackNum", formatter: this.formatter }, { label: "反馈人数", prop: "feedbackNum", formatter: this.formatter },
{ label: "创建用户", prop: "createUserId", formatter: this.formatter }, { label: "创建用户", prop: "createUserId", formatter: this.formatter },
{ // {
label: "绩效反馈问题", // label: "绩效反馈问题",
width: 120, // width: 120,
prop: "subColumns", // prop: "subColumns",
formatter: (row) => { // formatter: (row) => {
let widthsize = this.columnSet.reduce((pre, cur) => { // let widthsize = this.columnSet.reduce((pre, cur) => {
return pre + Number(cur.width); // return pre + Number(cur.width);
}, 50); // }, 50);
return ( // return (
<el-popover placement="right" width={widthsize} trigger="click"> // <el-popover placement="right" width={widthsize} trigger="click">
{this.renderTable(row.feedbackQuestionList)} // {this.renderTable(row.feedbackQuestionList)}
<el-button type="text" slot="reference">详细</el-button> // <el-button type="text" slot="reference">详细</el-button>
</el-popover> // </el-popover>
); // );
}, // },
}, // },
{ {
label: "操作", label: "操作",
width: 240, width: 240,
formatter: row => { formatter: row => {
return ( return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons noAdd noEdit row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
); );
} }
} }
......
attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue
View file @ 72c6da3f
...@@ -188,97 +188,6 @@ export default { ...@@ -188,97 +188,6 @@ export default {
mounted() { mounted() {
let id = localStorage.getItem('checkFeedbackId') let id = localStorage.getItem('checkFeedbackId')
this.getInfo(id) this.getInfo(id)
// this.Frule = [
// {
// "type": "span",
// "title": "问卷名称",
// "native": false,
// "children": [
// "这是一段文字"
// ],
// "_fc_drag_tag": "span",
// "hidden": false,
// "display": true
// },
// {
// "type": "input",
// "field": "Fupb1nuyh5txf1",
// "title": "输入框",
// "info": "",
// "$required": false,
// "_fc_drag_tag": "input",
// "hidden": false,
// "display": true
// },
// {
// "type": "inputNumber",
// "field": "Flo91nuyh5vjag",
// "title": "计数器",
// "info": "",
// "$required": false,
// "_fc_drag_tag": "inputNumber",
// "hidden": false,
// "display": true
// },
// {
// "type": "radio",
// "field": "Fz3d1nuyh5xpor",
// "title": "单选框",
// "info": "",
// "effect": {
// "fetch": ""
// },
// "$required": false,
// "options": [
// {
// "value": "1",
// "label": "选项1"
// },
// {
// "value": "2",
// "label": "选项2"
// }
// ],
// "_fc_drag_tag": "radio",
// "hidden": false,
// "display": true
// },
// {
// "type": "checkbox",
// "field": "Fwzb1nuyh61906",
// "title": "多选框",
// "info": "",
// "effect": {
// "fetch": ""
// },
// "$required": false,
// "options": [
// {
// "value": "1",
// "label": "选项1"
// },
// {
// "value": "2",
// "label": "选项2"
// }
// ],
// "_fc_drag_tag": "checkbox",
// "hidden": false,
// "display": true
// }
// ]
// this.Fopthion = {
// "form": {
// "labelPosition": "top",
// "size": "mini",
// "labelWidth": "20%",
// "hideRequiredAsterisk": false,
// "showMessage": true,
// "inlineMessage": false
// },
// "submitBtn": true,
// "resetBtn": false
// }
}, },
methods: { methods: {
...@@ -295,6 +204,9 @@ export default { ...@@ -295,6 +204,9 @@ export default {
this.Frule = formCreate.parseJson(this.feedbackData.formContent) this.Frule = formCreate.parseJson(this.feedbackData.formContent)
this.Fopthion = formCreate.parseJson(this.feedbackData.ruleContent) this.Fopthion = formCreate.parseJson(this.feedbackData.ruleContent)
}) })
this.$get('/feedback/getOptionSummaryList', { feedbackId: id }).then(res => {
console.log(res)
})
} }
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java
View file @ 72c6da3f
...@@ -21,8 +21,6 @@ public abstract class BaseReq implements Serializable { ...@@ -21,8 +21,6 @@ public abstract class BaseReq implements Serializable {
/** /**
* 工号 * 工号
*/ */
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/InspectSaveReq.java 0 → 100644
View file @ 72c6da3f
package com.mortals.xhx.busiz.req;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.xhx.busiz.BaseReq;
import lombok.Data;
import java.util.Date;
@Data
public class InspectSaveReq extends BaseReq {
//考勤
/**
* 所属考勤组ID
*/
private Long attendanceGroupId;
/**
* 所属考勤组名称
*/
private String attendanceGroupName;
/**
* 考勤时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date attendanceDate;
/**
* 异常时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date errorTime;
/**
* 上下班时间
*/
private String goOffTimeStr;
/**
* 实际打卡时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date actualAttendTime;
/**
* 异常处理结果
*/
private String errorResult;
//评价
/**
* 评价结果(1.非常不满意,2.差评)
*/
private Integer reviewResult;
/**
* 评价时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date reviewTime;
/**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/
private String reviewSource;
/**
* 评价设备
*/
private String reviewDevice;
//投诉
/**
* 投诉标题
*/
private String complainTitle;
/**
* 投诉内容
*/
private String complainContent;
/**
* 投诉人真实姓名
*/
private String complainRealName;
/**
* 联系电话
*/
private String contact;
/**
* 投诉时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date complainTime;
/**
* 投诉来源
*/
private String complainSource;
/**
* 投诉设备
*/
private String complainDevice;
//办件
/**
* 办件编码
*/
private String goworkCode;
/**
* 办件所属部门
*/
private String goworkDepts;
/**
* 事项名称
*/
private String matterlName;
/**
* 办理时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date goworkTime;
//效能
/**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/
private Integer irregularType;
/**
* 发生时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date happenTime;
/**
* 持续时间，秒
*/
private Integer duration;
/**
* 报警时间
*/
private Date alarmTime;
//其它
/**
* 违规类型(1.工作纪律)
*/
private Integer irregularOtherType;
// /**
// * 发生时间
// */
// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
// private Date happenTime;
/**
* 评分标准
*/
private String ruleDesc;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/PerformReq.java
View file @ 72c6da3f
...@@ -19,5 +19,9 @@ public class PerformReq extends BaseReq { ...@@ -19,5 +19,9 @@ public class PerformReq extends BaseReq {
private Long id; private Long id;
private Integer processStatus;
private Integer scoreType;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/InspectStatInfo.java 0 → 100644
View file @ 72c6da3f
package com.mortals.xhx.busiz.rsp;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class InspectStatInfo {
/**
* 累计次数
*/
private Integer totalTimes;
/**
* 今日次数
*/
private Integer todayTimes;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java
View file @ 72c6da3f
...@@ -130,6 +130,8 @@ public class AppealApiController extends AbstractBaseController<PerformReq> { ...@@ -130,6 +130,8 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
model.put(PAGEINFO_KEY, result.getPageInfo()); model.put(PAGEINFO_KEY, result.getPageInfo());
parsePageInfo(model, result.getPageInfo()); parsePageInfo(model, result.getPageInfo());
rest.setData(model);
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java
View file @ 72c6da3f
...@@ -105,6 +105,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> { ...@@ -105,6 +105,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
model.put(PAGEINFO_KEY, pageAllInfo); model.put(PAGEINFO_KEY, pageAllInfo);
parsePageInfo(model, pageAllInfo); parsePageInfo(model, pageAllInfo);
rest.setData(model);
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java
View file @ 72c6da3f
...@@ -98,7 +98,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -98,7 +98,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performStatInfo.setTotalScore(new BigDecimal("15.9")); performStatInfo.setTotalScore(new BigDecimal("15.9"));
performStatInfo.setTotalTimes(12); performStatInfo.setTotalTimes(12);
performStatInfo.setTodayScore(new BigDecimal("12.6")); performStatInfo.setTodayScore(new BigDecimal("12.6"));
performStatInfo.setTodayTimes(11); performStatInfo.setTodayTimes(4);
rest.setData(performStatInfo);
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
......
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