Ethanfly 5 дней назад
Родитель
Сommit
1adba35963
2 измененных файлов с 11 добавлено и 4 удалено
  1. 5 0
      client/src/components.d.ts
  2. 6 4
      client/src/views/Analytics/Work/index.vue

+ 5 - 0
client/src/components.d.ts

@@ -18,7 +18,10 @@ declare module 'vue' {
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElDivider: typeof import('element-plus/es')['ElDivider']
+    ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
@@ -31,6 +34,8 @@ declare module 'vue' {
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElSelect: typeof import('element-plus/es')['ElSelect']

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

@@ -42,13 +42,13 @@
           collapse-tags 
           collapse-tags-tooltip
           placeholder="选择账号" 
-          style="width: 160px"
+          style="width: 200px"
           @change="handleFilterChange"
         >
           <el-option 
             v-for="account in accountList" 
             :key="account.id" 
-            :label="account.nickname" 
+            :label="`${account.nickname} (${getPlatformName(account.platform)})`" 
             :value="account.id"
           />
         </el-select>
@@ -395,9 +395,9 @@ const quickDateBtns = [
   { label: '近一个月', value: 'lastMonth' },
 ];
 
-// 账号选择
+// 账号选择(带平台信息,便于同名账号区分)
 const selectedAccounts = ref<number[]>([]);
-const accountList = ref<{ id: number; nickname: string }[]>([]);
+const accountList = ref<{ id: number; nickname: string; platform: PlatformType }[]>([]);
 
 // 分组和平台筛选
 const selectedGroup = ref<number | ''>('');
@@ -666,12 +666,14 @@ async function loadAccountList() {
       accountList.value = res.map((a: any) => ({
         id: a.id,
         nickname: a.accountName || a.nickname || a.username,
+        platform: a.platform as PlatformType,
       }));
     } else if ((res as any)?.data?.data) {
       // 兼容旧格式 { data: { data: [] } }
       accountList.value = (res as any).data.data.map((a: any) => ({
         id: a.id,
         nickname: a.accountName || a.nickname || a.username,
+        platform: a.platform as PlatformType,
       }));
     }
   } catch (error) {