修改任务包

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"
         },
       },

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,
+  },
   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
     }
   ]

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'

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;
+      loading.value = false;
-      // // 登录后操作
+      // 登录后操作
-      // // return false //调试好后删除
+      // return false //调试好后删除
-      // if (res.deptList.length === 1) {
+      if (res.deptList.length === 1) {
-      //   window.location.href = '/'
+        window.location.href = '/'
-      // } else {
+      } else {
-      //   deptList.value = [...res.deptList];
+        deptList.value = [...res.deptList];
-      //   loginDialog.value = true;
+        loginDialog.value = true;
-      //   authorization.value = res.jwtToken;
+        authorization.value = res.jwtToken;
-      //   ElNotification({
+        ElNotification({
-      //     title: "提示",
+          title: "提示",
-      //     message: "请选择部门",
+          message: "请选择部门",
-      //     duration: 3000
+          duration: 3000
-      //   });
+        });
-      // }
+      }
     })
       .catch(() => {
         loading.value = false;