From fb6629dcf7aad6bb03ebf3ec16c6db48494d57b3 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 16 Dec 2021 17:29:58 +0800
Subject: [PATCH] 最后跳整
---
src/views/qiandao/tables.vue | 10 +++++++---
src/views/qiandao/index.vue | 4 ++--
src/styles/element-ui.scss | 3 ++-
src/views/qiandao/signIn.vue | 32 ++++++++++++++++----------------
4 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 8225327..82be42c 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -259,7 +259,8 @@
}
.avue-crud__search .avue-form__group.avue-form__group--flex .avue-form__row:nth-child(1) .el-form-item__label,
.avue-crud__search .avue-form__group.avue-form__group--flex .avue-form__row:nth-child(2) .el-form-item__label {
- width: 42px !important;
+ // width: 50px !important;
+ // margin-left: 3px;
}
.avue-crud__search .avue-form__group.avue-form__group--flex .avue-form__row:nth-child(1) {
width: 133px !important;
diff --git a/src/views/qiandao/index.vue b/src/views/qiandao/index.vue
index af8de04..dadbced 100644
--- a/src/views/qiandao/index.vue
+++ b/src/views/qiandao/index.vue
@@ -13,7 +13,7 @@
</div>
<div class="examine_body">
<el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="签到识别" name="first">
+ <el-tab-pane label="身份识别" name="first">
<div class="examine_body_left">
<div class="e_m_left">
<forms></forms>
@@ -23,7 +23,7 @@
</div>
</div>
</el-tab-pane>
- <el-tab-pane label="签到数据" name="second">
+ <el-tab-pane label="签到记录" name="second">
<signIn v-if="activeName == 'second'"></signIn>
</el-tab-pane>
</el-tabs>
diff --git a/src/views/qiandao/signIn.vue b/src/views/qiandao/signIn.vue
index c30b26e..2f35f93 100644
--- a/src/views/qiandao/signIn.vue
+++ b/src/views/qiandao/signIn.vue
@@ -1,6 +1,6 @@
<template>
<basic-container class="signIn" id="signIn">
- <div class="timeDom">当天时间：{{ timeDom }}</div>
+ <!-- <div class="timeDom">当天时间：{{ timeDom }}</div> -->
<avue-crud
v-if="visible"
:option="option"
@@ -103,7 +103,7 @@
prop: "idCardNo",
search: true,
searchSpan: 9,
- searchLabelWidth: 80,
+ searchLabelWidth: 85,
// searchRange: true,
// searchValue: this.getuserid(),
width: 180,
@@ -112,25 +112,25 @@
label: "签到时间",
prop: "updateTime",
type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "yyyy-MM-dd hh:mm:ss",
// search: true,
// searchSpan: 5,
// searchLabelWidth: 80,
width: 180,
},
- {
- label: "签到时间",
- prop: "signTime",
- type: "date",
- hide: true,
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- search: true,
- searchSpan: 5,
- searchLabelWidth: 80,
- width: 180,
- },
+ // {
+ // label: "签到时间",
+ // prop: "signTime",
+ // type: "date",
+ // hide: true,
+ // format: "yyyy-MM-dd",
+ // valueFormat: "yyyy-MM-dd",
+ // search: true,
+ // searchSpan: 5,
+ // searchLabelWidth: 80,
+ // width: 180,
+ // },
],
delBtn: false,
editBtn: false,
diff --git a/src/views/qiandao/tables.vue b/src/views/qiandao/tables.vue
index 89c533a..7be1a98 100644
--- a/src/views/qiandao/tables.vue
+++ b/src/views/qiandao/tables.vue
@@ -274,7 +274,7 @@
// useZhiwen();
zhiwen.isoks = false;
that.useZhiWen("setZhiwenData", zhiwen);
- that.msg("warning", "无指纹信息,请添加指纹信息后更新！");
+ // that.msg("warning", "无指纹信息,请添加指纹信息后更新！");
// 若无指纹，提醒要录入指纹，再手动点击更新；
}
});
@@ -298,7 +298,7 @@
// this.msg("success", data.msg);
this.$confirm("签到成功！", "提示", {
confirmButtonText: "确定",
- cancelButtonText: "取消",
+ cancelButtonText: "指纹采集",
type: "success",
})
.then(() => {
@@ -322,6 +322,10 @@
// type: "info",
// message: "已取消删除",
// });
+ this.$message({
+ type: "success",
+ message: "请采集指纹并点击更新进行签到!",
+ });
});
} else {
this.msg("warning", data.msg);
@@ -464,7 +468,7 @@
} else if (data.total == 1) {
//查询出一个人 将数据覆盖
// console.log(value[0])
- this.rowUps(data.records[0], "once");
+ this.rowUps(data.records[0]);
} else {
this.msg("warning", "查无此人");
let zhiwen = {
--
Gitblit v1.9.3