From 7246f8f3a8af254abd893d34bb6d846b34408c7c Mon Sep 17 00:00:00 2001
From: 13684185576 <2731628804@qq.com>
Date: Fri, 14 Nov 2025 11:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  4 +--
 .../service/taskPage/clockRecord/index.vue    |  8 ++---
 .../taskPage/dailyTaskPackage/index.vue       |  2 +-
 src/views/login/index.vue                     | 30 +++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index d74e5cf..81f721d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -597,9 +597,9 @@ export const privateRoutes = [{
       {
         path: "/taskPage/clockRecord",
         component: () => import("@/views/backOfficeSystem/service/taskPage/clockRecord/index"),
-        name: "clockRecord",
+        name: "taskPage/clockRecord",
         meta: {
-          title: '打卡情况',
+          title: '打卡记录',
           icon: "article-ranking"
         },
       },
diff --git a/src/views/backOfficeSystem/service/taskPage/clockRecord/index.vue b/src/views/backOfficeSystem/service/taskPage/clockRecord/index.vue
index b641751..72aea3d 100644
--- a/src/views/backOfficeSystem/service/taskPage/clockRecord/index.vue
+++ b/src/views/backOfficeSystem/service/taskPage/clockRecord/index.vue
@@ -22,9 +22,9 @@ const pageData = reactive({
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
-    loading: false
+    loading: false,
+    haveControls:false,
   },
-  haveControls:false,
   total: 0,
   pageConfiger: {
     pageSize: 10,
@@ -46,7 +46,7 @@ const pageData = reactive({
     },
     {
       label: "打卡开始附件",
-      prop: "dkKsSj",
+      prop: "dkKsFj",
       showSolt: true
     },
     {
@@ -55,7 +55,7 @@ const pageData = reactive({
     },
     {
       label: "打卡结束附件",
-      prop: "dkKsSj",
+      prop: "dkJsFj",
       showSolt: true
     }
   ]
diff --git a/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue b/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue
index bcfa874..f119cd1 100644
--- a/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue
+++ b/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue
@@ -215,7 +215,7 @@ const getListData = async (params = {}) => {
       ...item,
       xfxz: item?.xfbb?.fzrXm ? `${item?.xfbb?.fzrXm}警组` : '',
       bddListLabel: item?.bddList?.map((i, idx) => (`卡点${idx + 1}-${i?.xlghDkcs}次`))?.join(',') || '',
-      fgJqtjXsLabel: JSON.parse(item?.fgJqtjXs)?.filter(i => (i?.count !== 0))?.map(i => (`${i?.hour}小时-${i?.count}起`))?.join('、') || '',
+      fgJqtjXsLabel: item.fgJqtjXs?JSON.parse(item?.fgJqtjXs)?.filter(i => (i?.count !== 0))?.map(i => (`${i?.hour}小时-${i?.count}起`))?.join('、'): '',
       fgJqtjLx: parseAndJoinLx(item?.fgJqtjLx, 'lx')
     })) || []
     // pageData.tableData[2].rwRq = '2025-09-18'
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 46f04eb..4b7609e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -189,21 +189,21 @@ const handleLogin = () => {
     loading.value = true;
     console.log(loginForm.value,'loginForm.value')
     store.dispatch("user/login", loginForm.value).then((res) => {
-      // loading.value = false;
-      // // 登录后操作
-      // // return false //调试好后删除
-      // if (res.deptList.length === 1) {
-      //   window.location.href = '/'
-      // } else {
-      //   deptList.value = [...res.deptList];
-      //   loginDialog.value = true;
-      //   authorization.value = res.jwtToken;
-      //   ElNotification({
-      //     title: "提示",
-      //     message: "请选择部门",
-      //     duration: 3000
-      //   });
-      // }
+      loading.value = false;
+      // 登录后操作
+      // return false //调试好后删除
+      if (res.deptList.length === 1) {
+        window.location.href = '/'
+      } else {
+        deptList.value = [...res.deptList];
+        loginDialog.value = true;
+        authorization.value = res.jwtToken;
+        ElNotification({
+          title: "提示",
+          message: "请选择部门",
+          duration: 3000
+        });
+      }
     })
       .catch(() => {
         loading.value = false;