Merge branch 'master' of http://47.99.164.66:3000/hzdyjs-xg/all-project
This commit is contained in:
commit
ae8cddff00
10 files changed
+115
-69
No files matched your search
@@ -36,7 +36,7 @@
|
||||
<el-icon class="status-icon success"><SuccessFilled /></el-icon>
|
||||
<div class="status-text">
|
||||
<h4>已签到</h4>
|
||||
<p>{{ parseTime(todayRecord.checkInTime, '{h}:{i}') }}</p>
|
||||
<p>{{ todayRecord.checkInTime }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="not-checked-in">
|
||||
@@ -184,12 +184,12 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="签到时间" width="100">
|
||||
<template #default="scope">
|
||||
{{ scope.row.checkInTime ? parseTime(scope.row.checkInTime, '{h}:{i}') : '-' }}
|
||||
{{ scope.row.checkInTime || '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="签退时间" width="100">
|
||||
<template #default="scope">
|
||||
{{ scope.row.checkOutTime ? parseTime(scope.row.checkOutTime, '{h}:{i}') : '-' }}
|
||||
{{ scope.row.checkOutTime || '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工作时长" width="100">
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
<div class="student-info">
|
||||
<div class="student-name">{{ scope.row.studentName }}</div>
|
||||
<div class="student-number">学号:{{ scope.row.studentNumber }}</div>
|
||||
<div class="student-class">班级:{{ scope.row.className }}</div>
|
||||
<!-- <div class="student-class">班级:{{ scope.row.className }}</div> -->
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -161,8 +161,8 @@
|
||||
<el-table-column label="签到时间" min-width="120" align="center">
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.checkInTime">
|
||||
<div>{{ parseTime(scope.row.checkInTime, '{y}-{m}-{d}') }}</div>
|
||||
<div class="time-detail">{{ parseTime(scope.row.checkInTime, '{h}:{i}') }}</div>
|
||||
<div>{{ parseTime(scope.row.checkDate, '{y}-{m}-{d}') }}</div>
|
||||
<div class="time-detail">{{ scope.row.checkInTime }}</div>
|
||||
</div>
|
||||
<span v-else class="text-danger">未签到</span>
|
||||
</template>
|
||||
@@ -171,8 +171,8 @@
|
||||
<el-table-column label="签退时间" min-width="120" align="center">
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.checkOutTime">
|
||||
<div>{{ parseTime(scope.row.checkOutTime, '{y}-{m}-{d}') }}</div>
|
||||
<div class="time-detail">{{ parseTime(scope.row.checkOutTime, '{h}:{i}') }}</div>
|
||||
<div>{{ parseTime(scope.row.checkDate, '{y}-{m}-{d}') }}</div>
|
||||
<div class="time-detail">{{ scope.row.checkOutTime }}</div>
|
||||
</div>
|
||||
<span v-else class="text-muted">未签退</span>
|
||||
</template>
|
||||
@@ -231,10 +231,10 @@
|
||||
<el-descriptions-item label="班级">{{ currentRecord.className }}</el-descriptions-item>
|
||||
<el-descriptions-item label="实习单位">{{ currentRecord.companyName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="签到时间">
|
||||
{{ currentRecord.checkInTime ? parseTime(currentRecord.checkInTime) : '未签到' }}
|
||||
{{ currentRecord.checkInTime || '未签到' }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="签退时间">
|
||||
{{ currentRecord.checkOutTime ? parseTime(currentRecord.checkOutTime) : '未签退' }}
|
||||
{{ currentRecord.checkOutTime || '未签退' }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="工作时长">
|
||||
{{ currentRecord.workDuration ? currentRecord.workDuration + '小时' : '-' }}
|
||||
@@ -406,9 +406,10 @@
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="InternshipDaily">
|
||||
import { listInternshipDaily, getCalendar, getStatistics, addInternshipDaily } from "@/api/zsjy/internshipDaily";
|
||||
import { parseTime } from "@/utils/ruoyi";
|
||||
<script setup name="InternshipDaily" lang="ts">
|
||||
import { listInternshipDaily, getCalendar, getStatistics, addInternshipDaily } from '@/api/zsjy/internshipDaily';
|
||||
import { parseTime } from '@/utils/ruoyi';
|
||||
import { User, Check, Warning, TrendCharts } from '@element-plus/icons-vue';
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
|
||||
@@ -508,8 +509,13 @@ const getList = () => {
|
||||
|
||||
// 获取统计数据
|
||||
const getStatisticsData = () => {
|
||||
console.log('正在获取统计数据...');
|
||||
getStatistics().then(response => {
|
||||
console.log('统计数据响应:', response);
|
||||
statistics.value = response.data || {};
|
||||
console.log('设置的统计数据:', statistics.value);
|
||||
}).catch(error => {
|
||||
console.error('获取统计数据失败:', error);
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user