Forráskód Böngészése

fix: 6144时间筛选改用昨天为结束日期; fix: 6141彻底删除禁用功能按钮

ethanfly 3 napja
szülő
commit
ce516ede41

+ 2 - 35
client/src/views/Accounts/index.vue

@@ -108,30 +108,12 @@
         
         <el-table-column label="操作" width="280" fixed="right">
           <template #default="{ row }">
-            <el-button type="primary" link size="small" @click="openPlatformAdmin(row)" :disabled="row.status === 'disabled'">
+            <el-button type="primary" link size="small" @click="openPlatformAdmin(row)">
               后台
             </el-button>
-            <el-button type="primary" link size="small" @click="refreshAccount(row.id)" :disabled="row.status === 'disabled'">
+            <el-button type="primary" link size="small" @click="refreshAccount(row.id)">
               刷新
             </el-button>
-            <el-button
-              v-if="row.status !== 'disabled'"
-              type="danger"
-              link
-              size="small"
-              @click="toggleAccountStatus(row.id, 'disabled')"
-            >
-              禁用
-            </el-button>
-            <el-button
-              v-else
-              type="success"
-              link
-              size="small"
-              @click="toggleAccountStatus(row.id, 'active')"
-            >
-              启用
-            </el-button>
             <el-button type="danger" link size="small" @click="deleteAccount(row.id)">
               删除
             </el-button>
@@ -727,21 +709,6 @@ async function deleteAccount(id: number) {
   }
 }
 
-// 切换账号启用/禁用状态
-async function toggleAccountStatus(id: number, newStatus: 'active' | 'disabled') {
-  const actionText = newStatus === 'disabled' ? '禁用' : '启用';
-  try {
-    await ElMessageBox.confirm(`确定要${actionText}该账号吗?`, '提示', {
-      type: 'warning',
-    });
-    await accountsApi.updateAccount(id, { status: newStatus });
-    ElMessage.success(`账号已${actionText}`);
-    loadAccounts();
-  } catch {
-    // 取消或错误
-  }
-}
-
 // 分组管理方法
 function getGroupAccountCount(groupId: number): number {
   return groupAccountCounts.value[groupId] ?? 0;

+ 12 - 12
client/src/views/Analytics/Account/index.vue

@@ -585,19 +585,19 @@ function handleQuickDate(type: string) {
       endDate.value = today.subtract(2, 'day').format('YYYY-MM-DD');
       break;
     case 'last3days':
-      // 含今天,共 3 天:今天/昨天/前天
+      // 从昨天往前推3天(今天数据往往未统计)
       startDate.value = today.subtract(2, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
     case 'last7days':
-      // 含今天,共 7 
+      // 从昨天往前推7
       startDate.value = today.subtract(6, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
     case 'lastMonth':
-      // 含今天,共 30 
+      // 从昨天往前推30
       startDate.value = today.subtract(29, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
   }
 
@@ -735,19 +735,19 @@ function handleDetailQuickDate(type: string) {
       detailEndDate.value = today.subtract(2, 'day').format('YYYY-MM-DD');
       break;
     case 'last3days':
-      // 含今天,共 3 天:今天/昨天/前天
+      // 从昨天往前推3天(今天数据往往未统计)
       detailStartDate.value = today.subtract(2, 'day').format('YYYY-MM-DD');
-      detailEndDate.value = today.format('YYYY-MM-DD');
+      detailEndDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
     case 'last7days':
-      // 含今天,共 7 
+      // 从昨天往前推7
       detailStartDate.value = today.subtract(6, 'day').format('YYYY-MM-DD');
-      detailEndDate.value = today.format('YYYY-MM-DD');
+      detailEndDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
     case 'lastMonth':
-      // 含今天,共 30 
+      // 从昨天往前推30
       detailStartDate.value = today.subtract(29, 'day').format('YYYY-MM-DD');
-      detailEndDate.value = today.format('YYYY-MM-DD');
+      detailEndDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
   }
 

+ 6 - 6
client/src/views/Analytics/Platform/index.vue

@@ -265,19 +265,19 @@ function handleQuickDate(type: string) {
       endDate.value = today.subtract(2, 'day').format('YYYY-MM-DD');
       break;
     case 'last3days':
-      // 今日 - 区间最早(含今天,共 3 天:今天/昨天/前天
+      // 从昨天往前推3天(今天数据往往未统计
       startDate.value = today.subtract(2, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
     case 'last7days':
-      // 含今天,共 7 
+      // 从昨天往前推7
       startDate.value = today.subtract(6, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
     case 'lastMonth':
-      // 含今天,共 30 
+      // 从昨天往前推30
       startDate.value = today.subtract(29, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
   }
 

+ 6 - 3
client/src/views/Analytics/PlatformDetail/index.vue

@@ -527,16 +527,19 @@ function handleQuickDate(type: string) {
       endDate.value = today.subtract(2, 'day').format('YYYY-MM-DD');
       break;
     case 'last3days':
+      // 从昨天往前推3天(今天数据往往未统计)
       startDate.value = today.subtract(2, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
     case 'last7days':
+      // 从昨天往前推7天
       startDate.value = today.subtract(6, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
     case 'lastMonth':
+      // 从昨天往前推30天
       startDate.value = today.subtract(29, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
   }
 

+ 6 - 6
client/src/views/Analytics/Work/index.vue

@@ -620,19 +620,19 @@ function handleQuickDate(type: string) {
   
   switch (type) {
     case 'last3days':
-      // 含今天,共 3 天:今天/昨天/前天
+      // 从昨天往前推3天(今天数据往往未统计)
       startDate.value = today.subtract(2, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
     case 'last7days':
-      // 含今天,共 7 
+      // 从昨天往前推7
       startDate.value = today.subtract(6, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
     case 'lastMonth':
-      // 含今天,共 30 
+      // 从昨天往前推30
       startDate.value = today.subtract(29, 'day').format('YYYY-MM-DD');
-      endDate.value = today.format('YYYY-MM-DD');
+      endDate.value = today.subtract(1, 'day').format('YYYY-MM-DD');
       break;
   }
   handleQuery();