Skip to content

A
attendance-performance-platform
Commit f8dc6697 authored by 姬鋆屾's avatar 姬鋆屾
Browse files
Options

推

parent cad37e9d
Show whitespace changes
Inline Side-by-side
Showing with 192 additions and 168 deletions
attendance-performance-manager-ui/admin/src/views/staff/list.vue
View file @ f8dc6697
...@@ -78,7 +78,9 @@ ...@@ -78,7 +78,9 @@
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item> <el-dropdown-item>
<el-button type="text" @click="syncPerson">同步数据</el-button> <el-button type="text" @click="syncPerson"
>同步数据</el-button
>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
<el-button type="text" @click="handleImport" <el-button type="text" @click="handleImport"
...@@ -100,7 +102,13 @@ ...@@ -100,7 +102,13 @@
<span class="freshTime" slot="table-head-left2"> <span class="freshTime" slot="table-head-left2">
<i class="el-icon-refresh"></i> <i class="el-icon-refresh"></i>
<span>上次同步时间：{{ tableData.staff.refreshDate }}</span> <span
>上次同步时间：{{
tableData.staff
? tableData.staff.refreshDate
: "--"
}}</span
>
</span> </span>
</LayoutTable> </LayoutTable>
</el-row> </el-row>
...@@ -223,7 +231,7 @@ export default { ...@@ -223,7 +231,7 @@ export default {
syncPerson() { syncPerson() {
this.$post("/staff/syncPersons", {}).then((res) => { this.$post("/staff/syncPersons", {}).then((res) => {
if (res.code == 1) { if (res.code == 1) {
this.$message.success(res.msg) this.$message.success(res.msg);
} }
}); });
}, },
...@@ -474,12 +482,18 @@ export default { ...@@ -474,12 +482,18 @@ export default {
} }
.mytree ::v-deep { .mytree ::v-deep {
.el-tree--highlight-current ::v-deep .el-tree-node.is-checked > .el-tree-node__content { .el-tree--highlight-current
::v-deep
.el-tree-node.is-checked
> .el-tree-node__content {
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);
color: rgb(64, 158, 255); color: rgb(64, 158, 255);
} }
.el-tree--highlight-current ::v-deep .el-tree-node.is-current > .el-tree-node__content { .el-tree--highlight-current
::v-deep
.el-tree-node.is-current
> .el-tree-node__content {
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);
color: rgb(64, 158, 255); color: rgb(64, 158, 255);
} }
......
attendance-performance-manager-ui/admin/src/views/staff/view.vue
View file @ f8dc6697
...@@ -2,27 +2,34 @@ ...@@ -2,27 +2,34 @@
<div> <div>
<el-card> <el-card>
<div class="flex flex flex-pack-justify" style="margin:10px 0"> <div class="flex flex flex-pack-justify" style="margin:10px 0">
<div style="color:rgb(20, 134, 248);font-weight:bold;padding: 0 20px;">个人主页</div> <div style="color:rgb(20, 134, 248);font-weight:bold;padding: 0 20px;">
<el-button type="primary" @click="$router.back()" size="small">返回上级</el-button> 个人主页
</div>
<el-button type="primary" @click="$router.back()" size="small"
>返回上级</el-button
>
</div> </div>
<div class="persons"> <div class="persons">
<div class="cell1 flex"> <div class="cell1 flex">
<el-image <el-image
style="width: 120px; height: 150px" style="width: 120px; height: 150px"
:src="allinfo.photoPath" :src="allinfo.photoPath"
:preview-src-list="allinfo.photoPath"> :preview-src-list="allinfo.photoPath"
>
</el-image> </el-image>
<div class="content ml20"> <div class="content ml20">
<div class="c1"> <div class="c1">
<span>{{info.workName}}</span> <span>{{ info.workName }}</span>
<!-- 格式 --> <!-- 格式 -->
<span class="tags">{{dict.status[allinfo.status]}}</span> <span class="tags">{{
dict.status ? dict.status[allinfo.status] : ""
}}</span>
</div> </div>
<div class="c2"> <div class="c2">
<!-- - {{allinfo.positionName}} --> <!-- - {{allinfo.positionName}} -->
<span>{{allinfo.deptName}}</span> <span>{{ allinfo.deptName }}</span>
<span style="margin:0 10px">|</span> <span style="margin:0 10px">|</span>
<span>{{info.workLimit}}天</span> <span>{{ info.workLimit }}天</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -30,11 +37,11 @@ ...@@ -30,11 +37,11 @@
<div class="title">成长记录</div> <div class="title">成长记录</div>
<div class="flex"> <div class="flex">
<div class="history"> <div class="history">
<div class="times">{{info.workBeginDay}}</div> <div class="times">{{ info.workBeginDay }}</div>
<div>入职时间</div> <div>入职时间</div>
</div> </div>
<div class="history"> <div class="history">
<div class="times">{{info.workFormalDay}}</div> <div class="times">{{ info.workFormalDay }}</div>
<div>转正时间</div> <div>转正时间</div>
</div> </div>
</div> </div>
...@@ -47,31 +54,31 @@ ...@@ -47,31 +54,31 @@
<div class="flex flex-pack-justify" style="margin-top:10px"> <div class="flex flex-pack-justify" style="margin-top:10px">
<div class="flex"> <div class="flex">
<div>实际出勤天数</div> <div>实际出勤天数</div>
<div class="times ml20">{{info.attendanceCount}}天</div> <div class="times ml20">{{ info.attendanceCount }}天</div>
</div> </div>
<div class="flex"> <div class="flex">
<div>请假天数</div> <div>请假天数</div>
<div class="times ml20">{{info.leaveCount}}天</div> <div class="times ml20">{{ info.leaveCount }}天</div>
</div> </div>
</div> </div>
<div class="flex flex-pack-justify" style="margin-top:10px"> <div class="flex flex-pack-justify" style="margin-top:10px">
<div class="flex"> <div class="flex">
<div>迟到早退次数</div> <div>迟到早退次数</div>
<div class="times ml20">{{info.lateCount}}次</div> <div class="times ml20">{{ info.lateCount }}次</div>
</div> </div>
<div class="flex"> <div class="flex">
<div>旷工天数</div> <div>旷工天数</div>
<div class="times ml20">{{info.minerCount}}天</div> <div class="times ml20">{{ info.minerCount }}天</div>
</div> </div>
</div> </div>
<div class="flex flex-pack-justify" style="margin-top:10px"> <div class="flex flex-pack-justify" style="margin-top:10px">
<div class="flex"> <div class="flex">
<div>缺卡次数</div> <div>缺卡次数</div>
<div class="times ml20">{{info.lackCardCount}}次</div> <div class="times ml20">{{ info.lackCardCount }}次</div>
</div> </div>
<div class="flex"> <div class="flex">
<div>加班天数</div> <div>加班天数</div>
<div class="times ml20">{{info.workOverDay}}天</div> <div class="times ml20">{{ info.workOverDay }}天</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -80,21 +87,21 @@ ...@@ -80,21 +87,21 @@
<div class="flex flex-pack-justify" style="margin-top:10px"> <div class="flex flex-pack-justify" style="margin-top:10px">
<div class="flex"> <div class="flex">
<div>调休</div> <div>调休</div>
<div class="times ml20">{{info.compensatoryDay}}天</div> <div class="times ml20">{{ info.compensatoryDay }}天</div>
</div> </div>
<div class="flex"> <div class="flex">
<div>婚假</div> <div>婚假</div>
<div class="times ml20">{{info.marriageHoliday}}天</div> <div class="times ml20">{{ info.marriageHoliday }}天</div>
</div> </div>
</div> </div>
<div class="flex flex-pack-justify" style="margin-top:10px"> <div class="flex flex-pack-justify" style="margin-top:10px">
<div class="flex"> <div class="flex">
<div>年假</div> <div>年假</div>
<div class="times ml20">{{info.winterHoliday}}天</div> <div class="times ml20">{{ info.winterHoliday }}天</div>
</div> </div>
<div class="flex"> <div class="flex">
<div>陪产假</div> <div>陪产假</div>
<div class="times ml20">{{info.paternityLeaveDay}}天</div> <div class="times ml20">{{ info.paternityLeaveDay }}天</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -104,57 +111,61 @@ ...@@ -104,57 +111,61 @@
</template> </template>
<script> <script>
import {timestampToTime} from '@/assets/utils/dateFormat.js' import { timestampToTime } from "@/assets/utils/dateFormat.js";
export default { export default {
components: { components: {},
},
methods: { methods: {
getdata(id){ getdata(id) {
this.$get('/staff/info',{id}).then(res => { this.$get("/staff/info", { id })
if(res.code == 1){ .then((res) => {
this.info = res.data.holidayLists[0] if (res.code == 1) {
this.dict = res.dict this.info = res.data.holidayLists[0];
this.allinfo = res.data//总 this.dict = res.dict;
this.info.workBeginDay = this.info.workBeginDay?timestampToTime(Number(this.info.workBeginDay),3):'-' this.allinfo = res.data; //总
this.info.workFormalDay = this.info.workFormalDay?timestampToTime(Number(this.info.workFormalDay),3):'-' this.info.workBeginDay = this.info.workBeginDay
? timestampToTime(Number(this.info.workBeginDay), 3)
: "-";
this.info.workFormalDay = this.info.workFormalDay
? timestampToTime(Number(this.info.workFormalDay), 3)
: "-";
} }
}) })
.catch(err => { .catch((err) => {
this.$message.error(err.message) this.$message.error(err.message);
}) });
} },
}, },
data() { data() {
return { return {
info:{}, info: {},
allinfo:{}, allinfo: {},
dict:[] dict: [],
} };
}, },
created(){ created() {
this.getdata(this.$route.query.id) this.getdata(this.$route.query.id);
} },
} };
</script> </script>
<style lang="less"> <style lang="less">
.persons{ .persons {
width: 100%; width: 100%;
padding: 0 20px; padding: 0 20px;
.title{ .title {
font-weight: bold; font-weight: bold;
} }
.cell1{ .cell1 {
// .avator{ // .avator{
// width: 120px; // width: 120px;
// height: 150px; // height: 150px;
// background-color: aliceblue; // background-color: aliceblue;
// } // }
.c2{ .c2 {
color: #999; color: #999;
font-size: 12px; font-size: 12px;
margin-top: 10px; margin-top: 10px;
} }
.tags{ .tags {
background: aliceblue; background: aliceblue;
padding: 5px; padding: 5px;
border-radius: 5px; border-radius: 5px;
...@@ -162,18 +173,17 @@ ...@@ -162,18 +173,17 @@
font-size: 14px; font-size: 14px;
} }
} }
.cell2{ .cell2 {
background-color: rgb(247, 246, 246); background-color: rgb(247, 246, 246);
border-radius: 10px; border-radius: 10px;
margin-top: 20px; margin-top: 20px;
font-size: 15px; font-size: 15px;
padding: 10px 15px; padding: 10px 15px;
.history{ .history {
margin-right: 50px; margin-right: 50px;
margin-top: 20px; margin-top: 20px;
} }
.times{ .times {
color: rgb(20, 134, 248); color: rgb(20, 134, 248);
} }
} }
......
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