diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 00bd95e6..6d09f7d9 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -397,6 +397,7 @@ textarea { overflow-x: auto; display: flex; flex-direction: column; + } } diff --git a/src/components/drawers/FaceStu.vue b/src/components/drawers/FaceStu.vue index 3ec29b4f..58a2c390 100644 --- a/src/components/drawers/FaceStu.vue +++ b/src/components/drawers/FaceStu.vue @@ -37,7 +37,7 @@ placeholder="请输入姓名" /> -
+
签到状态:
@@ -146,7 +146,7 @@
-
+
@@ -414,20 +414,42 @@ export default { }, { title: "所在部门", - dataIndex: "com", + dataIndex: "studentDepartName", // width: "30%", - key: "com", + key: "studentDepartName", width: 50, align: "center", className: "h", + customRender: (text) => { + return ( +
+ + {text.record.studentDepartName + ? text.record.studentDepartName + : "-"} + +
+ ); + }, }, { title: "所在岗位", - dataIndex: "gang", - key: "gang", + dataIndex: "studentJobName", + key: "studentJobName", width: 50, align: "center", className: "h", + customRender: (text) => { + return ( +
+ + {text.record.studentJobName + ? text.record.studentJobName + : "-"} + +
+ ); + }, }, { title: "签到时间", diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue new file mode 100644 index 00000000..f014a345 --- /dev/null +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -0,0 +1,1085 @@ + + + + + diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 4f05c48f..305b2f4a 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -3,7 +3,7 @@ :visible="Fvisible" class="drawerStyle ProjectFaceTaskManage" placement="right" - width="60%" + width="80%" @after-visible-change="afterVisibleChange" >
@@ -629,8 +629,11 @@ export default { diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index 8f02716d..cb95c6ed 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -4,7 +4,7 @@ :visible="FaceTeachModelVisible" class="drawerStyle ProjectFaceTaskManage" placement="right" - width="60%" + width="80%" @after-visible-change="afterVisibleChange" >
@@ -643,8 +643,11 @@ export default {