Skip to content

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

Merge remote-tracking branch 'origin/master'

parents ac11ff46 202450cf
Show whitespace changes
Inline Side-by-side
Showing with 1048 additions and 803 deletions
attendance-performance-manager-ui/admin/.env
View file @ 1a06d676
......@@ -11,4 +11,5 @@ VUE_APP_WEBSOCKET_API =127.0.0.1:18222/m
VUE_APP_PORTAL_URL = /portal_home
VUE_APP_PORTAL_PORT = 17300
VUE_APP_API_appName = '智慧政务绩效管理系统'
attendance-performance-manager-ui/admin/public/index.html
View file @ 1a06d676
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
<title>智慧政务绩效管理系统</title>
<link rel="stylesheet" href="https://unpkg.com/element-ui@2.15.5/lib/theme-chalk/index.css">
<link
rel="stylesheet"
href="https://unpkg.com/element-ui@2.15.5/lib/theme-chalk/index.css"
/>
</head>
<body>
<noscript>
<strong>We're sorry but app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
<strong
>We're sorry but app doesn't work properly without JavaScript enabled.
Please enable it to continue.</strong
>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
......
attendance-performance-manager-ui/admin/src/App.vue
View file @ 1a06d676
......@@ -24,7 +24,8 @@ export default {
beforeCreate() {
Vue.prototype.$app = this;
},
created() {},
created() {
},
methods: {},
};
......@@ -32,7 +33,7 @@ export default {
<style lang="less" scoped>
#app {
height:100vh;
height: 100vh;
.loading {
display: flex;
align-items: center;
......
attendance-performance-manager-ui/admin/src/components/Header.vue
View file @ 1a06d676
......@@ -10,13 +10,13 @@
</i>
<router-link to="/">
<img
src="../assets/images/logo.png"
:src="sysLogo ? sysLogo : require('../assets/images/logo.png')"
style="margin-bottom: 5px; margin-left: 24px"
height="40"
alt=""
/>
<b style="color: white; font-size: 20px">
&nbsp;&nbsp;&nbsp;智慧政务绩效管理系统
&nbsp;&nbsp;&nbsp;{{ sysName ? sysName : "智慧政务绩效管理系统" }}
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</b>
</router-link>
......@@ -172,6 +172,12 @@ export default {
data() {
return {
showMobileMenu: false,
sysName: localStorage.getItem("sysName")
? localStorage.getItem("sysName")
: "",
sysLogo: localStorage.getItem("sysLogo")
? localStorage.getItem("sysLogo")
: "",
};
},
created() {},
......
attendance-performance-manager-ui/admin/src/views/Home.vue
View file @ 1a06d676
......@@ -8,43 +8,47 @@
<div class="title" style="margin-bottom:40px">今日数据洞察</div>
<div class="cell1">
<div class="title">人事数据</div>
<div class="datas flex flex-align-center flex-pack-justify flex_warp">
<div
class="datas flex flex-align-center flex-pack-justify flex_warp"
>
<div class="item">
<div>总人数</div>
<div>{{homeStat.totalPersonNum}}</div>
<div>{{ homeStat.totalPersonNum }}</div>
</div>
<div class="item">
<div>部门人数</div>
<div>{{homeStat.totalDeptNum}}</div>
<div>{{ homeStat.totalDeptNum }}</div>
</div>
</div>
</div>
<div class="cell1">
<div class="title">考勤数据</div>
<div class="datas flex flex-align-center flex-pack-justify flex_warp">
<div
class="datas flex flex-align-center flex-pack-justify flex_warp"
>
<div class="item">
<div>打卡人数</div>
<div>{{homeStat.attendPersonNum}}</div>
<div>{{ homeStat.attendPersonNum }}</div>
</div>
<div class="item">
<div>出勤率</div>
<div>{{homeStat.attendRadio}}%</div>
<div>{{ homeStat.attendRadio }}%</div>
</div>
<div class="item">
<div>请假人数</div>
<div>{{homeStat.levealPersonNum}}</div>
<div>{{ homeStat.levealPersonNum }}</div>
</div>
<div class="item">
<div>迟到人数</div>
<div>{{homeStat.latePersonNum}}</div>
<div>{{ homeStat.latePersonNum }}</div>
</div>
<div class="item">
<div>早退人数</div>
<div>{{homeStat.leftEarlyPersonNum}}</div>
<div>{{ homeStat.leftEarlyPersonNum }}</div>
</div>
<div class="item">
<div>缺卡人数</div>
<div>{{homeStat.missCardPersonNum}}</div>
<div>{{ homeStat.missCardPersonNum }}</div>
</div>
</div>
</div>
......@@ -56,14 +60,20 @@
<div class="data_right">
<div class="title">科学化、精细化、以人为本知行合一的管理理念</div>
<div class="textWord">
坚持政治性与人民性的根本遵循、制度化与规范化的根本依托、考人与考事的相互结合<br>
坚持政治性与人民性的根本遵循、制度化与规范化的根本依托、考人与考事的相互结合<br />
创新性与技术性的重要支撑以及效能性与发展性的不懈追求
</div>
<div class="selectBars flex flex-align-center flex-pack-justify flex_warp">
<div class="Bar_item" v-for="(item, index) in barList" :key="index"
@click="tabChildren(item.barName)">
<div
class="selectBars flex flex-align-center flex-pack-justify flex_warp"
>
<div
class="Bar_item"
v-for="(item, index) in barList"
:key="index"
@click="tabChildren(item.barName)"
>
<div class="icon">
<img :src="item.icon">
<img :src="item.icon" />
</div>
<div class="barnam">{{ item.barName }}</div>
<div class="des" v-html="item.desc"></div>
......@@ -83,40 +93,43 @@ export default {
return this.$store.state.userData;
},
menu() {
return this.mapMenu(this.userData.barList)
}
return this.mapMenu(this.userData.barList);
},
},
data() {
return {
// 数据洞察
homeStat:{
totalPersonNum:0,//总人数
totalDeptNum:0,//部门数
attendPersonNum:0,//考勤人数
attendRadio:0,//出勤率
levealPersonNum:0,//请假人数
latePersonNum:0,//迟到人数
leftEarlyPersonNum:0,//早退人数
missCardPersonNum:0,//缺卡人数
homeStat: {
totalPersonNum: 0, //总人数
totalDeptNum: 0, //部门数
attendPersonNum: 0, //考勤人数
attendRadio: 0, //出勤率
levealPersonNum: 0, //请假人数
latePersonNum: 0, //迟到人数
leftEarlyPersonNum: 0, //早退人数
missCardPersonNum: 0, //缺卡人数
},
barList: [
{
icon: require('@/assets/images/u148.png'),
barName: '智能人事',
desc: '提供包括组织管理、职位管理、人事管理、人事<br>统计报表等相关功能',
navList: []
icon: require("@/assets/images/u148.png"),
barName: "智能人事",
desc:
"提供包括组织管理、职位管理、人事管理、人事<br>统计报表等相关功能",
navList: [],
},
{
icon: require('@/assets/images/u153.png'),
barName: '考勤打卡',
desc: '提供包括组织管理、职位管理、人事管理、人事<br>统计报表等相关功能',
navList: []
icon: require("@/assets/images/u153.png"),
barName: "考勤打卡",
desc:
"提供包括组织管理、职位管理、人事管理、人事<br>统计报表等相关功能",
navList: [],
},
{
icon: require('@/assets/images/u158.png'),
barName: '绩效管理',
desc: '根据部门/个人承担的目标和任务完成情况以及工作<br>评价结果、加减分纪实现考核结果自动生成。',
navList: []
icon: require("@/assets/images/u158.png"),
barName: "绩效管理",
desc:
"根据部门/个人承担的目标和任务完成情况以及工作<br>评价结果、加减分纪实现考核结果自动生成。",
navList: [],
},
// {
// icon: require('@/assets/images/u167.png'),
......@@ -131,45 +144,48 @@ export default {
// navList: []
// },
{
icon: require('@/assets/images/u177.png'),
barName: '系统设置',
desc: '提供包括RBAC用户-角色-权限管理、版本管理、<br>操作及登录日志管理等功能',
navList: []
}
]
}
icon: require("@/assets/images/u177.png"),
barName: "系统设置",
desc:
"提供包括RBAC用户-角色-权限管理、版本管理、<br>操作及登录日志管理等功能",
navList: [],
},
],
};
},
created() {
this.$store.commit('setHeadBar', [])
this.$store.commit("setCurrentParentName", '')
this.$store.commit('setCurrentThirdArr', [])
this.$store.commit('setCurrentSecondPath', '')
this.$store.commit('setThirdPath', '')
this.homeNum()
this.$store.commit("setHeadBar", []);
this.$store.commit("setCurrentParentName", "");
this.$store.commit("setCurrentThirdArr", []);
this.$store.commit("setCurrentSecondPath", "");
this.$store.commit("setThirdPath", "");
this.homeNum();
},
methods: {
tabChildren(name) {
console.log("name:" + name)
this.$store.commit("setCurrentParentName", name)//存储选择路由
let result = this.menu.find(item => item.name === name)
this.$store.commit('setHeadBar', result)
console.log("name:" + name);
this.$store.commit("setCurrentParentName", name); //存储选择路由
let result = this.menu.find((item) => item.name === name);
this.$store.commit("setHeadBar", result);
console.log("result:", result)
console.log("result:", result);
if (result) {
// 路由跳转
if (result.children.length > 0) {
this.$store.commit('setCurrentThirdArr', result.children[0].children)
this.$store.commit('setCurrentSecondPath', result.children[0].path)
this.$store.commit('setThirdPath', result.children[0].path)
this.$router.push({ path: result.children[0].path })
this.$store.commit("setCurrentThirdArr", result.children[0].children);
this.$store.commit("setCurrentSecondPath", result.children[0].path);
this.$store.commit("setThirdPath", result.children[0].path);
this.$router.push({ path: result.children[0].path });
} else {
this.$message.error('暂未完成添加');
this.$message.error("暂未完成添加");
}
} else {
this.$message.error("暂无权限");
}
},
mapMenu(arr) {
if (arr.length === 0) return []
let result = arr.map(item => {
if (arr.length === 0) return [];
let result = arr.map((item) => {
const url = item.url
? item.url
: item.childList[0]
......@@ -180,23 +196,24 @@ export default {
path: url,
id: item.id,
icon: item.imgPath,
children: item.childList.length === 0 ? [] : this.mapMenu(item.childList)
}
})
return result
children:
item.childList.length === 0 ? [] : this.mapMenu(item.childList),
};
});
return result;
},
// 查询统计数据
homeNum() {
this.$post("/login/index").then((res) => {
const { code, data } = res
const { code, data } = res;
if (code == 1) {
this.homeStat = Object.assign({},this.homeStat,data.homeStat)
console.log(data,"####")
this.homeStat = Object.assign({}, this.homeStat, data.homeStat);
console.log(data, "####");
}
});
}
}
}
},
},
};
</script>
<style scoped lang="less">
.page-home {
......@@ -214,7 +231,7 @@ export default {
font-size: 16px;
.title {
color: #409EFF;
color: #409eff;
margin-bottom: 20px;
}
......@@ -234,20 +251,20 @@ export default {
}
.cell1:last-child {
border: none
border: none;
}
}
// 数据标题
.data_left>.title,
.data_right>.title {
.data_left > .title,
.data_right > .title {
text-align: center;
font-size: 22px;
font-weight: bold;
}
.right_card {
background-image: url('~@/assets/images/u162.svg');
background-image: url("~@/assets/images/u162.svg");
background-repeat: no-repeat;
background-size: 100% auto;
background-position: bottom;
......@@ -274,7 +291,11 @@ export default {
border-radius: 10px;
padding: 20px 0;
text-align: center;
background: linear-gradient(90deg, rgba(187, 193, 255, 0.3), rgb(235, 235, 235));
background: linear-gradient(
90deg,
rgba(187, 193, 255, 0.3),
rgb(235, 235, 235)
);
cursor: pointer;
.icon img {
......@@ -302,4 +323,5 @@ export default {
::v-deep .el-card {
height: 100%;
}</style>
}
</style>
attendance-performance-manager-ui/admin/src/views/SSO.vue
View file @ 1a06d676
......@@ -5,36 +5,47 @@
</template>
<script>
import jwt_decode from "jwt-decode";
export default {
name: 'sso',
created () {
},
name: "sso",
created() {},
mounted() {
let token = this.$route.query.token
console.log("token:"+token)
console.log("解析后的token:",jwt_decode(token))
let token = this.$route.query.token;
console.log("token:" + token);
console.log("解析后的token:", jwt_decode(token));
//const decode = jwt_decode(data.normal_login_token).accountId; // 解析
if(token) {
if (token) {
//本地登录后跳转
this.form.loginName=jwt_decode(token).userInfo.account
this.form.password=jwt_decode(token).userInfo.password
/* this.form.loginName="admin"
this.form.loginName = jwt_decode(token).userInfo.account;
this.form.password = jwt_decode(token).userInfo.password;
this.$route.query.sysName
? localStorage.setItem("sysName", this.$route.query.sysName)
: "";
this.$route.query.sysLogo
? localStorage.setItem("sysLogo", this.$route.query.sysLogo)
: "";
this.$route.query.sysName
? (document.title = this.$route.query.sysName)
: "";
/* this.form.loginName="admin"
this.form.password="scsmile"*/
this.login()
this.login();
//window.sessionStorage.setItem("token", token);
// this.$router.push('/index') // 有token直接跳转首页
}else{
} else {
this.$message({
message: '没有权限，正在跳转登录页面...',
center: true
message: "没有权限，正在跳转登录页面...",
center: true,
});
setTimeout(function(){
window.location.href=process.env.VUE_APP_PORTAL_URL=='undefined'?'http://192.168.0.98:11072':process.env.VUE_APP_PORTAL_URL
setTimeout(function() {
window.location.href =
process.env.VUE_APP_PORTAL_URL == "undefined"
? "http://192.168.0.98:11072"
: process.env.VUE_APP_PORTAL_URL;
//this.$router.push('/login')
},1000)
}, 1000);
}
},
methods: {
......@@ -47,8 +58,8 @@ export default {
loginSuccess({ data }) {
console.log("userData", data);
this.$store.commit("setUserData", data);
this.$router.push('/index') // 有token直接跳转首页
/* this.$router.replace({
this.$router.push("/index"); // 有token直接跳转首页
/* this.$router.replace({
path: this.redirect,
});*/
},
......@@ -60,15 +71,15 @@ export default {
data() {
return {
form: {
loginName: '',
password: '',
securityCode: '',
loginName: "",
password: "",
securityCode: "",
},
redirect: this.$route.query.redirect,
loading: true,
}
}
}
};
},
};
</script>
<style>
......
attendance-performance-manager-ui/admin/src/views/attendance/record/hik/dialogshow.vue
View file @ 1a06d676
......@@ -3,39 +3,118 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<Field label="员工ID" prop="staffId" v-model="form.staffId" placeholder="请输入员工ID"/>
<Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="职位ID" prop="positionId" v-model="form.positionId" placeholder="请输入职位ID"/>
<Field label="职位名称" prop="positionName" v-model="form.positionName" placeholder="请输入职位名称"/>
<Field label="所属考勤组ID" prop="attendanceGroupId" v-model="form.attendanceGroupId" placeholder="请输入所属考勤组ID"/>
<Field label="所属考勤组名称" prop="attendanceGroupName" v-model="form.attendanceGroupName" placeholder="请输入所属考勤组名称"/>
<Field label="班次ID" prop="shiftsId" v-model="form.shiftsId" placeholder="请输入班次ID"/>
<Field label="班次名称" prop="shiftsName" v-model="form.shiftsName" placeholder="请输入班次名称"/>
<Field label="考勤日期" prop="attendanceDate" v-model="form.attendanceDate" type="date" />
<Field label="考勤点名称" prop="attendanceAddress" v-model="form.attendanceAddress" placeholder="请输入考勤点名称"/>
<Field label="事件源" prop="eventSource" v-model="form.eventSource" placeholder="请输入事件源"/>
<Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
<Field
label="员工ID"
prop="staffId"
v-model="form.staffId"
placeholder="请输入员工ID"
/>
<Field
label="员工姓名"
prop="staffName"
v-model="form.staffName"
placeholder="请输入员工姓名"
/>
<Field
label="工号"
prop="workNum"
v-model="form.workNum"
placeholder="请输入工号"
/>
<Field
label="所属部门"
prop="deptId"
v-model="form.deptId"
placeholder="请输入所属部门"
/>
<Field
label="所属部门名称"
prop="deptName"
v-model="form.deptName"
placeholder="请输入所属部门名称"
/>
<Field
label="职位ID"
prop="positionId"
v-model="form.positionId"
placeholder="请输入职位ID"
/>
<Field
label="职位名称"
prop="positionName"
v-model="form.positionName"
placeholder="请输入职位名称"
/>
<Field
label="所属考勤组ID"
prop="attendanceGroupId"
v-model="form.attendanceGroupId"
placeholder="请输入所属考勤组ID"
/>
<Field
label="所属考勤组名称"
prop="attendanceGroupName"
v-model="form.attendanceGroupName"
placeholder="请输入所属考勤组名称"
/>
<Field
label="班次ID"
prop="shiftsId"
v-model="form.shiftsId"
placeholder="请输入班次ID"
/>
<Field
label="班次名称"
prop="shiftsName"
v-model="form.shiftsName"
placeholder="请输入班次名称"
/>
<Field
label="考勤日期"
prop="attendanceDate"
v-model="form.attendanceDate"
type="date"
/>
<Field
label="考勤点名称"
prop="attendanceAddress"
v-model="form.attendanceAddress"
placeholder="请输入考勤点名称"
/>
<Field
label="事件源"
prop="eventSource"
v-model="form.eventSource"
placeholder="请输入事件源"
/>
<Field
label="备注"
prop="remark"
v-model="form.remark"
type="textarea"
placeholder="请输入备注"
/>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button>
<el-button
type="primary"
v-if="pageInfo.type !== 'view'"
@click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow";
export default {
import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow";
export default {
mixins: [form],
components: {
dialogShow ,
dialogShow,
},
data() {
return {
......@@ -45,46 +124,43 @@
title: "海康考勤打卡记录汇总信息",
// 是否显示弹出层
open: false,
toString:[
],
toString: [],
// 表单校验
rules: {
staffName: [
{required: true,message: "请输入员工姓名", trigger: "blur" },
{max: 64,message: "最多只能录入64个字符",trigger: "blur",},
],
createTime: [
{required: true,message: "请选择创建时间" },
{ required: true, message: "请输入员工姓名", trigger: "blur" },
{ max: 64, message: "最多只能录入64个字符", trigger: "blur" },
],
}
createTime: [{ required: true, message: "请选择创建时间" }],
},
};
},
methods: {
/** 编辑 */
edit(row) {
this.reset()
this.reset();
this.query = { id: row.id };
this.urls.currUrl ="attendance/record/hik/edit";
this.urls.currUrl = "attendance/record/hik/edit";
this.getData();
this.pageInfo.type="edit"
this.pageInfo.type = "edit";
this.title = "修改海康考勤打卡记录汇总信息";
},
/** 新增 */
add(row) {
this.reset()
this.reset();
this.urls.currUrl = "attendance/record/hik/add";
this.getData();
this.pageInfo.type="add"
this.pageInfo.type = "add";
this.title = "新增海康考勤打卡记录汇总信息";
},
/** 查看*/
view(row) {
this.reset()
this.reset();
this.query = { id: row.id };
this.urls.currUrl ="attendance/record/hik/view";
this.urls.currUrl = "attendance/record/hik/view";
this.getData();
this.pageInfo.type="view"
this.pageInfo.type = "view";
this.title = "海康考勤打卡记录汇总信息详细";
},
/**取消按钮 */
......@@ -104,21 +180,21 @@
// 表单重置
reset() {
this.form = {
staffId : null,
staffName : "",
workNum : "",
deptId : null,
deptName : "",
positionId : null,
positionName : "",
attendanceGroupId : null,
attendanceGroupName : "",
shiftsId : null,
shiftsName : "",
attendanceDate : null,
attendanceAddress : "",
eventSource : "",
remark : "",
staffId: null,
staffName: "",
workNum: "",
deptId: null,
deptName: "",
positionId: null,
positionName: "",
attendanceGroupId: null,
attendanceGroupName: "",
shiftsId: null,
shiftsName: "",
attendanceDate: null,
attendanceAddress: "",
eventSource: "",
remark: "",
};
this.resetForm("form");
},
......@@ -128,5 +204,5 @@
}
},
},
};
};
</script>
attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue
View file @ 1a06d676
......@@ -7,7 +7,8 @@
icon="el-icon-tickets"
size="mini"
@click="handleImport"
>导入</el-button>
>导入</el-button
>
<el-button
slot="table-head-left2"
style="margin-left: 10px"
......@@ -16,7 +17,8 @@
type="primary"
@click="doExport"
:disabled="isExport"
>导出</el-button>
>导出</el-button
>
<el-button
slot="table-head-left2"
style="margin-left: 10px"
......@@ -24,9 +26,16 @@
size="mini"
type="success"
@click="lookexportHis"
>导出记录</el-button>
<el-button type="primary" size="mini" slot="table-head-left2"
style="margin-left: 10px" @click="formatData">生成打卡记录</el-button>
>导出记录</el-button
>
<!-- <el-button
type="primary"
size="mini"
slot="table-head-left2"
style="margin-left: 10px"
@click="formatData"
>生成打卡记录</el-button
> -->
</LayoutTable>
<dialog-show ref="dialogform" @ok="getData" />
<el-dialog
......@@ -53,10 +62,11 @@
<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
<el-checkbox
v-model="upload.updateSupport"
/>是否更新已经存在的数据
<el-link type="primary" style="font-size: 14px" @click="downloadTemplate"
<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的数据
<el-link
type="primary"
style="font-size: 14px"
@click="downloadTemplate"
>下载模板</el-link
>
</div>
......@@ -73,34 +83,40 @@
<el-drawer
title="导出记录"
:visible.sync="drawerhistory"
:direction="direction">
:direction="direction"
>
<div class="hisList">
<div class="list mt10" v-for="(item,index) in exportList" :key="index" @click="changeStatus(item)">
<div
class="list mt10"
v-for="(item, index) in exportList"
:key="index"
@click="changeStatus(item)"
>
<div class="flex flex-align-center flex-pack-justify">
<div>打卡记录汇总</div>
<el-button type="text">导出成功</el-button>
</div>
<div class="details" v-if="item.islook">
<div class="mt10" v-if="item.recordIdList">
选择列表id： {{item.recordIdList}}
选择列表id： {{ item.recordIdList }}
</div>
<div class="mt10" v-if="item.deptName">
选择部门：{{item.deptName}}
选择部门：{{ item.deptName }}
</div>
<div class="mt10" v-if="item.groupName">
选择考勤组：{{item.groupName}}
选择考勤组：{{ item.groupName }}
</div>
<div class="mt10" v-if="item.className">
选择班次：{{item.className}}
选择班次：{{ item.className }}
</div>
<div class="mt10">
<el-link :href="item.filePath" target="_blank" type="primary">重新下载</el-link>
</div>
<el-link :href="item.filePath" target="_blank" type="primary"
>重新下载</el-link
>
</div>
<div class="times mt10">
导出时间：{{item.createTime}}
</div>
<div class="times mt10">导出时间：{{ item.createTime }}</div>
</div>
</div>
</el-drawer>
......@@ -108,58 +124,59 @@
</template>
<script>
/** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table";
import {timestampToTime} from '@/assets/utils/dateFormat'
export default {
/** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table";
import { timestampToTime } from "@/assets/utils/dateFormat";
export default {
name: "AttendanceRecordHikList",
components: {
dialogShow
},
mixins: [table],
created() {
dialogShow,
},
mixins: [table],
created() {},
methods: {
// 生成打卡记录
formatData(){
let params = {}
for(let value of this.config.search){
if(this.query[value.name]){
params[value.name] = this.query[value.name]
formatData() {
let params = {};
for (let value of this.config.search) {
if (this.query[value.name]) {
params[value.name] = this.query[value.name];
}
}
if(this.selection.length>0){
params['idList'] = this.selection
if (this.selection.length > 0) {
params["idList"] = this.selection;
}
this.$post('/attendance/record/hik/addAttendanceRecord',{...params}).then(res => {
if(res.code == 1){
this.$message.success("生成打卡记录成功！")
this.$post("/attendance/record/hik/addAttendanceRecord", {
...params,
}).then((res) => {
if (res.code == 1) {
this.$message.success("生成打卡记录成功！");
}
})
});
},
// 更改状态
changeStatus(item){
this.$set(
item,
'islook',
!item.islook
)
changeStatus(item) {
this.$set(item, "islook", !item.islook);
},
// 导出记录
lookexportHis(){
this.$post('/attendance/export/record/list',{type:1,page:1,size:-1}).then(res => {
if(res.code == 1){
let arr = res.data.data
this.exportList = arr.map(item => {
item.createTime = timestampToTime(item.createTime,6)
item.islook = false
return item
})
lookexportHis() {
this.$post("/attendance/export/record/list", {
type: 1,
page: 1,
size: -1,
}).then((res) => {
if (res.code == 1) {
let arr = res.data.data;
this.exportList = arr.map((item) => {
item.createTime = timestampToTime(item.createTime, 6);
item.islook = false;
return item;
});
}
})
});
// 导出记录
this.drawerhistory = true
this.drawerhistory = true;
},
/** 导入 */
handleImport() {
......@@ -169,12 +186,16 @@
/** 下载模板操作 */
downloadTemplate() {
this.isExport = true;
this.$download("/attendance/record/hik/downloadTemplate", {}, { type: "excel" })
this.$download(
"/attendance/record/hik/downloadTemplate",
{},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false;
this.$message.error(error.message);
})
});
},
/** 文件上传中处理 */
handleFileUploadProgress(event, file, fileList) {
......@@ -195,23 +216,29 @@
/** 导出Excel */
doExport() {
this.isExport = true;
let params = {}
for(let value of this.config.search){
if(this.query[value.name]){
params[value.name] = this.query[value.name]
let params = {};
for (let value of this.config.search) {
if (this.query[value.name]) {
params[value.name] = this.query[value.name];
}
}
if(this.selection.length>0){
params['idList'] = this.selection
if (this.selection.length > 0) {
params["idList"] = this.selection;
}
this.$download("/attendance/record/hik/exportExcel", {
this.$download(
"/attendance/record/hik/exportExcel",
{
...params,
}, { type: "excel" }).then(() => this.isExport = false).catch(error => {
},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false;
this.$message.error(error.message);
})
});
},
/** 重写新增方法 */
toAdd(row) {
......@@ -226,14 +253,14 @@
this.$refs.dialogform.view(row);
},
afterRender(data) {
console.log(this.tableData.data)
console.log(this.tableData.data);
},
},
data() {
return {
upload: {
headers:{
Authorization:window.sessionStorage.getItem('token') || ''
headers: {
Authorization: window.sessionStorage.getItem("token") || "",
},
// 是否显示弹出层（员工关怀信息导入）
open: false,
......@@ -244,22 +271,24 @@
// 是否更新已经存在的数据
updateSupport: 0,
// 上传的地址
url: process.env.VUE_APP_API_BASE_URL +"/attendance/attendance/record/hik/importData",
url:
process.env.VUE_APP_API_BASE_URL +
"/attendance/attendance/record/hik/importData",
},
config: {
isshowTabPane:true,
isshowTabPane: true,
search: [
{
name: "staffName",
type: "text",
label: "员工姓名",
fuzzy: false
fuzzy: false,
},
{
name:'workNum',
type:'text',
label:'工号',
fuzzy: false
name: "workNum",
type: "text",
label: "工号",
fuzzy: false,
},
// {
// name: "deptId",
......@@ -280,30 +309,34 @@
// fuzzy: false
// },
{
name:'attendanceDateStart',
name: "attendanceDateStart",
type: "date",
label: "考勤开始时间",
fuzzy: false
fuzzy: false,
},
{
name:'attendanceDateEnd',
name: "attendanceDateEnd",
type: "date",
label: "考勤结束时间",
fuzzy: false
}
fuzzy: false,
},
],
columns: [
{type: "selection", width: 60},
{type: "index",label: "序号",width: 50},
{label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
{label: "部门", prop: "deptName"},
{ type: "selection", width: 60 },
{ type: "index", label: "序号", width: 50 },
{ label: "员工姓名", prop: "staffName" },
{ label: "工号", prop: "workNum" },
{ label: "部门", prop: "deptName" },
// {label: "考勤组", prop: "attendanceGroupName"},
// {label: "职位", prop: "positionName"},
// {label: "班次", prop: "shiftsName"},
{label: "考勤时间", prop: "attendanceDate",formatter: this.formatterDate},
{label: "考勤点名称", prop: "attendanceAddress"},
{label: "事件源", prop: "eventSource"},
{
label: "考勤时间",
prop: "attendanceDate",
formatter: this.formatterDate,
},
{ label: "考勤点名称", prop: "attendanceAddress" },
{ label: "事件源", prop: "eventSource" },
// {
// label: "操作",
// width: 240,
......@@ -314,32 +347,31 @@
// )
// }
// }
]
],
},
drawerhistory:false,
exportList:[],
baseUrl:process.env.VUE_APP_API_BASE_URL+'/'
}
}
drawerhistory: false,
exportList: [],
baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
};
},
};
</script>
<style scoped lang="scss">
.hisList{
.hisList {
padding: 15px;
.list{
.list {
background-color: rgba(64, 158, 255, 0.1);
font-size: 14px;
border-radius: 10px;
padding: 10px;
.times{
.times {
font-size: 12px;
color: #999;
}
cursor: pointer;
}
}
.details{
.details {
cursor: pointer;
}
</style>
attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue
View file @ 1a06d676
......@@ -24,7 +24,9 @@
>
<el-col :span="12"
>违规类型：{{
form.irregularType ? form.irregularType : "--"
form.irregularType
? util_formatter("irregularType", form.irregularType)
: "--"
}}</el-col
>
</el-row>
......
attendance-performance-manager-ui/admin/src/views/login/login.vue
View file @ 1a06d676
......@@ -3,20 +3,43 @@
<template>
<div class="page page-login flex flex-v">
<div class="form-wrap flex flex-1">
<el-form @submit.prevent='onSubmit' ref="form" :model="form" label-width="0px" size="small">
<h1>智慧政务绩效管理系统</h1>
<el-form
@submit.prevent="onSubmit"
ref="form"
:model="form"
label-width="0px"
size="small"
>
<h1>{{ sysName ? sysName : "智慧政务绩效管理系统" }}</h1>
<div class="des">数据驱动绩效改善，强化从指标到目标全过程管理</div>
<el-form-item label="">
<el-input v-model="form.loginName" placeholder="请输入用户名" class="input"></el-input>
<el-input
v-model="form.loginName"
placeholder="请输入用户名"
class="input"
></el-input>
</el-form-item>
<el-form-item label="">
<el-input v-model="form.password" type='password' placeholder="请输入密码" class="input"></el-input>
<el-input
v-model="form.password"
type="password"
placeholder="请输入密码"
class="input"
></el-input>
</el-form-item>
<el-form-item size="large">
<el-button type="primary" native-type='submit' :loading='loading' @click='onSubmit'>登录</el-button>
<el-button
type="primary"
native-type="submit"
:loading="loading"
@click="onSubmit"
>登录</el-button
>
</el-form-item>
<div class="tips">温馨提示：请使用谷歌或火狐等非ie内核浏览器，观看效果更佳</div>
<div class="tips">
温馨提示：请使用谷歌或火狐等非ie内核浏览器，观看效果更佳
</div>
</el-form>
</div>
......@@ -31,7 +54,15 @@ import { createSocket } from "@/assets/utils/websocket";
export default {
name: "login",
created() {},
created() {
this.$route.query.sysName
? localStorage.setItem("sysName", this.$route.query.sysName)
: "";
this.$route.query.sysName
? (document.title = this.$route.query.sysName)
: "";
localStorage.setItem("sysLogo", this.$route.query.sysLogo);
},
methods: {
login() {
this.loading = true;
......@@ -41,11 +72,11 @@ export default {
},
loginSuccess({ data }) {
console.log("userData", data);
console.log("redirect",this.redirect)
console.log("redirect", this.redirect);
this.$store.commit("setUserData", data);
this.$router.replace({
path: this.redirect,
})
});
//成功 创建websocket连接 process.env.VUE_WEBSOCKET_BASE_API +
console.log("process", process.env);
......@@ -81,10 +112,11 @@ export default {
form: {
loginName: "",
password: "",
}
}
}
}
},
sysName: localStorage.getItem("sysName"),
};
},
};
</script>
<style lang="less">
......@@ -94,14 +126,15 @@ export default {
border-top: 2px solid #e8eaec;
}
.page-login {
background-image: url('~@/assets/images/login_bg.jpg');
background-image: url("~@/assets/images/login_bg.jpg");
background-repeat: no-repeat;
background-size: cover;
margin: 0;
height: 100%;
overflow: hidden;
text-align: center;
.des,.tips{
.des,
.tips {
font-size: 14px;
white-space: nowrap;
margin-bottom: 20px;
......@@ -123,33 +156,37 @@ export default {
margin-top: 10px;
width: 240px;
}
.el-form-item{
.el-form-item {
margin-bottom: 28px;
}
.el-input-group__append {
padding: 0;
font-size: 0;
}
.el-input{
.el-input {
width: 80%;
}
.el-input__inner{
border-color: #409EFF;
.el-input__inner {
border-color: #409eff;
border-radius: 20px;
}
.el-input--small .el-input__inner{
.el-input--small .el-input__inner {
height: 52px;
line-height: 1em;
font-size: 15px;
}
.el-input__inner::placeholder{
color: #409EFF;
.el-input__inner::placeholder {
color: #409eff;
}
button{
button {
width: 80%;
border-radius: 20px;
height: 52px;
background: linear-gradient(90deg, rgba(24, 69, 198, 1) 0%, rgba(41, 153, 255, 1) 100%);
background: linear-gradient(
90deg,
rgba(24, 69, 198, 1) 0%,
rgba(41, 153, 255, 1) 100%
);
}
}
.footer {
......@@ -168,4 +205,3 @@ export default {
// border-color: #409EFF;
// }
</style>
attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue
View file @ 1a06d676
......@@ -37,7 +37,7 @@
: item.subAddType == 2
? "扣分方式："
: "方式："
}}{{ util_formatters("subMethod", item.subMethod) }}</span
}}{{ util_formatter("subMethod", item.subMethod) }}</span
>
</div>
<div class="user-info">
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java
View file @ 1a06d676
......@@ -47,6 +47,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Duration;
import java.util.Date;
import java.util.List;
import java.util.Map;
import static cn.hutool.core.date.DatePattern.*;
......@@ -278,9 +279,10 @@ public class DingMessageController {
leaveRecordEntity.setProcessStatus(2);
}
if(result.getResult().compareToIgnoreCase("AGREE") == 0){
if(result.getTasks().size() > 1){
if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") == 0){
if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") != 0){
leaveRecordEntity.setAuditResult(4); //撤销审批完成
}else {
leaveRecordEntity.setAuditResult(1);
......@@ -288,7 +290,8 @@ public class DingMessageController {
}
}else if(result.equals("")){ //撤销假期审批中result会为空 撤销审批通过后result为AGREE
if(result.getTasks().size() > 1){
if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") == 0){
log.info("status"+result.getTasks().get(1).getStatus());
if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") != 0){
leaveRecordEntity.setAuditResult(3); //撤销审批中
}
}
......@@ -301,7 +304,7 @@ public class DingMessageController {
log.info("钉钉返回的result:"+result.getResult()+"---auditresult:"+leaveRecordEntity.getAuditResult());
leaveRecordEntity.setAuditDesc(result.getOperationRecords().get(0).getRemark());
leaveRecordEntity.setReason(result.getOperationRecords().get(0).getRemark());
//更新请假记录表
AttendanceLeaveRecordEntity recordEntity = attendanceLeaveRecordService.selectOne(new AttendanceLeaveRecordQuery().remark(processInstanceId));
if(ObjectUtils.isEmpty(recordEntity)){
......@@ -335,14 +338,22 @@ public class DingMessageController {
if(leaveRecordsResponseBodyResultRest.getCode() == Rest.SUCCESS){
OapiAttendanceVacationQuotaListResponse.OapiLeaveQuotaUserListVo result1 = leaveRecordsResponseBodyResultRest.getData();
double leaveBlance = 0;
//如果钉钉有假期余额就写入钉钉返回的余额 否则用数据库表数据减去当前请假的天数
if(result1.getLeaveQuotas() != null && result1.getLeaveQuotas().size() > 0){
if(leaveRecordEntity.getAuditResult() == 4) { //撤销休假 要把已经扣除的假期加回来
leaveBlance = (result1.getLeaveQuotas().get(0).getQuotaNumPerDay() + result1.getLeaveQuotas().get(0).getUsedNumPerDay())/100;
}else {
leaveBlance = (result1.getLeaveQuotas().get(0).getQuotaNumPerDay() - result1.getLeaveQuotas().get(0).getUsedNumPerDay())/100;
}
}
// //如果钉钉有假期余额就写入钉钉返回的余额 否则用数据库表数据减去当前请假的天数
// if(result1.getLeaveQuotas() != null && result1.getLeaveQuotas().size() > 0){
// if(leaveRecordEntity.getAuditResult() == 4) { //撤销休假 要把已经扣除的假期加回来
// if(!ObjectUtils.isEmpty(balanceEntity) && balanceEntity.getCompensatedLeaveDays() != null){
// leaveBlance = balanceEntity.getCompensatedLeaveDays().floatValue() + result1.getLeaveQuotas().get(0).getUsedNumPerDay()/100;
// }else {
// leaveBlance = result1.getLeaveQuotas().get(0).getUsedNumPerDay()/100; //秒转换为天
// }
// }else {
// if(!ObjectUtils.isEmpty(balanceEntity) && balanceEntity.getCompensatedLeaveDays() != null){
// leaveBlance = balanceEntity.getCompensatedLeaveDays().floatValue() - result1.getLeaveQuotas().get(0).getUsedNumPerDay()/100;
// }else {
// leaveBlance = - result1.getLeaveQuotas().get(0).getUsedNumPerDay()/100; //秒转换为天
// }
// }
// }
switch (leave_name) {
case "调休":
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceVacationBalanceServiceImpl.java
View file @ 1a06d676
package com.mortals.xhx.module.attendance.service.impl;
import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceQuery;
import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.service.StaffService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
......@@ -16,4 +20,41 @@ import com.mortals.xhx.module.attendance.service.AttendanceVacationBalanceServic
@Service("attendanceVacationBalanceService")
public class AttendanceVacationBalanceServiceImpl extends AbstractCRUDServiceImpl<AttendanceVacationBalanceDao, AttendanceVacationBalanceEntity, Long> implements AttendanceVacationBalanceService {
@Autowired
private StaffService staffService;
@Override
protected void saveBefore(AttendanceVacationBalanceEntity entity, Context context) throws AppException {
super.saveBefore(entity,context);
if(entity.getStaffId()==null){
throw new AppException("员工ID不能为空");
}
StaffEntity staff = staffService.get(entity.getStaffId());
if(staff==null){
throw new AppException("员工ID不正确");
}
entity.setStaffName(staff.getName());
entity.setDeptId(staff.getDeptId());
entity.setDeptName(staff.getDeptName());
}
@Override
public AttendanceVacationBalanceEntity save(AttendanceVacationBalanceEntity entity, Context context) throws AppException {
this.saveBefore(entity, context);
AttendanceVacationBalanceEntity temp = this.selectOne(new AttendanceVacationBalanceQuery().staffId(entity.getStaffId()));
int iRet = 0;
if(temp!=null){
entity.setId(temp.getId());
iRet = this.dao.update(entity);
}else {
iRet = this.dao.insert(entity);
}
if (iRet == 0) {
throw new AppException(-1001, "写入数据库失败！");
} else {
this.saveAfter(entity, context);
return entity;
}
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
View file @ 1a06d676
......@@ -141,9 +141,9 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
*/
public com.aliyun.teaopenapi.models.Config setConfig() {
com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
config.protocol = "http";
config.regionId = "central";
config.endpoint = oaUrl;
// config.protocol = "http";
// config.regionId = "central";
// config.endpoint = oaUrl;
return config;
}
......@@ -153,9 +153,9 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
com.aliyun.dingtalkworkflow_1_0.Client client = new com.aliyun.dingtalkworkflow_1_0.Client(setConfig());
com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders getProcessInstanceHeaders = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders();
getProcessInstanceHeaders.xAcsDingtalkAccessToken = getToken();
HashMap<String, String> map = new HashMap<>();
getProcessInstanceHeaders.setCommonHeaders(map);
getProcessInstanceHeaders.getCommonHeaders().put("host", "172.15.28.113:8919");
// HashMap<String, String> map = new HashMap<>();
// getProcessInstanceHeaders.setCommonHeaders(map);
// getProcessInstanceHeaders.getCommonHeaders().put("host", "172.15.28.113:8919");
com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest()
.setProcessInstanceId(processInstanceId);
......
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