Merge remote-tracking branch 'origin/master'

client/src/router/modules/remaining.ts

@@ -364,7 +364,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'weeklyStatistic2',
         component: () => import('@/views/OaSystem/personnelManagement/weeklyStatistic/index.vue'),
-        name: '"DeptWeeklyStatistic"',
+        name: 'DeptWeeklyStatistic',
         meta: {
           title: '部门周报统计'
         }

client/src/views/OaSystem/personnelManagement/CompletionRate/index.vue

@@ -214,12 +214,7 @@ const computedRate = (value, number?) => {
 const { push } = useRouter()
 const handleView = (row) => {
   // 还需判断是跳转周报还是日报
-  let pathName: string = 'DeptWeeklyStatistic'
-  if (row.reportType == 'weekly') {
-    pathName = 'DeptWeeklyStatistic'
-  } else {
-    pathName = 'DailyStatistic'
-  }
+  const pathName = row.reportType == 'weekly' ? 'DeptWeeklyStatistic' : 'DailyStatistic'
   push({
     name: pathName,
     query: {