From 6404924e299094f13993fbb2cd6822c7349d7e93 Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Fri, 4 Jul 2025 18:12:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=AA=92=E4=BD=93=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9C=8B=E6=9D=BF=E5=AD=97=E6=AE=B5=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../brands/brand-materials/style.scss         |   2 +-
 .../components/account-table/constants.ts     | 315 ++++++++++++++----
 .../components/account-table/index.vue        |  49 ++-
 .../custom-column-modal/img/icon-lock.png     | Bin 0 -> 677 bytes
 .../components/custom-column-modal/index.vue  | 218 ++++++++++++
 .../components/custom-column-modal/style.scss |  99 ++++++
 .../components/filter-block/index.vue         |  16 +-
 .../account-dashboard/constants.ts            |   5 +-
 .../media-account/account-dashboard/index.vue |   1 +
 .../components/board-table/index.vue          |  11 +-
 .../components/plan-table/index.vue           |  11 +-
 11 files changed, 627 insertions(+), 100 deletions(-)
 create mode 100644 src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/img/icon-lock.png
 create mode 100644 src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/index.vue
 create mode 100644 src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/style.scss

diff --git a/src/views/property-marketing/brands/brand-materials/style.scss b/src/views/property-marketing/brands/brand-materials/style.scss
index ba5bf26..eedda5f 100644
--- a/src/views/property-marketing/brands/brand-materials/style.scss
+++ b/src/views/property-marketing/brands/brand-materials/style.scss
@@ -44,7 +44,7 @@
         .label {
           margin-right: 8px;
           color: #211f24;
-          font-family: 'PuHuiTi-Medium';
+          font-family: 'PuHuiTi-Regular';
           font-size: 14px;
           font-style: normal;
           font-weight: 400;
diff --git a/src/views/property-marketing/media-account/account-dashboard/components/account-table/constants.ts b/src/views/property-marketing/media-account/account-dashboard/components/account-table/constants.ts
index 90b8c90..8de46c3 100644
--- a/src/views/property-marketing/media-account/account-dashboard/components/account-table/constants.ts
+++ b/src/views/property-marketing/media-account/account-dashboard/components/account-table/constants.ts
@@ -2,13 +2,167 @@
  * @Author: RenXiaoDong
  * @Date: 2025-06-28 10:33:06
  */
-export const getDefaultColumns = (type = 'week') => {
-  const isWeek = type === 'week';
-  const viewChain = isWeek ? 'week_view_chain' : 'month_view_chain';
-  const likeChain = isWeek ? 'week_like_chain' : 'month_like_chain';
-  const viewChainText = isWeek ? '近7天观看量环比' : '近30天观看量环比';
-  const likeChainText = isWeek ? '近7天点赞量环比' : '近30天点赞量环比';
 
+export const CUSTOM_FIELDS = [
+  {
+    dataIndex: 'comment_number',
+    prop: 'comment_number',
+    title: '评论数',
+    width: 180,
+    tooltip: '账号所有内容的评论总数',
+    align: 'right',
+  },
+  {
+    dataIndex: 'share_number',
+    prop: 'share_number',
+    title: '分享数',
+    width: 180,
+    tooltip: '账号所有内容的分享总数',
+    align: 'right',
+  },
+  {
+    dataIndex: 'like_number',
+    prop: 'like_number',
+    title: '点赞数',
+    width: 180,
+    tooltip: '账号所有内容的点赞总数',
+    align: 'right',
+  },
+  {
+    dataIndex: 'rise_fans_number',
+    prop: 'rise_fans_number',
+    title: '粉丝增长数',
+    width: 180,
+    tooltip: '账号所有内容的粉丝增长总数',
+    align: 'right',
+  },
+  {
+    dataIndex: 'collect_number',
+    prop: 'collect_number',
+    title: '收藏数',
+    width: 180,
+    tooltip: '账号所有内容的收藏总数',
+    align: 'right',
+  },
+  {
+    dataIndex: 'view_number',
+    prop: 'view_number',
+    title: '浏览数',
+    width: 180,
+    tooltip: '账号所有内容的浏览总数',
+    align: 'right',
+  },
+  {
+    dataIndex: 'avg_view_time',
+    prop: 'avg_view_time',
+    title: '平均浏览数',
+    width: 180,
+    tooltip: '账号所有内容的平均浏览数',
+    align: 'right',
+  },
+  {
+    dataIndex: 'home_view_number',
+    prop: 'home_view_number',
+    title: '主页浏览数',
+    width: 180,
+    tooltip: '账号所有内容的主页浏览数',
+    align: 'right',
+  },
+  {
+    dataIndex: 'barrage_number',
+    prop: 'barrage_number',
+    title: '弹幕数',
+    width: 180,
+    tooltip: '账号所有内容的弹幕总数',
+    align: 'right',
+  },
+  {
+    dataIndex: 'rise_fans_rate',
+    prop: 'rise_fans_rate',
+    title: '粉丝增长率',
+    width: 180,
+    tooltip: '账号所有内容的粉丝增长率',
+    align: 'right',
+    suffix: '%',
+    sortable: {
+      sortDirections: ['ascend', 'descend'],
+    },
+  },
+  {
+    dataIndex: 'home_view_rate',
+    prop: 'home_view_rate',
+    title: '主页浏览率',
+    width: 180,
+    tooltip: '账号所有内容的主页浏览率',
+    align: 'right',
+    suffix: '%',
+    sortable: {
+      sortDirections: ['ascend', 'descend'],
+    },
+  },
+  {
+    dataIndex: 'share_rate',
+    prop: 'share_rate',
+    title: '分享率',
+    width: 180,
+    tooltip: '账号所有内容的分享率',
+    align: 'right',
+    suffix: '%',
+    sortable: {
+      sortDirections: ['ascend', 'descend'],
+    },
+  },
+  {
+    dataIndex: 'collect_rate',
+    prop: 'collect_rate',
+    title: '收藏率',
+    width: 180,
+    tooltip: '账号所有内容的收藏率',
+    align: 'right',
+    suffix: '%',
+    sortable: {
+      sortDirections: ['ascend', 'descend'],
+    },
+  },
+  {
+    dataIndex: 'comment_rate',
+    prop: 'comment_rate',
+    title: '评论率',
+    width: 180,
+    tooltip: '账号所有内容的评论率',
+    align: 'right',
+    suffix: '%',
+    sortable: {
+      sortDirections: ['ascend', 'descend'],
+    },
+  },
+  {
+    dataIndex: 'avg_view_time_rate',
+    prop: 'avg_view_time_rate',
+    title: '平均访问时长增长比率',
+    width: 180,
+    tooltip: '账号所有内容的平均访问时长增长比率',
+    align: 'right',
+    suffix: '%',
+    sortable: {
+      sortDirections: ['ascend', 'descend'],
+    },
+  },
+];
+
+export function getPeriodColumns(type = 'week') {
+  const prefix = type === 'week' ? 'seven' : 'thirty';
+  const labelPrefix = type === 'week' ? '近7天' : '近30天';
+
+  return CUSTOM_FIELDS.map((item) => ({
+    ...item,
+    dataIndex: `${prefix}_${item.dataIndex}`,
+    title: `${labelPrefix}${item.title}`,
+    prop: `${prefix}_${item.prop}`,
+  }));
+}
+
+export const getDefaultColumns = (type = 'week') => {
   return [
     {
       title: '账号名称',
@@ -65,56 +219,12 @@ export const getDefaultColumns = (type = 'week') => {
         sortDirections: ['ascend', 'descend'],
       },
     },
-    {
-      title: '观看量',
-      dataIndex: 'view_number',
-      prop: 'view_number',
-      width: 180,
-      tooltip: '账号所有内容的总观看次数',
-      align: 'right',
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-      },
-    },
-    {
-      title: viewChainText,
-      dataIndex: viewChain,
-      prop: viewChain,
-      width: 180,
-      tooltip: '相比上一周期的观看量变化百分比',
-      align: 'right',
-      suffix: '%',
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-      },
-    },
-    {
-      title: '点赞量',
-      dataIndex: 'like_number',
-      prop: 'like_number',
-      width: 180,
-      tooltip: '账号所有内容的总点赞数',
-      align: 'right',
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-      },
-    },
-    {
-      title: likeChainText,
-      dataIndex: likeChain,
-      prop: likeChain,
-      width: 180,
-      tooltip: '相比上一周期的点赞量变化百分比',
-      align: 'right',
-      suffix: '%',
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-      },
-    },
+    ...getPeriodColumns(type),
+
     {
       title: '最新内容标题/日期',
-      dataIndex: 'newest_work_title_and_publish_time',
-      prop: 'newest_work_title_and_publish_time',
+      dataIndex: 'newest_work_title',
+      prop: 'newest_work_title',
       width: 240,
       tooltip: '最新发布内容的标题和发布日期',
     },
