-
+
+
+
+
+
+
+
+ {{ row.node.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue b/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue
index 094c2cb..d4614cd 100644
--- a/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue
+++ b/SafeCampus.WEB/src/views/attendance/passenger/components/form/index.vue
@@ -5,23 +5,23 @@
-->
-
+
-
+
取消
- 确定
+ 确定
@@ -37,8 +37,8 @@ import { formatDate } from "@/utils";
const visible = ref(false); //是否显示表单
const activeName = ref("basic");
-// 表单参数
-const formProps = reactive>({
+// 弹框参数
+const propsInfo = reactive>({
opt: FormOptEnum.ADD,
record: {},
disabled: false
@@ -68,17 +68,17 @@ const rules = reactive({
* @param props 表单参数
*/
function onOpen(props: FormProps.Base) {
- Object.assign(formProps, props); //合并参数
+ Object.assign(propsInfo, props); //合并参数
if (props.opt == FormOptEnum.ADD) {
//如果是新增,设置默认值
- formProps.record.shijianduan = [];
- formProps.record.shexiangtou = [];
+ propsInfo.record.shijianduan = [];
+ propsInfo.record.shexiangtou = [];
}
visible.value = true; //显示表单
if (props.record.id) {
//如果传了id,就去请求api获取record
attendancePassenger.detail({ id: props.record.id }).then(res => {
- formProps.record = res.data;
+ propsInfo.record = res.data;
});
}
}
@@ -87,37 +87,14 @@ function onOpen(props: FormProps.Base) {
const formRef = ref();
/** 提交表单 */
async function handleSubmit() {
- formRef.value?.validate(async valid => {
- if (!valid) return; //表单验证失败
- // shijianduan时间段
- formProps.record.startTime = formatDate(formProps.record.shijianduan[0]);
- formProps.record.endTime = formatDate(formProps.record.shijianduan[1]);
- delete formProps.record.shijianduan;
- // shexiangtou摄像头
- formProps.record.shexiangtou = formProps.record.shexiangtou.toString();
- //提交表单
- console.log(formProps);
- if (formProps.record.id) {
- await attendancePassenger
- .update(formProps.record)
- .then(() => {
- formProps.successful!(); //调用父组件的successful方法
- })
- .finally(() => {
- onClose();
- });
- } else {
- console.log(formProps.record);
- await attendancePassenger
- .add(formProps.record)
- .then(() => {
- formProps.successful!(); //调用父组件的successful方法
- })
- .finally(() => {
- onClose();
- });
- }
- });
+ await attendancePassenger
+ .update(propsInfo.record)
+ .then(() => {
+ propsInfo.successful!(); //调用父组件的successful方法
+ })
+ .finally(() => {
+ onClose();
+ });
}
/** 关闭表单*/
diff --git a/SafeCampus.WEB/src/views/attendance/passenger/index.vue b/SafeCampus.WEB/src/views/attendance/passenger/index.vue
index 6146f94..18c9f1f 100644
--- a/SafeCampus.WEB/src/views/attendance/passenger/index.vue
+++ b/SafeCampus.WEB/src/views/attendance/passenger/index.vue
@@ -5,7 +5,7 @@
-->
-
+
diff --git a/SafeCampus.WEB/src/views/attendance/studentsReturn/components/nofaceTable/index.vue b/SafeCampus.WEB/src/views/attendance/studentsReturn/components/nofaceTable/index.vue
new file mode 100644
index 0000000..8eeb4d3
--- /dev/null
+++ b/SafeCampus.WEB/src/views/attendance/studentsReturn/components/nofaceTable/index.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue b/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue
index e5fac1a..39f49f2 100644
--- a/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue
+++ b/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue
@@ -1,30 +1,85 @@