一键升学对接完成，设备日志列表对接完成

src/views/StudentSafetyAttendance/AttendanceForm/columns.js

@@ -4,6 +4,16 @@ export default   [
     prop: "id",
     type: "text",
   },
+  {
+    label: "设备Id",
+    prop: "deviceId",
+    type: "text",
+  },
+  {
+    label: "设备名称",
+    prop: "deviceName",
+    type: "text",
+  },
   {
     label: "姓名",
     prop: "username",

src/views/StudentSafetyAttendance/AttendanceForm/index.vue

@@ -16,11 +16,11 @@
             <el-form-item label="日期范围选择">
               <el-date-picker
                 v-model="dateRange"
-                type="datetimerange"
+                type="daterange"
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd"
               >
               </el-date-picker>
             </el-form-item>
@@ -117,14 +117,24 @@ export default {
           this.dateRange[0],
           this.dateRange[1]
         );
-        if (result.code == 200) {
-          this.loading = false;
-          this.attendanceData = result.data.records;
-          this.total = result.data.total;
-        } else {
-          this.loading = false;
-          this.$message.error("网络错误");
-        }
+        // this.attendanceData = result.records;
+        this.attendanceData = result.records.map(item =>{
+          item.pictureUrl = 'data:image/' + item.imgType + ';base64,'+item.faceImg // 将base64图片添加前缀处理
+          return item
+        })
+        this.loading = false;
+        this.total = result.total;
+        
+
+
+        // if (result.code == 200) {
+        //   this.loading = false;
+        //   this.attendanceData = result.data.records;
+        //   this.total = result.data.total;
+        // } else {
+        //   this.loading = false;
+        //   this.$message.error("网络错误");
+        // }
       } catch (error) {
         this.loading = false;
         this.$message.error("网络错误");

src/views/StudentSafetyAttendance/api.js

@@ -2,7 +2,7 @@ import request from '@/utils/request';
 
 // 获取当前用户老师可查看的考勤表单
 export const  rqObtainingSafetyAttendanceTeachers = (current,size,startTime,endTime) => request({
-	url: `/attendance/equipment/entranceLog/all?current=${current}&size=${size}&startTime=${startTime}&endTime=${endTime}`,
+	url: `/manager/entrance/list?current=${current}&size=${size}&startTime=${startTime}&endTime=${endTime}`,
     method: 'get',
 })