@@ -130,20 +240,64 @@ export const getDefaultColumns = (type = 'week') => {
       },
     },
     {
-      title: '最新作品日增长',
-      dataIndex: 'newest_work_view_grow_number',
-      prop: 'newest_work_view_grow_number',
+      title: '最新作品点赞数',
+      dataIndex: 'newest_work_like_number',
+      prop: 'newest_work_like_number',
       width: 180,
-      tooltip: '最新作品每日观看量的增长情况',
+      tooltip: '最新发布内容的点赞数',
       align: 'right',
       sortable: {
         sortDirections: ['ascend', 'descend'],
       },
     },
+    {
+      title: '最新作品收藏数',
+      dataIndex: 'newest_work_collect_number',
+      prop: 'newest_work_collect_number',
+      width: 180,
+      tooltip: '最新发布内容的收藏数',
+      align: 'right',
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+      },
+    },
+    {
+      title: '最新作品评论数',
+      dataIndex: 'newest_work_comment_number',
+      prop: 'newest_work_comment_number',
+      width: 180,
+      tooltip: '最新发布内容的评论数',
+      align: 'right',
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+      },
+    },
+    {
+      title: '最新作品分享数',
+      dataIndex: 'newest_work_share_number',
+      prop: 'newest_work_share_number',
+      width: 180,
+      tooltip: '最新发布内容的分享数',
+      align: 'right',
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+      },
+    },
+    // {
+    //   title: '最新作品日增长',
+    //   dataIndex: 'newest_work_view_grow_number',
+    //   prop: 'newest_work_view_grow_number',
+    //   width: 180,
+    //   tooltip: '最新作品每日观看量的增长情况',
+    //   align: 'right',
+    //   sortable: {
+    //     sortDirections: ['ascend', 'descend'],
+    //   },
+    // },
     {
       title: '次新内容标题/日期',
-      dataIndex: 'second_new_work_title_and_publish_time',
-      prop: 'second_new_work_title_and_publish_time',
+      dataIndex: 'second_new_work_title',
+      prop: 'second_new_work_title',
       width: 240,
     },
     {
@@ -158,16 +312,49 @@ export const getDefaultColumns = (type = 'week') => {
       },
     },
     {
-      title: '次新作品日增长',
-      dataIndex: 'second_new_work_view_grow_number',
-      prop: 'second_new_work_view_grow_number',
+      title: '次新作品点赞数',
+      dataIndex: 'second_new_work_like_number',
+      prop: 'second_new_work_like_number',
       width: 180,
-      tooltip: '倒数第二个作品每日观看量的增长情况',
+      tooltip: '倒数第二个发布内容的点赞数',
       align: 'right',
       sortable: {
         sortDirections: ['ascend', 'descend'],
       },
     },
