diff --git a/src/assets/i18n/langs/cn/towerCraneManagement/towerCrane.js b/src/assets/i18n/langs/cn/towerCraneManagement/towerCrane.js index 9ea5376b..cf412aa2 100644 --- a/src/assets/i18n/langs/cn/towerCraneManagement/towerCrane.js +++ b/src/assets/i18n/langs/cn/towerCraneManagement/towerCrane.js @@ -72,6 +72,7 @@ export default { alarmData: '报警数据', dutyCycleData: '工作循环数据', violationData: '违章数据', + workerAttendanceData: '考勤数据', allTowerCranes: '全部塔吊(位置配置)', newTowerCrane: '新增塔吊', @@ -439,4 +440,12 @@ export default { violationInfo6: '风速违章', violationInfo7: '添加时间', violationInfo8: '违章时间', + + //考勤记录列表 + driverName: '驾驶员名称', + idCardNo: '驾驶员身份证号码', + recgRercentage: '匹配百分比', + recognitionType: '识别类型', + systemTime: '考勤时间', + towerName: '塔吊名称', } \ No newline at end of file diff --git a/src/assets/js/api/towerCrane.js b/src/assets/js/api/towerCrane.js index cf89a2fa..fb25e525 100644 --- a/src/assets/js/api/towerCrane.js +++ b/src/assets/js/api/towerCrane.js @@ -112,6 +112,8 @@ export const selectTowerWorkCycleCountApi = data => post('xmgl/towerWorkCycle/se export const selectTowerWorkCycleApi = data => post('xmgl/towerWorkCycle/list', data,'aa'); // 分页列表查询塔机违章数据表信息 export const selectTowerViolationApi = data => post('xmgl/towerViolation/list', data); +// 分页列表查询塔机考勤记录表信息 +export const selectTowerWorkerAttendanceApi = data => get('xmgl/towerWorkerAttendance/page', data); //螺母 export const selectTowerNutByNutHostIdApi = data => post('xmgl/towerNut/selectTowerNutByNutHostId', data); diff --git a/src/views/projectFront/towerCrane/reportForm.vue b/src/views/projectFront/towerCrane/reportForm.vue index 7854a76a..38061f94 100644 --- a/src/views/projectFront/towerCrane/reportForm.vue +++ b/src/views/projectFront/towerCrane/reportForm.vue @@ -21,6 +21,9 @@ +
@@ -35,6 +38,7 @@ import liveDataTable from './liveDataTable.vue' import violationData from './violationData.vue' import wireRopeMonitoring from './wireRopeMonitoring.vue' + import workerAttendanceData from './workerAttendanceData.vue' export default { name: "reportForm", props:['sn'], @@ -50,7 +54,8 @@ alarmsTable,//报警数据 liveDataTable,//实时数据 violationData,//违章数据 - wireRopeMonitoring//钢丝绳监测数据 + wireRopeMonitoring,//钢丝绳监测数据 + workerAttendanceData//考勤记录数据 }, created(){ this.projectSn = this.sn ? this.sn:this.$store.state.projectSn; @@ -71,6 +76,9 @@ else if(val == 5){ this.componentName = wireRopeMonitoring } + else if(val == 6){ + this.componentName = workerAttendanceData + } } } } diff --git a/src/views/projectFront/towerCrane/workerAttendanceData.vue b/src/views/projectFront/towerCrane/workerAttendanceData.vue new file mode 100644 index 00000000..689ca843 --- /dev/null +++ b/src/views/projectFront/towerCrane/workerAttendanceData.vue @@ -0,0 +1,325 @@ + + + + +