Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -338,8 +338,10 @@ export default {
             return false;
           }
         } else {
-          this.form.summaryTimeStart = getFirstDay();
-          this.form.summaryTimeEnd = getLastDay();
+          this.form.summaryTimeStart = timestampToTime(new Date(), 3);
+          this.form.summaryTimeEnd = timestampToTime(new Date(), 3);
+          // this.form.summaryTimeStart = getFirstDay();
+          // this.form.summaryTimeEnd = getLastDay();
         }
       } else {
         delete this.form.summaryTimeStart;
@@ -517,8 +519,10 @@ export default {
             return false;
           }
         } else {
-          this.form.summaryTimeStart = getFirstDay();
-          this.form.summaryTimeEnd = getLastDay();
+          this.form.summaryTimeStart = timestampToTime(new Date(), 3);
+          this.form.summaryTimeEnd = timestampToTime(new Date(), 3);
+          // this.form.summaryTimeStart = getFirstDay();
+          // this.form.summaryTimeEnd = getLastDay();
         }
       } else {
         delete this.form.summaryTimeStart;

attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue

@@ -127,8 +127,10 @@ export default {
   },
   mixins: [table],
   created() {
-    this.query.summaryTimeStart = getFirstDay();
-    this.query.summaryTimeEnd = getLastDay();
+    this.query.summaryTimeStart = timestampToTime(new Date(), 3);
+    this.query.summaryTimeEnd = timestampToTime(new Date(), 3);
+    // this.query.summaryTimeStart = getFirstDay();
+    // this.query.summaryTimeEnd = getLastDay();
     this.initalArr = this.config.columns;
   },
   methods: {
@@ -189,20 +191,25 @@ export default {
                 {arr[index].attendanceSummary}
               </el-tag>
             </el-tooltip>
+          ) : arr[index].attendanceSummary == "正常" ? (
+            <el-tag type={"success"} size="mini">
+              {arr[index].attendanceSummary}
+            </el-tag>
           ) : (
             <el-tag type={"danger"} size="mini">
               {arr[index].attendanceSummary}
             </el-tag>
           )
         ) : (
-          "正常"
+          "--"
         );
-      } else {
-        if (currentTime < timestampToTime(new Date(), 3)) {
-          return "正常";
       } else {
         return "--";
-        }
+        // if (currentTime < timestampToTime(new Date(), 3)) {
+        //   return "正常";
+        // } else {
+        //   return "--";
+        // }
         // return "正常";
       }
     },
@@ -228,12 +235,13 @@ export default {
               row.attendanceStaffStatEntities.length > 0
             ) {
               return this.handleArr(row.attendanceStaffStatEntities, item);
-            } else {
-              if (item < timestampToTime(new Date(), 3)) {
-                return "正常";
             } else {
               return "--";
-              }
+              // if (item < timestampToTime(new Date(), 3)) {
+              //   return "正常";
+              // } else {
+              //   return "--";
+              // }
             }
           },
         };
@@ -448,14 +456,14 @@ export default {
             show: true,
           },
 
-          {
-            label: "窗口类别",
-            prop: "windowCategory",
-            fixed: "left",
-            width: 100,
-            formatter: this.formatter,
-            show: true,
-          },
+          //{
+          //  label: "窗口类别",
+          //  prop: "windowCategory",
+          //  fixed: "left",
+          //width: 100,
+          //formatter: this.formatter,
+          //show: true,
+          //},
 
           {
             label: "员工姓名",