+    {
+      title: '次新作品评论数',
+      dataIndex: 'second_new_work_comment_number',
+      prop: 'second_new_work_comment_number',
+      width: 180,
+      tooltip: '倒数第二个发布内容的评论数',
+      align: 'right',
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+      },
+    },
+    {
+      title: '次新作品分享数',
+      dataIndex: 'second_new_work_share_number',
+      prop: 'second_new_work_share_number',
+      width: 180,
+      tooltip: '倒数第二个发布内容的分享数',
+      align: 'right',
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+      },
+    },
+    // {
+    //   title: '次新作品日增长',
+    //   dataIndex: 'second_new_work_view_grow_number',
+    //   prop: 'second_new_work_view_grow_number',
+    //   width: 180,
+    //   tooltip: '倒数第二个作品每日观看量的增长情况',
+    //   align: 'right',
+    //   sortable: {
+    //     sortDirections: ['ascend', 'descend'],
+    //   },
+    // },
     {
       title: '操作',
       dataIndex: 'operation',
diff --git a/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue b/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue
index 42b46bb..e61d11a 100644
--- a/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue
+++ b/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue
@@ -32,7 +32,11 @@
     ref="tableRef"
     :data="dataSource"
     row-key="id"
-    :row-selection="rowSelection"
+    :row-selection="{
+      type: 'checkbox',
+      showCheckedAll: true,
+      width: 48,
+    }"
     :selected-keys="selectedItems"
     :pagination="false"
     :scroll="{ x: '100%' }"
