Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -72,7 +72,6 @@ export default {
         return;
       }
       this.tableData.loading = true;
-      console.log(this.source.token);
 
       this.$post(this.pageInfo.list, this.query, {
         cancelToken: this.source.token,

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

@@ -113,12 +113,15 @@ export default {
     },
     // 处理
     handleArr(arr, currentTime) {
-      console.log(currentTime);
-      console.log(arr);
       let index = arr.findIndex((item) => item.createTime == currentTime);
       if (index > -1) {
-        console.log(arr[index].attendanceSummary);
-        return arr[index].attendanceSummary;
+        return arr[index].attendanceSummary ? (
+          <el-tag type={"danger"} size="mini">
+            {arr[index].attendanceSummary}
+          </el-tag>
+        ) : (
+          "-"
+        );
       } else {
         return "-";
       }
@@ -186,7 +189,6 @@ export default {
       this.setcolum = this.setcolum.filter(
         (val) => val.prop !== "attendanceStaffStatEntities"
       );
-      console.log(this.setcolum);
     },
     lookexportHis() {
       this.drawerhistory = true;
@@ -342,7 +344,6 @@ export default {
             label: "出勤率%",
             prop: "attendanceRate",
             formatter: (row) => {
-              console.log(row);
               return row.attendanceRate
                 ? (Number(row.attendanceRate) * 100).toFixed(2) + "%"
                 : "--";