feat:合并

src/components/drawers/FaceStu.vue

@@ -150,7 +150,7 @@
     </div>
   </a-drawer>
   <!-- 二维码签到弹窗 -->
-  <SignQR v-model:signQRvisible="signQRvisible"/>
+  <SignQR v-model:signQRvisible="signQRvisible" />
   <!-- 导入学员抽屉 -->
   <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
   <!-- 批量签到弹窗 -->
@@ -188,13 +188,13 @@
 <script>
 import { toRefs, reactive } from "vue";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
-import SignQR from "./SignQR.vue"
+import SignQR from "./SignQR.vue";
 export default {
   name: "FaceManage",
-  components: { 
+  components: {
     ImpStu,
     SignQR,
- },
+  },
   props: {
     FSvisible: {
       type: Boolean,
@@ -210,7 +210,7 @@ export default {
       closeCopy: false, //签到弹窗关闭图标
       stopModal: false, //签退弹窗
       closeStop: false, //签退弹窗关闭图标
-      signQRvisible:false, //二维码弹窗
+      signQRvisible: false, //二维码弹窗
       name: null,
       showmodal: false, //勾选提示框
       closable: false, //modal右上角的关闭按钮
@@ -404,9 +404,9 @@ export default {
     const closeStopModal = () => {
       state.stopModal = false;
     };
-    const signQR = ()=> {
-      state.signQRvisible = true
-    }
+    const signQR = () => {
+      state.signQRvisible = true;
+    };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -450,6 +450,15 @@ export default {
     getTableData();
     const tableDataFunc = () => {
       const columns = [
+        {
+          title: "工号",
+          dataIndex: "com",
+          // width: "30%",
+          key: "com",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
         {
           title: "姓名",
           dataIndex: "name",
@@ -493,14 +502,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "签退时间",
-          dataIndex: "jin",
-          key: "jin",
-          width: 110,
-          align: "center",
-          className: "h",
-        },
+        // {
+        //   title: "签退时间",
+        //   dataIndex: "jin",
+        //   key: "jin",
+        //   width: 110,
+        //   align: "center",
+        //   className: "h",
+        // },
         {
           title: "考勤",
           dataIndex: "time",
@@ -518,7 +527,7 @@ export default {
           className: "h",
         },
         {
-          title: "操作",
+          title: "考勤情况",
           className: "h",
           dataIndex: "opacation",
           key: "opacation",