@@ -113,14 +117,17 @@
             {{ formatTableField(column, record) }}
           </div>
         </template>
-        <template
-          v-else-if="
-            ['newest_work_title_and_publish_time', 'second_new_work_title_and_publish_time'].includes(column.dataIndex)
-          "
-          #cell="{ record }"
-        >
-          <p class="cts cursor-pointer hover:!color-#6D4CFE">打工人的环游世界旅行计划（国内版）</p>
-          <p class="cts text-12px lh-20px !color-#939499">2025-06-18</p>
+        <template v-else-if="column.dataIndex === 'newest_work_title'" #cell="{ record }">
+          <p class="cts cursor-pointer hover:!color-#6D4CFE">{{ record.newest_work_title }}</p>
+          <p class="cts text-12px lh-20px !color-#939499">
+            {{ exactFormatTime(record.newest_work_published_at) }}
+          </p>
+        </template>
+        <template v-else-if="column.dataIndex === 'second_new_work_title'" #cell="{ record }">
+          <p class="cts cursor-pointer hover:!color-#6D4CFE">{{ record.second_new_work_title }}</p>
+          <p class="cts text-12px lh-20px !color-#939499">
+            {{ exactFormatTime(record.second_new_work_published_at) }}
+          </p>
         </template>
 
         <template v-else #cell="{ record }">
@@ -130,7 +137,12 @@
     </template>
   </a-table>
 
-  <CustomTableColumnModal ref="customTableColumnModalRef" :type="CUSTOM_COLUMN_TYPE" @success="onCustomColumnSuccess" />
+  <CustomTableColumnModal
+    ref="customTableColumnModalRef"
+    :type="CUSTOM_COLUMN_TYPE"
+    :dateType="dateType"
+    @success="onCustomColumnSuccess"
+  />
 </template>
 
 <script setup>
@@ -139,9 +151,9 @@ import { useRouter } from 'vue-router';
 
 import { getCustomColumns } from '@/api/all/common';
 import { STATUS_LIST } from '@/views/property-marketing/media-account/components/status-select/constants';
-import { formatTableField, formatNumberShow } from '@/utils/tools';
+import { formatTableField, formatNumberShow, exactFormatTime } from '@/utils/tools';
 import { getDefaultColumns } from './constants';
-import CustomTableColumnModal from '@/components/custom-table-column-modal';
+import CustomTableColumnModal from '../custom-column-modal';
 
 import icon1 from '@/assets/img/media-account/icon-custom.png';
 import icon2 from '@/assets/img/media-account/icon-warn.png';
@@ -154,6 +166,10 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  query: {
+    type: Object,
+    default: () => {},
+  },
 });
 
 const emit = defineEmits(['selectionChange', 'sorterChange', 'export']);
