Merge pull request '优化 赴校任务超时时间' (#19) from dev into staging

Reviewed-on: #19

src/views/exam/classDetails.vue

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

src/views/exam/index.vue

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

src/views/toschoolinfomanage/addModal.vue

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

src/views/toschoolinfomanage/config.ts

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

src/views/toschoolinfomanage/index.vue

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