Compare commits

..

No commits in common. "de8c4162666ba177f4a86d09dabdeadf398e50a7" and "7cf08fcf143e3e3604417ebee8dd341e96c21c23" have entirely different histories.

5 changed files with 11 additions and 16 deletions

View File

@ -53,7 +53,7 @@ const tableData: TableConfig = intTableData({
show: true, show: true,
label: "删除", label: "删除",
click: deleteInfo, click: deleteInfo,
btnStyle: "warning", // topBtn: true success danger btnStyle: "danger", // topBtn: true success danger
}, },
{ {
topBtn: false, // topBtn: false, //

View File

@ -96,7 +96,7 @@ const tableData: TableConfig = intTableData({
show: true, show: true,
label: "录入成绩", label: "录入成绩",
click: entryExam, click: entryExam,
btnStyle: "warning", // topBtn: true success danger btnStyle: "primary", // topBtn: true success danger
}, },
{ {
topBtn: true, // topBtn: true, //

View File

@ -93,9 +93,9 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div> <div>
提示:离赴校时间超过<span class="text-yellow-500">{ {{ warningDay }}}</span 提示:到期前<span class="text-yellow-500">{3}</span>会黄色警告, 小于<span
>黄色警告, 超过预计完成时间<span class="text-red-500" class="text-red-500"
>{ {{ errorDay }}}</span >{1}</span
>红色警告 >红色警告
</div> </div>
</el-col> </el-col>
@ -184,7 +184,6 @@ import { ref, reactive, computed, defineProps, defineEmits, watch } from "vue";
import type { FormInstance, FormRules } from "element-plus"; import type { FormInstance, FormRules } from "element-plus";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import { getSchoolData } from "@/api/userCenter"; import { getSchoolData } from "@/api/userCenter";
import { errorDay, warningDay } from "./config";
import { getSchoolBusinessPeopleListApi, addOrEditApi } from "@/api/toschoolinfomanage"; import { getSchoolBusinessPeopleListApi, addOrEditApi } from "@/api/toschoolinfomanage";
const props = defineProps<{ visible: boolean }>(); const props = defineProps<{ visible: boolean }>();
// const emit = defineEmits<{ (e: "update:visible", value: boolean): void }>(); // const emit = defineEmits<{ (e: "update:visible", value: boolean): void }>();

View File

@ -1,4 +0,0 @@
/** 赴校后超时时间 */
export const warningDay = 8;
/** 赴校任务过期时间 */
export const errorDay = 2;

View File

@ -198,7 +198,6 @@ import AddModal from "./addModal.vue";
import { Check, Search } from "@element-plus/icons-vue"; import { Check, Search } from "@element-plus/icons-vue";
import EditModal from "./editModal.vue"; import EditModal from "./editModal.vue";
import { message } from "@/utils/message"; import { message } from "@/utils/message";
import { errorDay, warningDay } from "./config";
interface TableItem { interface TableItem {
id: number; id: number;
school: string; school: string;
@ -224,12 +223,13 @@ const tableRowClassName = ({ row, rowIndex }: { row: TableItem; rowIndex: number
const nD = new Date(); const nD = new Date();
const d = new Date(row.endTime + " "); const d = new Date(row.endTime + " ");
const startTime = new Date(row.times + " "); const startTime = new Date(row.times + " ");
const daysDiff1 = (nD.getTime() - startTime.getTime()) / (1000 * 60 * 60 * 24); const daysDiff1 = Math.floor(
debugger; (nD.getTime() - startTime.getTime()) / (1000 * 60 * 60 * 24)
const daysDiff = (d.getTime() - nD.getTime()) / (1000 * 60 * 60 * 24); );
if (daysDiff <= -errorDay) { const daysDiff = Math.floor((d.getTime() - nD.getTime()) / (1000 * 60 * 60 * 24));
if (daysDiff < -1) {
return "error-row"; return "error-row";
} else if (daysDiff1 >= warningDay) { } else if (daysDiff1 > 7) {
return "warning-row"; return "warning-row";
} }
return ""; return "";