周日报统计完成率切换BUG修复

client/.env.dev

@@ -5,8 +5,8 @@ VITE_DEV=false
 
 # 请求路径
 # VITE_BASE_URL='http://10.10.9.113:48080'
-# VITE_BASE_URL='http://10.10.10.7:18080'
-VITE_BASE_URL='http://oa.zjugis.com:28080'
+VITE_BASE_URL='http://10.10.10.7:18080'
+# VITE_BASE_URL='http://oa.zjugis.com:28080'
 
 # VITE_BASE_URL='http://10.10.9.168:48080'
 

client/src/router/modules/remaining.ts

@@ -300,7 +300,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'dailyLogDetail',
         component: () => import('@/views/OaSystem/personnelManagement/dailyDetail/index.vue'),
-        name: 'dailyLogDetail',
+        name: 'DailyLogDetail',
         meta: {
           title: '日报详情'
         }
@@ -308,7 +308,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'weeklyLogDetail',
         component: () => import('@/views/OaSystem/personnelManagement/weeklyDetail/index.vue'),
-        name: 'weeklyLogDetail',
+        name: 'WeeklyLogDetail',
         meta: {
           title: '周报详情'
         }
@@ -372,7 +372,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'dailyStatistic2',
         component: () => import('@/views/OaSystem/personnelManagement/dailyStatistic/index.vue'),
-        name: 'dailyStatistic',
+        name: 'DailyStatistic',
         meta: {
           title: '部门日报统计'
         }

client/src/views/OaSystem/oaLayout/tagList.vue

@@ -237,8 +237,9 @@ const closeRightTags = () => {
 
 // 新增tag
 const addTags = () => {
-  const { name, path } = unref(currentRoute)
-  if (name) {
+  const { name, query, path } = unref(currentRoute)
+  if (!name) return
+  if (query?.only && query?.only === '1') {
     // 检查当前路由路径是否已经存在
     const existingTagIndex = unref(visitedViews).findIndex((view) => view.path === path)
     if (existingTagIndex !== -1) {
@@ -249,7 +250,9 @@ const addTags = () => {
       tagsViewStore.addView(unref(currentRoute))
       tagsViewStore.addCachedView()
     }
+  } else {
     selectedTag.value = unref(currentRoute)
+    tagsViewStore.addView(unref(currentRoute))
   }
   nextTick(() => {
     // 当前选择路由滚入视野

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

@@ -209,13 +209,19 @@ const computedRate = (value, number?) => {
 const { push } = useRouter()
 const handleView = (row) => {
   // 还需判断是跳转周报还是日报
+  let pathName: string = 'DeptWeeklyStatistic'
   if (row.reportType == 'weekly') {
-    push(
-      `/weeklyStatistic2?deptId=${row.deptId}&date=${moment(selectDate.value).format('YYYY-MM')}`
-    )
+    pathName = 'DeptWeeklyStatistic'
   } else {
-    push(`/dailyStatistic2?deptId=${row.deptId}&date=${moment(selectDate.value).format('YYYY-MM')}`)
+    pathName = 'DailyStatistic'
   }
+  push({
+    name: pathName,
+    query: {
+      deptId: row.deptId,
+      date: moment(selectDate.value).format('YYYY-MM')
+    }
+  })
 }
 
 /** 一键催报 ↓ */

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

@@ -110,12 +110,18 @@ const handleSizeChange = (size): void => {
 const { push } = useRouter()
 const jumpToMyLog = (row: any): void => {
   const { userId, nickName, reportYear, reportMonth } = row
-  // 查看本月填报详情
-  push(`/dailyLogDetail?userId=${userId}&userName=${nickName}&date=${reportYear}-${reportMonth}`)
   // 查看本月填报列表
   // push(
   //   `/mySendLog?type=daily&userId=${userId}&userName=${nickName}&date=${reportYear}-${reportMonth}`
   // )
+  push({
+    name: 'DailyLogDetail',
+    query: {
+      userId: userId,
+      userName: nickName,
+      date: reportYear - reportMonth
+    }
+  })
 }
 
 const { currentRoute } = useRouter()

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

@@ -112,12 +112,18 @@ const handleSizeChange = (size): void => {
 const { push } = useRouter()
 const jumpToMyLog = (row: any): void => {
   const { userId, nickName, reportYear, reportMonth } = row
-  // 查看本月填报详情
-  push(`/weeklyLogDetail?userId=${userId}&userName=${nickName}&date=${reportYear}-${reportMonth}`)
   // 查看本月填报列表
   // push(
   //   `/mySendLog?type=weekly&userId=${userId}&userName=${nickName}&date=${reportYear}-${reportMonth}`
   // )
+  push({
+    name: 'WeeklyLogDetail',
+    query: {
+      userId: userId,
+      userName: nickName,
+      date: reportYear - reportMonth
+    }
+  })
 }
 
 const { currentRoute } = useRouter()