Commit 26ca99b7 authored by 张牧越's avatar 张牧越

bugfix

parent 40ab1f71
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
{{ personData.name }} {{ personData.name }}
<i <i
:class="['iconfont', personData.sex == 1 ? 'icon-nan' : 'icon-nv']" :class="['iconfont', personData.sex == 1 ? 'icon-nan' : 'icon-nv']"
:style="{ color: personData.sex == 1 ? '#00FFFF' : '#FF6464' }"
></i> ></i>
</div> </div>
<div class="person-job">{{ personData.work_types_name.join("/") }}</div> <div class="person-job">{{ personData.work_types_name.join("/") }}</div>
...@@ -35,7 +36,15 @@ ...@@ -35,7 +36,15 @@
<div class="time-detail"> <div class="time-detail">
<div class="time-picker"> <div class="time-picker">
<i class="iconfont icon-you-22" @click="prevDay"></i> <i class="iconfont icon-you-22" @click="prevDay"></i>
<span>{{ this.getTime(this.timeStamp) }}</span> <span class="time-selector">
<el-date-picker
v-model="currentTime"
type="date"
value-format="yyyy-MM-dd"
@change="changeTime"
>
</el-date-picker
></span>
<i class="iconfont icon-you-2-2" @click="nextDay"></i> <i class="iconfont icon-you-2-2" @click="nextDay"></i>
</div> </div>
<div class="time-line"> <div class="time-line">
...@@ -48,7 +57,7 @@ ...@@ -48,7 +57,7 @@
> >
<div class="list-line-container"> <div class="list-line-container">
<div class="mid-line"> <div class="mid-line">
<div class="dot"></div> <div :class="['dot', index == 0 ? 'current' : '']"></div>
</div> </div>
</div> </div>
<div class="time-description"> <div class="time-description">
...@@ -92,9 +101,14 @@ export default { ...@@ -92,9 +101,14 @@ export default {
unit_type_name_arr: [], unit_type_name_arr: [],
}, },
checkList: [], checkList: [],
currentTime: new Date(),
}; };
}, },
methods: { methods: {
changeTime(value) {
this.timeStamp = new Date(value).getTime();
this.getPersonCheckListData();
},
getTime(ts) { getTime(ts) {
let date = new Date(ts); let date = new Date(ts);
let year = date.getFullYear(); let year = date.getFullYear();
...@@ -107,10 +121,12 @@ export default { ...@@ -107,10 +121,12 @@ export default {
}, },
prevDay() { prevDay() {
this.timeStamp = this.timeStamp - 86400000; this.timeStamp = this.timeStamp - 86400000;
this.currentTime = new Date(this.timeStamp);
this.getPersonCheckListData(); this.getPersonCheckListData();
}, },
nextDay() { nextDay() {
this.timeStamp = this.timeStamp + 86400000; this.timeStamp = this.timeStamp + 86400000;
this.currentTime = new Date(this.timeStamp);
this.getPersonCheckListData(); this.getPersonCheckListData();
}, },
getPersonData() { getPersonData() {
...@@ -247,17 +263,7 @@ export default { ...@@ -247,17 +263,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
transform: translateY(-3px); transform: translateY(-3px);
&:hover {
.list-line-container {
.mid-line {
.dot {
background: #00ffff;
border: 2px solid #ffffff;
border-radius: 50%;
}
}
}
}
.time-description { .time-description {
width: calc(100% - 48px); width: calc(100% - 48px);
height: 100px; height: 100px;
...@@ -280,7 +286,7 @@ export default { ...@@ -280,7 +286,7 @@ export default {
top: 50%; top: 50%;
transform: translateX(-100%) translateY(-50%); transform: translateX(-100%) translateY(-50%);
} }
&:hover { &:first-child {
background: #1c569f; background: #1c569f;
.arrow { .arrow {
width: 20px; width: 20px;
...@@ -312,6 +318,7 @@ export default { ...@@ -312,6 +318,7 @@ export default {
} }
} }
} }
&:last-child { &:last-child {
.mid-line { .mid-line {
width: 2px; width: 2px;
...@@ -333,4 +340,23 @@ export default { ...@@ -333,4 +340,23 @@ export default {
} }
} }
} }
.time-selector {
::v-deep .el-input__inner {
border: none;
background: transparent;
text-align: center;
padding: 0 !important;
line-height: 16px;
height: 16px;
cursor: pointer;
}
::v-deep .el-input__icon {
display: none !important;
}
}
.current.dot {
background: #00ffff !important;
border: 2px solid #ffffff !important;
border-radius: 50%;
}
</style> </style>
\ No newline at end of file
...@@ -51,7 +51,10 @@ ...@@ -51,7 +51,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model="searchForm.keywords" placeholder="请输入姓名" /> <el-input
v-model="searchForm.person_keywords"
placeholder="请输入姓名"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
...@@ -89,7 +92,7 @@ ...@@ -89,7 +92,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="最早入时间" label="最早入时间"
prop="in_record_time" prop="in_record_time"
align="center" align="center"
> >
......
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