@@ -173,15 +189,12 @@ const checkedAll = computed(
 const indeterminate = computed(
   () => selectedItems.value.length > 0 && selectedItems.value.length < props.dataSource.length,
 );
-
-const rowSelection = computed(() => ({
-  type: 'checkbox',
-  showCheckedAll: true,
-}));
+const dateType = computed(() => (props.query.type === 7 ? 'week' : 'month'));
 
 const tableColumns = computed(() => {
   const _result = [];
-  const _columns = getDefaultColumns();
+  const _columns = getDefaultColumns(dateType.value);
+
   selectedColumns.value.forEach((item) => {
     const _column = _columns.find((_item) => _item.prop === item);
     if (_column) {
diff --git a/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/img/icon-lock.png b/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/img/icon-lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcc72b0858ae54915f7f7d8615d1677616f893d4
GIT binary patch
literal 677
zcmV;W0$TlvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0y;@VK~#7F?Uq4q
z(?Ar4|L0l|sS9$1ast{dAl2NUH=sR1P#sH7H=S;frKBj?vBR7o^aKP6!IIpdIf6wi
zM3rP7Gmhgprm1F3L%Zm=napJ7&GVc8y&2$vJBDD15TgF`@^^y>`(SLPMu>)z`O_m8
zAEPK5S(vkPpxF#P2K521udp^E#zChO4Pc0|13_@KEm{63EKStv0WsH^R3x%!XdH5O
z+U>VP6T2=9k&ykx-snv?AB(OK$$UsfM=)?)nETYku2BShzqJSAezqb$ZAS;!&TEFT
zYF=lCUzr?*10&d5EO2_OW~oi%d<9_-2ADZO$VGS4*)Dyt#1j~qE|DsoXJO27;N>FY
z#aFJdxSzEn<-{N#-k`*FxK~coB?rPV+!{}Cjx|!&#?ldt$9RJ^Q;zO(8Wzs_v=doZ
z$(v9a!q<%(X2JR}E<|PYopAB%$|K2%>tbYk2h6Dy0Y5luTwGqALvmlm^|Kc4VKY2N
z1*{!73_^7a%5M2WQi2ibf9rO@VQLgMJs}4tdB0pg46xP!gSTfb&Qzud{o4;(&s2Wt
z((A#J3L;e3unIqcc6H&>Bjf4JskHi8VtoVz&MqUaYw@L(bMY29gC*7uOeQrYKpOt-
z7zWeLnt&zNN6_u2kB}X$c#_!FW9;CIdLzWBK;=U8Znj~Jf8_p_V&4xx;D0;7=_@xY
zCi92IEu-~P>~9o1-@knwzIgsp37T|X*Kn&)qH0G=6|eVr;6CvOe+$T_?DSwK00000
LNkvXXu0mjf^g}BY

literal 0
HcmV?d00001

diff --git a/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/index.vue b/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/index.vue
new file mode 100644
index 0000000..4026a40
--- /dev/null
+++ b/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/index.vue
@@ -0,0 +1,218 @@
+<!--
+ * @Author: RenXiaoDong
+ * @Date: 2025-06-30 10:54:49
+-->
+<template>
+  <a-modal
+    v-model:visible="visible"
+    title="自定义列"
+    width="960px"
+    unmountOnClose
+    titleAlign="start"
+    class="custom-table-column-modal-98"
+    @close="close"
+  >
+    <div class="modal-body">
+      <!-- 左侧分组 -->
+      <div class="left">
+        <div v-for="group in dataSource" :key="group.label" class="group-item">
+          <div class="title-row">
+            <span class="text">{{ group.label }}</span>
+          </div>
+          <div class="fields">
+            <a-checkbox
+              v-for="option in group.columns"
+              :key="option.value"
+              :model-value="isCheck(option)"
+              :value="option.value"
+              :disabled="option.is_require === ENUM_STATUS.NO"
+              @change="(checked) => onCheckChange(checked, option)"
+            >
+              {{ option.label }}
+            </a-checkbox>
+          </div>
+        </div>
+      </div>
+      <!-- 右侧已选 -->
+      <div class="right">
+        <span class="checked-title mb-16px">
+          已添加<span class="count">（{{ checkColumns.length }}）</span>
+        </span>
+        <div class="checked-list">
+          <div v-for="(groupName, index) in requiredGroupNames" :key="index" class="checked-item !cursor-default">
+            <div class="flex items-center">
+              <img :src="icon1" alt="icon" class="mr-8px" width="16" height="16" />
+              <span>{{ groupName }}</span>
+            </div>
+          </div>
+          <VueDraggable v-model="checkColumns">
+            <div
+              v-for="item in checkColumns"
+              :key="item"
+              class="checked-item justify-between"
+              :class="isRequiredColumn(item) ? '!display-none' : ''"
+            >
+              <div class="flex items-center">
+                <icon-menu size="16" class="mr-8px" />
+                <span>{{ getCheckColumnLabel(item) }}</span>
+              </div>
+              <icon-close size="16" class="color-#737478 cursor-pointer" @click="removeCheckedField(item)" />
+            </div>
+          </VueDraggable>
+        </div>
+      </div>
+    </div>
+
+    <template #footer>
+      <div style="text-align: right">
+        <a-button class="mr-8px cancel-btn" size="medium" @click="close">取消</a-button>
+        <a-button type="primary" size="medium" @click="onSubmit">确定</a-button>
+      </div>
+    </template>
+  </a-modal>
+</template>
+
+<script setup>
+import { ref, defineExpose } from 'vue';
+import { VueDraggable } from 'vue-draggable-plus';
+
+import { getCustomColumns, updateCustomColumns } from '@/api/all/common';
+import { CUSTOM_FIELDS } from '../account-table/constants';
+
+import icon1 from './img/icon-lock.png';
+
+const props = defineProps({
+  type: {
+    type: String,
+    default: '',
+    required: true,
+  },
+  dateType: {
+    type: String,
+    default: 'week',
+  },
+});
+
+const emit = defineEmits(['success']);
+
+const ENUM_STATUS = {
+  YES: 0,
+  NO: 1,
+};
+
+const visible = ref(false);
+
+const dataSource = ref([]);
+const checkColumns = ref([]); // 选中字段
+const allColumns = ref([]); // 所有字段
+const requiredGroupNames = ref([]); // 必选分组名称
+
+const open = () => {
+  initData();
+  visible.value = true;
+};
+
+const close = () => {
+  visible.value = false;
+
+  dataSource.value = [];
+  checkColumns.value = [];
+  allColumns.value = [];
+  requiredGroupNames.value = [];
+};
+
+const initData = async () => {
+  const { code, data } = await getCustomColumns({ type: props.type });
+  if (code === 200) {
+    const { selected_columns, groups } = data;
+    dataSource.value = groups;
+    formatDataSource();
+
+    setDefaultCheckColumns(groups, selected_columns);
+    allColumns.value = groups.flatMap((group) => group.columns);
+  }
+};
+
+// 过滤近7天/近30天字段
+const formatDataSource = () => {
+  const prefix = props.dateType === 'week' ? 'seven_' : 'thirty_';
+  dataSource.value.forEach((group) => {
+    group.columns = group.columns.filter((item) => {
+      if (item.value.startsWith('seven_') || item.value.startsWith('thirty_')) {
+        return item.value.startsWith(prefix);
+      }
+      return true;
+    });
+  });
+};
+
+const isCheck = (option) => {
+  return checkColumns.value.includes(option.value);
+};
+const getCheckColumnLabel = (value) => {
+  const column = allColumns.value.find((column) => column.value === value);
+  return column?.label;
+};
+const isRequiredColumn = (value) => {
+  const column = allColumns.value.find((column) => column.value === value);
+  return column?.is_require === 1;
+};
+
+const removeCheckedField = (value) => {
+  checkColumns.value = checkColumns.value.filter((column) => column !== value);
+};
+
+// 勾选/取消
+const onCheckChange = (checked, option) => {
+  if (checked) {
+    checkColumns.value.push(option.value);
+  } else {
+    checkColumns.value = checkColumns.value.filter((item) => item !== option.value);
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const result = checkColumns.value
+    .map((item) => {
+      if (item.startsWith('thirty_')) {
+        return [item, item.replace('thirty_', 'seven_')];
+      } else if (item.startsWith('seven_')) {
+        return [item, item.replace('seven_', 'thirty_')];
+      } else {
+        return item;
+      }
+    })
+    .flat();
+
+  const { code } = await updateCustomColumns({ type: props.type, selected_columns: result });
+  if (code === 200) {
+    emit('success', result);
+    close();
+  }
+};
+
+const setDefaultCheckColumns = (groups, selected_columns) => {
+  const prefix = props.dateType === 'week' ? 'seven_' : 'thirty_';
+  const requiredGroups = groups.filter((group) => group.is_require === 1);
+  const requiredValues = requiredGroups
+    .flatMap((group) => (group.columns || []).filter((col) => col.is_require === 1))
+    .map((col) => col.value);
+
+  const filteredSelected = selected_columns.filter(
+    (col) => (!col.startsWith('seven_') && !col.startsWith('thirty_')) || col.startsWith(prefix),
+  );
+
+  const merged = union(requiredValues, filteredSelected);
+
+  checkColumns.value = merged;
+  requiredGroupNames.value = requiredGroups.map((group) => group.label);
+};
+
+// 暴露方法
+defineExpose({ open });
+</script>
+
+<style lang="scss">
+@import './style.scss';
+</style>
diff --git a/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/style.scss b/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/style.scss
new file mode 100644
index 0000000..bdd491a
--- /dev/null
+++ b/src/views/property-marketing/media-account/account-dashboard/components/custom-column-modal/style.scss
@@ -0,0 +1,99 @@
+.custom-table-column-modal-98 {
+  .arco-modal-body {
+    .modal-body {
+      height: 504px;
+      border-radius: 8px;
+      border: 1px solid var(--BG-300, #e6e6e8);
+      display: flex;
+      flex-direction: row;
+      .left {
+        flex: 1;
+        padding: 20px;
+        border-right: 1px solid #eee;
+        overflow-y: auto;
+        .group-item {
+          .title-row {
+            border-radius: 4px;
+            background: var(--BG-100, #f7f8fa);
+            display: flex;
+            height: 44px;
+            padding: 0px 12px;
+            align-items: center;
+            margin-bottom: 16px;
+            .text {
+              color: var(--Text-1, #211f24);
+              font-family: 'PuHuiTi-Medium';
+              font-size: 16px;
+              font-style: normal;
+              font-weight: 400;
+              line-height: 24px; /* 150% */
+            }
+          }
+          .fields {
+            width: 100%;
+            display: grid;
+            grid-template-columns: repeat(3, 1fr);
+            gap: 16px;
+          }
+          &:not(:last-child) {
+            margin-bottom: 24px;
+          }
+        }
+      }
+      .right {
+        width: 280px;
+        padding: 16px 12px;
+        display: flex;
+        flex-direction: column;
+        .checked-title {
+          color: var(--Text-1, #211f24);
+          font-family: 'PuHuiTi-Medium';
+          font-size: 16px;
+          font-style: normal;
+          font-weight: 400;
+          line-height: 24px;
+          .count {
+            font-weight: 500;
+          }
+        }
+        .checked-list {
+          flex: 1;
+          overflow-y: auto;
+          .checked-item {
+            cursor: move;
+            border-radius: 4px;
+            background: var(--BG-100, #f7f8fa);
+            display: flex;
+            height: 32px;
+            padding: 0px 12px;
+            align-items: center;
+            .text {
+              color: var(--Text-1, #211f24);
+              font-family: 'PuHuiTi-Medium';
+              font-size: 14px;
+              font-style: normal;
+              font-weight: 400;
+              line-height: 22px; /* 157.143% */
+            }
+            &:not(:last-child) {
+              margin-bottom: 12px;
+            }
+          }
+          .draggable-list {
+            min-height: 40px;
+          }
+        }
+      }
+    }
+  }
+  .arco-modal-footer {
+    .cancel-btn {
+      border-radius: 4px;
+      border: 1px solid var(--BG-500, #b1b2b5);
+      background: var(--BG-white, #fff);
+      &:hover {
+        border: 1px solid var(--BG-500, #b1b2b5);
+      }
+    }
+  }
+}
diff --git a/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue b/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue
index 30db154..8b3317c 100644
--- a/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue
+++ b/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue
@@ -5,7 +5,7 @@
 -->
 <template>
   <div class="container">
-    <div class="filter-row flex">
+    <div class="filter-row flex mb-20px">
       <div class="filter-row-item flex items-center">
         <span class="label">账号名称</span>
         <a-space size="medium" class="w-240px">
@@ -34,7 +34,19 @@
           <OperatorSelect v-model="query.operator_id" :options="operators" @change="handleSearch" />
         </a-space>
       </div>
-
+    </div>
+    <div class="filter-row flex">
+      <div class="filter-row-item flex items-center">
+        <span class="label">时间筛选</span>
+        <a-space class="w-240px">
+          <a-select v-model="query.type" size="medium" placeholder="全部" class="w-120px" @change="handleSearch">
+            <template #arrow-icon> <icon-calendar size="16" /> </template>
+            <a-option :value="7" label="近7天">近7天</a-option>
+            <!-- <a-option :value="14" label="近14天">近14天</a-option> -->
+            <a-option :value="30" label="近30天">近30天</a-option>
+          </a-select>
+        </a-space>
+      </div>
       <a-button class="w-84px search-btn mr-12px" size="medium" @click="handleSearch">
         <template #icon>
           <icon-search />
diff --git a/src/views/property-marketing/media-account/account-dashboard/constants.ts b/src/views/property-marketing/media-account/account-dashboard/constants.ts
index e9a8fd6..d1f9c46 100644
--- a/src/views/property-marketing/media-account/account-dashboard/constants.ts
+++ b/src/views/property-marketing/media-account/account-dashboard/constants.ts
@@ -1,8 +1,7 @@
 /*
  * @Author: RenXiaoDong
- * @Date: 2025-06-27 17:23:56
+ * @Date: 2025-07-04 15:50:37
  */
-
 import icon1 from '@/assets/img/media-account/icon1.png';
 import icon2 from '@/assets/img/media-account/icon2.png';
 import icon3 from '@/assets/img/media-account/icon3.png';
@@ -39,7 +38,7 @@ export const INITIAL_QUERY = {
   status: '',
   operator_id: '',
   group_ids: [],
-  // date_range: '',
+  type: 7,
   column: '',
   order: '',
 };
diff --git a/src/views/property-marketing/media-account/account-dashboard/index.vue b/src/views/property-marketing/media-account/account-dashboard/index.vue
index 98edfcc..9c07674 100644
--- a/src/views/property-marketing/media-account/account-dashboard/index.vue
+++ b/src/views/property-marketing/media-account/account-dashboard/index.vue
@@ -36,6 +36,7 @@
       <AccountTable
         ref="accountTableRef"
         :dataSource="dataSource"
+        :query="query"
         @selectionChange="handleSelectionChange"
         @export="handleExport"
         @sorterChange="handleSorterChange"
diff --git a/src/views/property-marketing/put-account/account-data/components/board-table/index.vue b/src/views/property-marketing/put-account/account-data/components/board-table/index.vue
index 7530418..d7a0178 100644
--- a/src/views/property-marketing/put-account/account-data/components/board-table/index.vue
+++ b/src/views/property-marketing/put-account/account-data/components/board-table/index.vue
@@ -33,7 +33,11 @@
     ref="tableRef"
     :data="dataSource"
     row-key="id"
-    :row-selection="rowSelection"
+    :row-selection="{
+      type: 'checkbox',
+      showCheckedAll: true,
+      width: 48,
+    }"
     :selected-keys="selectedItems"
     :pagination="false"
     :scroll="{ x: '100%' }"
@@ -173,11 +177,6 @@ const indeterminate = computed(
   () => selectedItems.value.length > 0 && selectedItems.value.length < props.dataSource.length,
 );
 
-const rowSelection = computed(() => ({
-  type: 'checkbox',
-  showCheckedAll: true,
-}));
-
 const handleSelectAll = (checked) => {
   if (checked) {
     selectedItems.value = props.dataSource.map((item) => item.id);
diff --git a/src/views/property-marketing/put-account/account-data/components/plan-table/index.vue b/src/views/property-marketing/put-account/account-data/components/plan-table/index.vue
index adf0168..bc2ac0c 100644
--- a/src/views/property-marketing/put-account/account-data/components/plan-table/index.vue
+++ b/src/views/property-marketing/put-account/account-data/components/plan-table/index.vue
@@ -33,7 +33,11 @@
     ref="tableRef"
     :data="dataSource"
     row-key="id"
-    :row-selection="rowSelection"
+    :row-selection="{
+      type: 'checkbox',
+      showCheckedAll: true,
+      width: 48,
+    }"
     :selected-keys="selectedItems"
     :pagination="false"
     :scroll="{ x: '100%' }"
@@ -173,11 +177,6 @@ const indeterminate = computed(
   () => selectedItems.value.length > 0 && selectedItems.value.length < props.dataSource.length,
 );
 
-const rowSelection = computed(() => ({
-  type: 'checkbox',
-  showCheckedAll: true,
-}));
-
 const handleSelectAll = (checked) => {
   if (checked) {
     selectedItems.value = props.dataSource.map((item) => item.id);