From b3d1a4789d95f569c46e37cfd3a7a5b95166dfcf Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Fri, 12 Sep 2025 17:46:01 +0800
Subject: [PATCH 01/39] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common-select/index.vue        |  48 +++++--
 src/components/filter-popup/index.vue         |  90 +++++++++++++
 .../components/colorTip.vue                   |  38 ++++++
 .../components/filter-popup.vue               | 119 ++++++++++++++++++
 .../assignment-management/index.vue           | 102 +++------------
 yarn.lock                                     |   5 +
 6 files changed, 312 insertions(+), 90 deletions(-)
 create mode 100644 src/components/filter-popup/index.vue
 create mode 100644 src/views/property-marketing/assignment-management/components/colorTip.vue
 create mode 100644 src/views/property-marketing/assignment-management/components/filter-popup.vue

diff --git a/src/components/common-select/index.vue b/src/components/common-select/index.vue
index c2f7569..7b4fcfe 100644
--- a/src/components/common-select/index.vue
+++ b/src/components/common-select/index.vue
@@ -14,19 +14,30 @@
     :maxTagCount="maxTagCount"
     @change="handleChange"
   >
-    <Option v-for="(item, index) in options" :key="index" :value="item.id" :label="item.name">
+    <Option v-for="(item, index) in validOptions" :key="index" :value="item.value" :label="item.label">
       <div class="flex items-center">
-        <img v-if="item.icon" :src="item.icon" class="w-16px h-16px mr-8px rounded-4px" />
-        {{ item.name }}
+        <img v-if="item.icon" :src="item.icon" class="w-16px h-16px mr-4px rounded-4px" />
+        <span>{{ item.label }}</span>
       </div>
     </Option>
+    <template #tag="{ label, icon }">
+      <div class="flex items-center">
+        <img v-if="icon" :src="icon" class="w-16px h-16px mr-4px rounded-4px" />
+        <span>{{ label }}</span>
+      </div>
+    </template>
+    <template v-if="!allowSearch" #empty>
+      <div v-if="validOptions.length === 0" class="empty-placeholder">
+        {{ placeholder || '暂无数据' }}
+      </div>
+    </template>
   </Select>
 </template>
 
 <script setup>
 import { Select } from 'ant-design-vue';
 const { Option } = Select;
-import { ref, watch } from 'vue';
+import { ref, watch, computed } from 'vue';
 
 const props = defineProps({
   modelValue: {
@@ -48,7 +59,7 @@ const props = defineProps({
   maxTagCount: {
     type: Number,
     default: 3,
-  },  
+  },
   allClear: {
     type: Boolean,
     default: true,
@@ -56,13 +67,28 @@ const props = defineProps({
   allowSearch: {
     type: Boolean,
     default: false,
-  }
+  },
 });
 
 const emits = defineEmits(['update:modelValue', 'change']);
 
 const selectedValues = ref(props.multiple ? [] : '');
 
+// 计算有效选项，兼容不同的数据格式
+const validOptions = computed(() => {
+  if (!props.options || !Array.isArray(props.options)) {
+    return [];
+  }
+  
+  return props.options
+    .filter(item => item && (item.id !== undefined || item.value !== undefined) && (item.name !== undefined || item.label !== undefined))
+    .map(item => ({
+      ...item,
+      value: item.id !== undefined ? item.id : item.value,
+      label: item.name !== undefined ? item.name : item.label
+    }));
+});
+
 watch(
   () => props.modelValue,
   (newVal) => {
@@ -79,4 +105,12 @@ const handleChange = (value) => {
   selectedValues.value = value;
   emits('change', value);
 };
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.empty-placeholder {
+  padding: 8px 12px;
+  color: #8f959e;
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/filter-popup/index.vue b/src/components/filter-popup/index.vue
new file mode 100644
index 0000000..ad0f85d
--- /dev/null
+++ b/src/components/filter-popup/index.vue
@@ -0,0 +1,90 @@
+<!-- // 新增内容： -->
+<template>
+  <a-trigger trigger="click" :style="triggerStyle">
+    <a-button size="small">
+      <template #icon>
+        <icon-filter size="16" class="color-#55585F" />
+      </template>
+      <template #default>筛选</template>
+    </a-button>
+    <template #content>
+      <div>
+        <!-- 运营人员 -->
+        <div class="flex items-center mb-24px">
+          <div class="w-70px">运营人员</div>
+          <a-space class="w-200px">
+            <CommonSelect
+              placeholder="请选择运营人员"
+              :options="operators"
+              v-model="localQuery.operator"
+              @change="(val) => handleChange('operator_id', val)"
+              class="!w-200px"
+            />
+          </a-space>
+        </div>
+        <!-- 发布平台 -->
+        <div class="flex items-center mb-24px">
+          <div class="w-70px">发布平台</div>
+          <a-space class="w-200px">
+            <CommonSelect
+              :options="platformOptions"
+              v-model="localQuery.platform"
+              @change="(val) => handleChange('platform', val)"
+              class="!w-200px"
+              placeholder="请选择发布平台"
+            />
+          </a-space>
+        </div>
+        <!-- 账号名称 -->
+        <div class="flex items-center">
+          <div class="w-80px">账号名称</div>
+          <a-space class="w-200px">
+            <CommonSelect
+              v-model="localQuery.accounts"
+              :options="accountList"
+              :multiple="true"
+              @change="(val) => handleChange('account_id', val)"
+              class="!w-200px"
+              placeholder="请选择账号名称"
+            />
+          </a-space>
+        </div>
+      </div>
+    </template>
+  </a-trigger>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue';
+
+const props = defineProps({
+  operators: Array,
+  platformOptions: Array,
+  accountList: Array,
+  query: Object,
+});
+
+const emit = defineEmits(['update:query']);
+
+// 初始化本地查询对象
+const localQuery = ref({ ...props.query });
+
+// 监听外部 query 变化并同步到本地状态
+watch(
+  () => props.query,
+  (newQuery) => {
+    localQuery.value = { ...newQuery };
+  },
+  { deep: true },
+);
+
+// 处理筛选变化
+const handleChange = (field, value) => {
+  localQuery.value[field] = value;
+  emit('update:query', { ...localQuery.value });
+};
+</script>
+
+<style scoped>
+/* 样式保持不变 */
+</style>
diff --git a/src/views/property-marketing/assignment-management/components/colorTip.vue b/src/views/property-marketing/assignment-management/components/colorTip.vue
new file mode 100644
index 0000000..0449ae9
--- /dev/null
+++ b/src/views/property-marketing/assignment-management/components/colorTip.vue
@@ -0,0 +1,38 @@
+<template>
+  <a-trigger
+    trigger="click"
+    style="
+      background-color: #ffffff;
+      border: 1px solid #d9d9d9;
+      border-radius: 4px;
+      box-shadow: #00000010 0px 2px 8px;
+      padding: 8px;
+      margin-top: 8px;
+    "
+  >
+    <a-button size="small" class="mr-12px color-scheme-btn" :bordered="false">
+      <template #icon>
+        <icon-info-circle-fill size="16" class="color-#55585F" />
+      </template>
+      <template #default>颜色示意</template>
+    </a-button>
+    <template #content>
+      <div class="flex items-center mt-8px w-104px mr-8px">
+        <div style="background-color: #ffae00; width: 16px; height: 16px; margin-right: 5px; border-radius: 4px"></div>
+        <div>待生成</div>
+      </div>
+      <div class="flex items-center mt-8px w-104px mr-8px">
+        <div style="background-color: #6d4cfe; width: 16px; height: 16px; margin-right: 5px; border-radius: 4px"></div>
+        <div>待发布</div>
+      </div>
+      <div class="flex items-center mt-8px w-104px mr-8px">
+        <div style="background-color: #939499; width: 16px; height: 16px; margin-right: 5px; border-radius: 4px"></div>
+        <div>已发布</div>
+      </div>
+      <div class="flex items-center mt-8px mb-4px w-104px mr-8px">
+        <div style="background-color: #f64b31; width: 16px; height: 16px; margin-right: 5px; border-radius: 4px"></div>
+        <div>发布失败</div>
+      </div>
+    </template>
+  </a-trigger>
+</template>
diff --git a/src/views/property-marketing/assignment-management/components/filter-popup.vue b/src/views/property-marketing/assignment-management/components/filter-popup.vue
new file mode 100644
index 0000000..b47133e
--- /dev/null
+++ b/src/views/property-marketing/assignment-management/components/filter-popup.vue
@@ -0,0 +1,119 @@
+<!-- // 新增内容： -->
+<template>
+  <a-trigger trigger="click" :clickOutsideToClose="true" :clickToClose="false">
+    <a-button size="small">
+      <template #icon>
+        <icon-filter size="16" class="color-#55585F" />
+      </template>
+      <template #default>筛选</template>
+    </a-button>
+    <template #content>
+      <div class="filter-popup-content">
+        <!-- 运营人员 -->
+        <div class="flex items-center mb-24px">
+          <div class="w-70px">运营人员</div>
+          <a-space class="w-240px">
+            <CommonSelect
+              placeholder="请选择运营人员"
+              :options="operators || []"
+              v-model="localQuery.operator"
+              @change="(val) => handleChange('operator_id', val)"
+              class="!w-240px"
+              :allowSearch="true"
+              popup-container=".filter-popup-content"
+            />
+          </a-space>
+        </div>
+        <!-- 发布平台 -->
+        <div class="flex items-center mb-24px">
+          <div class="w-70px">发布平台</div>
+          <a-space class="w-240px">
+            <CommonSelect
+              :options="platformOptions || []"
+              v-model="localQuery.platform"
+              @change="(val) => handleChange('platform', val)"
+              class="!w-240px"
+              placeholder="请选择发布平台"
+              :allowSearch="true"
+              popup-container=".filter-popup-content"
+            />
+          </a-space>
+        </div>
+        <!-- 账号名称 -->
+        <div class="flex items-center">
+          <div class="w-70px">账号名称</div>
+          <a-space class="w-240px">
+            <CommonSelect
+              v-model="localQuery.accounts"
+              :options="accountList || []"
+              :multiple="true"
+              @change="(val) => handleChange('account_id', val)"
+              class="!w-240px"
+              placeholder="请选择账号名称"
+              :allowSearch="true"
+              popup-container=".filter-popup-content"
+            />
+          </a-space>
+        </div>
+      </div>
+    </template>
+  </a-trigger>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue';
+
+const props = defineProps({
+  operators: Array,
+  platformOptions: Array,
+  accountList: Array,
+  query: Object,
+});
+
+onMounted(() => {});
+const emit = defineEmits(['update:query']);
+
+// 初始化本地查询对象，只设置非空值
+const localQuery = ref({});
+
+// 监听外部 query 变化并同步到本地状态
+watch(
+  () => props.query,
+  (newQuery) => {
+    if (newQuery) {
+      // 只有当值不为空时才设置到localQuery中
+      const filteredQuery = {};
+      if (newQuery.operator) {
+        filteredQuery.operator = newQuery.operator;
+      }
+      if (newQuery.platform) {
+        filteredQuery.platform = newQuery.platform;
+      }
+      if (newQuery.accounts && newQuery.accounts.length > 0) {
+        filteredQuery.accounts = newQuery.accounts;
+      }
+      localQuery.value = { ...filteredQuery };
+    }
+  },
+  { deep: true, immediate: true },
+);
+
+// 处理筛选变化
+const handleChange = (field, value) => {
+  localQuery.value[field] = value;
+  emit('update:query', { ...localQuery.value });
+};
+</script>
+
+<style scoped>
+.filter-popup-content {
+  background-color: #ffffff;
+  border: 1px solid #d9d9d9;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  overflow-y: auto;
+  padding: 24px;
+  margin-top: 8px;
+  margin-right: 25px;
+}
+</style>
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 5746a4b..82f4a35 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -53,7 +53,7 @@
         </div>
       </div>
       <div class="flex items-start">
-        <a-trigger
+        <!-- <a-trigger
           trigger="click"
           style="
             background-color: #ffffff;
@@ -86,82 +86,14 @@
               <div>内容稿件</div>
             </div>
           </template>
-        </a-trigger>
-
-        <a-trigger
-          trigger="click"
-          style="
-            background-color: #ffffff;
-            border: 1px solid #d9d9d9;
-            border-radius: 4px;
-            box-shadow: #00000010 0px 2px 8px;
-            width: 308px;
-            max-height: 400px;
-            overflow-y: auto;
-            padding: 24px;
-            margin-top: 8px;
-          "
-        >
-          <a-button size="small">
-            <template #icon>
-              <icon-filter size="16" class="color-#55585F" />
-            </template>
-            <template #default>筛选</template>
-          </a-button>
-          <template #content>
-            <div>
-              <div class="flex items-center mb-24px">
-                <div class="w-70px">运营人员</div>
-                <a-space class="w-200px">
-                  <CommonSelect
-                    placeholder="请选择运营人员"
-                    :options="operators"
-                    v-model="query.operator"
-                    @change="
-                      (val) => {
-                        handleFilterChange('operator_id', val, operators);
-                      }
-                    "
-                    class="!w-200px"
-                  />
-                </a-space>
-              </div>
-              <div class="flex items-center mb-24px">
-                <div class="w-70px">发布平台</div>
-                <a-space class="w-200px">
-                  <CommonSelect
-                    :options="platformOptions"
-                    v-model="query.platform"
-                    @change="
-                      (val) => {
-                        handleFilterChange('platform', val, platformOptions);
-                      }
-                    "
-                    class="!w-200px"
-                    placeholder="请选择发布平台"
-                  />
-                </a-space>
-              </div>
-              <div class="flex items-center">
-                <div class="w-80px">账号名称</div>
-                <a-space class="w-200px">
-                  <CommonSelect
-                    v-model="query.accounts"
-                    :options="accountList"
-                    :multiple="true"
-                    @change="
-                      (val) => {
-                        handleFilterChange('account_id', val, accountList);
-                      }
-                    "
-                    class="!w-200px"
-                    placeholder="请选择账号名称"
-                  />
-                </a-space>
-              </div>
-            </div>
-          </template>
-        </a-trigger>
+        </a-trigger> -->
+        <colorTip />
+        <FilterPopup
+          :operators="operators"
+          :platformOptions="platformOptions"
+          :accountList="accountList"
+          :query="query"
+        />
       </div>
     </div>
     <div class="flex justify-between items-start mt-16px" style="width: 100%">
@@ -345,6 +277,8 @@ import TaskDetail from './components/TaskDetail.vue';
 import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
 import emptyIcon from '@/assets/img/media-account/icon-empty.png';
 import router from '@/router';
+import colorTip from './components/colorTip.vue';
+import FilterPopup from './components/filter-popup.vue';
 
 const {
   dataSource,
@@ -359,13 +293,13 @@ const {
   DEFAULT_PAGE_INFO,
 } = useTableSelectionWithPagination({
   onPageChange: () => {
-    query.page = pageInfo.page;
-    query.page_size = pageInfo.page_size;
+    query.page = pageInfo.value.page;
+    query.page_size = pageInfo.value.page_size;
     handleSearch();
   },
   onPageSizeChange: () => {
-    query.page = pageInfo.page;
-    query.page_size = pageInfo.page_size;
+    query.page = pageInfo.value.page;
+    query.page_size = pageInfo.value.page_size;
     handleSearch();
   },
 });
@@ -867,8 +801,8 @@ const handleFilterChange = (field: string, value: any, options?: any[]) => {
 // 获取数据
 const handleSearch = () => {
   console.log('handleSearch查询参数:', query);
-  query.page = pageInfo.page;
-  query.page_size = pageInfo.page_size;
+  query.page = pageInfo.value.page;
+  query.page_size = pageInfo.value.page_size;
   getTaskSchedules(query)
     .then((response) => {
       if (response.data) {
@@ -892,6 +826,7 @@ const getOperators = async () => {
         value: op.id,
         name: op.name,
       }));
+      console.log('获取运营人员数据成功:', operatorsData, operators.value);
     }
   } catch (error) {
     console.error('获取运营人员数据失败:', error);
@@ -919,6 +854,7 @@ const getAccountList = async () => {
         platform: account.platform,
         icon: getPlatformIcon(account.platform),
       }));
+      console.log('获取账号数据成功:', accountData, accountList.value);
     }
   } catch (error) {}
 };
diff --git a/yarn.lock b/yarn.lock
index 1f3617c..aec5f68 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8936,6 +8936,11 @@ vue-eslint-parser@^9.0.0, vue-eslint-parser@^9.0.1, vue-eslint-parser@^9.1.0, vu
     lodash "^4.17.21"
     semver "^7.3.6"
 
+vue-lazyload@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/vue-lazyload/-/vue-lazyload-3.0.0.tgz"
+  integrity sha512-h2keL/Rj550dLgesgOtXJS9qOiSMmuJNeVlfNAYV1/IYwOQYaWk5mFJlwRxmZDK9YC5gECcFLYYj7z1lKSf9ug==
+
 vue-router@^4.4.0:
   version "4.5.1"
   resolved "https://registry.npmmirror.com/vue-router/-/vue-router-4.5.1.tgz"

From 2b98615d2aa76389692bda41d522600288ef66b2 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Fri, 12 Sep 2025 17:48:46 +0800
Subject: [PATCH 02/39] =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common-select/index.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/components/common-select/index.vue b/src/components/common-select/index.vue
index 7b4fcfe..3dcbc99 100644
--- a/src/components/common-select/index.vue
+++ b/src/components/common-select/index.vue
@@ -13,6 +13,7 @@
     showArrow
     :maxTagCount="maxTagCount"
     @change="handleChange"
+    :filterOption="allowSearch ? filterOption : undefined"
   >
     <Option v-for="(item, index) in validOptions" :key="index" :value="item.value" :label="item.label">
       <div class="flex items-center">
@@ -105,6 +106,17 @@ const handleChange = (value) => {
   selectedValues.value = value;
   emits('change', value);
 };
+
+// 搜索过滤函数
+const filterOption = (input, option) => {
+  // 确保 input 和 option.label 都存在且为字符串
+  if (!input || !option || !option.label) {
+    return false;
+  }
+  
+  // 不区分大小写的模糊搜索
+  return option.label.toString().toLowerCase().includes(input.toLowerCase());
+};
 </script>
 
 <style scoped>

From 9fce76d952d993854c9a91fee541ff08034fd7d5 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Mon, 15 Sep 2025 14:19:43 +0800
Subject: [PATCH 03/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9ui=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 -
 src/components/filter-popup/index.vue         |  63 +++++++---
 src/main.ts                                   |   2 +-
 .../components/colorTip.vue                   |  47 +++++---
 .../components/filter-popup.vue               |  30 ++---
 .../assignment-management/index.vue           | 111 ++++--------------
 6 files changed, 114 insertions(+), 140 deletions(-)

diff --git a/package.json b/package.json
index 651b256..cadf53e 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@arco-design/web-vue": "^2.42.0",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@types/nprogress": "^0.2.0",
     "@vueuse/core": "^9.12.0",
diff --git a/src/components/filter-popup/index.vue b/src/components/filter-popup/index.vue
index ad0f85d..435a0f9 100644
--- a/src/components/filter-popup/index.vue
+++ b/src/components/filter-popup/index.vue
@@ -1,16 +1,10 @@
 <!-- // 新增内容： -->
 <template>
-  <a-trigger trigger="click" :style="triggerStyle">
-    <a-button size="small">
-      <template #icon>
-        <icon-filter size="16" class="color-#55585F" />
-      </template>
-      <template #default>筛选</template>
-    </a-button>
+  <a-popover trigger="click" :overlayStyle="{ width: '300px' }" overlayClassName="filter-popup-popover">
     <template #content>
       <div>
         <!-- 运营人员 -->
-        <div class="flex items-center mb-24px">
+        <div class="flex items-center mb-6">
           <div class="w-70px">运营人员</div>
           <a-space class="w-200px">
             <CommonSelect
@@ -19,11 +13,12 @@
               v-model="localQuery.operator"
               @change="(val) => handleChange('operator_id', val)"
               class="!w-200px"
+              :allowSearch="true"
             />
           </a-space>
         </div>
         <!-- 发布平台 -->
-        <div class="flex items-center mb-24px">
+        <div class="flex items-center mb-6">
           <div class="w-70px">发布平台</div>
           <a-space class="w-200px">
             <CommonSelect
@@ -32,12 +27,13 @@
               @change="(val) => handleChange('platform', val)"
               class="!w-200px"
               placeholder="请选择发布平台"
+              :allowSearch="true"
             />
           </a-space>
         </div>
         <!-- 账号名称 -->
         <div class="flex items-center">
-          <div class="w-80px">账号名称</div>
+          <div class="w-70px">账号名称</div>
           <a-space class="w-200px">
             <CommonSelect
               v-model="localQuery.accounts"
@@ -46,45 +42,74 @@
               @change="(val) => handleChange('account_id', val)"
               class="!w-200px"
               placeholder="请选择账号名称"
+              :allowSearch="true"
             />
           </a-space>
         </div>
       </div>
     </template>
-  </a-trigger>
+    <a-button size="small">
+      <template #icon>
+        <FilterOutlined class="color-#55585F" />
+      </template>
+      <template #default>筛选</template>
+    </a-button>
+  </a-popover>
 </template>
 
 <script setup>
 import { ref, watch } from 'vue';
+import { FilterOutlined } from '@ant-design/icons-vue';
 
 const props = defineProps({
   operators: Array,
   platformOptions: Array,
   accountList: Array,
   query: Object,
+  triggerStyle: Object,
 });
 
-const emit = defineEmits(['update:query']);
+const emit = defineEmits(['filter-change']);
 
-// 初始化本地查询对象
-const localQuery = ref({ ...props.query });
+// 初始化本地查询对象，只设置非空值
+const localQuery = ref({});
 
 // 监听外部 query 变化并同步到本地状态
 watch(
   () => props.query,
   (newQuery) => {
-    localQuery.value = { ...newQuery };
+    if (newQuery) {
+      // 只有当值不为空时才设置到localQuery中
+      const filteredQuery = {};
+      if (newQuery.operator) {
+        filteredQuery.operator = newQuery.operator;
+      }
+      if (newQuery.platform) {
+        filteredQuery.platform = newQuery.platform;
+      }
+      if (newQuery.accounts && newQuery.accounts.length > 0) {
+        filteredQuery.accounts = newQuery.accounts;
+      }
+      localQuery.value = { ...filteredQuery };
+    }
   },
-  { deep: true },
+  { deep: true, immediate: true },
 );
 
 // 处理筛选变化
 const handleChange = (field, value) => {
   localQuery.value[field] = value;
-  emit('update:query', { ...localQuery.value });
+  console.log(localQuery.value);
+  emit('filter-change', { ...localQuery.value });
 };
 </script>
 
 <style scoped>
-/* 样式保持不变 */
-</style>
+.filter-popup-popover :deep(.ant-popover-inner-content) {
+  background-color: #ffffff;
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+  padding: 16px;
+}
+</style>
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index bf34b07..150a597 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,7 +13,7 @@ import SvgIcon from '@/components/svg-icon/index.vue';
 
 import '@/api/index';
 import './core';
-import '@arco-design/web-vue/dist/arco.css'; // 已移除 Arco 样式
+// import '@arco-design/web-vue/dist/arco.css'; // 已移除 Arco 样式
 
 import 'normalize.css';
 import 'uno.css';
diff --git a/src/views/property-marketing/assignment-management/components/colorTip.vue b/src/views/property-marketing/assignment-management/components/colorTip.vue
index 0449ae9..2dcd28b 100644
--- a/src/views/property-marketing/assignment-management/components/colorTip.vue
+++ b/src/views/property-marketing/assignment-management/components/colorTip.vue
@@ -1,21 +1,5 @@
 <template>
-  <a-trigger
-    trigger="click"
-    style="
-      background-color: #ffffff;
-      border: 1px solid #d9d9d9;
-      border-radius: 4px;
-      box-shadow: #00000010 0px 2px 8px;
-      padding: 8px;
-      margin-top: 8px;
-    "
-  >
-    <a-button size="small" class="mr-12px color-scheme-btn" :bordered="false">
-      <template #icon>
-        <icon-info-circle-fill size="16" class="color-#55585F" />
-      </template>
-      <template #default>颜色示意</template>
-    </a-button>
+  <a-popover trigger="click" overlayClassName="color-tip-popover">
     <template #content>
       <div class="flex items-center mt-8px w-104px mr-8px">
         <div style="background-color: #ffae00; width: 16px; height: 16px; margin-right: 5px; border-radius: 4px"></div>
@@ -29,10 +13,35 @@
         <div style="background-color: #939499; width: 16px; height: 16px; margin-right: 5px; border-radius: 4px"></div>
         <div>已发布</div>
       </div>
-      <div class="flex items-center mt-8px mb-4px w-104px mr-8px">
+      <div class="flex items-center mt-8px w-104px mr-8px">
         <div style="background-color: #f64b31; width: 16px; height: 16px; margin-right: 5px; border-radius: 4px"></div>
         <div>发布失败</div>
       </div>
     </template>
-  </a-trigger>
+    <a-button size="small" class="mr-3 color-scheme-btn">
+      <template #icon>
+        <InfoCircleOutlined class="color-#55585F" />
+      </template>
+      <template #default>颜色示意</template>
+    </a-button>
+  </a-popover>
 </template>
+
+<script setup>
+import { InfoCircleOutlined } from '@ant-design/icons-vue';
+</script>
+
+<style scoped>
+.color-tip-popover :deep(.ant-popover-inner-content) {
+  background-color: #ffffff;
+  border: 1px solid #d9d9d9;
+  border-radius: 4px;
+  box-shadow: #00000010 0px 2px 8px;
+  padding: 8px;
+  margin-top: 8px;
+}
+
+.color-tip-popover :deep(.ant-popover-arrow) {
+  display: none;
+}
+</style>
diff --git a/src/views/property-marketing/assignment-management/components/filter-popup.vue b/src/views/property-marketing/assignment-management/components/filter-popup.vue
index b47133e..fab82f6 100644
--- a/src/views/property-marketing/assignment-management/components/filter-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/filter-popup.vue
@@ -1,16 +1,10 @@
 <!-- // 新增内容： -->
 <template>
-  <a-trigger trigger="click" :clickOutsideToClose="true" :clickToClose="false">
-    <a-button size="small">
-      <template #icon>
-        <icon-filter size="16" class="color-#55585F" />
-      </template>
-      <template #default>筛选</template>
-    </a-button>
+  <a-popover trigger="click" :overlayStyle="{ width: '360px' }" overlayClassName="filter-popup-popover">
     <template #content>
       <div class="filter-popup-content">
         <!-- 运营人员 -->
-        <div class="flex items-center mb-24px">
+        <div class="flex items-center mb-6">
           <div class="w-70px">运营人员</div>
           <a-space class="w-240px">
             <CommonSelect
@@ -25,7 +19,7 @@
           </a-space>
         </div>
         <!-- 发布平台 -->
-        <div class="flex items-center mb-24px">
+        <div class="flex items-center mb-6">
           <div class="w-70px">发布平台</div>
           <a-space class="w-240px">
             <CommonSelect
@@ -57,11 +51,18 @@
         </div>
       </div>
     </template>
-  </a-trigger>
+    <a-button size="small">
+      <template #icon>
+        <FilterOutlined class="color-#55585F" />
+      </template>
+      <template #default>筛选</template>
+    </a-button>
+  </a-popover>
 </template>
 
 <script setup>
 import { ref, watch } from 'vue';
+import { FilterOutlined } from '@ant-design/icons-vue';
 
 const props = defineProps({
   operators: Array,
@@ -71,7 +72,7 @@ const props = defineProps({
 });
 
 onMounted(() => {});
-const emit = defineEmits(['update:query']);
+const emit = defineEmits(['filter-change']);
 
 // 初始化本地查询对象，只设置非空值
 const localQuery = ref({});
@@ -101,12 +102,13 @@ watch(
 // 处理筛选变化
 const handleChange = (field, value) => {
   localQuery.value[field] = value;
-  emit('update:query', { ...localQuery.value });
+  console.log(localQuery.value);
+  emit('filter-change', { ...localQuery.value });
 };
 </script>
 
 <style scoped>
-.filter-popup-content {
+.filter-popup-popover :deep(.ant-popover-inner-content) {
   background-color: #ffffff;
   border: 1px solid #d9d9d9;
   border-radius: 4px;
@@ -114,6 +116,6 @@ const handleChange = (field, value) => {
   overflow-y: auto;
   padding: 24px;
   margin-top: 8px;
-  margin-right: 25px;
+  margin-right: 50px;
 }
 </style>
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 82f4a35..5e5de87 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -53,46 +53,13 @@
         </div>
       </div>
       <div class="flex items-start">
-        <!-- <a-trigger
-          trigger="click"
-          style="
-            background-color: #ffffff;
-            border: 1px solid #d9d9d9;
-            border-radius: 4px;
-            box-shadow: #00000010 0px 2px 8px;
-            width: 120px;
-            height: 64px;
-            padding: 8px;
-            margin-top: 8px;
-          "
-        >
-          <a-button size="small" class="mr-12px color-scheme-btn" :bordered="false">
-            <template #icon>
-              <icon-info-circle-fill size="16" class="color-#55585F" />
-            </template>
-            <template #default>颜色示意</template>
-          </a-button>
-          <template #content>
-            <div class="flex items-center mb-8px">
-              <div
-                style="background-color: #6d4cfe; width: 16px; height: 16px; margin-right: 5px; border-radius: 4px"
-              ></div>
-              <div>选题</div>
-            </div>
-            <div class="flex items-center">
-              <div
-                style="background-color: #ffae00; width: 16px; height: 16px; margin-right: 5px; border-radius: 4px"
-              ></div>
-              <div>内容稿件</div>
-            </div>
-          </template>
-        </a-trigger> -->
         <colorTip />
         <FilterPopup
           :operators="operators"
           :platformOptions="platformOptions"
           :accountList="accountList"
           :query="query"
+          @filter-change="handleFilterChange"
         />
       </div>
     </div>
@@ -261,7 +228,7 @@
 
 <script lang="ts" setup>
 import { ref, reactive, onMounted, watch, computed, nextTick } from 'vue';
-import type { TableColumnData } from '@arco-design/web-vue';
+import type { ColumnProps } from 'ant-design-vue/es/table';
 import { getTaskSchedules, delTaskSchedules, editTaskSchedules } from '@/api/all/assignment-management';
 import { fetchAccountOperators, getMediaAccountList } from '@/api/all/propertyMarketing';
 import icon1 from '@/assets/img/platform/icon-dy.png';
@@ -351,7 +318,7 @@ const currentDateRange = reactive({
   start: '',
   end: '',
 });
-const columns = ref<TableColumnData[]>([]);
+const columns = ref<ColumnProps[]>([]);
 const data = ref<any[]>([]);
 const operators = ref([]);
 const accountList = ref([]);
@@ -744,57 +711,29 @@ const handleToday = () => {
   }
 };
 // 处理筛选项选择事件
-const handleFilterChange = (field: string, value: any, options?: any[]) => {
-  console.log(`筛选项 ${field} 发生变化:`, value);
-  // 根据不同的筛选字段执行不同的操作
-  switch (field) {
-    case 'operator_id':
-      console.log('运营人员选择:', value, typeof value, Array.isArray(value), options);
-      // 查找选中的运营人员完整信息
-      if (options && value) {
-        if (Array.isArray(value)) {
-          // 多选情况
-          const selectedOperators = options.filter((op) => value.includes(op.name)).map((op) => op.value);
-          query.operator_ids = selectedOperators;
-        }
-      } else {
-        query.operator_ids = [];
+const handleFilterChange = (field: object) => {
+  console.log(`筛选项发生变化:`, field);
+  // // 根据不同的筛选字段执行不同的操作
+  if (typeof field === 'object' && field !== null) {
+    // 处理传入整个对象的情况
+    Object.keys(field).forEach((key) => {
+      const value = field[key];
+      switch (key) {
+        case 'operator':
+          query.operator_ids = value;
+          break;
+        case 'platform':
+          query.platforms = value;
+          break;
+        case 'accounts':
+          query.ids = value;
+          break;
+        default:
+          // 其他字段直接赋值
+          query[key] = value;
       }
-      console.log('选中的运营人员完整信息(多选):', query.operator_ids);
-      handleSearch();
-      break;
-    case 'account_id':
-      // 查找选中的账号完整信息
-      if (options && value !== undefined && value !== '') {
-        if (Array.isArray(value)) {
-          console.log(options, value);
-          // 多选情况
-          const selectedAccounts = options.filter((op: any) => value.includes(op.name));
-          query.ids = selectedAccounts.map((account: any) => account.value);
-        }
-      } else {
-        query.ids = [];
-      }
-      console.log('选中的账号完整信息(单选):', query.ids);
-      handleSearch();
-      break;
-    case 'platform':
-      // 查找选中的平台完整信息
-      if (options && value !== undefined && value !== '') {
-        console.log(options, value);
-        if (Array.isArray(value)) {
-          // 多选情况
-          const selectedPlatforms = options.filter((op: any) => value.includes(op.id));
-          query.platforms = selectedPlatforms.map((account: any) => account.id);
-        }
-      } else {
-        query.platforms = [];
-      }
-      console.log('发布平台选择:', query.platforms);
-      handleSearch();
-      break;
-    default:
-      console.log('未知筛选字段:', field, value);
+    });
+    handleSearch();
   }
 };
 

From f01fb13af52b6e742a19732cd793565b470e86c8 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Mon, 15 Sep 2025 19:40:07 +0800
Subject: [PATCH 04/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/components/common-select/index.vue        |   4 +-
 .../components/TaskDetail.vue                 | 105 --
 .../components/colorTip.vue                   |   5 +-
 .../components/date-selector.vue              | 259 +++++
 .../components/filter-popup.vue               | 218 ++--
 .../assignment-management/index.vue           | 999 ++++++------------
 7 files changed, 753 insertions(+), 838 deletions(-)
 delete mode 100644 src/views/property-marketing/assignment-management/components/TaskDetail.vue
 create mode 100644 src/views/property-marketing/assignment-management/components/date-selector.vue

diff --git a/package.json b/package.json
index cadf53e..651b256 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@arco-design/web-vue": "^2.42.0",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@types/nprogress": "^0.2.0",
     "@vueuse/core": "^9.12.0",
diff --git a/src/components/common-select/index.vue b/src/components/common-select/index.vue
index 3dcbc99..7ad2445 100644
--- a/src/components/common-select/index.vue
+++ b/src/components/common-select/index.vue
@@ -11,7 +11,7 @@
     :allowClear="allClear"
     :showSearch="allowSearch"
     showArrow
-    :maxTagCount="maxTagCount"
+    :maxTagCount="maxTagCount !== undefined ? maxTagCount : (multiple ? 3 : undefined)"
     @change="handleChange"
     :filterOption="allowSearch ? filterOption : undefined"
   >
@@ -59,7 +59,7 @@ const props = defineProps({
   },
   maxTagCount: {
     type: Number,
-    default: 3,
+    default: undefined,
   },
   allClear: {
     type: Boolean,
diff --git a/src/views/property-marketing/assignment-management/components/TaskDetail.vue b/src/views/property-marketing/assignment-management/components/TaskDetail.vue
deleted file mode 100644
index 0d3499c..0000000
--- a/src/views/property-marketing/assignment-management/components/TaskDetail.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div class="flex flex-col items-start cell-detail">
-    <div class="flex items-center" @click="gotoDetail">
-      <img
-        :src="getPlatformIcon(record.platform)"
-        style="border-radius: 8px; width: 16px; height: 16px; margin-right: 8px; font-size: 14px"
-      />
-      {{ record.name || '-' }}
-    </div>
-    <div class="size-12px color-#939499 mt-2px" @click="gotoDetail">
-      {{ timestampToTime1(task.execution_time) }}
-    </div>
-    <div class="size-14px color-#211F24 mt-12px color-#6D4CFE" @click="gotoDetail">{{ task.name || '未命名' }}</div>
-    <div class="flex items-center mt-12px">
-      <div class="custom-time-picker">
-        <a-time-picker
-          format="HH:mm"
-          size="small"
-          :visible="isPanelVisible"
-          @visible-change="handleVisibleChange"
-          @change="handleTimeChange"
-          placeholder="修改发布时间"
-          class="hide-input-container opt-btn mr-12px"
-        />
-      </div>
-      <div class="opt-btn" @click.stop="handleDelete" style="margin-right: 0px">删除</div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { defineProps, defineEmits } from 'vue';
-import { ref, computed } from 'vue';
-
-const props = defineProps({
-  task: {
-    type: Object,
-    required: true,
-  },
-  record: {
-    type: Object,
-    required: true,
-  },
-  getPlatformIcon: {
-    type: Function,
-    required: true,
-  },
-});
-const isPanelVisible = ref(false);
-const toggleTimePanel = () => {
-  isPanelVisible.value = !isPanelVisible.value;
-};
-const handleVisibleChange = (visible: boolean) => {
-  isPanelVisible.value = visible;
-};
-const handleTimeChange = (time: string) => {
-  if (time) {
-    emit('edit-time', props.task, timestampToTime1() + ' ' + time + ':00');
-  }
-};
-
-const timestampToTime1 = (): string => {
-  const timestamp = Date.now();
-  const date = new Date(timestamp);
-
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, '0'); // 补零
-  const day = String(date.getDate()).padStart(2, '0'); // 补零
-
-  return `${year}-${month}-${day}`;
-};
-
-const emit = defineEmits(['edit-time', 'delete', 'gotoDetail']);
-
-const handleDelete = () => {
-  emit('delete', props.task);
-};
-
-const gotoDetail = () => {
-  console.log('跳转详情');
-  emit('gotoDetail', props.task);
-};
-</script>
-
-<style scoped>
-.cell-detail {
-  background-color: #fff;
-  border: 1px solid #d9d9d9;
-  border-radius: 4px;
-  box-shadow: #00000010 0px 2px 8px;
-  padding: 8px 16px;
-  margin-top: 8px;
-}
-
-.opt-btn {
-  font-size: 12px;
-  width: 138px;
-  height: 28px;
-  background-color: #f2f3f5;
-  text-align: center;
-  line-height: 28px;
-  border-radius: 4px;
-  margin-right: 12px;
-}
-</style>
diff --git a/src/views/property-marketing/assignment-management/components/colorTip.vue b/src/views/property-marketing/assignment-management/components/colorTip.vue
index 2dcd28b..9bb4524 100644
--- a/src/views/property-marketing/assignment-management/components/colorTip.vue
+++ b/src/views/property-marketing/assignment-management/components/colorTip.vue
@@ -18,17 +18,18 @@
         <div>发布失败</div>
       </div>
     </template>
-    <a-button size="small" class="mr-3 color-scheme-btn">
+    <Button class="w-112px mr-8px" size="middle">
       <template #icon>
         <InfoCircleOutlined class="color-#55585F" />
       </template>
       <template #default>颜色示意</template>
-    </a-button>
+    </Button>
   </a-popover>
 </template>
 
 <script setup>
 import { InfoCircleOutlined } from '@ant-design/icons-vue';
+import { Checkbox, Button, Space, Pagination, notification } from 'ant-design-vue';
 </script>
 
 <style scoped>
diff --git a/src/views/property-marketing/assignment-management/components/date-selector.vue b/src/views/property-marketing/assignment-management/components/date-selector.vue
new file mode 100644
index 0000000..7cb81f8
--- /dev/null
+++ b/src/views/property-marketing/assignment-management/components/date-selector.vue
@@ -0,0 +1,259 @@
+<template>
+  <div class="flex items-center">
+    <!-- 日选择器 -->
+    <a-date-picker
+      class="w-188px size-14px"
+      v-if="choseType === '日'"
+      @change="handleDateChange"
+      v-model="currentDate"
+      format="YYYY年MM月DD日周dd"
+    />
+    <!-- 周选择器 -->
+    <a-week-picker
+      class="w-188px size-14px"
+      v-else-if="choseType === '周'"
+      @change="handleDateChange"
+      v-model="currentDate"
+      format="YYYY年MM月DD日"
+    />
+    <!-- 月选择器 -->
+    <a-month-picker
+      class="w-188px size-14px"
+      v-else
+      @change="handleDateChange"
+      v-model="currentDate"
+      format="YYYY年MM月"
+    />
+
+    <!-- 日期导航按钮 -->
+    <div class="flex items-center ml-12px">
+      <a-button class="mr-4px prv-btn" @click="navigate(-1)" type="text">
+        <template #icon><icon-left /></template>
+      </a-button>
+      <a-button
+        @click="navigateToToday"
+        type="text"
+        style="background-color: #f7f8fa !important; color: #211f24 !important; height: 28px"
+        >今天</a-button
+      >
+      <a-button class="ml-4px prv-btn" @click="navigate(1)" type="text">
+        <template #icon><icon-right /></template>
+      </a-button>
+    </div>
+
+    <!-- 维度切换下拉框 -->
+    <div class="flex items-center">
+      <a-dropdown position="bottom" @select="handleTypeChange" class="w-80px" :popupVisible="dropdownVisible" @popupVisibleChange="handleDropdownVisibleChange">
+        <a-button type="text" class="prv-today"> {{ choseType }}<icon-down class="ml-4px" /> </a-button>
+        <template #content>
+          <a-doption value="日" class="doption">日</a-doption>
+          <a-doption value="周" class="doption">周</a-doption>
+          <a-doption value="月" class="doption">月</a-doption>
+        </template>
+      </a-dropdown>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch, defineProps, defineEmits, withDefaults, computed } from 'vue';
+import DateUtils from '@/utils/DateUtils';
+
+// 1. 定义Props：接收父组件初始日期配置
+interface Props {
+  modelValue?: {
+    choseType: '日' | '周' | '月';
+    dayModel?: Date;
+    weekModel?: Date;
+    monthModel?: Date;
+  };
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  modelValue: () => ({ choseType: '周', dayModel: new Date(), weekModel: new Date(), monthModel: new Date() }),
+});
+
+// 2. 定义Emits：向父组件传递事件
+const emit = defineEmits([
+  'update:modelValue', // v-model双向绑定
+  'date-change', // 日期/维度切换统一事件（父组件只需要监听这个）
+]);
+
+// 3. 内部状态管理：根据当前维度同步日期
+const choseType = ref<Props['modelValue']['choseType']>(props.modelValue.choseType);
+const dayModel = ref(props.modelValue.dayModel || new Date());
+const weekModel = ref(props.modelValue.weekModel || new Date());
+const monthModel = ref(props.modelValue.monthModel || new Date());
+
+// 下拉菜单显示状态
+const dropdownVisible = ref(false);
+
+// 添加一个标志位，用于避免初始化时触发事件
+let isInitializing = true;
+
+// 计算属性：根据当前维度返回对应日期（简化选择器v-model绑定）
+const currentDate = computed({
+  get() {
+    switch (choseType.value) {
+      case '日':
+        return dayModel.value;
+      case '周':
+        return weekModel.value;
+      case '月':
+        return monthModel.value;
+    }
+  },
+  set(val: Date) {
+    switch (choseType.value) {
+      case '日':
+        dayModel.value = val;
+        break;
+      case '周':
+        weekModel.value = val;
+        break;
+      case '月':
+        monthModel.value = val;
+        break;
+    }
+  },
+});
+
+// 4. 核心工具函数：获取当前维度的日期范围（给父组件用）
+const getDateRange = (): { start: string; end: string } => {
+  if (choseType.value === '周') {
+    const range = DateUtils.getWeekRangeByDate(weekModel.value);
+    return { start: range.startFormatted, end: range.endFormatted };
+  }
+  if (choseType.value === '月') {
+    const date = monthModel.value;
+    const range = DateUtils.getMonthRangeByYearMonth(date.getFullYear(), date.getMonth() + 1);
+    return { start: range.startFormatted, end: range.endFormatted };
+  }
+  // 日维度
+  const dateStr = DateUtils.formatDate(dayModel.value);
+  return { start: dateStr, end: dateStr };
+};
+
+// 5. 维度切换处理（日/周/月）
+const handleTypeChange = (val: '日' | '周' | '月') => {
+  choseType.value = val;
+  // 切换维度时默认选中当天对应的维度日期
+  const today = new Date();
+  currentDate.value = today;
+  emitChange();
+  
+  // 选择后隐藏下拉菜单
+  setTimeout(() => {
+    dropdownVisible.value = false;
+  }, 100);
+};
+
+// 6. 日期选择器变更处理
+const handleDateChange = (val: Date | string | undefined) => {
+  if (!val) return;
+  const selectedDate = val instanceof Date ? val : new Date(val);
+  currentDate.value = selectedDate;
+  emitChange();
+};
+
+// 7. 日期导航（上一个/下一个维度）
+const navigate = (step: 1 | -1) => {
+  const current = currentDate.value;
+  const newDate = new Date(current);
+
+  switch (choseType.value) {
+    case '日':
+      newDate.setDate(current.getDate() + step);
+      break;
+    case '周':
+      newDate.setDate(current.getDate() + step * 7);
+      break;
+    case '月':
+      newDate.setMonth(current.getMonth() + step);
+      break;
+  }
+
+  currentDate.value = newDate;
+  emitChange();
+};
+
+// 8. 跳转今天
+const navigateToToday = () => {
+  currentDate.value = new Date();
+  emitChange();
+};
+
+// 9. 下拉菜单显示状态变化处理
+const handleDropdownVisibleChange = (visible: boolean) => {
+  dropdownVisible.value = visible;
+};
+
+// 10. 统一事件发射：向父组件传递完整信息
+const emitChange = () => {
+  const result = {
+    choseType: choseType.value,
+    dayModel: dayModel.value,
+    weekModel: weekModel.value,
+    monthModel: monthModel.value,
+    dateRange: getDateRange(), // 父组件直接可用的日期范围
+  };
+  emit('update:modelValue', result);
+  // 只有在初始化完成后才触发 date-change 事件
+  if (!isInitializing) {
+    console.log('emitChange', result);
+    emit('date-change', result); // 父组件监听此事件做后续处理
+  }
+};
+
+// 11. 监听父组件Props变化（同步外部修改）
+watch(
+  () => props.modelValue,
+  (newVal) => {
+    if (newVal) {
+      choseType.value = newVal.choseType;
+      dayModel.value = newVal.dayModel || new Date();
+      weekModel.value = newVal.weekModel || new Date();
+      monthModel.value = newVal.monthModel || new Date();
+      // 只有在初始化完成后才触发 emitChange
+      if (!isInitializing) {
+        emitChange();
+      }
+    }
+  },
+  { deep: true },
+);
+
+// 初始化时触发一次事件
+emitChange();
+
+// 初始化完成，设置标志位
+setTimeout(() => {
+  isInitializing = false;
+}, 0);
+</script>
+
+<style scoped>
+.arco-dropdown-open .arco-icon-down {
+  transform: rotate(180deg);
+  transition: transform 0.2s ease;
+}
+.prv-btn {
+  background-color: #f7f8fa !important; /* 使用正确的6位十六进制颜色值 */
+  width: 28px;
+  height: 28px;
+  border-radius: 4px;
+  color: #211f24 !important;
+}
+.doption {
+  width: 80px !important;
+}
+.prv-today {
+  color: #211f24 !important;
+  width: 80px !important;
+  background-color: #f7f8fa !important;
+  height: 28px;
+  margin-left: 4px;
+  display: flex;
+  justify-content: space-between;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/property-marketing/assignment-management/components/filter-popup.vue b/src/views/property-marketing/assignment-management/components/filter-popup.vue
index fab82f6..60164f8 100644
--- a/src/views/property-marketing/assignment-management/components/filter-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/filter-popup.vue
@@ -1,69 +1,84 @@
-<!-- // 新增内容： -->
 <template>
-  <a-popover trigger="click" :overlayStyle="{ width: '360px' }" overlayClassName="filter-popup-popover">
-    <template #content>
-      <div class="filter-popup-content">
-        <!-- 运营人员 -->
-        <div class="flex items-center mb-6">
-          <div class="w-70px">运营人员</div>
-          <a-space class="w-240px">
-            <CommonSelect
-              placeholder="请选择运营人员"
-              :options="operators || []"
-              v-model="localQuery.operator"
-              @change="(val) => handleChange('operator_id', val)"
-              class="!w-240px"
-              :allowSearch="true"
-              popup-container=".filter-popup-content"
-            />
-          </a-space>
+  <div class="filter-popup-wrapper">
+    <!-- 关键修复：添加手动控制弹窗显示/隐藏的逻辑 -->
+    <a-popover
+      trigger="click"
+      :visible="visible"
+      :overlayStyle="{ width: '360px' }"
+      overlayClassName="filter-popup-popover"
+      @clickoutside="handleClickOutside"
+    >
+      <template #content>
+        <div class="filter-popup-content">
+          <!-- 运营人员 -->
+          <div class="flex items-start mb-3 select-container">
+            <div class="w-70px pt-6px">运营人员</div>
+            <a-space class="flex-1">
+              <CommonSelect
+                placeholder="请选择运营人员"
+                :options="operators || []"
+                v-model="localQuery.operator"
+                @change="(val) => handleChange('operator', val)"
+                class="!w-240px select-with-tags"
+                :allowSearch="true"
+                :maxTagCount="999"
+                popup-container=".filter-popup-content"
+              />
+            </a-space>
+          </div>
+          <!-- 发布平台 -->
+          <div class="flex items-start mb-3 select-container">
+            <div class="w-70px pt-6px">发布平台</div>
+            <a-space class="flex-1">
+              <CommonSelect
+                :options="platformOptions || []"
+                v-model="localQuery.platform"
+                @change="(val) => handleChange('platform', val)"
+                class="!w-240px select-with-tags"
+                placeholder="请选择发布平台"
+                :allowSearch="true"
+                :maxTagCount="999"
+                popup-container=".filter-popup-content"
+              />
+            </a-space>
+          </div>
+          <!-- 账号名称 -->
+          <div class="flex items-start mb-3 select-container">
+            <div class="w-70px pt-6px">账号名称</div>
+            <a-space class="flex-1">
+              <CommonSelect
+                v-model="localQuery.accounts"
+                :options="accountList || []"
+                :multiple="true"
+                @change="(val) => handleChange('accounts', val)"
+                class="!w-240px select-with-tags"
+                placeholder="请选择账号名称"
+                :allowSearch="true"
+                :maxTagCount="999"
+                popup-container=".filter-popup-content"
+              />
+            </a-space>
+          </div>
         </div>
-        <!-- 发布平台 -->
-        <div class="flex items-center mb-6">
-          <div class="w-70px">发布平台</div>
-          <a-space class="w-240px">
-            <CommonSelect
-              :options="platformOptions || []"
-              v-model="localQuery.platform"
-              @change="(val) => handleChange('platform', val)"
-              class="!w-240px"
-              placeholder="请选择发布平台"
-              :allowSearch="true"
-              popup-container=".filter-popup-content"
-            />
-          </a-space>
-        </div>
-        <!-- 账号名称 -->
-        <div class="flex items-center">
-          <div class="w-70px">账号名称</div>
-          <a-space class="w-240px">
-            <CommonSelect
-              v-model="localQuery.accounts"
-              :options="accountList || []"
-              :multiple="true"
-              @change="(val) => handleChange('account_id', val)"
-              class="!w-240px"
-              placeholder="请选择账号名称"
-              :allowSearch="true"
-              popup-container=".filter-popup-content"
-            />
-          </a-space>
-        </div>
-      </div>
-    </template>
-    <a-button size="small">
-      <template #icon>
-        <FilterOutlined class="color-#55585F" />
       </template>
-      <template #default>筛选</template>
-    </a-button>
-  </a-popover>
+
+      <!-- 触发按钮：添加点击事件控制弹窗显示 -->
+      <Button class="w-112px mr-8px" size="middle" @click="visible = !visible">
+        <template #icon>
+          <FilterOutlined class="color-#55585F" />
+        </template>
+        <template #default>筛选</template>
+      </Button>
+    </a-popover>
+  </div>
 </template>
 
 <script setup>
-import { ref, watch } from 'vue';
+import { ref, watch, defineProps, defineEmits } from 'vue';
 import { FilterOutlined } from '@ant-design/icons-vue';
+import { Button } from 'ant-design-vue';
 
+// 定义props和emit
 const props = defineProps({
   operators: Array,
   platformOptions: Array,
@@ -71,39 +86,52 @@ const props = defineProps({
   query: Object,
 });
 
-onMounted(() => {});
 const emit = defineEmits(['filter-change']);
 
-// 初始化本地查询对象，只设置非空值
-const localQuery = ref({});
+// 弹窗显示状态（关键：控制弹窗显示的核心变量）
+const visible = ref(false);
 
-// 监听外部 query 变化并同步到本地状态
+// 本地筛选状态（保持上次选择）
+const localQuery = ref({
+  operator: props.query?.operator_ids,
+  platform: props.query?.platforms,
+  accounts: props.query?.ids || [],
+});
+
+// 监听父组件query变化，同步到本地
 watch(
   () => props.query,
   (newQuery) => {
     if (newQuery) {
-      // 只有当值不为空时才设置到localQuery中
-      const filteredQuery = {};
-      if (newQuery.operator) {
-        filteredQuery.operator = newQuery.operator;
-      }
-      if (newQuery.platform) {
-        filteredQuery.platform = newQuery.platform;
-      }
-      if (newQuery.accounts && newQuery.accounts.length > 0) {
-        filteredQuery.accounts = newQuery.accounts;
-      }
-      localQuery.value = { ...filteredQuery };
+      localQuery.value = {
+        operator: newQuery.operator_ids,
+        platform: newQuery.platforms,
+        accounts: newQuery.ids || [],
+      };
     }
   },
   { deep: true, immediate: true },
 );
 
-// 处理筛选变化
+// 处理筛选条件变化（不关闭弹窗，直接触发筛选）
 const handleChange = (field, value) => {
   localQuery.value[field] = value;
-  console.log(localQuery.value);
-  emit('filter-change', { ...localQuery.value });
+  // 直接触发筛选变更，不需要确认按钮
+  emit('filter-change', {
+    operator: localQuery.value.operator,
+    platform: localQuery.value.platform,
+    accounts: localQuery.value.accounts,
+  });
+  
+  // 选择后自动隐藏下拉菜单
+  setTimeout(() => {
+    visible.value = false;
+  }, 100);
+};
+
+// 点击外部关闭弹窗
+const handleClickOutside = () => {
+  visible.value = false;
 };
 </script>
 
@@ -113,9 +141,41 @@ const handleChange = (field, value) => {
   border: 1px solid #d9d9d9;
   border-radius: 4px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-  overflow-y: auto;
   padding: 24px;
   margin-top: 8px;
   margin-right: 50px;
+  max-height: 400px;
+  overflow-y: auto;
 }
-</style>
+
+.select-container {
+  align-items: flex-start;
+}
+
+.select-with-tags :deep(.ant-select-selector) {
+  height: auto !important;
+  min-height: 32px !important;
+  align-items: flex-start !important;
+}
+
+.select-with-tags :deep(.ant-select-selection-item) {
+  max-width: none !important;
+  overflow: visible !important;
+  text-overflow: unset !important;
+  line-height: 1.5;
+}
+
+/* 确保选择器容器能够适应内容高度 */
+.select-with-tags :deep(.ant-select) {
+  height: auto !important;
+}
+
+.select-with-tags :deep(.ant-select-multiple .ant-select-selection-item) {
+  height: auto !important;
+  align-items: flex-start !important;
+}
+
+.select-with-tags :deep(.ant-select-selection-overflow) {
+  flex-wrap: wrap !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 5e5de87..0e3c90a 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -1,57 +1,8 @@
 <template>
-  <div class="flex-column justify-between">
-    <div class="flex justify-between items-start" style="width: 100%">
-      <div class="flex justify-between items-center" style="width: 100%">
-        <div class="flex items-center">
-          <a-date-picker
-            class="w-188px size-14px"
-            v-if="choseType === '日'"
-            @change="onChangeDate"
-            v-model="dayModel"
-            format="YYYY年MM月DD日周dd"
-          />
-          <a-week-picker
-            class="w-188px size-14px"
-            v-else-if="choseType === '周'"
-            @change="onChangeWeek"
-            v-model="weekModel"
-            format="YYYY年MM月DD日"
-          />
-          <a-month-picker
-            class="w-188px size-14px"
-            v-else
-            @change="onChangeMonth"
-            v-model="monthModel"
-            format="YYYY年MM月"
-          />
-          <div class="flex items-center ml-12px">
-            <a-button class="mr-4px" @click="handlePrev">
-              <template #icon>
-                <icon-left />
-              </template>
-            </a-button>
-
-            <a-button @click="handleToday">今天</a-button>
-            <a-button class="ml-4px" @click="handleNext">
-              <template #icon>
-                <icon-right />
-              </template>
-            </a-button>
-          </div>
-          <div class="flex items-center ml-12px">
-            <a-space class="flex justify-between">
-              <a-dropdown position="bottom" @select="handleSelect">
-                <a-button class="w-80px flex justify-between">{{ choseType }}<icon-down /></a-button>
-                <template #content>
-                  <a-doption value="日" class="w-80px">日</a-doption>
-                  <a-doption value="周" class="w-80px">周</a-doption>
-                  <a-doption value="月" class="w-80px">月</a-doption>
-                </template>
-              </a-dropdown>
-            </a-space>
-          </div>
-        </div>
-      </div>
+  <div class="flex-column justify-between bg-#fff rounded-8px p-24px">
+    <!-- 日期选择器和筛选区域 -->
+    <div class="flex justify-between items-start w-full">
+      <DateSelector v-model="dateSelectorModel" @date-change="handleDateSelectorChange" />
       <div class="flex items-start">
         <colorTip />
         <FilterPopup
@@ -61,147 +12,83 @@
           :query="query"
           @filter-change="handleFilterChange"
         />
+        <Button type="primary" class="w-112px" size="middle" @click="handleAddTask">
+          <template #default>创建任务</template>
+        </Button>
       </div>
     </div>
-    <div class="flex justify-between items-start mt-16px" style="width: 100%">
-      <div class="table-wrap bg-#fff rounded-8px px-24px py-24px flex flex-col">
+
+    <!-- 表格内容区域 -->
+    <div class="flex justify-between items-start w-full">
+      <div class="table-wrap py-24px flex flex-col" style="width: 100%; overflow-x: auto;">
         <a-table
           :columns="columns"
           :data="data"
           :bordered="{ cell: true }"
+          :scroll="{ x: 'max-content', y: 600 }"
           style="width: 100%"
           :pagination="false"
           @change="handleTableChange"
         >
-          <!-- 表头插槽：用于自定义日期列的表头样式 -->
+          <!-- 空数据显示 -->
           <template #empty>
             <div class="flex flex-col items-center justify-center">
-              <img :src="emptyIcon" class="img mt-20px" alt="" width="106" height="72" />
+              <img :src="emptyIcon" class="img mt-20px" alt="暂无数据" width="106" height="72" />
               <div class="text mt-36px">暂无数据</div>
               <div class="mt-12px mb-12px">可通过账号管理添加账号，进行任务排期管理</div>
               <a-button type="primary" @click="handleAddAccount">去添加</a-button>
             </div>
           </template>
+
+          <!-- 账号与平台列 -->
           <template #name="{ record }">
             <div class="flex items-center">
               <img
                 :src="getPlatformIcon(record.platform)"
                 style="border-radius: 8px; width: 16px; height: 16px; margin-right: 8px"
+                :alt="getPlatformName(record.platform)"
               />
               {{ record.name || '-' }}
             </div>
           </template>
 
-          <!-- 动态日期列渲染 -->
+          <!-- 动态日期单元格 -->
           <template #dateCell="{ record, column }">
-            <div v-if="record[column.dataIndex] && record[column.dataIndex].length > 0" class="task-container">
+            <div v-if="record[column.dataIndex]?.length" class="task-container">
+              <!-- 任务数量≥3时显示更多 -->
               <div v-if="record[column.dataIndex].length >= 3" class="task-more">
-                <div
-                  :key="record[column.dataIndex][0].id"
-                  class="task-item size-12px"
-                  :title="record[column.dataIndex][0].name || '-'"
-                >
-                  <a-trigger trigger="click" position="br">
-                    <div class="task-item size-12px">
-                      <div class="size-12px color-#211F24 mr-4px">
-                        {{ timestampToTime(record[column.dataIndex][0].execution_time) }}
-                      </div>
-                      <div
-                        class="size-12px"
-                        :style="{
-                          color: getTaskColor(
-                            record[column.dataIndex][0].type,
-                            record[column.dataIndex][0].execution_time,
-                          ),
-                        }"
-                        style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
-                      >
-                        {{ formatTaskName(record[column.dataIndex][0].name) }}
-                      </div>
-                    </div>
-                    <template #content>
-                      <TaskDetail
-                        :task="record[column.dataIndex][0]"
-                        :record="record"
-                        :get-platform-icon="getPlatformIcon"
-                        @edit-time="handleModifyTime"
-                        @delete="handleDelete"
-                        @delete-task="handleDelete"
-                        @gotoDetail="handleGoToDetail"
-                      />
-                    </template>
-                  </a-trigger>
-                </div>
+                <TaskItem :task="record[column.dataIndex][0]" :record="record" @handle-task="handleTaskAction" />
                 <a-trigger trigger="click" position="br">
-                  <div class="size-12px color-#8f959f" style="padding: 0px 8px">
-                    还有{{ record[column.dataIndex].length - 1 }}项
-                  </div>
+                  <div class="size-12px color-#8f959f px-8px">还有{{ record[column.dataIndex].length - 1 }}项</div>
                   <template #content>
-                    <div
-                      class="flex flex-col items-start"
-                      style="
-                        background-color: #fff;
-                        padding: 12px;
-                        box-shadow: #00000010 0px 2px 8px;
-                        border-radius: 4px;
-                      "
-                    >
-                      <div v-for="task in record[column.dataIndex]" :key="task.id" :title="task.name || '-'">
-                        <a-trigger trigger="click" align-point>
-                          <div class="flex items-start mb-8px">
-                            <div class="size-12px color-#211F24 mr-4px">
-                              {{ timestampToTime(task.execution_time) }}
-                            </div>
-                            <div class="size-12px" :style="{ color: getTaskColor(task.type, task.execution_time) }">
-                              {{ task.name || '未命名' }}
-                            </div>
-                          </div>
-                          <template #content>
-                            <TaskDetail
-                              :task="task"
-                              :record="record"
-                              :get-platform-icon="getPlatformIcon"
-                              @edit-time="handleModifyTime"
-                              @delete="handleDelete"
-                              @delete-task="handleDelete"
-                              @gotoDetail="handleGoToDetail"
-                            />
-                          </template>
-                        </a-trigger>
-                      </div>
+                    <div class="bg-#fff p-12px shadow-sm rounded-4px">
+                      <TaskItem
+                        v-for="task in record[column.dataIndex]"
+                        :key="task.id"
+                        :task="task"
+                        :record="record"
+                        @handle-task="handleTaskAction"
+                      />
                     </div>
                   </template>
                 </a-trigger>
               </div>
-              <div v-else v-for="task in record[column.dataIndex]" :key="task.id" :title="task.name || '-'">
-                <a-trigger trigger="click" align-point>
-                  <div class="task-item">
-                    <div class="size-12px color-#211F24 mr-4px">
-                      {{ timestampToTime(task.execution_time) }}
-                    </div>
-                    <div
-                      :style="{ color: getTaskColor(task.type, task.execution_time) }"
-                      style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
-                    >
-                      {{ formatTaskName(task.name) }}
-                    </div>
-                  </div>
-                  <template #content>
-                    <TaskDetail
-                      :task="task"
-                      :record="record"
-                      :get-platform-icon="getPlatformIcon"
-                      @edit-time="handleModifyTime"
-                      @delete="handleDelete"
-                      @gotoDetail="handleGoToDetail"
-                    />
-                  </template>
-                </a-trigger>
+              <!-- 任务数量<3时直接显示 -->
+              <div v-else>
+                <TaskItem
+                  v-for="task in record[column.dataIndex]"
+                  :key="task.id"
+                  :task="task"
+                  :record="record"
+                  @handle-task="handleTaskAction"
+                />
               </div>
             </div>
             <div v-else class="no-task"></div>
           </template>
         </a-table>
+
+        <!-- 分页控件 -->
         <div v-if="pageInfo.total > 0" class="pagination-box">
           <a-pagination
             :total="pageInfo.total"
@@ -218,261 +105,122 @@
       </div>
     </div>
   </div>
-  <a-modal v-model:visible="showModal" @ok="handleOk" @cancel="handleCancel" ok-text="确认删除">
-    <template #title> {{ deleteTitle }} </template>
-    <div>
-      {{ deleteContent }}
-    </div>
+  <!-- 删除确认弹窗 -->
+  <a-modal v-model:visible="showModal" @ok="handleDeleteConfirm" @cancel="showModal = false" ok-text="确认删除">
+    <template #title>{{ deleteTitle }}</template>
+    <div>{{ deleteContent }}</div>
   </a-modal>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, onMounted, watch, computed, nextTick } from 'vue';
+import { ref, reactive, onMounted, computed } from 'vue';
 import type { ColumnProps } from 'ant-design-vue/es/table';
-import { getTaskSchedules, delTaskSchedules, editTaskSchedules } from '@/api/all/assignment-management';
-import { fetchAccountOperators, getMediaAccountList } from '@/api/all/propertyMarketing';
-import icon1 from '@/assets/img/platform/icon-dy.png';
-import icon2 from '@/assets/img/platform/icon-xhs.png';
-import icon3 from '@/assets/img/media-account/icon-warn.png';
-import icon4 from '@/assets/img/platform/icon-sph.png';
-import icon5 from '@/assets/img/platform/icon-wb.png';
-import icon6 from '@/assets/img/platform/icon-gzh.png';
-import icon7 from '@/assets/img/platform/icon-ks.png';
-import icon8 from '@/assets/img/platform/icon-bilibili.png';
-import DateUtils from '@/utils/DateUtils';
-import TaskDetail from './components/TaskDetail.vue';
-import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
-import emptyIcon from '@/assets/img/media-account/icon-empty.png';
 import router from '@/router';
+import DateUtils from '@/utils/DateUtils';
+// 组件引入
+import DateSelector from './components/date-selector.vue';
 import colorTip from './components/colorTip.vue';
 import FilterPopup from './components/filter-popup.vue';
-
-const {
-  dataSource,
-  pageInfo,
-  rowSelection,
-  onPageChange,
-  onPageSizeChange,
-  resetPageInfo,
-  selectedRowKeys,
-  selectedRows,
-  handleSelectAll,
-  DEFAULT_PAGE_INFO,
-} = useTableSelectionWithPagination({
-  onPageChange: () => {
-    query.page = pageInfo.value.page;
-    query.page_size = pageInfo.value.page_size;
-    handleSearch();
-  },
-  onPageSizeChange: () => {
-    query.page = pageInfo.value.page;
-    query.page_size = pageInfo.value.page_size;
-    handleSearch();
-  },
+// API引入
+import { getTaskSchedules, delTaskSchedules, editTaskSchedules } from '@/api/all/assignment-management';
+import { fetchAccountOperators, getMediaAccountList } from '@/api/all/propertyMarketing';
+// 工具引入
+import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
+// 静态资源
+import emptyIcon from '@/assets/img/media-account/icon-empty.png';
+// 平台图标
+import iconDy from '@/assets/img/platform/icon-dy.png';
+import iconXhs from '@/assets/img/platform/icon-xhs.png';
+import iconBilibili from '@/assets/img/platform/icon-bilibili.png';
+import iconKs from '@/assets/img/platform/icon-ks.png';
+import iconSph from '@/assets/img/platform/icon-sph.png';
+import iconWb from '@/assets/img/platform/icon-wb.png';
+import iconGzh from '@/assets/img/platform/icon-gzh.png';
+import iconWarn from '@/assets/img/media-account/icon-warn.png';
+import { Checkbox, Button, Space, Pagination, notification } from 'ant-design-vue';
+// 表格分页逻辑
+const { pageInfo, onPageChange, onPageSizeChange } = useTableSelectionWithPagination({
+  onPageChange: () => handleSearch(),
+  onPageSizeChange: () => handleSearch(),
 });
 
-const handleTableChange = (pagination: any, sorter: any, extra: any) => {
-  // 获取当前排序的列信息
-  if (sorter && sorter.sorter.direction == 'ascend' && sorter.sorter.field !== undefined) {
-    // 在columns中查找对应的列
-    // 注意：dataIndex是数字类型，而sorter.field可能是字符串类型
-    const column = columns.value.find((col: any) => {
-      // 确保比较时类型一致
-      return col.dataIndex == sorter.sorter.field || col.dataIndex == parseInt(sorter.sorter.field);
-    });
-
-    if (column) {
-      if (column.date) {
-        // 获取格式化的日期字符串
-        const formattedDate = DateUtils.formatDate(column.date);
-        query.top_execution_time = formattedDate;
-        handleSearch();
-      }
-    } else {
-      console.log('未找到匹配的列，尝试查找dataIndex为', sorter.field, '的列');
-    }
-  } else {
-    query.top_execution_time = undefined;
-    handleSearch();
-  }
-
-  // 获取触发变更的列信息
-  if (extra && extra.column) {
-    console.log('触发变更的列:', extra.column);
-  }
-};
-const isChartEmpty = ref(true);
-const currentTask = ref();
-const visible = ref(false);
-const deleteTitle = ref('');
-const deleteContent = ref('');
-const showModal = ref(false);
-const modalVisible = ref(false);
-const selectedTask = ref<any>(null);
-const timePickerVisible = ref(false);
-const choseType = ref('周');
-const dayModel = ref(new Date());
-const weekModel = ref(new Date());
-const monthModel = ref(new Date());
-const currentDateRange = reactive({
-  start: '',
-  end: '',
+// 状态管理
+const dateSelectorModel = ref({
+  choseType: '周' as '日' | '周' | '月',
+  dayModel: new Date(),
+  weekModel: new Date(),
+  monthModel: new Date(),
 });
 const columns = ref<ColumnProps[]>([]);
 const data = ref<any[]>([]);
 const operators = ref([]);
 const accountList = ref([]);
-const platformOptions = ref([
-  { id: 0, name: '抖音', icon: icon1 },
-  { id: 1, name: '小红书', icon: icon2 },
-  { id: 2, name: 'B站', icon: icon8 },
-  { id: 3, name: '快手', icon: icon7 },
-  { id: 4, name: '视频号', icon: icon4 },
-  { id: 5, name: '微博', icon: icon5 },
-  { id: 6, name: '公众号', icon: icon6 },
-]);
+const showModal = ref(false);
+const currentTask = ref<any>(null);
+const deleteTitle = ref('');
+const deleteContent = ref('');
 
+// 获取当前周的日期范围
+const getCurrentWeekRange = () => {
+  const weekRange = DateUtils.getWeekRangeByDate(new Date());
+  return [weekRange.startFormatted, weekRange.endFormatted];
+};
+
+// 查询参数
 const query = reactive({
-  page: 1,
-  page_size: 20,
+  page: pageInfo.value.page,
+  page_size: pageInfo.value.page_size,
   platforms: undefined,
   operator_ids: undefined,
-  name: '',
-  top_execution_time: '' as string | undefined,
-  execution_time: undefined,
-  operator: '',
-  platform: '',
-  accounts: '',
   ids: [],
+  execution_time: getCurrentWeekRange(), // 设置默认值为当前周
+  top_execution_time: undefined,
 });
 
-// 处理删除操作
-const handleDelete = (task: any) => {
-  currentTask.value = task;
-  if (task.type == 1) {
-    deleteTitle.value = '删除内容稿件排期';
-  } else {
-    deleteTitle.value = '删除选题排期';
-  }
-  deleteContent.value = '确认删除“' + task.name + '”吗？';
-  showModal.value = true;
-};
-const handleGoToDetail = (task: any) => {
-  router.push(`/media-account/management-detail/${task.id}`);
-};
-const handleOk = () => {
-  showModal.value = false;
-  delTaskSchedules(currentTask.value.id).then(() => {
-    handleSearch();
-  });
+// 平台配置
+const platformConfig = {
+  icons: { 0: iconDy, 1: iconXhs, 2: iconBilibili, 3: iconKs, 4: iconSph, 5: iconWb, 6: iconGzh },
+  names: { 0: '抖音', 1: '小红书', 2: 'B站', 3: '快手', 4: '视频号', 5: '微博', 6: '公众号' },
+  options: [
+    { id: 0, name: '抖音', icon: iconDy },
+    { id: 1, name: '小红书', icon: iconXhs },
+    { id: 2, name: 'B站', icon: iconBilibili },
+    { id: 3, name: '快手', icon: iconKs },
+    { id: 4, name: '视频号', icon: iconSph },
+    { id: 5, name: '微博', icon: iconWb },
+    { id: 6, name: '公众号', icon: iconGzh },
+  ],
 };
+const platformOptions = ref(platformConfig.options);
 
-const handleCancel = () => {
-  showModal.value = false;
-};
+// 工具函数
+const getPlatformIcon = (platform: number) => platformConfig.icons[platform] || iconWarn;
+const getPlatformName = (platform: number) => platformConfig.names[platform] || '未知平台';
 
-const handleAddAccount = () => {};
-const handleModifyTime = (task: any, time: any) => {
-  editTaskSchedules(task.id, { execution_time: time }).then(() => {
-    handleSearch();
-    timePickerVisible.value = true;
-  });
-};
-
-const onTimeConfirm = () => {
-  if (selectedTask.value && selectedTask.value.execution_time) {
-    // 更新任务的执行时间
-    selectedTask.value.execution_time = new Date().getTime() / 1000; // 假设时间戳是秒级
-    // 重新获取数据
-    handleSearch();
-  }
-  timePickerVisible.value = false;
-};
-
-// 计算当前日期范围内的所有日期，统一返回 number 数组
-const currentDateHeaders = computed(() => {
-  if (choseType.value === '周') {
-    const specificWeek = DateUtils.getWeekDaysByDate(new Date(weekModel.value), 0);
-    return specificWeek.map((item) => parseInt(item.day.toString(), 10)); // 转换为数字数组
-  } else if (choseType.value === '月') {
-    const date = new Date(monthModel.value);
-    const tabTitle = DateUtils.getDaysAndWeekdays(date.getFullYear(), date.getMonth());
-    return tabTitle.map((item) => parseInt(item.day.toString(), 10)); // 转换为数字数组
-  } else {
-    // 日维度，返回当天的日期数字
-    const day = new Date(dayModel.value).getDate();
-    return [day];
-  }
-});
-
-// 获取平台图标
-const getPlatformIcon = (platform: number) => {
-  const platformIcons: Record<number, any> = {
-    0: icon1, // 抖音
-    1: icon2, // 小红书
-    2: icon8, // B站
-    3: icon7, // 快手
-    4: icon4, // 视频号
-    5: icon5, // 微博
-    6: icon6, // 公众号
-  };
-
-  return platformIcons[platform] || icon3; // 默认图标
-};
-
-// 根据平台ID获取平台名称
-const getPlatformName = (platform: number) => {
-  const platformNames: { [key: number]: string } = {
-    0: '抖音',
-    1: '小红书',
-    2: 'B站',
-    3: '快手',
-    4: '视频号',
-    5: '微博',
-    6: '公众号',
-  };
-
-  return platformNames[platform] || '未知平台';
-};
-
-// 获取任务颜色
 const getTaskColor = (taskType: number, executionTime: number) => {
-  // 判断任务是否已过期
   const isExpired = executionTime * 1000 < Date.now();
-  // 如果已过期，根据任务类型返回对应颜色
-  if (isExpired) {
-    return taskType === 0 ? '#A794FE' : '#FFCF66';
-  }
-  // 未过期，根据API文档，type: 0=选题，1=内容稿件
-  return taskType === 0 ? '#6d4cfe' : '#ffae00';
+  return isExpired ? (taskType === 0 ? '#A794FE' : '#FFCF66') : taskType === 0 ? '#6d4cfe' : '#ffae00';
 };
 
-// 格式化任务名称
-const formatTaskName = (name: string) => {
-  if (!name) return '未命名';
-  return name.length > 8 ? name.substring(0, 8) + '...' : name;
-};
+// const formatTaskName = (name: string) => {
+//   if (!name) return '未命名';
+//   return name.length > 8 ? name.substring(0, 8) + '...' : name;
+// };
 
-// 时间戳转日期格式，并提取日期数字
 const timestampToDayNumber = (timestamp: number) => {
-  const date = new Date(timestamp * 1000); // 假设时间戳是秒级
-  return date.getDate(); // 返回数字类型的日期
+  return new Date(timestamp * 1000).getDate();
 };
 
-// 时间戳转时间格式 (HH:MM)
-const timestampToTime = (timestamp: number): string => {
-  const date = new Date(timestamp * 1000); // 假设时间戳是秒级
-  // 获取小时和分钟
-  const hours = date.getHours().toString().padStart(2, '0');
-  const minutes = date.getMinutes().toString().padStart(2, '0');
+// const timestampToTime = (timestamp: number): string => {
+//   const date = new Date(timestamp * 1000);
+//   return `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
+// };
 
-  return `${hours}:${minutes}`;
-};
-
-// 处理表格数据，使其与动态表头匹配
+// 处理表格数据
 const processTableData = (apiData: any[]) => {
   const processedData: any[] = [];
-  // 处理每条账号数据
+  const dateHeaders = currentDateHeaders.value;
+
   apiData.forEach((account) => {
     const rowData: any = {
       id: account.id,
@@ -480,17 +228,16 @@ const processTableData = (apiData: any[]) => {
       platform: account.platform,
     };
 
-    // 初始化所有日期列为空数组
-    currentDateHeaders.value.forEach((day) => {
+    // 初始化日期列
+    dateHeaders.forEach((day) => {
       rowData[day] = [];
     });
 
-    // 将任务按日期分组
-    if (account.task_schedules && account.task_schedules.length > 0) {
+    // 分配任务到对应日期列
+    if (account.task_schedules?.length) {
       account.task_schedules.forEach((task: any) => {
         const taskDay = timestampToDayNumber(task.execution_time);
-        // 如果这个日期在当前表头中，则添加到对应列
-        if (currentDateHeaders.value.includes(taskDay)) {
+        if (dateHeaders.includes(taskDay)) {
           rowData[taskDay].push({
             id: task.id,
             name: task.name,
@@ -507,32 +254,10 @@ const processTableData = (apiData: any[]) => {
   return processedData;
 };
 
-// 设置日期范围
-const setDateRange = () => {
-  if (choseType.value === '周') {
-    const weekRange = DateUtils.getWeekRangeByDate(new Date(weekModel.value));
-    currentDateRange.start = weekRange.startFormatted;
-    currentDateRange.end = weekRange.endFormatted;
-    query.execution_time = [currentDateRange.start, currentDateRange.end];
-  } else if (choseType.value === '月') {
-    const monthRange = DateUtils.getMonthRangeByYearMonth(
-      new Date(monthModel.value).getFullYear(),
-      new Date(monthModel.value).getMonth() + 1,
-    );
-    currentDateRange.start = monthRange.startFormatted;
-    currentDateRange.end = monthRange.endFormatted;
-    query.execution_time = [currentDateRange.start, currentDateRange.end];
-  } else {
-    // 日维度
-    const date = new Date(dayModel.value);
-    currentDateRange.start = DateUtils.formatDate(date);
-    currentDateRange.end = DateUtils.formatDate(date);
-    query.execution_time = [currentDateRange.start, currentDateRange.end];
-  }
-};
-
-// 设置table的头部
-const setTableSpecific = () => {
+// 创建任务
+const handleAddTask = () => {};
+// 设置表格列
+const setTableColumns = () => {
   columns.value = [
     {
       title: '账号与发布平台',
@@ -540,223 +265,222 @@ const setTableSpecific = () => {
       width: 150,
       ellipsis: true,
       tooltip: true,
+      fixed: 'left', // 固定列
     },
   ];
-
   let dateHeaders: any[] = [];
-  if (choseType.value === '周') {
-    const specificWeek = DateUtils.getWeekDaysByDate(new Date(weekModel.value), 0);
-    dateHeaders = specificWeek;
-  } else if (choseType.value === '月') {
-    const date = new Date(monthModel.value);
-    const tabTitle = DateUtils.getDaysAndWeekdays(date.getFullYear(), date.getMonth());
-    // 为月视图添加日期对象，以便后续判断是否为周末
-    dateHeaders = tabTitle.map((item) => {
-      const dayDate = new Date(date.getFullYear(), date.getMonth(), item.day);
-      return {
-        ...item,
-        date: dayDate,
-      };
-    });
+  const { choseType } = dateSelectorModel.value;
+
+  if (choseType === '周') {
+    dateHeaders = DateUtils.getWeekDaysByDate(dateSelectorModel.value.weekModel, 0);
+  } else if (choseType === '月') {
+    const date = dateSelectorModel.value.monthModel;
+    dateHeaders = DateUtils.getDaysAndWeekdays(date.getFullYear(), date.getMonth());
   } else {
-    // 日维度
-    const date = new Date(dayModel.value);
-    const day = date.getDate();
-    const weekday = DateUtils.formatDateToWeekdayDay(date);
-    dateHeaders = [{ day: day, weekday, date: date }];
+    const date = dateSelectorModel.value.dayModel;
+    dateHeaders = [
+      {
+        day: date.getDate(),
+        weekday: DateUtils.formatDateToWeekdayDay(date),
+        date,
+      },
+    ];
   }
+
   // 判断是否为今天
   const isToday = (date: Date) => {
+    if (!date) return false;
     const today = new Date();
-    return (
-      date.getDate() === today.getDate() &&
-      date.getMonth() === today.getMonth() &&
-      date.getFullYear() === today.getFullYear()
-    );
+    today.setHours(0, 0, 0, 0);
+    const targetDate = new Date(date);
+    targetDate.setHours(0, 0, 0, 0);
+    return targetDate.getTime() === today.getTime();
   };
+
   // 添加日期列
   dateHeaders.forEach((item) => {
-    // 检查是否为周末（周日为0，周六为6）
-    const isWeekend = item.date ? item.date.getDay() === 0 || item.date.getDay() === 6 : false;
+    const isWeekend = item.date?.getDay() === 0 || item.date?.getDay() === 6;
+    // 确保item.date存在再进行判断
     const todayFlag = item.date ? isToday(item.date) : false;
-    columns.value.push({
+    
+    // 调试信息
+    if (todayFlag) {
+      console.log('Today column detected:', item);
+      console.log('Today flag value:', todayFlag);
+    }
+
+    const columnConfig = {
       title: `${item.weekday}`,
-      dataIndex: item.day, // 使用日期数字作为dataIndex
+      dataIndex: item.day,
       slotName: 'dateCell',
       date: item.date,
       width: 135,
       sortable: {
         sortDirections: ['ascend', 'descend'],
-        sorter: true, // 禁用默认排序
+        sorter: true,
       },
-      // 存储额外信息用于表头渲染
       weekday: item.weekday,
-      todayFlag: todayFlag,
-      // 如果是周末，添加自定义样式
+      todayFlag,
+      // 为周末设置特定的背景色
       cellClass: isWeekend ? 'weekend-column' : '',
-    });
+      // 为今日添加特殊类名
+      class: todayFlag ? 'today-column' : '',
+    };
+    
+    // 更多调试信息
+    if (todayFlag) {
+      console.log('Column config for today:', columnConfig);
+    }
+    
+    columns.value.push(columnConfig);
   });
 };
 
-// 日期变化处理（日维度）
-const onChangeDate = (val: any) => {
-  if (val) {
-    // 确保val是Date对象
-    const selectedDate = val instanceof Date ? val : new Date(val);
-    dayModel.value = selectedDate;
+// 当前日期头部计算
+const currentDateHeaders = computed(() => {
+  const { choseType } = dateSelectorModel.value;
 
-    // 更新日期范围和其他相关状态
-    setDateRange();
-    setTableSpecific();
-
-    // 在下一个tick中执行搜索，确保DOM更新完成
-    nextTick(() => {
-      handleSearch();
-    });
-  }
-};
-
-// 日期变化处理（周维度）
-const onChangeWeek = (val: any) => {
-  if (val) {
-    // 确保val是Date对象
-    const selectedDate = val instanceof Date ? val : new Date(val);
-    weekModel.value = selectedDate;
-
-    // 更新日期范围和其他相关状态
-    setDateRange();
-    setTableSpecific();
-
-    // 在下一个tick中执行搜索，确保DOM更新完成
-    nextTick(() => {
-      handleSearch();
-    });
-  }
-};
-
-const onChangeMonth = (val: any) => {
-  if (typeof val === 'string') {
-    val = DateUtils.MonthStrToDate(val);
-  }
-  if (val) {
-    // 确保val是Date对象
-    const selectedDate = val instanceof Date ? val : new Date(val);
-    monthModel.value = selectedDate;
-
-    // 更新日期范围和其他相关状态
-    setDateRange();
-    setTableSpecific();
-
-    // 在下一个tick中执行搜索，确保DOM更新完成
-    nextTick(() => {
-      handleSearch();
-    });
-  }
-};
-
-// 设置维度
-const handleSelect = (val: string) => {
-  choseType.value = val;
-  setDateRange();
-  setTableSpecific();
-  nextTick(() => {
-    handleSearch();
-  });
-};
-
-// 日期导航
-const handlePrev = () => {
-  // 根据当前维度向前导航
-  if (choseType.value === '周') {
-    const prevWeek = new Date(weekModel.value);
-    prevWeek.setDate(prevWeek.getDate() - 7);
-    onChangeWeek(prevWeek);
-  } else if (choseType.value === '月') {
-    const prevMonth = new Date(monthModel.value);
-    prevMonth.setMonth(prevMonth.getMonth() - 1);
-    onChangeMonth(prevMonth);
+  if (choseType === '周') {
+    return DateUtils.getWeekDaysByDate(dateSelectorModel.value.weekModel, 0).map((item) =>
+      parseInt(item.day.toString(), 10),
+    );
+  } else if (choseType === '月') {
+    const date = dateSelectorModel.value.monthModel;
+    return DateUtils.getDaysAndWeekdays(date.getFullYear(), date.getMonth()).map((item) =>
+      parseInt(item.day.toString(), 10),
+    );
   } else {
-    const prevDay = new Date(dayModel.value);
-    prevDay.setDate(prevDay.getDate() - 1);
-    onChangeDate(prevDay);
+    return [dateSelectorModel.value.dayModel.getDate()];
   }
-};
+});
 
-const handleNext = () => {
-  // 根据当前维度向后导航
-  if (choseType.value === '周') {
-    const nextWeek = new Date(weekModel.value);
-    nextWeek.setDate(nextWeek.getDate() + 7);
-    onChangeWeek(nextWeek);
-  } else if (choseType.value === '月') {
-    const nextMonth = new Date(monthModel.value);
-    nextMonth.setMonth(nextMonth.getMonth() + 1);
-    onChangeMonth(nextMonth);
-  } else {
-    const nextDay = new Date(dayModel.value);
-    nextDay.setDate(nextDay.getDate() + 1);
-    onChangeDate(nextDay);
-  }
-};
-
-const handleToday = () => {
-  // 回到今天
-  const today = new Date();
-  if (choseType.value === '周') {
-    onChangeWeek(today);
-  } else if (choseType.value === '月') {
-    onChangeMonth(today);
-  } else {
-    onChangeDate(today);
-  }
-};
-// 处理筛选项选择事件
-const handleFilterChange = (field: object) => {
-  console.log(`筛选项发生变化:`, field);
-  // // 根据不同的筛选字段执行不同的操作
-  if (typeof field === 'object' && field !== null) {
-    // 处理传入整个对象的情况
-    Object.keys(field).forEach((key) => {
-      const value = field[key];
-      switch (key) {
-        case 'operator':
-          query.operator_ids = value;
-          break;
-        case 'platform':
-          query.platforms = value;
-          break;
-        case 'accounts':
-          query.ids = value;
-          break;
-        default:
-          // 其他字段直接赋值
-          query[key] = value;
-      }
-    });
-    handleSearch();
-  }
-};
-
-// 获取数据
+// 数据获取
 const handleSearch = () => {
-  console.log('handleSearch查询参数:', query);
   query.page = pageInfo.value.page;
   query.page_size = pageInfo.value.page_size;
   getTaskSchedules(query)
     .then((response) => {
       if (response.data) {
-        // 根据API响应结构调整
         const apiData = response.data.data || response.data;
         data.value = processTableData(apiData);
         pageInfo.value.total = response.data.total || apiData.length;
       }
     })
-    .catch((error) => {
+    .catch(() => {
       data.value = [];
     });
 };
 
-// 获取运营人员
+// 添加一个标志位来避免死循环
+let isDateSelectorUpdating = false;
+
+// 日期选择器变化处理
+const handleDateSelectorChange = (value: any) => {
+  // 如果正在更新中，则跳过
+  if (isDateSelectorUpdating) {
+    return;
+  }
+
+  const newStartDate = value.dateRange.start;
+  const newEndDate = value.dateRange.end;
+
+  // 添加空值检查以避免数组越界错误
+  const currentStart =
+    Array.isArray(query.execution_time) && query.execution_time.length > 0 ? query.execution_time[0] : null;
+  const currentEnd =
+    Array.isArray(query.execution_time) && query.execution_time.length > 1 ? query.execution_time[1] : null;
+
+  // 如果日期范围没有变化，则不执行后续操作
+  if (currentStart === newStartDate && currentEnd === newEndDate) {
+    return;
+  }
+
+  // 设置标志位
+  isDateSelectorUpdating = true;
+
+  query.execution_time = [newStartDate, newEndDate];
+  setTableColumns();
+  handleSearch();
+
+  // 在下一个事件循环重置标志位
+  setTimeout(() => {
+    isDateSelectorUpdating = false;
+  }, 0);
+};
+
+// 筛选条件变化处理
+
+const handleFilterChange = (filters: any) => {
+  console.log(filters);
+  if (typeof filters === 'object' && filters !== null) {
+    Object.keys(filters).forEach((key) => {
+      switch (key) {
+        case 'operator':
+          query.operator_ids = filters[key];
+          break;
+        case 'platform':
+          query.platforms = filters[key];
+          break;
+        case 'accounts':
+          query.ids = filters[key];
+          break;
+        default:
+          query[key] = filters[key];
+      }
+    });
+    console.log(query);
+    handleSearch();
+  }
+};
+
+// 表格排序变化
+const handleTableChange = (pagination: any, sorter: any) => {
+  if (sorter && sorter.sorter?.direction === 'ascend' && sorter.sorter?.field) {
+    const column = columns.value.find((col) => col.dataIndex == sorter.sorter.field);
+    if (column?.date) {
+      query.top_execution_time = DateUtils.formatDate(column.date);
+    }
+  } else {
+    query.top_execution_time = undefined;
+  }
+  handleSearch();
+};
+
+// 任务操作处理
+const handleTaskAction = (action: string, task: any, ...args: any[]) => {
+  switch (action) {
+    case 'delete':
+      currentTask.value = task;
+      deleteTitle.value = task.type === 1 ? '删除内容稿件排期' : '删除选题排期';
+      deleteContent.value = `确认删除“${task.name}”吗？`;
+      showModal.value = true;
+      break;
+    case 'edit-time':
+      editTaskSchedules(task.id, { execution_time: args[0] }).then(() => handleSearch());
+      break;
+    case 'goto-detail':
+      router.push(`/media-account/management-detail/${task.id}`);
+      break;
+  }
+};
+
+// 确认删除
+const handleDeleteConfirm = () => {
+  if (currentTask.value) {
+    delTaskSchedules(currentTask.value.id).then(() => {
+      showModal.value = false;
+      handleSearch();
+    });
+  }
+};
+
+// 添加账号
+const handleAddAccount = () => {
+  // 跳转到添加账号页面的逻辑
+  router.push('/media-account/add');
+};
+
+// 获取运营人员列表
 const getOperators = async () => {
   try {
     const { code, data: operatorsData } = await fetchAccountOperators();
@@ -765,60 +489,33 @@ const getOperators = async () => {
         value: op.id,
         name: op.name,
       }));
-      console.log('获取运营人员数据成功:', operatorsData, operators.value);
     }
   } catch (error) {
-    console.error('获取运营人员数据失败:', error);
+    console.error('获取运营人员失败:', error);
   }
 };
 
+// 获取账号列表
 const getAccountList = async () => {
   try {
     const { code, data: accountData } = await getMediaAccountList();
     if (code === 200) {
-      // 创建平台映射，用于获取平台名称
-      const platformMap = {
-        0: '抖音',
-        1: '小红书',
-        2: 'B站',
-        3: '快手',
-        4: '视频号',
-        5: '微博',
-        6: '公众号',
-      };
-
       accountList.value = accountData.map((account: any) => ({
         value: account.id,
-        name: `${account.name}(${platformMap[account.platform] || '未知平台'})`,
+        name: `${account.name}(${getPlatformName(account.platform)})`,
         platform: account.platform,
         icon: getPlatformIcon(account.platform),
       }));
-      console.log('获取账号数据成功:', accountData, accountList.value);
     }
-  } catch (error) {}
+  } catch (error) {
+    console.error('获取账号列表失败:', error);
+  }
 };
 
-// 监听日期维度变化
-watch(choseType, (newVal) => {
-  // 重置对应模型的值为当前日期
-  const now = new Date();
-  if (newVal === '日') {
-    dayModel.value = now;
-  } else if (newVal === '周') {
-    weekModel.value = now;
-  } else if (newVal === '月') {
-    monthModel.value = now;
-  }
-  nextTick(() => {
-    setDateRange();
-    setTableSpecific();
-    handleSearch();
-  });
-});
-
+// 初始化
 onMounted(() => {
-  setDateRange();
-  setTableSpecific();
+  // 确保在初始化时设置表格列和执行搜索
+  setTableColumns();
   handleSearch();
   getOperators();
   getAccountList();
@@ -826,17 +523,6 @@ onMounted(() => {
 </script>
 
 <style scoped>
-.content {
-  background: white;
-  width: 100%;
-  height: 600px;
-  padding: 12px;
-}
-
-.arco-dropdown-open .arco-icon-down {
-  transform: rotate(180deg);
-}
-
 .task-container {
   display: flex;
   flex-direction: column;
@@ -865,37 +551,44 @@ onMounted(() => {
   justify-content: center;
 }
 
-/* 周末列背景色 */
+/* 周末列样式 */
 :deep(.weekend-column) {
-  background-color: #fbfaff !important;
+  background-color: #FBFAFF !important;
 }
 
-/* 颜色示意按钮样式 */
-:deep(.color-scheme-btn) {
-  border: none !important;
-  background: none !important;
-  box-shadow: none !important;
+/* 今日列样式 */
+:deep(th.today-column),
+:deep(td.today-column) {
+  background-color: #6D4CFE !important;
+  color: white !important;
 }
 
-.cell-detail {
-  background-color: #fff;
-  border: 1px solid #d9d9d9;
-  border-radius: 4px;
-  box-shadow: #00000010 0px 2px 8px;
-  padding: 8px 16px;
-  margin-top: 8px;
-}
-.opt-btn {
-  font-size: 12px;
-  width: 138px;
-  height: 28px;
-  background-color: #f2f3f5;
-  text-align: center;
-  line-height: 28px;
-  border-radius: 4px;
-  margin-right: 12px;
+:deep(th.today-column) .arco-table-th-item,
+:deep(th.today-column) .arco-table-th-item-title {
+  color: #6D4CFE !important;
+  background-color: white !important;
+  font-weight: bold;
 }
 
+:deep(td.today-column) .arco-table-cell-wrap {
+  color: white !important;
+}
+
+/* 表头今日样式增强 */
+:deep(th.today-column) {
+  background-color: #6D4CFE !important;
+}
+
+:deep(th.today-column .arco-table-th-item) {
+  background-color: white !important;
+  color: #6D4CFE !important;
+}
+
+:deep(td.today-column) {
+  background-color: #6D4CFE !important;
+}
+
+/* 分页样式 */
 .pagination-box {
   display: flex;
   width: 100%;
@@ -903,4 +596,10 @@ onMounted(() => {
   justify-content: flex-end;
   align-items: center;
 }
+
+/* 下拉框样式优化 */
+:deep(.arco-dropdown-open .arco-icon-down) {
+  transform: rotate(180deg);
+  transition: transform 0.2s ease;
+}
 </style>

From 7c8495ed7c0066ca136ce6049b39c25d8ed4e0f9 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Mon, 15 Sep 2025 19:48:10 +0800
Subject: [PATCH 05/39] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/date-selector.vue              | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/date-selector.vue b/src/views/property-marketing/assignment-management/components/date-selector.vue
index 7cb81f8..e4bf860 100644
--- a/src/views/property-marketing/assignment-management/components/date-selector.vue
+++ b/src/views/property-marketing/assignment-management/components/date-selector.vue
@@ -7,6 +7,7 @@
       @change="handleDateChange"
       v-model="currentDate"
       format="YYYY年MM月DD日周dd"
+      value-format="YYYY-MM-DD"
     />
     <!-- 周选择器 -->
     <a-week-picker
@@ -15,6 +16,7 @@
       @change="handleDateChange"
       v-model="currentDate"
       format="YYYY年MM月DD日"
+      value-format="YYYY-MM-DD"
     />
     <!-- 月选择器 -->
     <a-month-picker
@@ -23,6 +25,7 @@
       @change="handleDateChange"
       v-model="currentDate"
       format="YYYY年MM月"
+      value-format="YYYY-MM"
     />
 
     <!-- 日期导航按钮 -->
@@ -43,7 +46,13 @@
 
     <!-- 维度切换下拉框 -->
     <div class="flex items-center">
-      <a-dropdown position="bottom" @select="handleTypeChange" class="w-80px" :popupVisible="dropdownVisible" @popupVisibleChange="handleDropdownVisibleChange">
+      <a-dropdown
+        position="bottom"
+        @select="handleTypeChange"
+        class="w-80px"
+        :popupVisible="dropdownVisible"
+        @popupVisibleChange="handleDropdownVisibleChange"
+      >
         <a-button type="text" class="prv-today"> {{ choseType }}<icon-down class="ml-4px" /> </a-button>
         <template #content>
           <a-doption value="日" class="doption">日</a-doption>
@@ -141,7 +150,7 @@ const handleTypeChange = (val: '日' | '周' | '月') => {
   const today = new Date();
   currentDate.value = today;
   emitChange();
-  
+
   // 选择后隐藏下拉菜单
   setTimeout(() => {
     dropdownVisible.value = false;
@@ -151,7 +160,22 @@ const handleTypeChange = (val: '日' | '周' | '月') => {
 // 6. 日期选择器变更处理
 const handleDateChange = (val: Date | string | undefined) => {
   if (!val) return;
-  const selectedDate = val instanceof Date ? val : new Date(val);
+
+  let selectedDate: Date;
+  if (val instanceof Date) {
+    selectedDate = val;
+  } else {
+    // 处理字符串格式的日期
+    if (choseType.value === '月') {
+      // 月份选择器返回 YYYY-MM 格式
+      const [year, month] = val.split('-').map(Number);
+      selectedDate = new Date(year, month - 1, 1);
+    } else {
+      // 日和周选择器返回 YYYY-MM-DD 格式
+      selectedDate = new Date(val);
+    }
+  }
+
   currentDate.value = selectedDate;
   emitChange();
 };
@@ -245,7 +269,7 @@ setTimeout(() => {
   color: #211f24 !important;
 }
 .doption {
-  width: 80px !important;
+  width: 78px !important;
 }
 .prv-today {
   color: #211f24 !important;
@@ -256,4 +280,4 @@ setTimeout(() => {
   display: flex;
   justify-content: space-between;
 }
-</style>
\ No newline at end of file
+</style>

From 1ccf8b991e89e1badc04dfc2fccb799333e2115f Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Mon, 15 Sep 2025 20:26:31 +0800
Subject: [PATCH 06/39] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E7=9A=84=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 33 +++++++++++
 .../assignment-management/index.vue           | 55 +++++++++++--------
 2 files changed, 66 insertions(+), 22 deletions(-)
 create mode 100644 src/views/property-marketing/assignment-management/components/draw-popup.vue

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
new file mode 100644
index 0000000..1585103
--- /dev/null
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -0,0 +1,33 @@
+<template>
+  <a-drawer
+    title="创建任务"
+    cancel-text="取消"
+    ok-text="创建任务"
+    placement="right"
+    v-model:visible="showDriwer"
+    @after-visible-change="showDriwerChange"
+    width="480px"
+    class="rounded-left"
+  >
+  </a-drawer>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+
+const showDriwer = ref(false);
+
+// 暴露方法给父组件
+const showDrawer = () => {
+  showDriwer.value = true;
+};
+
+const showDriwerChange = (visible: boolean) => {
+  console.log('Drawer visible: ', visible);
+};
+
+// 使用defineExpose暴露方法
+defineExpose({
+  showDrawer
+});
+</script>
\ No newline at end of file
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 0e3c90a..bc48ba2 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -20,7 +20,7 @@
 
     <!-- 表格内容区域 -->
     <div class="flex justify-between items-start w-full">
-      <div class="table-wrap py-24px flex flex-col" style="width: 100%; overflow-x: auto;">
+      <div class="table-wrap py-24px flex flex-col" style="width: 100%; overflow-x: auto">
         <a-table
           :columns="columns"
           :data="data"
@@ -110,10 +110,11 @@
     <template #title>{{ deleteTitle }}</template>
     <div>{{ deleteContent }}</div>
   </a-modal>
+  <DrowPopup ref="drawerPopupRef" />
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, onMounted, computed } from 'vue';
+import { ref, reactive, onMounted, computed, inject } from 'vue';
 import type { ColumnProps } from 'ant-design-vue/es/table';
 import router from '@/router';
 import DateUtils from '@/utils/DateUtils';
@@ -121,6 +122,7 @@ import DateUtils from '@/utils/DateUtils';
 import DateSelector from './components/date-selector.vue';
 import colorTip from './components/colorTip.vue';
 import FilterPopup from './components/filter-popup.vue';
+import DrowPopup from './components/draw-popup.vue';
 // API引入
 import { getTaskSchedules, delTaskSchedules, editTaskSchedules } from '@/api/all/assignment-management';
 import { fetchAccountOperators, getMediaAccountList } from '@/api/all/propertyMarketing';
@@ -211,6 +213,13 @@ const timestampToDayNumber = (timestamp: number) => {
   return new Date(timestamp * 1000).getDate();
 };
 
+// // 获取任务列表
+// const handleSearch = async () => {
+//   const { data: accountData } = await fetchAccountOperators();
+//   const { data: mediaAccountData } = await getMediaAccountList();
+//   operators.value = accountData;
+//   accountList.value = mediaAccountData;
+// };
 // const timestampToTime = (timestamp: number): string => {
 //   const date = new Date(timestamp * 1000);
 //   return `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
@@ -255,7 +264,14 @@ const processTableData = (apiData: any[]) => {
 };
 
 // 创建任务
-const handleAddTask = () => {};
+const handleAddTask = () => {
+  console.log('handleAddTask');
+  drawerPopupRef.value?.showDrawer();
+};
+
+// 添加对DrowPopup组件的引用
+const drawerPopupRef = ref();
+
 // 设置表格列
 const setTableColumns = () => {
   columns.value = [
@@ -302,7 +318,7 @@ const setTableColumns = () => {
     const isWeekend = item.date?.getDay() === 0 || item.date?.getDay() === 6;
     // 确保item.date存在再进行判断
     const todayFlag = item.date ? isToday(item.date) : false;
-    
+
     // 调试信息
     if (todayFlag) {
       console.log('Today column detected:', item);
@@ -326,12 +342,12 @@ const setTableColumns = () => {
       // 为今日添加特殊类名
       class: todayFlag ? 'today-column' : '',
     };
-    
+
     // 更多调试信息
     if (todayFlag) {
       console.log('Column config for today:', columnConfig);
     }
-    
+
     columns.value.push(columnConfig);
   });
 };
@@ -553,39 +569,34 @@ onMounted(() => {
 
 /* 周末列样式 */
 :deep(.weekend-column) {
-  background-color: #FBFAFF !important;
+  background-color: #fbfaff !important;
 }
 
 /* 今日列样式 */
 :deep(th.today-column),
 :deep(td.today-column) {
-  background-color: #6D4CFE !important;
-  color: white !important;
+  background-color: #6d4cfe !important;
 }
 
 :deep(th.today-column) .arco-table-th-item,
 :deep(th.today-column) .arco-table-th-item-title {
-  color: #6D4CFE !important;
+  color: #6d4cfe !important;
   background-color: white !important;
   font-weight: bold;
 }
 
+:deep(th.today-column) .arco-table-th-item-title {
+  color: #6d4cfe !important;
+}
+
 :deep(td.today-column) .arco-table-cell-wrap {
   color: white !important;
 }
 
-/* 表头今日样式增强 */
-:deep(th.today-column) {
-  background-color: #6D4CFE !important;
-}
-
-:deep(th.today-column .arco-table-th-item) {
-  background-color: white !important;
-  color: #6D4CFE !important;
-}
-
-:deep(td.today-column) {
-  background-color: #6D4CFE !important;
+/* 抽屉左侧圆角样式 */
+:deep(.rounded-left .ant-drawer-content) {
+  border-top-left-radius: 8px !important;
+  border-bottom-left-radius: 8px !important;
 }
 
 /* 分页样式 */

From 0671c19306938b4808092fbf7b8b792647384df2 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Thu, 18 Sep 2025 14:40:47 +0800
Subject: [PATCH 07/39] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/media-account/icon-AI.png      | Bin 0 -> 1520 bytes
 .../components/draw-popup.vue                 | 335 +++++++++++++++++-
 .../components/filter-popup.vue               |  10 +-
 .../components/task-item.vue                  |   4 +
 4 files changed, 340 insertions(+), 9 deletions(-)
 create mode 100644 src/assets/img/media-account/icon-AI.png
 create mode 100644 src/views/property-marketing/assignment-management/components/task-item.vue

diff --git a/src/assets/img/media-account/icon-AI.png b/src/assets/img/media-account/icon-AI.png
new file mode 100644
index 0000000000000000000000000000000000000000..795b3bbf86ea90d508950f5fffc104174429de62
GIT binary patch
literal 1520
zcmV<M1rPd(P)<h;3K|Lk000e1NJLTq001EX001Be1^@s6oVXFn00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1%*jOK~#7F?N`lf
zTvZf5=e;){nWXKcP4iI^$5y0J#a5`LxaeddE<|WIVpnZIFkRJvh;@^6C9cH3pv^*X
zX95;c!F1&ZNRui>iJ)l+Xqu{7n9RqU_m01F?|t(oNoSJQO&7gz=FYr#-~Ij0?|i&F
zL=VAW`k!NVLW-D*lp{KJi5KVr#(k5RIStSZo#O(P{VqD?by07on<Tf3DBDe(>!G=9
zp5`(+njSdAQ#;vn$0R;2OR<opi=3yo{2c88ID>?E1>&GUl-q4cP!5*Yxy#r>zKbqr
zU*xNu_6~MJ;PbMSVu%nCl|0$t0aHv8<EEMjF-+&=ehGF(zLQfVbeT`yJ6s-ZGp?28
zDE7Z0K9xX%)BvKu5=SrqMgR{R#0}g`EK*`Aq4QugBi~BtzDcM8@Z@U{=*3DAtkyjn
za573PhJlO$Z=@Egh1OzAq-2Q9nnd0?2|PO!GZh6)Vh>X5jLSZ9AiEdV3oF`CL=BR9
zXu<0aJXFF6c$g|uq8fd;8HYQlFdi{YKn0~Lu@4gXu4<fkk7(#bx^{k=Xz6<-7?LsH
zgM=(tE4_^0{UCA|_A>})tk>W<oH@zYJ1Sukk!f53*%448x;ogkk${fABT&NSf~o*B
zs<<$yinLyXRf(#h3D-Dn7Y;mB76pdqj(`mZ=DugQuHX9<Hp;q?)B#i{uGVar%zhwK
zQ4+YfRyRb-D_=>uBME?=GfAl6Y-eYZs1U9b-Tb(X8kR_^MC6o!RqB>ZEuzz%NidXP
zGZWc75I6JwBX-RSVm$vPiIUOL{|pGku1sBWCQ3w-f~ykixL0Y=b8Sgndr6KaUYk5%
zQ<|nS`T$heZ`Uo|u%TL-bxIsU{$yQ=S|XAtp*>^Wk*I`Di3TdA9SLk)B<Hz;BuS~n
zhK{G}?#x@Imgnv73@W2%$N-8G(B_qNP9@Vy04m5@n3CAiwi_rhiET1UQow9X9y@MJ
z`pz#z|NgBF1B(2VK05%VmKRY_0QEse+qemDY;z=3fw4F4vDf1M782Ef7JLUvE)2}X
zg?(u#`VSMm`T=d}G6$j551)a6m?Ui~p_4W-Emi%YBthaIY8Q^PpYTGMmDPGyILrt|
z8Qb*^ys&XycOPt@wPa+wY;KrN>A-bpeuns{gIE~ZZd$9;&9+MDs0TEM4ay$WfVQlH
z9C+UPy@oLS_Kj7+gbQwTqlF)GBnQzm{#djX5mU-SNqCW2E~*3`o$E-V=E;<jP;?)$
z*xe^Q@U+!_5&VDr!nz3(wwwA^kwK_1a1ht8<2s&=Tb00@7jL{~K46}tcHz)b3BAdx
z$SRC#EVSqG^xonvY#LaTz!K2P`SW*sf9Od=h+B6SOG5id5|+8w#<;0O+ZWjTZ-f(`
z$KwGu>*-;7;;<(k2rb<*d1^7lby5()5l=%QP=^<O#f)n`y~KkhqQ6#%?k-!8eN}<!
z%*fm6(XTCuiStrqFPhB+QpyBOxxkaa7Y?vPz~(igPqTWN5HWMGq0JjJC}OHimrstq
z!y~O&ZO;=ES9!G>H$JLGPD+FZ;nb2x9*AjT!tS8sw}85YHQ>H05NXEcc5a=<He<Ct
zV~)OFDOKuxk#eF*WKL5a+Yc0smJG7YbQ5vS%)DC?Qc57fRt50mHar*}nc&sUSZ$T4
zR`?2%sFakNIa{)IDp4Y~fNWm#E)0}}z<SOu;M4gE9lOxxf5|<SIQvRfk6>kL?&UnS
zv)Q^SxpO6EQz@o2-C7lG4zKaC(M#zmYR4q-|DvqP7{EMV&780jFF9#au3?#qpfm{=
zkgZdYe)`RAz&n!ICAnept3?X(s6DjftW|;0ZUf&wm1&Wwnzdgqy!&8(10RitYWxTI
WKcuPE<`qu>0000<MNUMnLSTY~_P#Ix

literal 0
HcmV?d00001

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 1585103..cddf15f 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -7,16 +7,175 @@
     v-model:visible="showDriwer"
     @after-visible-change="showDriwerChange"
     width="480px"
-    class="rounded-left"
+    class="task-drawer"
+    style="z-index: 999"
   >
+    <div class="drawer-content" :style="isActive == 'ai' ? 'height: 376px;' : 'height:216px;'">
+      <div class="flex flex-col justify-center items-start">
+        <CommonSelect
+          v-model="localQuery.accounts"
+          :options="accountList || []"
+          :multiple="true"
+          @change="(val) => handleChange('accounts', val)"
+          class="!w-432px select-with-tags"
+          placeholder="请选择账号名称"
+          :allowSearch="true"
+          :maxTagCount="999"
+          popup-container=".filter-popup-content"
+        />
+        <div class="ai-content-generator">
+          <div class="flex mt-16px">
+            <Button
+              class="w-194px h-38px mr-8px"
+              :class="isActive == 'ai' ? 'active-chose' : ''"
+              @click="handleSelect('ai')"
+            >
+              <template #icon>
+                <img :src="aiIcon" class="w-16 h-16 mr-8px" />
+              </template>
+              AI生成
+            </Button>
+
+            <Button
+              class="w-194px h-38px"
+              :class="isActive == 'chose' ? 'active-chose' : ''"
+              @click="handleSelect('chose')"
+            >
+              从成品库选择</Button
+            >
+          </div>
+          <div v-show="isActive == 'ai'">
+            <!-- 任务描述区域 -->
+            <div class="form-section">
+              <div class="flex items-center w-400px mt-16px mb-8px">
+                <div class="section-title">任务描述</div>
+                <div class="font-size-12px text-[#999999]">（非必填）</div>
+              </div>
+              <div class="w-400px h-126px border-rounded-8px mb-8px" style="background: #fff">
+                <a-textarea
+                  placeholder="描述你想让AI帮你生成的内容。未填写时，AI 会参考账号历史内容的题材与行业方向，结合当下话题，自动生成文案和图片后发布"
+                  class="task-description font-size-12px"
+                  :rows="5"
+                />
+              </div>
+            </div>
+            <!-- 素材添加区域 -->
+            <div class="form-section material-section">
+              <Button class="add-material-btn" @click="handleAddMaterial">
+                <template #icon>
+                  <icon-plus size="16" class="mr-8px" />
+                </template>
+                从原料库添加
+              </Button>
+              <p class="material-hint">AI会参考添加的文本、图片、视频等素材，完成符合需求的创作</p>
+            </div>
+          </div>
+          <div v-show="isActive == 'chose'">
+            <!-- 任务描述区域 -->
+            <div class="form-section">
+              <div class="flex items-center w-400px mt-16px mb-8px">
+                <div class="section-title">发布内容</div>
+                <div class="font-size-12px text-[#999999]">（必填）</div>
+              </div>
+              <div class="form-section material-section">
+                <Button @click="handleAddMaterial" class="add-material-btn">
+                  <template #icon>
+                    <icon-plus size="16" class="mr-8px" />
+                  </template>
+                  添加内容
+                </Button>
+
+                <p class="material-hint">前往成品库，选择要发布的内容</p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 发布计划区域 -->
+      <div class="publish-section">
+        <div class="flex items-center justify-between w-384px">
+          <div class="section-title">发布计划</div>
+          <CommonSelect
+            v-model="localQuery.accounts"
+            :options="accountList || []"
+            :multiple="true"
+            @change="(val) => handleChange('accounts', val)"
+            class="w-180px background-#fff"
+            placeholder="请选择账号名称"
+            :allowSearch="true"
+            :maxTagCount="999"
+            popup-container=".filter-popup-content"
+          />
+        </div>
+
+        <div v-if="isTiming">
+          <div class="line"></div>
+          <div class="flex items-center justify-between mt-16px w-384px">
+            <div class="section-title">日期</div>
+            <a-date-picker
+              class="w-180px h-40px background-#fff"
+              @change="handleDateChange"
+              v-model="currentDate"
+              format="YYYY年MM月DD日周dd"
+              value-format="YYYY-MM-DD"
+            />
+          </div>
+          <div class="line"></div>
+          <div class="flex items-center justify-between mt-16px w-384px">
+            <div class="section-title">时间</div>
+            <a-time-picker v-model:value="strValue" format="HH:mm" class="w-180px h-40px background-#fff" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <a-drawer
+      title="成品库"
+      cancel-text="取消"
+      ok-text="确定"
+      placement="right"
+      v-model:visible="showDrawer2"
+      @after-visible-change="showDriwerChange"
+      width="904px"
+      class="task-drawer"
+      style="right: 481px"
+    >
+    </a-drawer>
   </a-drawer>
 </template>
 
 <script lang="ts" setup>
 import { ref } from 'vue';
+import aiIcon from '@/assets/img/media-account/icon-AI.png';
+import { Checkbox, Button, Space, Pagination, notification } from 'ant-design-vue';
+import dayjs from 'dayjs';
 
+const selectedTab = ref('ai-generate');
+// 定义props和emit
+const props = defineProps({
+  operators: Array,
+  platformOptions: Array,
+  accountList: Array,
+  query: Object,
+});
+const isActive = ref('ai');
+// 本地筛选状态（保持上次选择）
+const localQuery = ref({
+  accounts: props.query?.ids || [],
+});
 const showDriwer = ref(false);
-
+const showDrawer2 = ref(false);
+const emit = defineEmits(['filter-change']);
+const isTiming = ref(true);
+const currentDate = ref(new Date());
+const strValue = ref('12:08');
+const handleSelect = (value) => {
+  console.log('++++++++++', value);
+  isActive.value = value;
+};
+const handleAddMaterial = () => {
+  showDrawer2.value = true;
+};
+const handleDateChange = (date) => {};
 // 暴露方法给父组件
 const showDrawer = () => {
   showDriwer.value = true;
@@ -26,8 +185,176 @@ const showDriwerChange = (visible: boolean) => {
   console.log('Drawer visible: ', visible);
 };
 
+// 处理筛选条件变化（不关闭弹窗，直接触发筛选）
+const handleChange = (field, value) => {
+  localQuery.value[field] = value;
+  // 直接触发筛选变更，不需要确认按钮
+  emit('filter-change', {
+    accounts: localQuery.value.accounts,
+  });
+};
+
 // 使用defineExpose暴露方法
 defineExpose({
-  showDrawer
+  showDrawer,
 });
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.drawer-content {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+/* 抽屉左侧圆角样式 */
+.arco-drawer {
+  border-top-left-radius: 8px !important;
+  border-bottom-left-radius: 8px !important;
+}
+
+.ai-content-generator {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: start;
+  margin-top: 24px;
+  width: 432px;
+  background: linear-gradient(to right, #f0f5ff, #fff6f5) !important;
+  border-radius: 8px;
+}
+.active-chose {
+  border: #722ed1 1px solid !important;
+}
+
+.main-container {
+  width: 100%;
+  max-width: 600px;
+  background-color: #fff;
+  border: 1px solid #e0e0e0;
+  border-radius: 8px;
+  padding: 24px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+}
+
+.tab-group {
+  margin-bottom: 24px;
+  width: 100%;
+}
+
+.tab-button {
+  flex: 1;
+  height: 48px;
+  font-size: 16px;
+}
+
+.ai-tab .ai-icon {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  background-color: #722ed1;
+  color: white;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 16px;
+  font-size: 12px;
+  margin-right: 8px;
+}
+
+.form-section {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 400px;
+  border-radius: 8px;
+}
+
+.publish-section {
+  width: 432px;
+  padding: 16px 24px;
+  background-color: #f7f8fa;
+  display: flex;
+  flex-direction: column;
+  border-radius: 8px;
+  align-items: start;
+  justify-content: space-between;
+  margin-top: 24px;
+}
+
+.section-title {
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+}
+
+.task-description {
+  width: 100%;
+  font-size: 14px;
+  height: 126px;
+  border: none !important;
+  box-shadow: none !important;
+  outline: none !important; /* 去除默认的聚焦轮廓 */
+}
+
+.task-description::placeholder {
+  color: #999;
+}
+
+.material-section {
+  border-radius: 8px;
+  text-align: center;
+  background-color: #fff;
+  margin-bottom: 8px;
+  padding: 16px;
+}
+
+.add-material-btn {
+  width: 240px;
+  height: 38px;
+  border-radius: 8px;
+  font-size: 14px;
+  border: 1px dashed #e0e0e0 !important;
+  margin-bottom: 8px;
+}
+
+.drag-handle {
+  position: absolute;
+  width: 16px;
+  height: 16px;
+  background-color: #ff7d00;
+  border-radius: 50%;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.material-hint {
+  color: #939499;
+  font-size: 14px;
+  margin: 0 40px;
+}
+
+.size-selector {
+  margin-bottom: 24px;
+  text-align: center;
+}
+
+.size-tag {
+  font-size: 14px;
+  padding: 6px 16px;
+  border-radius: 16px;
+}
+
+.publish-select {
+  width: 100%;
+  height: 40px;
+}
+.line {
+  background-color: #e6e6e8;
+  width: 382px;
+  height: 1px;
+  margin-top: 16px;
+}
+</style>
diff --git a/src/views/property-marketing/assignment-management/components/filter-popup.vue b/src/views/property-marketing/assignment-management/components/filter-popup.vue
index 60164f8..9398eac 100644
--- a/src/views/property-marketing/assignment-management/components/filter-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/filter-popup.vue
@@ -11,7 +11,7 @@
       <template #content>
         <div class="filter-popup-content">
           <!-- 运营人员 -->
-          <div class="flex items-start mb-3 select-container">
+          <div class="flex items-center mb-3 select-container">
             <div class="w-70px pt-6px">运营人员</div>
             <a-space class="flex-1">
               <CommonSelect
@@ -27,7 +27,7 @@
             </a-space>
           </div>
           <!-- 发布平台 -->
-          <div class="flex items-start mb-3 select-container">
+          <div class="flex items-center mb-3 select-container">
             <div class="w-70px pt-6px">发布平台</div>
             <a-space class="flex-1">
               <CommonSelect
@@ -43,7 +43,7 @@
             </a-space>
           </div>
           <!-- 账号名称 -->
-          <div class="flex items-start mb-3 select-container">
+          <div class="flex items-center mb-3 select-container">
             <div class="w-70px pt-6px">账号名称</div>
             <a-space class="flex-1">
               <CommonSelect
@@ -122,7 +122,7 @@ const handleChange = (field, value) => {
     platform: localQuery.value.platform,
     accounts: localQuery.value.accounts,
   });
-  
+
   // 选择后自动隐藏下拉菜单
   setTimeout(() => {
     visible.value = false;
@@ -178,4 +178,4 @@ const handleClickOutside = () => {
 .select-with-tags :deep(.ant-select-selection-overflow) {
   flex-wrap: wrap !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
new file mode 100644
index 0000000..60cf331
--- /dev/null
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -0,0 +1,4 @@
+<template>
+    <div class="task-item"> 
+    </div>
+</template>
\ No newline at end of file

From 14192d5c8efca96eb73c7136e472a87e6790e961 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Fri, 19 Sep 2025 10:34:26 +0800
Subject: [PATCH 08/39] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                  |  9 ++++++++-
 .../components/task-item.vue                   | 18 +++++++++++++++---
 .../assignment-management/index.vue            |  1 +
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index cddf15f..633d8a4 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -96,7 +96,7 @@
         <div class="flex items-center justify-between w-384px">
           <div class="section-title">发布计划</div>
           <CommonSelect
-            v-model="localQuery.accounts"
+            v-model="publishQuery"
             :options="accountList || []"
             :multiple="true"
             @change="(val) => handleChange('accounts', val)"
@@ -158,6 +158,13 @@ const props = defineProps({
   query: Object,
 });
 const isActive = ref('ai');
+const publishQuery = ref([{
+    id: 1,
+    name:"立即发布"
+},{
+    id: 2,
+    name:"定时发布"
+}]);
 // 本地筛选状态（保持上次选择）
 const localQuery = ref({
   accounts: props.query?.ids || [],
diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index 60cf331..42f2b97 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -1,4 +1,16 @@
 <template>
-    <div class="task-item"> 
-    </div>
-</template>
\ No newline at end of file
+  <div class="task-item">
+    
+  </div>
+</template>
+
+<script setup lang="ts">
+
+</script>
+
+<style lang="less" scoped>
+.task-item {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index bc48ba2..7f002e7 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -123,6 +123,7 @@ import DateSelector from './components/date-selector.vue';
 import colorTip from './components/colorTip.vue';
 import FilterPopup from './components/filter-popup.vue';
 import DrowPopup from './components/draw-popup.vue';
+import TaskItem from './components/task-item.vue';
 // API引入
 import { getTaskSchedules, delTaskSchedules, editTaskSchedules } from '@/api/all/assignment-management';
 import { fetchAccountOperators, getMediaAccountList } from '@/api/all/propertyMarketing';

From bf202e77a6f79e8c4c1cd534bfcdbd0277a1d3c1 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Fri, 19 Sep 2025 14:57:14 +0800
Subject: [PATCH 09/39] =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 74 +++++++++++++++++--
 1 file changed, 66 insertions(+), 8 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 633d8a4..fc56655 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -139,16 +139,55 @@
       class="task-drawer"
       style="right: 481px"
     >
+      <a-table :data="materialData" bordered :columns="columns">
+        <template #create_at="{ record }">
+          <div class="flex items-center">
+            {{ record.created_at ? dayjs(record.created_at).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+          </div>
+        </template>
+      </a-table>
     </a-drawer>
   </a-drawer>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, reactive, onMounted } from 'vue';
 import aiIcon from '@/assets/img/media-account/icon-AI.png';
-import { Checkbox, Button, Space, Pagination, notification } from 'ant-design-vue';
+import { Checkbox, Button, Space, Pagination, notification, DatePicker, TimePicker } from 'ant-design-vue';
+import { TABS_LIST, ORIGIN_LIST, RawMaterialType } from '@/views/material-center/components/raw-material/constants';
 import dayjs from 'dayjs';
+import { getRawMaterialsPage } from '@/api/all/generationWorkshop';
+// 工具引入
+import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
 
+const columns = ref([
+  {
+    title: '名称',
+    dataIndex: 'name',
+    width: 200,
+    solts: { customRender: 'name' },
+  },
+  {
+    title: '类型',
+    dataIndex: 'type',
+    width: 100,
+    render: (text) => {
+      return RawMaterialType[text];
+    },
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'created_at',
+    width: 200,
+    slots: { customRender: 'create_at' },
+  },
+]);
+
+// 表格分页逻辑
+const { pageInfo, onPageChange, onPageSizeChange } = useTableSelectionWithPagination({
+  onPageChange: () => handleSearch(),
+  onPageSizeChange: () => handleSearch(),
+});
 const selectedTab = ref('ai-generate');
 // 定义props和emit
 const props = defineProps({
@@ -157,14 +196,29 @@ const props = defineProps({
   accountList: Array,
   query: Object,
 });
+// 查询参数
+const query = reactive({
+  page: pageInfo.value.page,
+  page_size: pageInfo.value.page_size,
+  platforms: undefined,
+  operator_ids: undefined,
+  ids: [],
+  top_execution_time: undefined,
+});
+const materialData = ref([]);
+const handleSearch = async () => {
+  const res = await getRawMaterialsPage(query);
+  console.log(res.data.data);
+  materialData.value = [...materialData.value, ...res.data.data];
+};
 const isActive = ref('ai');
-const publishQuery = ref([{
+const publishQuery = ref([
+  {
     id: 1,
-    name:"立即发布"
-},{
-    id: 2,
-    name:"定时发布"
-}]);
+    name: '立即发布',
+  },
+  { id: 2, name: '定时发布' },
+]);
 // 本地筛选状态（保持上次选择）
 const localQuery = ref({
   accounts: props.query?.ids || [],
@@ -175,6 +229,10 @@ const emit = defineEmits(['filter-change']);
 const isTiming = ref(true);
 const currentDate = ref(new Date());
 const strValue = ref('12:08');
+
+onMounted(() => {
+  handleSearch();
+});
 const handleSelect = (value) => {
   console.log('++++++++++', value);
   isActive.value = value;

From d0a731b2cb05e9cbd95301b60179d8d9d470ad32 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Fri, 19 Sep 2025 15:53:12 +0800
Subject: [PATCH 10/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9taskItem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/task-item.vue                  | 42 +++++++++++++++++--
 .../assignment-management/index.vue           | 12 +++++-
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index 42f2b97..f200255 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -1,16 +1,52 @@
 <template>
-  <div class="task-item">
-    
+  <div class="task-item" @click="handleTask(task, record)">
+    <div class="w-4px h-18px rounded-2px" :style="{ background: getTaskColor() }"></div>
+    <div>{{ task?.name || '-' }}</div>
   </div>
 </template>
 
 <script setup lang="ts">
+// 定义props和emit
+const props = defineProps({
+  task: Object,
+  record: Object,
+});
 
+const emit = defineEmits(['filter-change', 'handle-task']);
+const handleTask = (task, record) => {
+  
+};
+// 根据任务类型获取颜色
+const getTaskColor = () => {
+  if (!props.task) return '#000';
+
+  // 根据colorTip.vue中的颜色定义设置不同状态的颜色
+  switch (props.task.status) {
+    case 0: // 待生成
+      return '#ffae00';
+    case 1: // 待发布
+      return '#6d4cfe';
+    case 2: // 已发布
+      return '#939499';
+    case 3: // 发布失败
+      return '#f64b31';
+    default:
+      return props.task.color || '#939499';
+  }
+};
 </script>
 
 <style lang="less" scoped>
 .task-item {
   width: 100%;
-  height: 100%;
+  font-size: 12px;
+  height: 19px;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
 }
 </style>
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 7f002e7..ecc733b 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -59,7 +59,9 @@
               <div v-if="record[column.dataIndex].length >= 3" class="task-more">
                 <TaskItem :task="record[column.dataIndex][0]" :record="record" @handle-task="handleTaskAction" />
                 <a-trigger trigger="click" position="br">
-                  <div class="size-12px color-#8f959f px-8px">还有{{ record[column.dataIndex].length - 1 }}项</div>
+                  <div class="size-12px color-#8f959f h-19px ml-4px">
+                    还有{{ record[column.dataIndex].length - 1 }}项
+                  </div>
                   <template #content>
                     <div class="bg-#fff p-12px shadow-sm rounded-4px">
                       <TaskItem
@@ -590,6 +592,14 @@ onMounted(() => {
   color: #6d4cfe !important;
 }
 
+:deep(.arco-table-cell) {
+  padding: 0px !important;
+  display: flex;
+  flex-direction: column;
+  align-items: start;
+  height: 42px;
+}
+
 :deep(td.today-column) .arco-table-cell-wrap {
   color: white !important;
 }

From db2ad32730a0609ea3ab34f88c01298d2b0c9bf4 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Fri, 19 Sep 2025 16:08:00 +0800
Subject: [PATCH 11/39] task

---
 .../components/task-item.vue                  | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index f200255..4920b02 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -1,8 +1,16 @@
 <template>
-  <div class="task-item" @click="handleTask(task, record)">
-    <div class="w-4px h-18px rounded-2px" :style="{ background: getTaskColor() }"></div>
-    <div>{{ task?.name || '-' }}</div>
-  </div>
+  <a-trigger trigger="click" position="br">
+    <div class="task-item" @click="handleTask(task, record)">
+      <div class="w-4px h-18px rounded-2px" :style="{ background: getTaskColor() }"></div>
+      <div>{{ task?.name || '-' }}</div>
+    </div>
+    <template #content>
+      <div
+        class="flex flex-col items-start"
+        style="background-color: #fff; padding: 12px; box-shadow: #00000010 0px 2px 8px; border-radius: 4px"
+      ></div>
+    </template>
+  </a-trigger>
 </template>
 
 <script setup lang="ts">
@@ -11,11 +19,17 @@ const props = defineProps({
   task: Object,
   record: Object,
 });
+// 时间戳转时间格式 (HH:MM)
+const timestampToTime = (timestamp: number): string => {
+  const date = new Date(timestamp * 1000); // 假设时间戳是秒级
+  // 获取小时和分钟
+  const hours = date.getHours().toString().padStart(2, '0');
+  const minutes = date.getMinutes().toString().padStart(2, '0');
 
-const emit = defineEmits(['filter-change', 'handle-task']);
-const handleTask = (task, record) => {
-  
+  return `${hours}:${minutes}`;
 };
+const emit = defineEmits(['filter-change', 'handle-task']);
+const handleTask = (task, record) => {};
 // 根据任务类型获取颜色
 const getTaskColor = () => {
   if (!props.task) return '#000';

From 614c654ca266df52c11ce6a04e4a84c406a23c2d Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Fri, 19 Sep 2025 17:58:13 +0800
Subject: [PATCH 12/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9task?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/date-selector.vue              |  19 +--
 .../components/task-item.vue                  | 144 ++++++++++++++++--
 2 files changed, 140 insertions(+), 23 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/date-selector.vue b/src/views/property-marketing/assignment-management/components/date-selector.vue
index e4bf860..9ad0dbb 100644
--- a/src/views/property-marketing/assignment-management/components/date-selector.vue
+++ b/src/views/property-marketing/assignment-management/components/date-selector.vue
@@ -221,9 +221,10 @@ const emitChange = () => {
     monthModel: monthModel.value,
     dateRange: getDateRange(), // 父组件直接可用的日期范围
   };
-  emit('update:modelValue', result);
-  // 只有在初始化完成后才触发 date-change 事件
+
+  // 只有在初始化完成后才触发 update:modelValue 和 date-change 事件
   if (!isInitializing) {
+    emit('update:modelValue', result);
     console.log('emitChange', result);
     emit('date-change', result); // 父组件监听此事件做后续处理
   }
@@ -233,26 +234,22 @@ const emitChange = () => {
 watch(
   () => props.modelValue,
   (newVal) => {
-    if (newVal) {
+    if (newVal && !isInitializing) {
+      // 只有在初始化完成后才响应外部props变化
       choseType.value = newVal.choseType;
       dayModel.value = newVal.dayModel || new Date();
       weekModel.value = newVal.weekModel || new Date();
       monthModel.value = newVal.monthModel || new Date();
-      // 只有在初始化完成后才触发 emitChange
-      if (!isInitializing) {
-        emitChange();
-      }
+      emitChange();
     }
   },
   { deep: true },
 );
 
-// 初始化时触发一次事件
-emitChange();
-
-// 初始化完成，设置标志位
+// 初始化完成，设置标志位，并在之后触发一次事件
 setTimeout(() => {
   isInitializing = false;
+  emitChange();
 }, 0);
 </script>
 
diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index 4920b02..fef4203 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -1,35 +1,126 @@
 <template>
-  <a-trigger trigger="click" position="br">
-    <div class="task-item" @click="handleTask(task, record)">
+  <a-trigger trigger="click" position="bl">
+    <div class="task-item">
       <div class="w-4px h-18px rounded-2px" :style="{ background: getTaskColor() }"></div>
       <div>{{ task?.name || '-' }}</div>
     </div>
     <template #content>
       <div
         class="flex flex-col items-start"
-        style="background-color: #fff; padding: 12px; box-shadow: #00000010 0px 2px 8px; border-radius: 4px"
-      ></div>
+        style="background-color: #fff; box-shadow: #e6e6e8 0px 2px 8px; border-radius: 4px"
+        @click="gotoDetail"
+      >
+        <div class="flex flex-col items-start p-16px w-full" @click="gotoDetail">
+          <div class="flex justify-between w-full items-center">
+            <div class="flex items-center">
+              <img
+                :src="getPlatformIcon(record.platform)"
+                style="border-radius: 8px; width: 16px; height: 16px; margin-right: 8px; font-size: 14px"
+              />
+              <div style="font-size: 16px; font-style: medium; font-weight: 500">{{ record.name || '-' }}</div>
+            </div>
+            <div
+              :style="{
+                color: getTaskColor(),
+                backgroundColor: getTaskColor() + '50',
+                padding: '2px 8px',
+                borderRadius: '4px',
+              }"
+            >
+              {{ getTaskStatusText(record.status) }}
+            </div>
+          </div>
+
+          <div class="text-12px color-#939499 mt-4px h-22px" @click="gotoDetail">
+            {{ timestampToTime1(task.execution_time) }}
+          </div>
+        </div>
+
+        <div class="font-size-14px color-#211F24 color-#211F24 p-12px" style="margin-top: -10px">
+          {{ task.name || '未命名' }}
+        </div>
+        <div class="flex items-center mt-12px w-full h-1px bg-#E6E6E8"></div>
+        <div class="flex items-center mt-12px mb-16px">
+          <div class="flex items-center mr-12px" @click.stop="handleDelete">
+            <icon-delete style="font-size: 20px; margin: 0px 22px" />
+          </div>
+          <button class="opt-btn" @click.stop="handleTimeChange">修改发布时间</button>
+          <button class="opt-btn ml-12px opt-right mr-16px" @click.stop="handleAICreate">AI立即生成</button>
+        </div>
+      </div>
     </template>
   </a-trigger>
 </template>
 
 <script setup lang="ts">
+import { ref } from 'vue';
+import { DeleteOutlined as IconDelete } from '@ant-design/icons-vue';
+import iconDy from '@/assets/img/platform/icon-dy.png';
+import iconXhs from '@/assets/img/platform/icon-xhs.png';
+import iconBilibili from '@/assets/img/platform/icon-bilibili.png';
+import iconKs from '@/assets/img/platform/icon-ks.png';
+import iconSph from '@/assets/img/platform/icon-sph.png';
+import iconWb from '@/assets/img/platform/icon-wb.png';
+import iconGzh from '@/assets/img/platform/icon-gzh.png';
+import iconWarn from '@/assets/img/media-account/icon-warn.png';
+
 // 定义props和emit
 const props = defineProps({
   task: Object,
   record: Object,
 });
-// 时间戳转时间格式 (HH:MM)
-const timestampToTime = (timestamp: number): string => {
-  const date = new Date(timestamp * 1000); // 假设时间戳是秒级
-  // 获取小时和分钟
-  const hours = date.getHours().toString().padStart(2, '0');
-  const minutes = date.getMinutes().toString().padStart(2, '0');
 
-  return `${hours}:${minutes}`;
+const isPanelVisible = ref(false);
+const toggleTimePanel = () => {
+  isPanelVisible.value = !isPanelVisible.value;
 };
+const handleVisibleChange = (visible: boolean) => {
+  isPanelVisible.value = visible;
+};
+
+const handleDelete = () => {
+  emit('handle-task', 'delete', props.task, props.record);
+};
+const gotoDetail = () => {
+  console.log('跳转详情');
+  emit('handle-task', 'goto-detail', props.task, props.record);
+};
+const handleTimeChange = (time: string) => {
+  if (time) {
+    emit('handle-task', 'edit-time', props.task, timestampToTime1() + ' ' + time + ':00');
+  }
+};
+const handleAICreate = (task, record) => {};
+
+const timestampToTime1 = (): string => {
+  const timestamp = Date.now();
+  const date = new Date(timestamp);
+
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0'); // 补零
+  const day = String(date.getDate()).padStart(2, '0'); // 补零
+
+  return `${month}月${day}日`;
+};
+
 const emit = defineEmits(['filter-change', 'handle-task']);
-const handleTask = (task, record) => {};
+
+// 平台配置
+const platformConfig = {
+  icons: {
+    0: iconDy,
+    1: iconXhs,
+    2: iconBilibili,
+    3: iconKs,
+    4: iconSph,
+    5: iconWb,
+    6: iconGzh,
+  },
+};
+
+// 获取平台图标
+const getPlatformIcon = (platform: number) => platformConfig.icons[platform] || iconWarn;
+
 // 根据任务类型获取颜色
 const getTaskColor = () => {
   if (!props.task) return '#000';
@@ -48,6 +139,21 @@ const getTaskColor = () => {
       return props.task.color || '#939499';
   }
 };
+
+const getTaskStatusText = (status) => {
+  switch (status) {
+    case 0:
+      return '待生成';
+    case 1:
+      return '待发布';
+    case 2:
+      return '已发布';
+    case 3:
+      return '发布失败';
+    default:
+      return '未知状态';
+  }
+};
 </script>
 
 <style lang="less" scoped>
@@ -63,4 +169,18 @@ const getTaskColor = () => {
     margin-bottom: 0;
   }
 }
+
+.opt-btn {
+  width: 154px;
+  height: 32px;
+  font-size: 14px;
+  background: #f2f3f5;
+  border: none;
+  border-radius: 4px;
+}
+
+.opt-right {
+  background: linear-gradient(90deg, #fbf9ff 0%, #f3fafe 100%);
+  color: #9a56ba;
+}
 </style>

From 77cd789d4aa96c140e96e382ea0b67659bb1ed45 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Fri, 19 Sep 2025 18:07:33 +0800
Subject: [PATCH 13/39] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=92=8C=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 52 ++++++++++++++-----
 .../assignment-management/index.vue           |  3 +-
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index fc56655..3863edc 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -96,19 +96,17 @@
         <div class="flex items-center justify-between w-384px">
           <div class="section-title">发布计划</div>
           <CommonSelect
-            v-model="publishQuery"
-            :options="accountList || []"
-            :multiple="true"
-            @change="(val) => handleChange('accounts', val)"
-            class="w-180px background-#fff"
-            placeholder="请选择账号名称"
-            :allowSearch="true"
-            :maxTagCount="999"
+            v-model="publishType"
+            :options="publishOptions"
+            @change="handlePublishTypeChange"
+            class="w-180px background-#fff publish-type-select"
+            :allowSearch="false"
+            :multiple="false"
             popup-container=".filter-popup-content"
           />
         </div>
 
-        <div v-if="isTiming">
+        <div v-if="publishType === 'timing'">
           <div class="line"></div>
           <div class="flex items-center justify-between mt-16px w-384px">
             <div class="section-title">日期</div>
@@ -123,7 +121,7 @@
           <div class="line"></div>
           <div class="flex items-center justify-between mt-16px w-384px">
             <div class="section-title">时间</div>
-            <a-time-picker v-model:value="strValue" format="HH:mm" class="w-180px h-40px background-#fff" />
+            <a-time-picker v-model="strValue" format="HH:mm" class="w-180px h-40px background-#fff" />
           </div>
         </div>
       </div>
@@ -151,7 +149,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted, watch } from 'vue';
 import aiIcon from '@/assets/img/media-account/icon-AI.png';
 import { Checkbox, Button, Space, Pagination, notification, DatePicker, TimePicker } from 'ant-design-vue';
 import { TABS_LIST, ORIGIN_LIST, RawMaterialType } from '@/views/material-center/components/raw-material/constants';
@@ -212,6 +210,21 @@ const handleSearch = async () => {
   materialData.value = [...materialData.value, ...res.data.data];
 };
 const isActive = ref('ai');
+
+// 发布类型选项
+const publishOptions = ref([
+  { value: 'immediate', label: '立即发布' },
+  { value: 'timing', label: '定时发布' },
+]);
+
+// 发布类型，默认为立即发布
+const publishType = ref('immediate');
+
+// 处理发布类型变化
+const handlePublishTypeChange = (value) => {
+  publishType.value = value;
+};
+
 const publishQuery = ref([
   {
     id: 1,
@@ -228,7 +241,15 @@ const showDrawer2 = ref(false);
 const emit = defineEmits(['filter-change']);
 const isTiming = ref(true);
 const currentDate = ref(new Date());
-const strValue = ref('12:08');
+// 将时间选择器默认值设置为当前时间
+const strValue = ref(dayjs().format('HH:mm'));
+
+// 监听抽屉显示状态，每次打开时更新时间为当前时间
+watch(showDriwer, (newVal) => {
+  if (newVal) {
+    strValue.value = dayjs().format('HH:mm');
+  }
+});
 
 onMounted(() => {
   handleSearch();
@@ -412,6 +433,13 @@ defineExpose({
   border-radius: 16px;
 }
 
+.publish-type-select :deep(.ant-select-selection-item) {
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .publish-select {
   width: 100%;
   height: 40px;
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index ecc733b..9b4d899 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -592,7 +592,8 @@ onMounted(() => {
   color: #6d4cfe !important;
 }
 
-:deep(.arco-table-cell) {
+/* 只对 td 单元格应用样式，避免影响表头 */
+:deep(td .arco-table-cell) {
   padding: 0px !important;
   display: flex;
   flex-direction: column;

From c70b44022b265ddcf159aef1856491d2d427823e Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Fri, 19 Sep 2025 18:36:20 +0800
Subject: [PATCH 14/39] =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 11 +++++--
 .../assignment-management/index.vue           | 30 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 3863edc..3cc7fca 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -149,7 +149,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, onMounted, watch } from 'vue';
+import { ref, reactive, onMounted, nextTick } from 'vue';
 import aiIcon from '@/assets/img/media-account/icon-AI.png';
 import { Checkbox, Button, Space, Pagination, notification, DatePicker, TimePicker } from 'ant-design-vue';
 import { TABS_LIST, ORIGIN_LIST, RawMaterialType } from '@/views/material-center/components/raw-material/constants';
@@ -263,8 +263,15 @@ const handleAddMaterial = () => {
 };
 const handleDateChange = (date) => {};
 // 暴露方法给父组件
-const showDrawer = () => {
+const showDrawer = (accountInfo = null) => {
   showDriwer.value = true;
+  // 如果传入了账号信息，则设置为默认选中
+  if (accountInfo && accountInfo.id) {
+    // 使用 nextTick 确保在 DOM 更新后设置默认值
+    nextTick(() => {
+      localQuery.value.accounts = [accountInfo.name];
+    });
+  }
 };
 
 const showDriwerChange = (visible: boolean) => {
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 9b4d899..78b5853 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -29,6 +29,7 @@
           style="width: 100%"
           :pagination="false"
           @change="handleTableChange"
+          @row-click="handleRowClick"
         >
           <!-- 空数据显示 -->
           <template #empty>
@@ -465,6 +466,35 @@ const handleTableChange = (pagination: any, sorter: any) => {
   handleSearch();
 };
 
+// 处理表格行单击事件（用于调试）
+const handleRowClick = (record: any, index: number, event: Event) => {
+  console.log('单击行:', record);
+  console.log('行索引:', index);
+  console.log('事件对象:', event);
+  const accountInfo = {
+    id: record.id,
+    name: record.name,
+    platform: record.platform,
+  };
+  drawerPopupRef.value.showDrawer(accountInfo);
+};
+
+// 处理表格行双击事件
+const handleRowDblClick = (record: any, index: number, event: Event) => {
+  console.log('双击行:', record);
+  console.log('行索引:', index);
+  console.log('事件对象:', event);
+  // 双击行时打开创建任务弹窗并传递账号信息
+  if (drawerPopupRef.value) {
+    const accountInfo = {
+      id: record.id,
+      name: record.name,
+      platform: record.platform
+    };
+    drawerPopupRef.value.showDrawer(accountInfo);
+  }
+};
+
 // 任务操作处理
 const handleTaskAction = (action: string, task: any, ...args: any[]) => {
   switch (action) {

From 15492d6d33273fbcf302d47b7f5bbcbc4d838a57 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 11:25:34 +0800
Subject: [PATCH 15/39] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 20 +++--
 .../components/task-item.vue                  | 88 +++++++++++++++----
 .../assignment-management/index.vue           | 45 +---------
 3 files changed, 85 insertions(+), 68 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 3cc7fca..606bfd9 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -61,13 +61,18 @@
             </div>
             <!-- 素材添加区域 -->
             <div class="form-section material-section">
-              <Button class="add-material-btn" @click="handleAddMaterial">
-                <template #icon>
-                  <icon-plus size="16" class="mr-8px" />
-                </template>
-                从原料库添加
-              </Button>
-              <p class="material-hint">AI会参考添加的文本、图片、视频等素材，完成符合需求的创作</p>
+              <div v-if="hasChose" class="flex items-center">
+                
+              </div>
+              <div v-else class="flex flex-col items-center">
+                <Button class="add-material-btn" @click="handleAddMaterial">
+                  <template #icon>
+                    <icon-plus size="16" class="mr-8px" />
+                  </template>
+                  从原料库添加
+                </Button>
+                <p class="material-hint">AI会参考添加的文本、图片、视频等素材，完成符合需求的创作</p>
+              </div>
             </div>
           </div>
           <div v-show="isActive == 'chose'">
@@ -255,7 +260,6 @@ onMounted(() => {
   handleSearch();
 });
 const handleSelect = (value) => {
-  console.log('++++++++++', value);
   isActive.value = value;
 };
 const handleAddMaterial = () => {
diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index fef4203..1949dc9 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -1,33 +1,28 @@
 <template>
-  <a-trigger trigger="click" position="bl">
+  <a-trigger trigger="click" position="br" @click.stop>
     <div class="task-item">
-      <div class="w-4px h-18px rounded-2px" :style="{ background: getTaskColor() }"></div>
-      <div>{{ task?.name || '-' }}</div>
+      <div class="color-indicator" :style="{ background: getTaskColor() }"></div>
+      <div class="task-name" :title="task?.name || '-'">{{ task?.name || '-' }}</div>
     </div>
     <template #content>
-      <div
-        class="flex flex-col items-start"
-        style="background-color: #fff; box-shadow: #e6e6e8 0px 2px 8px; border-radius: 4px"
-        @click="gotoDetail"
-      >
+      <div class="flex flex-col items-start popup-content" @click="gotoDetail">
         <div class="flex flex-col items-start p-16px w-full" @click="gotoDetail">
           <div class="flex justify-between w-full items-center">
-            <div class="flex items-center">
+            <div class="flex items-center title-container">
               <img
                 :src="getPlatformIcon(record.platform)"
                 style="border-radius: 8px; width: 16px; height: 16px; margin-right: 8px; font-size: 14px"
               />
-              <div style="font-size: 16px; font-style: medium; font-weight: 500">{{ record.name || '-' }}</div>
+              <div class="task-title" :title="record.name || '-'">{{ record.name || '-' }}</div>
             </div>
             <div
+              class="status-tag"
               :style="{
                 color: getTaskColor(),
                 backgroundColor: getTaskColor() + '50',
-                padding: '2px 8px',
-                borderRadius: '4px',
               }"
             >
-              {{ getTaskStatusText(record.status) }}
+              {{ getTaskStatusText(task.status) }}
             </div>
           </div>
 
@@ -36,13 +31,13 @@
           </div>
         </div>
 
-        <div class="font-size-14px color-#211F24 color-#211F24 p-12px" style="margin-top: -10px">
+        <div class="font-size-14px color-#211F24 color-#211F24 p-12px task-description" :title="task.name || '未命名'">
           {{ task.name || '未命名' }}
         </div>
         <div class="flex items-center mt-12px w-full h-1px bg-#E6E6E8"></div>
-        <div class="flex items-center mt-12px mb-16px">
+        <div class="flex items-center mt-12px mb-16px action-buttons">
           <div class="flex items-center mr-12px" @click.stop="handleDelete">
-            <icon-delete style="font-size: 20px; margin: 0px 22px" />
+            <icon-delete style="font-size: 20px; margin-left: 16px" />
           </div>
           <button class="opt-btn" @click.stop="handleTimeChange">修改发布时间</button>
           <button class="opt-btn ml-12px opt-right mr-16px" @click.stop="handleAICreate">AI立即生成</button>
@@ -70,6 +65,10 @@ const props = defineProps({
   record: Object,
 });
 
+onMounted(() => {
+  console.log('props.task', props.task, props.record);
+});
+
 const isPanelVisible = ref(false);
 const toggleTimePanel = () => {
   isPanelVisible.value = !isPanelVisible.value;
@@ -141,6 +140,7 @@ const getTaskColor = () => {
 };
 
 const getTaskStatusText = (status) => {
+  console.log('任务状态:', status);
   switch (status) {
     case 0:
       return '待生成';
@@ -164,12 +164,68 @@ const getTaskStatusText = (status) => {
   display: flex;
   align-items: center;
   gap: 4px;
+  min-width: 0;
 
   &:last-child {
     margin-bottom: 0;
   }
 }
 
+.color-indicator {
+  width: 4px;
+  height: 18px;
+  border-radius: 2px;
+  flex-shrink: 0;
+}
+
+.task-name {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  min-width: 0;
+  width: 0;
+}
+
+.popup-content {
+  width: 388px;
+  background-color: #fff;
+  box-shadow: #e6e6e8 0px 2px 8px;
+  border-radius: 4px;
+}
+
+.title-container {
+  flex: 1;
+  min-width: 0;
+}
+
+.task-title {
+  font-size: 16px;
+  font-weight: 500;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  flex: 1;
+  min-width: 0;
+  line-height: 1.2;
+}
+
+.task-description {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  line-height: 1.2;
+  flex: 1;
+  min-width: 0;
+  width: 365px;
+}
+
+.status-tag {
+  padding: 2px 8px;
+  border-radius: 4px;
+  flex-shrink: 0;
+}
+
 .opt-btn {
   width: 154px;
   height: 32px;
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 78b5853..7143b1b 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -203,32 +203,10 @@ const platformOptions = ref(platformConfig.options);
 const getPlatformIcon = (platform: number) => platformConfig.icons[platform] || iconWarn;
 const getPlatformName = (platform: number) => platformConfig.names[platform] || '未知平台';
 
-const getTaskColor = (taskType: number, executionTime: number) => {
-  const isExpired = executionTime * 1000 < Date.now();
-  return isExpired ? (taskType === 0 ? '#A794FE' : '#FFCF66') : taskType === 0 ? '#6d4cfe' : '#ffae00';
-};
-
-// const formatTaskName = (name: string) => {
-//   if (!name) return '未命名';
-//   return name.length > 8 ? name.substring(0, 8) + '...' : name;
-// };
-
 const timestampToDayNumber = (timestamp: number) => {
   return new Date(timestamp * 1000).getDate();
 };
 
-// // 获取任务列表
-// const handleSearch = async () => {
-//   const { data: accountData } = await fetchAccountOperators();
-//   const { data: mediaAccountData } = await getMediaAccountList();
-//   operators.value = accountData;
-//   accountList.value = mediaAccountData;
-// };
-// const timestampToTime = (timestamp: number): string => {
-//   const date = new Date(timestamp * 1000);
-//   return `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
-// };
-
 // 处理表格数据
 const processTableData = (apiData: any[]) => {
   const processedData: any[] = [];
@@ -251,12 +229,7 @@ const processTableData = (apiData: any[]) => {
       account.task_schedules.forEach((task: any) => {
         const taskDay = timestampToDayNumber(task.execution_time);
         if (dateHeaders.includes(taskDay)) {
-          rowData[taskDay].push({
-            id: task.id,
-            name: task.name,
-            type: task.type,
-            execution_time: task.execution_time,
-          });
+          rowData[taskDay].push(task);
         }
       });
     }
@@ -479,22 +452,6 @@ const handleRowClick = (record: any, index: number, event: Event) => {
   drawerPopupRef.value.showDrawer(accountInfo);
 };
 
-// 处理表格行双击事件
-const handleRowDblClick = (record: any, index: number, event: Event) => {
-  console.log('双击行:', record);
-  console.log('行索引:', index);
-  console.log('事件对象:', event);
-  // 双击行时打开创建任务弹窗并传递账号信息
-  if (drawerPopupRef.value) {
-    const accountInfo = {
-      id: record.id,
-      name: record.name,
-      platform: record.platform
-    };
-    drawerPopupRef.value.showDrawer(accountInfo);
-  }
-};
-
 // 任务操作处理
 const handleTaskAction = (action: string, task: any, ...args: any[]) => {
   switch (action) {

From 5318a99b7008dfb47e6a8e60ebdb0abad8797308 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 12:37:28 +0800
Subject: [PATCH 16/39] =?UTF-8?q?loading=20=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/task-item.vue                  | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index 1949dc9..796253f 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -34,6 +34,11 @@
         <div class="font-size-14px color-#211F24 color-#211F24 p-12px task-description" :title="task.name || '未命名'">
           {{ task.name || '未命名' }}
         </div>
+        <div v-if="task.ai_generate_status == 0" class="AILoding">
+          <ASpin />
+          <div style="color: #9a56ba">内容生成中...</div>
+          <div style="color: #9a56ba">完成后将自动展示，您可先返回其他操作</div>
+        </div>
         <div class="flex items-center mt-12px w-full h-1px bg-#E6E6E8"></div>
         <div class="flex items-center mt-12px mb-16px action-buttons">
           <div class="flex items-center mr-12px" @click.stop="handleDelete">
@@ -49,7 +54,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
-import { DeleteOutlined as IconDelete } from '@ant-design/icons-vue';
+import { Spin as ASpin } from 'ant-design-vue';
 import iconDy from '@/assets/img/platform/icon-dy.png';
 import iconXhs from '@/assets/img/platform/icon-xhs.png';
 import iconBilibili from '@/assets/img/platform/icon-bilibili.png';
@@ -70,12 +75,6 @@ onMounted(() => {
 });
 
 const isPanelVisible = ref(false);
-const toggleTimePanel = () => {
-  isPanelVisible.value = !isPanelVisible.value;
-};
-const handleVisibleChange = (visible: boolean) => {
-  isPanelVisible.value = visible;
-};
 
 const handleDelete = () => {
   emit('handle-task', 'delete', props.task, props.record);
@@ -239,4 +238,24 @@ const getTaskStatusText = (status) => {
   background: linear-gradient(90deg, #fbf9ff 0%, #f3fafe 100%);
   color: #9a56ba;
 }
+
+.AILoding {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 356px;
+  height: 108px;
+  border-radius: 8px;
+  background: linear-gradient(90deg, #fbf9ff 0%, #f3fafe 100%);
+  color: linear-gradient(90deg, #9a56ba 0%, #576fd1 100%);
+  margin-left: 16px;
+  font-weight: 400;
+  font-style: Regular;
+  font-size: 12px;
+  leading-trim: NONE;
+  line-height: 20px;
+  letter-spacing: 0%;
+  text-align: center;
+}
 </style>

From d790ce193f028f6b453d11a62fc79d435a6f0699 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 12:42:00 +0800
Subject: [PATCH 17/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignment-management/components/task-item.vue           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index 796253f..74cdd5d 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -31,7 +31,7 @@
           </div>
         </div>
 
-        <div class="font-size-14px color-#211F24 color-#211F24 p-12px task-description" :title="task.name || '未命名'">
+        <div class="font-size-14px color-#211F24 color-#211F24 task-description" :title="task.name || '未命名'">
           {{ task.name || '未命名' }}
         </div>
         <div v-if="task.ai_generate_status == 0" class="AILoding">
@@ -217,6 +217,9 @@ const getTaskStatusText = (status) => {
   flex: 1;
   min-width: 0;
   width: 365px;
+  margin-top: -10px;
+  margin-bottom: 12px;
+  padding: 0 16px;
 }
 
 .status-tag {

From da8fcb40a2d05d05cf89b2dde4501a7769268283 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 14:13:01 +0800
Subject: [PATCH 18/39] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 85 +++++++++++++------
 1 file changed, 60 insertions(+), 25 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 606bfd9..c390945 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -61,9 +61,7 @@
             </div>
             <!-- 素材添加区域 -->
             <div class="form-section material-section">
-              <div v-if="hasChose" class="flex items-center">
-                
-              </div>
+              <div v-if="hasChose" class="flex items-center"></div>
               <div v-else class="flex flex-col items-center">
                 <Button class="add-material-btn" @click="handleAddMaterial">
                   <template #icon>
@@ -132,7 +130,7 @@
       </div>
     </div>
     <a-drawer
-      title="成品库"
+      title="原料库"
       cancel-text="取消"
       ok-text="确定"
       placement="right"
@@ -142,13 +140,32 @@
       class="task-drawer"
       style="right: 481px"
     >
-      <a-table :data="materialData" bordered :columns="columns">
-        <template #create_at="{ record }">
+      <Table :data-source="materialData" bordered :columns="columns" :pagination="false">
+        <template #name="{ record }">
           <div class="flex items-center">
-            {{ record.created_at ? dayjs(record.created_at).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+            <img :src="record.cover" class="w-16px h-16px" />
+            <div class="flex flex-col ml-8px">
+              <div>{{ record.name }}</div>
+              <div class="text-#999 text-12px">序号：{{ record.uid }}</div>
+            </div>
           </div>
         </template>
-      </a-table>
+        <template #type="{ record }">
+          <div class="flex items-center">
+            {{ getType(record.type) }}
+          </div>
+        </template>
+        <template #from="{ record }">
+          <div class="flex items-center">
+            {{ getFrom(record.type) }}
+          </div>
+        </template>
+        <template #create_at="{ record }">
+          <div class="flex items-center">
+            {{ record.created_at ? dayjs(record.created_at * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+          </div>
+        </template>
+      </Table>
     </a-drawer>
   </a-drawer>
 </template>
@@ -156,7 +173,7 @@
 <script lang="ts" setup>
 import { ref, reactive, onMounted, nextTick } from 'vue';
 import aiIcon from '@/assets/img/media-account/icon-AI.png';
-import { Checkbox, Button, Space, Pagination, notification, DatePicker, TimePicker } from 'ant-design-vue';
+import { Checkbox, Button, Space, Pagination, notification, DatePicker, TimePicker, Table } from 'ant-design-vue';
 import { TABS_LIST, ORIGIN_LIST, RawMaterialType } from '@/views/material-center/components/raw-material/constants';
 import dayjs from 'dayjs';
 import { getRawMaterialsPage } from '@/api/all/generationWorkshop';
@@ -165,33 +182,36 @@ import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPa
 
 const columns = ref([
   {
-    title: '名称',
+    title: '文件名称',
     dataIndex: 'name',
     width: 200,
-    solts: { customRender: 'name' },
+    slots: { customRender: 'name' },
   },
   {
     title: '类型',
     dataIndex: 'type',
     width: 100,
-    render: (text) => {
-      return RawMaterialType[text];
-    },
+    slots: { customRender: 'type' },
   },
   {
-    title: '创建时间',
+    title: '来源',
+    dataIndex: 'from',
+    width: 100,
+    slots: { customRender: 'from' },
+  },
+  {
+    title: '上传时间',
     dataIndex: 'created_at',
     width: 200,
     slots: { customRender: 'create_at' },
   },
 ]);
-
 // 表格分页逻辑
 const { pageInfo, onPageChange, onPageSizeChange } = useTableSelectionWithPagination({
   onPageChange: () => handleSearch(),
   onPageSizeChange: () => handleSearch(),
 });
-const selectedTab = ref('ai-generate');
+
 // 定义props和emit
 const props = defineProps({
   operators: Array,
@@ -211,7 +231,6 @@ const query = reactive({
 const materialData = ref([]);
 const handleSearch = async () => {
   const res = await getRawMaterialsPage(query);
-  console.log(res.data.data);
   materialData.value = [...materialData.value, ...res.data.data];
 };
 const isActive = ref('ai');
@@ -225,18 +244,34 @@ const publishOptions = ref([
 // 发布类型，默认为立即发布
 const publishType = ref('immediate');
 
+const getType = (type) => {
+  switch (type) {
+    case RawMaterialType.Image:
+      return '图片';
+    case RawMaterialType.Video:
+      return '视频';
+    case RawMaterialType.Text:
+      return '文本';
+    default:
+      return '未知';
+  }
+};
+
+const getFrom = (type) => {
+  switch (type) {
+    case 0:
+      return '本地上传';
+    case 1:
+      return 'AI生成';
+    default:
+      return '未知';
+  }
+};
 // 处理发布类型变化
 const handlePublishTypeChange = (value) => {
   publishType.value = value;
 };
 
-const publishQuery = ref([
-  {
-    id: 1,
-    name: '立即发布',
-  },
-  { id: 2, name: '定时发布' },
-]);
 // 本地筛选状态（保持上次选择）
 const localQuery = ref({
   accounts: props.query?.ids || [],

From 38a3c355fa1bd06ada7f1b62a0447795e65d949c Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 14:22:03 +0800
Subject: [PATCH 19/39] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignment-management/components/draw-popup.vue      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index c390945..260ac8f 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -140,10 +140,10 @@
       class="task-drawer"
       style="right: 481px"
     >
-      <Table :data-source="materialData" bordered :columns="columns" :pagination="false">
+      <Table :data-source="materialData" bordered :columns="columns" :pagination="false" :row-selection="rowSelection">
         <template #name="{ record }">
           <div class="flex items-center">
-            <img :src="record.cover" class="w-16px h-16px" />
+            <img :src="record.cover" class="w-64px h-64px border-rounded-8px bg-#F0EDFF" />
             <div class="flex flex-col ml-8px">
               <div>{{ record.name }}</div>
               <div class="text-#999 text-12px">序号：{{ record.uid }}</div>
@@ -206,8 +206,9 @@ const columns = ref([
     slots: { customRender: 'create_at' },
   },
 ]);
+
 // 表格分页逻辑
-const { pageInfo, onPageChange, onPageSizeChange } = useTableSelectionWithPagination({
+const { pageInfo, onPageChange, onPageSizeChange, rowSelection } = useTableSelectionWithPagination({
   onPageChange: () => handleSearch(),
   onPageSizeChange: () => handleSearch(),
 });
@@ -294,7 +295,7 @@ watch(showDriwer, (newVal) => {
 onMounted(() => {
   handleSearch();
 });
-const handleSelect = (value) => {
+const handleTabSelect = (value) => {
   isActive.value = value;
 };
 const handleAddMaterial = () => {

From 71674843a9eba70ad6962e1ffb6d1d4ef8bfe6c9 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 14:49:49 +0800
Subject: [PATCH 20/39] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 260ac8f..63953c0 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -140,7 +140,14 @@
       class="task-drawer"
       style="right: 481px"
     >
-      <Table :data-source="materialData" bordered :columns="columns" :pagination="false" :row-selection="rowSelection">
+      <Table
+        :data-source="materialData"
+        bordered
+        :columns="columns"
+        :pagination="false"
+        :row-selection="true"
+        @onSelect="handleSelectRow"
+      >
         <template #name="{ record }">
           <div class="flex items-center">
             <img :src="record.cover" class="w-64px h-64px border-rounded-8px bg-#F0EDFF" />
@@ -166,6 +173,20 @@
           </div>
         </template>
       </Table>
+      <!-- 分页控件 -->
+      <div v-if="pageInfo.total > 0" class="pagination-box">
+        <a-pagination
+          :total="pageInfo.total"
+          size="mini"
+          show-total
+          show-jumper
+          show-page-size
+          :current="pageInfo.page"
+          :page-size="pageInfo.page_size"
+          @change="onPageChange"
+          @page-size-change="onPageSizeChange"
+        />
+      </div>
     </a-drawer>
   </a-drawer>
 </template>
@@ -208,11 +229,17 @@ const columns = ref([
 ]);
 
 // 表格分页逻辑
-const { pageInfo, onPageChange, onPageSizeChange, rowSelection } = useTableSelectionWithPagination({
+const { pageInfo, onPageChange, onPageSizeChange } = useTableSelectionWithPagination({
   onPageChange: () => handleSearch(),
   onPageSizeChange: () => handleSearch(),
 });
 
+const handleSelectRow = (selectedRowKeys, selectedRows) => {
+  console.log('选择++++++++++++++');
+  console.log(selectedRowKeys, selectedRows);
+  query.ids = selectedRowKeys;
+};
+
 // 定义props和emit
 const props = defineProps({
   operators: Array,
@@ -232,6 +259,7 @@ const query = reactive({
 const materialData = ref([]);
 const handleSearch = async () => {
   const res = await getRawMaterialsPage(query);
+  pageInfo.value.total = res.data.total;
   materialData.value = [...materialData.value, ...res.data.data];
 };
 const isActive = ref('ai');
@@ -497,4 +525,12 @@ defineExpose({
   height: 1px;
   margin-top: 16px;
 }
+/* 分页样式 */
+.pagination-box {
+  display: flex;
+  width: 100%;
+  padding: 16px 0;
+  justify-content: flex-end;
+  align-items: center;
+}
 </style>

From ec51ddea077e6494310922063cf1d08d88ee5cb8 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 14:53:27 +0800
Subject: [PATCH 21/39] =?UTF-8?q?=E9=80=89=E4=B8=AD=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E7=9B=91=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useTableSelectionWithPagination.ts  | 16 ++++++++-
 .../components/draw-popup.vue                 | 36 +++++++++++++++----
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/hooks/useTableSelectionWithPagination.ts b/src/hooks/useTableSelectionWithPagination.ts
index ebc6b22..0c30800 100644
--- a/src/hooks/useTableSelectionWithPagination.ts
+++ b/src/hooks/useTableSelectionWithPagination.ts
@@ -1,4 +1,6 @@
 import { ref, computed } from 'vue';
+import { merge } from 'lodash-es';
+import { cloneDeep } from 'lodash-es';
 
 interface UseTableSelectionWithPaginationOptions {
   rowKey?: string; // 主键字段名，默认 'id'
@@ -60,18 +62,27 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa
     options.onSelectChange?.();
   };
 
+  // 选择变更处理
+  const handleSelectChange = (keys: Array<string | number>, rows: Array<any>) => {
+    selectedRowKeys.value = keys;
+    selectedRows.value = rows;
+    options.onSelectChange?.();
+  };
+
   const onPageChange = (page: number, pageSize: number) => {
     // console.log('onPageChange', page, pageSize);
     pageInfo.value.page = page;
     pageInfo.value.page_size = pageSize;
     options.onPageChange?.(page);
   };
+  
   const onPageSizeChange = (current: number, size: number) => {
     // console.log('onPageSizeChange', current, size);
     // pageInfo.value.page_size = size;
     // pageInfo.value.page = 1;
     // options.onPageSizeChange?.(size);
   };
+  
   const resetPageInfo = () => {
     pageInfo.value = cloneDeep(DEFAULT_PAGE_INFO);
   };
@@ -80,6 +91,8 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa
     type: 'checkbox',
     showCheckedAll: true,
     width: 48,
+    selectedRowKeys: selectedRowKeys.value,
+    onChange: handleSelectChange
   }));
 
   return {
@@ -92,7 +105,8 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa
     rowSelection,
     handleSelect,
     handleSelectAll,
+    handleSelectChange,
     resetPageInfo,
     DEFAULT_PAGE_INFO,
   };
-}
+}
\ No newline at end of file
diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 63953c0..c8ac6d3 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -145,8 +145,8 @@
         bordered
         :columns="columns"
         :pagination="false"
-        :row-selection="true"
-        @onSelect="handleSelectRow"
+        row-key="id"
+        :row-selection="rowSelection"
       >
         <template #name="{ record }">
           <div class="flex items-center">
@@ -229,16 +229,30 @@ const columns = ref([
 ]);
 
 // 表格分页逻辑
-const { pageInfo, onPageChange, onPageSizeChange } = useTableSelectionWithPagination({
+const { 
+  pageInfo, 
+  onPageChange, 
+  onPageSizeChange, 
+  rowSelection, 
+  selectedRowKeys
+} = useTableSelectionWithPagination({
+  rowKey: 'id',
   onPageChange: () => handleSearch(),
   onPageSizeChange: () => handleSearch(),
 });
 
-const handleSelectRow = (selectedRowKeys, selectedRows) => {
+// 处理选择变更
+// const handleSelectChange = (selectedRowKeys, selectedRows) => {
+//   console.log('选择变更:', selectedRowKeys, selectedRows);
+//   query.ids = selectedRowKeys;
+// };
+
+// 监听选中项变化
+watch(selectedRowKeys, (newVal) => {
   console.log('选择++++++++++++++');
-  console.log(selectedRowKeys, selectedRows);
-  query.ids = selectedRowKeys;
-};
+  console.log(newVal);
+  query.ids = newVal;
+});
 
 // 定义props和emit
 const props = defineProps({
@@ -262,6 +276,14 @@ const handleSearch = async () => {
   pageInfo.value.total = res.data.total;
   materialData.value = [...materialData.value, ...res.data.data];
 };
+
+// 移除原来的 handleSelectRow 方法，因为我们现在使用 hook 提供的 handleSelect 方法
+// const handleSelectRow = (selectedRowKeys, selectedRows) => {
+//   console.log('选择++++++++++++++');
+//   console.log(selectedRowKeys, selectedRows);
+//   query.ids = selectedRowKeys;
+// };
+
 const isActive = ref('ai');
 
 // 发布类型选项

From 0ae5531f97bf47d4fe3d4ceeb6cf23fefb66642c Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 14:57:25 +0800
Subject: [PATCH 22/39] =?UTF-8?q?=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index c8ac6d3..e83d11e 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -229,27 +229,14 @@ const columns = ref([
 ]);
 
 // 表格分页逻辑
-const { 
-  pageInfo, 
-  onPageChange, 
-  onPageSizeChange, 
-  rowSelection, 
-  selectedRowKeys
-} = useTableSelectionWithPagination({
+const { pageInfo, onPageChange, onPageSizeChange, rowSelection, selectedRowKeys } = useTableSelectionWithPagination({
   rowKey: 'id',
   onPageChange: () => handleSearch(),
   onPageSizeChange: () => handleSearch(),
 });
 
-// 处理选择变更
-// const handleSelectChange = (selectedRowKeys, selectedRows) => {
-//   console.log('选择变更:', selectedRowKeys, selectedRows);
-//   query.ids = selectedRowKeys;
-// };
-
 // 监听选中项变化
 watch(selectedRowKeys, (newVal) => {
-  console.log('选择++++++++++++++');
   console.log(newVal);
   query.ids = newVal;
 });
@@ -277,13 +264,6 @@ const handleSearch = async () => {
   materialData.value = [...materialData.value, ...res.data.data];
 };
 
-// 移除原来的 handleSelectRow 方法，因为我们现在使用 hook 提供的 handleSelect 方法
-// const handleSelectRow = (selectedRowKeys, selectedRows) => {
-//   console.log('选择++++++++++++++');
-//   console.log(selectedRowKeys, selectedRows);
-//   query.ids = selectedRowKeys;
-// };
-
 const isActive = ref('ai');
 
 // 发布类型选项

From a770e2b74d3cdfdae4ebd4aa898d8f4409abd291 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 15:39:46 +0800
Subject: [PATCH 23/39] =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index e83d11e..f3e18d7 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -187,6 +187,18 @@
           @page-size-change="onPageSizeChange"
         />
       </div>
+      <template #footer>
+        <div class="flex items-center justify-between">
+          <div class="flex items-center">
+            <div class="color-#737478 font-size-14px">已选择：</div>
+            <div class="color-#737478 font-size-14px">{{ choseText }}</div>
+          </div>
+          <div class="flex justify-end">
+            <Button @click="handleCancel">取消</Button>
+            <Button class="ml-16px" type="primary" @click="handleOk">确定</Button>
+          </div>
+        </div>
+      </template>
     </a-drawer>
   </a-drawer>
 </template>
@@ -200,7 +212,7 @@ import dayjs from 'dayjs';
 import { getRawMaterialsPage } from '@/api/all/generationWorkshop';
 // 工具引入
 import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
-
+const choseText = ref('');
 const columns = ref([
   {
     title: '文件名称',
@@ -239,6 +251,18 @@ const { pageInfo, onPageChange, onPageSizeChange, rowSelection, selectedRowKeys
 watch(selectedRowKeys, (newVal) => {
   console.log(newVal);
   query.ids = newVal;
+  const filteredData = materialData.value.filter((item) => newVal.includes(item.id));
+  choseText.value = '';
+  const typeCount = filteredData.reduce((acc, item) => {
+    acc[item.type] = (acc[item.type] || 0) + 1;
+    return acc;
+  }, {});
+  console.log('+++++', typeCount);
+  Object.entries(typeCount).forEach(([type, count]) => {
+    console.log('++++tyype', type, getType(type));
+    console.log(`${getType(type)}: ${count}个`);
+    choseText.value += `${getType(type)}: ${count}个 `;
+  });
 });
 
 // 定义props和emit
@@ -276,12 +300,19 @@ const publishOptions = ref([
 const publishType = ref('immediate');
 
 const getType = (type) => {
+  // 处理字符串和数字类型的type值
   switch (type) {
     case RawMaterialType.Image:
+    case '0':
+    case 0:
       return '图片';
     case RawMaterialType.Video:
+    case '1':
+    case 1:
       return '视频';
     case RawMaterialType.Text:
+    case '2':
+    case 2:
       return '文本';
     default:
       return '未知';

From fb00c0a0b844fa4452a456c6810e98222f1a1198 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 16:29:05 +0800
Subject: [PATCH 24/39] =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93=E5=92=8C?=
 =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/manuscript-table/constants.ts  |   8 -
 .../components/draw-popup.vue                 | 198 +++++++++++++++++-
 2 files changed, 193 insertions(+), 13 deletions(-)

diff --git a/src/views/material-center/components/finished-products/manuscript/list/components/manuscript-table/constants.ts b/src/views/material-center/components/finished-products/manuscript/list/components/manuscript-table/constants.ts
index a285027..8045360 100644
--- a/src/views/material-center/components/finished-products/manuscript/list/components/manuscript-table/constants.ts
+++ b/src/views/material-center/components/finished-products/manuscript/list/components/manuscript-table/constants.ts
@@ -43,14 +43,6 @@ export const TABLE_COLUMNS = [
     dataIndex: 'origin',
     width: 120,
   },
-  {
-    title: '上传时间',
-    dataIndex: 'created_at',
-    width: 180,
-    sortable: {
-      sortDirections: ['ascend', 'descend'],
-    },
-  },
   {
     title: '上传人员',
     dataIndex: 'uploader',
diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index f3e18d7..079feac 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -81,7 +81,7 @@
                 <div class="font-size-12px text-[#999999]">（必填）</div>
               </div>
               <div class="form-section material-section">
-                <Button @click="handleAddMaterial" class="add-material-btn">
+                <Button @click="handleAddContent" class="add-material-btn">
                   <template #icon>
                     <icon-plus size="16" class="mr-8px" />
                   </template>
@@ -192,6 +192,101 @@
           <div class="flex items-center">
             <div class="color-#737478 font-size-14px">已选择：</div>
             <div class="color-#737478 font-size-14px">{{ choseText }}</div>
+            <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
+              <img :src="item.cover" alt="" class="w-44px h-44px border-rounded-8px bg-#F0EDFF" />
+            </div>
+          </div>
+          <div class="flex justify-end">
+            <Button @click="handleCancel">取消</Button>
+            <Button class="ml-16px" type="primary" @click="handleOk">确定</Button>
+          </div>
+        </div>
+      </template>
+    </a-drawer>
+    <a-drawer
+      title="成品库"
+      cancel-text="取消"
+      ok-text="确定"
+      placement="right"
+      v-model:visible="showDrawer3"
+      @after-visible-change="showDriwerChange"
+      width="904px"
+      class="task-drawer"
+      style="right: 481px"
+    >
+      <Table
+        :data-source="materialData"
+        bordered
+        :columns="columns2"
+        :pagination="false"
+        row-key="id"
+        :row-selection="rowSelection"
+      >
+        <template #cover="{ record }">
+          <div class="flex items-center">
+            <img
+              :src="record.cover ? record.cover : icon4"
+              alt=""
+              class="w-44px h-44px border-rounded-8px bg-#F0EDFF"
+            />
+          </div>
+        </template>
+        <template #name="{ record }">
+          <div class="flex items-center">
+            <div>{{ record.title }}</div>
+          </div>
+        </template>
+        <template #type="{ record }">
+          <div class="flex items-center">
+            <img
+              :src="record.type === EnumManuscriptType.Image ? icon2 : icon3"
+              width="16"
+              height="16"
+              class="mr-4px"
+            />
+            <span class="cts" :class="record.type === EnumManuscriptType.Image ? '!color-#25C883' : '!color-#6D4CFE'">{{
+              record.type === EnumManuscriptType.Image ? '图文' : '视频'
+            }}</span>
+          </div>
+        </template>
+        <template #uploader="{ record }">
+          <div class="flex items-center">
+            {{ record.last_modifier.mobile }}
+          </div>
+        </template>
+        <template #audit_status="{ record }">
+          <div class="flex items-center">
+            {{ getStatus(record.audit_status) }}
+          </div>
+        </template>
+        <template #last_modified_at="{ record }">
+          <div class="flex items-center">
+            {{ record.created_at ? dayjs(record.last_modified_at * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+          </div>
+        </template>
+      </Table>
+      <!-- 分页控件 -->
+      <div v-if="pageInfo.total > 0" class="pagination-box">
+        <a-pagination
+          :total="pageInfo.total"
+          size="mini"
+          show-total
+          show-jumper
+          show-page-size
+          :current="pageInfo.page"
+          :page-size="pageInfo.page_size"
+          @change="onPageChange"
+          @page-size-change="onPageSizeChange"
+        />
+      </div>
+      <template #footer>
+        <div class="flex items-center justify-between">
+          <div class="flex items-center">
+            <div class="color-#737478 font-size-14px">已选择：</div>
+            <div class="color-#737478 font-size-14px">{{ choseText }}</div>
+            <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
+              <img :src="item.cover ? item.cover : icon4" class="w-44px h-44px border-rounded-8px bg-#F0EDFF" />
+            </div>
           </div>
           <div class="flex justify-end">
             <Button @click="handleCancel">取消</Button>
@@ -204,6 +299,7 @@
 </template>
 
 <script lang="ts" setup>
+import { getWorksPage, getWriterLinksGenerate } from '@/api/all/generationWorkshop.ts';
 import { ref, reactive, onMounted, nextTick } from 'vue';
 import aiIcon from '@/assets/img/media-account/icon-AI.png';
 import { Checkbox, Button, Space, Pagination, notification, DatePicker, TimePicker, Table } from 'ant-design-vue';
@@ -212,6 +308,10 @@ import dayjs from 'dayjs';
 import { getRawMaterialsPage } from '@/api/all/generationWorkshop';
 // 工具引入
 import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
+import { EnumManuscriptType } from '@/views/material-center/components/finished-products/manuscript/list/constants';
+import icon2 from '@/assets/img/creative-generation-workshop/icon-photo.png';
+import icon3 from '@/assets/img/creative-generation-workshop/icon-video.png';
+import icon4 from '@/assets/img/error-img.png';
 const choseText = ref('');
 const columns = ref([
   {
@@ -240,6 +340,57 @@ const columns = ref([
   },
 ]);
 
+const columns2 = ref([
+  {
+    title: '图片/视频',
+    dataIndex: 'cover',
+    width: 200,
+    slots: { customRender: 'cover' },
+  },
+  {
+    title: '文件名称',
+    dataIndex: 'name',
+    width: 200,
+    slots: { customRender: 'name' },
+  },
+  {
+    title: '稿件类型',
+    dataIndex: 'type',
+    width: 100,
+    slots: { customRender: 'type' },
+  },
+  {
+    title: '审核状态',
+    dataIndex: 'audit_status',
+    width: 100,
+    slots: { customRender: 'audit_status' },
+  },
+  {
+    title: '最后修改时间',
+    dataIndex: 'last_modified_at',
+    width: 200,
+    slots: { customRender: 'last_modified_at' },
+  },
+  {
+    title: '上传人员',
+    dataIndex: 'uploader',
+    width: 200,
+    slots: { customRender: 'uploader' },
+  },
+]);
+
+const handleSelect = (value) => {
+  isActive.value = value;
+  if (value == 'ai') {
+    showDrawer3.value = false;
+    handleSearch();
+  } else {
+    showDrawer2.value = false;
+    handleSearchWork();
+  }
+};
+
+const choseImgArray = ref([]);
 // 表格分页逻辑
 const { pageInfo, onPageChange, onPageSizeChange, rowSelection, selectedRowKeys } = useTableSelectionWithPagination({
   rowKey: 'id',
@@ -252,6 +403,10 @@ watch(selectedRowKeys, (newVal) => {
   console.log(newVal);
   query.ids = newVal;
   const filteredData = materialData.value.filter((item) => newVal.includes(item.id));
+  choseImgArray.value = materialData.value.filter(
+    (item) => newVal.includes(item.id) && (item.type == 0 || item.type == 1),
+  );
+  console.log('+++++', choseImgArray.value);
   choseText.value = '';
   const typeCount = filteredData.reduce((acc, item) => {
     acc[item.type] = (acc[item.type] || 0) + 1;
@@ -285,11 +440,22 @@ const materialData = ref([]);
 const handleSearch = async () => {
   const res = await getRawMaterialsPage(query);
   pageInfo.value.total = res.data.total;
+  if (pageInfo.value.page == 1) {
+    materialData.value = [];
+  }
+  materialData.value = [...materialData.value, ...res.data.data];
+};
+
+const handleSearchWork = async () => {
+  const res = await getWorksPage(query);
+  pageInfo.value.total = res.data.total;
+  if (pageInfo.value.page == 1) {
+    materialData.value = [];
+  }
   materialData.value = [...materialData.value, ...res.data.data];
 };
 
 const isActive = ref('ai');
-
 // 发布类型选项
 const publishOptions = ref([
   { value: 'immediate', label: '立即发布' },
@@ -299,6 +465,27 @@ const publishOptions = ref([
 // 发布类型，默认为立即发布
 const publishType = ref('immediate');
 
+const getStatus = (status) => {
+  // 处理字符串和数字类型的type值
+  switch (status) {
+    case 0:
+      return '全部';
+    case RawMaterialType.Video:
+    case '1':
+    case 1:
+      return '待审核';
+    case RawMaterialType.Text:
+    case '2':
+    case 2:
+      return '审核中';
+    case RawMaterialType.Text:
+    case '3':
+    case 3:
+      return '已通过';
+    default:
+      return '未知';
+  }
+};
 const getType = (type) => {
   // 处理字符串和数字类型的type值
   switch (type) {
@@ -340,6 +527,7 @@ const localQuery = ref({
 });
 const showDriwer = ref(false);
 const showDrawer2 = ref(false);
+const showDrawer3 = ref(false);
 const emit = defineEmits(['filter-change']);
 const isTiming = ref(true);
 const currentDate = ref(new Date());
@@ -353,15 +541,15 @@ watch(showDriwer, (newVal) => {
   }
 });
 
-onMounted(() => {
-  handleSearch();
-});
 const handleTabSelect = (value) => {
   isActive.value = value;
 };
 const handleAddMaterial = () => {
   showDrawer2.value = true;
 };
+const handleAddContent = () => {
+  showDrawer3.value = true;
+};
 const handleDateChange = (date) => {};
 // 暴露方法给父组件
 const showDrawer = (accountInfo = null) => {

From c03142b85f834ec5aff6793875eb0ac769d71fbf Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 16:43:29 +0800
Subject: [PATCH 25/39] =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93=E5=92=8C?=
 =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 079feac..f78d8a6 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -378,15 +378,20 @@ const columns2 = ref([
     slots: { customRender: 'uploader' },
   },
 ]);
-
+const handleAddMaterial = () => {
+  handleSearch();
+  showDrawer2.value = true;
+};
+const handleAddContent = () => {
+  handleSearchWork();
+  showDrawer3.value = true;
+};
 const handleSelect = (value) => {
   isActive.value = value;
   if (value == 'ai') {
     showDrawer3.value = false;
-    handleSearch();
   } else {
     showDrawer2.value = false;
-    handleSearchWork();
   }
 };
 
@@ -544,12 +549,7 @@ watch(showDriwer, (newVal) => {
 const handleTabSelect = (value) => {
   isActive.value = value;
 };
-const handleAddMaterial = () => {
-  showDrawer2.value = true;
-};
-const handleAddContent = () => {
-  showDrawer3.value = true;
-};
+
 const handleDateChange = (date) => {};
 // 暴露方法给父组件
 const showDrawer = (accountInfo = null) => {

From 1693cd477b95c49eb3ca48584eeba50ecdccdda1 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 17:17:55 +0800
Subject: [PATCH 26/39] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=93=E5=92=8C?=
 =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 327 +++++++++---------
 1 file changed, 164 insertions(+), 163 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index f78d8a6..af1841c 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -129,172 +129,177 @@
         </div>
       </div>
     </div>
-    <a-drawer
-      title="原料库"
-      cancel-text="取消"
-      ok-text="确定"
-      placement="right"
-      v-model:visible="showDrawer2"
-      @after-visible-change="showDriwerChange"
-      width="904px"
-      class="task-drawer"
-      style="right: 481px"
-    >
-      <Table
-        :data-source="materialData"
-        bordered
-        :columns="columns"
-        :pagination="false"
-        row-key="id"
-        :row-selection="rowSelection"
+    <div v-show="isActive == 'ai'">
+      <a-drawer
+        title="原料库"
+        cancel-text="取消"
+        ok-text="确定"
+        placement="right"
+        v-model:visible="showDrawer2"
+        @after-visible-change="showDriwerChange"
+        width="904px"
+        class="task-drawer"
+        style="right: 481px"
       >
-        <template #name="{ record }">
-          <div class="flex items-center">
-            <img :src="record.cover" class="w-64px h-64px border-rounded-8px bg-#F0EDFF" />
-            <div class="flex flex-col ml-8px">
-              <div>{{ record.name }}</div>
-              <div class="text-#999 text-12px">序号：{{ record.uid }}</div>
+        <Table
+          :data-source="materialData"
+          bordered
+          :columns="columns"
+          :pagination="false"
+          row-key="id"
+          :row-selection="rowSelection"
+        >
+          <template #name="{ record }">
+            <div class="flex items-center">
+              <img :src="record.cover" class="w-64px h-64px border-rounded-8px bg-#F0EDFF" />
+              <div class="flex flex-col ml-8px">
+                <div>{{ record.name }}</div>
+                <div class="text-#999 text-12px">序号：{{ record.uid }}</div>
+              </div>
             </div>
-          </div>
-        </template>
-        <template #type="{ record }">
-          <div class="flex items-center">
-            {{ getType(record.type) }}
-          </div>
-        </template>
-        <template #from="{ record }">
-          <div class="flex items-center">
-            {{ getFrom(record.type) }}
-          </div>
-        </template>
-        <template #create_at="{ record }">
-          <div class="flex items-center">
-            {{ record.created_at ? dayjs(record.created_at * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }}
-          </div>
-        </template>
-      </Table>
-      <!-- 分页控件 -->
-      <div v-if="pageInfo.total > 0" class="pagination-box">
-        <a-pagination
-          :total="pageInfo.total"
-          size="mini"
-          show-total
-          show-jumper
-          show-page-size
-          :current="pageInfo.page"
-          :page-size="pageInfo.page_size"
-          @change="onPageChange"
-          @page-size-change="onPageSizeChange"
-        />
-      </div>
-      <template #footer>
-        <div class="flex items-center justify-between">
-          <div class="flex items-center">
-            <div class="color-#737478 font-size-14px">已选择：</div>
-            <div class="color-#737478 font-size-14px">{{ choseText }}</div>
-            <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
-              <img :src="item.cover" alt="" class="w-44px h-44px border-rounded-8px bg-#F0EDFF" />
+          </template>
+          <template #type="{ record }">
+            <div class="flex items-center">
+              {{ getType(record.type) }}
             </div>
-          </div>
-          <div class="flex justify-end">
-            <Button @click="handleCancel">取消</Button>
-            <Button class="ml-16px" type="primary" @click="handleOk">确定</Button>
-          </div>
+          </template>
+          <template #from="{ record }">
+            <div class="flex items-center">
+              {{ getFrom(record.type) }}
+            </div>
+          </template>
+          <template #create_at="{ record }">
+            <div class="flex items-center">
+              {{ record.created_at ? dayjs(record.created_at * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+            </div>
+          </template>
+        </Table>
+        <!-- 分页控件 -->
+        <div v-if="pageInfo.total > 0" class="pagination-box">
+          <a-pagination
+            :total="pageInfo.total"
+            size="mini"
+            show-total
+            show-jumper
+            show-page-size
+            :current="pageInfo.page"
+            :page-size="pageInfo.page_size"
+            @change="onPageChange"
+            @page-size-change="onPageSizeChange"
+          />
         </div>
-      </template>
-    </a-drawer>
-    <a-drawer
-      title="成品库"
-      cancel-text="取消"
-      ok-text="确定"
-      placement="right"
-      v-model:visible="showDrawer3"
-      @after-visible-change="showDriwerChange"
-      width="904px"
-      class="task-drawer"
-      style="right: 481px"
-    >
-      <Table
-        :data-source="materialData"
-        bordered
-        :columns="columns2"
-        :pagination="false"
-        row-key="id"
-        :row-selection="rowSelection"
+        <template #footer>
+          <div class="flex items-center justify-between">
+            <div class="flex items-center">
+              <div class="color-#737478 font-size-14px">已选择：</div>
+              <div class="color-#737478 font-size-14px">{{ choseText }}</div>
+              <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
+                <img :src="item.cover" alt="" class="w-44px h-44px border-rounded-8px bg-#F0EDFF" />
+              </div>
+            </div>
+            <div class="flex justify-end">
+              <Button @click="handleCancel">取消</Button>
+              <Button class="ml-16px" type="primary" @click="handleOk">确定</Button>
+            </div>
+          </div>
+        </template>
+      </a-drawer>
+    </div>
+    <div v-show="isActive == 'chose'">
+      <a-drawer
+        title="成品库"
+        cancel-text="取消"
+        ok-text="确定"
+        placement="right"
+        v-model:visible="showDrawer3"
+        @after-visible-change="showDriwerChange"
+        width="904px"
+        class="task-drawer"
+        style="right: 481px"
       >
-        <template #cover="{ record }">
-          <div class="flex items-center">
-            <img
-              :src="record.cover ? record.cover : icon4"
-              alt=""
-              class="w-44px h-44px border-rounded-8px bg-#F0EDFF"
-            />
-          </div>
-        </template>
-        <template #name="{ record }">
-          <div class="flex items-center">
-            <div>{{ record.title }}</div>
-          </div>
-        </template>
-        <template #type="{ record }">
-          <div class="flex items-center">
-            <img
-              :src="record.type === EnumManuscriptType.Image ? icon2 : icon3"
-              width="16"
-              height="16"
-              class="mr-4px"
-            />
-            <span class="cts" :class="record.type === EnumManuscriptType.Image ? '!color-#25C883' : '!color-#6D4CFE'">{{
-              record.type === EnumManuscriptType.Image ? '图文' : '视频'
-            }}</span>
-          </div>
-        </template>
-        <template #uploader="{ record }">
-          <div class="flex items-center">
-            {{ record.last_modifier.mobile }}
-          </div>
-        </template>
-        <template #audit_status="{ record }">
-          <div class="flex items-center">
-            {{ getStatus(record.audit_status) }}
-          </div>
-        </template>
-        <template #last_modified_at="{ record }">
-          <div class="flex items-center">
-            {{ record.created_at ? dayjs(record.last_modified_at * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }}
-          </div>
-        </template>
-      </Table>
-      <!-- 分页控件 -->
-      <div v-if="pageInfo.total > 0" class="pagination-box">
-        <a-pagination
-          :total="pageInfo.total"
-          size="mini"
-          show-total
-          show-jumper
-          show-page-size
-          :current="pageInfo.page"
-          :page-size="pageInfo.page_size"
-          @change="onPageChange"
-          @page-size-change="onPageSizeChange"
-        />
-      </div>
-      <template #footer>
-        <div class="flex items-center justify-between">
-          <div class="flex items-center">
-            <div class="color-#737478 font-size-14px">已选择：</div>
-            <div class="color-#737478 font-size-14px">{{ choseText }}</div>
-            <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
-              <img :src="item.cover ? item.cover : icon4" class="w-44px h-44px border-rounded-8px bg-#F0EDFF" />
+        <Table
+          :data-source="materialData"
+          bordered
+          :columns="columns2"
+          :pagination="false"
+          row-key="id"
+          :row-selection="rowSelection"
+        >
+          <template #cover="{ record }">
+            <div class="flex items-center">
+              <img
+                :src="record.cover ? record.cover : icon4"
+                alt=""
+                class="w-44px h-44px border-rounded-8px bg-#F0EDFF"
+              />
+            </div>
+          </template>
+          <template #name="{ record }">
+            <div class="flex items-center">
+              <div>{{ record.title }}</div>
+            </div>
+          </template>
+          <template #type="{ record }">
+            <div class="flex items-center">
+              <img
+                :src="record.type === EnumManuscriptType.Image ? icon2 : icon3"
+                width="16"
+                height="16"
+                class="mr-4px"
+              />
+              <span
+                class="cts"
+                :class="record.type === EnumManuscriptType.Image ? '!color-#25C883' : '!color-#6D4CFE'"
+                >{{ record.type === EnumManuscriptType.Image ? '图文' : '视频' }}</span
+              >
+            </div>
+          </template>
+          <template #uploader="{ record }">
+            <div class="flex items-center">
+              {{ record.last_modifier.mobile }}
+            </div>
+          </template>
+          <template #audit_status="{ record }">
+            <div class="flex items-center">
+              {{ getStatus(record.audit_status) }}
+            </div>
+          </template>
+          <template #last_modified_at="{ record }">
+            <div class="flex items-center">
+              {{ record.created_at ? dayjs(record.last_modified_at * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+            </div>
+          </template>
+        </Table>
+        <div v-if="pageInfo.total > 0" class="pagination-box">
+          <a-pagination
+            :total="pageInfo.total"
+            size="mini"
+            show-total
+            show-jumper
+            show-page-size
+            :current="pageInfo.page"
+            :page-size="pageInfo.page_size"
+            @change="onPageChange"
+            @page-size-change="onPageSizeChange"
+          />
+        </div>
+        <template #footer>
+          <div class="flex items-center justify-between">
+            <div class="flex items-center">
+              <div class="color-#737478 font-size-14px">已选择：</div>
+              <div class="color-#737478 font-size-14px">{{ choseText }}</div>
+              <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
+                <img :src="item.cover ? item.cover : icon4" class="w-44px h-44px border-rounded-8px bg-#F0EDFF" />
+              </div>
+            </div>
+            <div class="flex justify-end">
+              <Button @click="handleCancel">取消</Button>
+              <Button class="ml-16px" type="primary" @click="handleOk">确定</Button>
             </div>
           </div>
-          <div class="flex justify-end">
-            <Button @click="handleCancel">取消</Button>
-            <Button class="ml-16px" type="primary" @click="handleOk">确定</Button>
-          </div>
-        </div>
-      </template>
-    </a-drawer>
+        </template>
+      </a-drawer>
+    </div>
   </a-drawer>
 </template>
 
@@ -546,10 +551,6 @@ watch(showDriwer, (newVal) => {
   }
 });
 
-const handleTabSelect = (value) => {
-  isActive.value = value;
-};
-
 const handleDateChange = (date) => {};
 // 暴露方法给父组件
 const showDrawer = (accountInfo = null) => {

From 35eb0252cde56bb1116793009f24f40ce7b5f0c9 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Sat, 20 Sep 2025 18:42:34 +0800
Subject: [PATCH 27/39] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=93=E6=88=90?=
 =?UTF-8?q?=E5=93=81=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 645 +++++-------------
 .../components/finished-product-drawer.vue    | 267 ++++++++
 .../components/raw-material-drawer.vue        | 379 ++++++++++
 3 files changed, 819 insertions(+), 472 deletions(-)
 create mode 100644 src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
 create mode 100644 src/views/property-marketing/assignment-management/components/raw-material-drawer.vue

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index af1841c..29d3c5e 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -56,12 +56,13 @@
                   placeholder="描述你想让AI帮你生成的内容。未填写时，AI 会参考账号历史内容的题材与行业方向，结合当下话题，自动生成文案和图片后发布"
                   class="task-description font-size-12px"
                   :rows="5"
+                  v-model="taskDescription"
                 />
               </div>
             </div>
             <!-- 素材添加区域 -->
             <div class="form-section material-section">
-              <div v-if="hasChose" class="flex items-center"></div>
+              <div v-if="hasChoseMaterial" class="flex items-center"></div>
               <div v-else class="flex flex-col items-center">
                 <Button class="add-material-btn" @click="handleAddMaterial">
                   <template #icon>
@@ -129,343 +130,55 @@
         </div>
       </div>
     </div>
-    <div v-show="isActive == 'ai'">
-      <a-drawer
-        title="原料库"
-        cancel-text="取消"
-        ok-text="确定"
-        placement="right"
-        v-model:visible="showDrawer2"
-        @after-visible-change="showDriwerChange"
-        width="904px"
-        class="task-drawer"
-        style="right: 481px"
-      >
-        <Table
-          :data-source="materialData"
-          bordered
-          :columns="columns"
-          :pagination="false"
-          row-key="id"
-          :row-selection="rowSelection"
-        >
-          <template #name="{ record }">
-            <div class="flex items-center">
-              <img :src="record.cover" class="w-64px h-64px border-rounded-8px bg-#F0EDFF" />
-              <div class="flex flex-col ml-8px">
-                <div>{{ record.name }}</div>
-                <div class="text-#999 text-12px">序号：{{ record.uid }}</div>
-              </div>
-            </div>
-          </template>
-          <template #type="{ record }">
-            <div class="flex items-center">
-              {{ getType(record.type) }}
-            </div>
-          </template>
-          <template #from="{ record }">
-            <div class="flex items-center">
-              {{ getFrom(record.type) }}
-            </div>
-          </template>
-          <template #create_at="{ record }">
-            <div class="flex items-center">
-              {{ record.created_at ? dayjs(record.created_at * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }}
-            </div>
-          </template>
-        </Table>
-        <!-- 分页控件 -->
-        <div v-if="pageInfo.total > 0" class="pagination-box">
-          <a-pagination
-            :total="pageInfo.total"
-            size="mini"
-            show-total
-            show-jumper
-            show-page-size
-            :current="pageInfo.page"
-            :page-size="pageInfo.page_size"
-            @change="onPageChange"
-            @page-size-change="onPageSizeChange"
-          />
-        </div>
-        <template #footer>
-          <div class="flex items-center justify-between">
-            <div class="flex items-center">
-              <div class="color-#737478 font-size-14px">已选择：</div>
-              <div class="color-#737478 font-size-14px">{{ choseText }}</div>
-              <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
-                <img :src="item.cover" alt="" class="w-44px h-44px border-rounded-8px bg-#F0EDFF" />
-              </div>
-            </div>
-            <div class="flex justify-end">
-              <Button @click="handleCancel">取消</Button>
-              <Button class="ml-16px" type="primary" @click="handleOk">确定</Button>
-            </div>
-          </div>
-        </template>
-      </a-drawer>
-    </div>
-    <div v-show="isActive == 'chose'">
-      <a-drawer
-        title="成品库"
-        cancel-text="取消"
-        ok-text="确定"
-        placement="right"
-        v-model:visible="showDrawer3"
-        @after-visible-change="showDriwerChange"
-        width="904px"
-        class="task-drawer"
-        style="right: 481px"
-      >
-        <Table
-          :data-source="materialData"
-          bordered
-          :columns="columns2"
-          :pagination="false"
-          row-key="id"
-          :row-selection="rowSelection"
-        >
-          <template #cover="{ record }">
-            <div class="flex items-center">
-              <img
-                :src="record.cover ? record.cover : icon4"
-                alt=""
-                class="w-44px h-44px border-rounded-8px bg-#F0EDFF"
-              />
-            </div>
-          </template>
-          <template #name="{ record }">
-            <div class="flex items-center">
-              <div>{{ record.title }}</div>
-            </div>
-          </template>
-          <template #type="{ record }">
-            <div class="flex items-center">
-              <img
-                :src="record.type === EnumManuscriptType.Image ? icon2 : icon3"
-                width="16"
-                height="16"
-                class="mr-4px"
-              />
-              <span
-                class="cts"
-                :class="record.type === EnumManuscriptType.Image ? '!color-#25C883' : '!color-#6D4CFE'"
-                >{{ record.type === EnumManuscriptType.Image ? '图文' : '视频' }}</span
-              >
-            </div>
-          </template>
-          <template #uploader="{ record }">
-            <div class="flex items-center">
-              {{ record.last_modifier.mobile }}
-            </div>
-          </template>
-          <template #audit_status="{ record }">
-            <div class="flex items-center">
-              {{ getStatus(record.audit_status) }}
-            </div>
-          </template>
-          <template #last_modified_at="{ record }">
-            <div class="flex items-center">
-              {{ record.created_at ? dayjs(record.last_modified_at * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }}
-            </div>
-          </template>
-        </Table>
-        <div v-if="pageInfo.total > 0" class="pagination-box">
-          <a-pagination
-            :total="pageInfo.total"
-            size="mini"
-            show-total
-            show-jumper
-            show-page-size
-            :current="pageInfo.page"
-            :page-size="pageInfo.page_size"
-            @change="onPageChange"
-            @page-size-change="onPageSizeChange"
-          />
-        </div>
-        <template #footer>
-          <div class="flex items-center justify-between">
-            <div class="flex items-center">
-              <div class="color-#737478 font-size-14px">已选择：</div>
-              <div class="color-#737478 font-size-14px">{{ choseText }}</div>
-              <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
-                <img :src="item.cover ? item.cover : icon4" class="w-44px h-44px border-rounded-8px bg-#F0EDFF" />
-              </div>
-            </div>
-            <div class="flex justify-end">
-              <Button @click="handleCancel">取消</Button>
-              <Button class="ml-16px" type="primary" @click="handleOk">确定</Button>
-            </div>
-          </div>
-        </template>
-      </a-drawer>
-    </div>
+
+    <!-- 原料库子组件：使用:visible和@update:visible替代v-model -->
+    <RawMaterialDrawer
+      :visible="showDrawer2"
+      @update:visible="val => showDrawer2 = val"
+      :query="materialQuery"
+      @after-visible-change="handleMaterialDrawerVisibleChange"
+      @confirm="handleMaterialConfirm"
+      @cancel="handleMaterialCancel"
+    />
+
+    <!-- 成品库子组件：使用:visible和@update:visible替代v-model -->
+    <FinishedProductDrawer
+      :visible="showDrawer3"
+      @update:visible="val => showDrawer3 = val"
+      :query="productQuery"
+      @after-visible-change="handleProductDrawerVisibleChange"
+      @confirm="handleProductConfirm"
+      @cancel="handleProductCancel"
+    />
   </a-drawer>
 </template>
 
 <script lang="ts" setup>
-import { getWorksPage, getWriterLinksGenerate } from '@/api/all/generationWorkshop.ts';
-import { ref, reactive, onMounted, nextTick } from 'vue';
+import { getWorksPage } from '@/api/all/generationWorkshop.ts';
+import { ref, reactive, watch, nextTick } from 'vue';
 import aiIcon from '@/assets/img/media-account/icon-AI.png';
-import { Checkbox, Button, Space, Pagination, notification, DatePicker, TimePicker, Table } from 'ant-design-vue';
+import { Button, DatePicker, TimePicker } from 'ant-design-vue';
 import { TABS_LIST, ORIGIN_LIST, RawMaterialType } from '@/views/material-center/components/raw-material/constants';
 import dayjs from 'dayjs';
 import { getRawMaterialsPage } from '@/api/all/generationWorkshop';
-// 工具引入
 import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
 import { EnumManuscriptType } from '@/views/material-center/components/finished-products/manuscript/list/constants';
 import icon2 from '@/assets/img/creative-generation-workshop/icon-photo.png';
 import icon3 from '@/assets/img/creative-generation-workshop/icon-video.png';
 import icon4 from '@/assets/img/error-img.png';
+// 引入子组件
+import RawMaterialDrawer from './raw-material-drawer.vue';
+import FinishedProductDrawer from './finished-product-drawer.vue';
+
+// 状态管理
 const choseText = ref('');
-const columns = ref([
-  {
-    title: '文件名称',
-    dataIndex: 'name',
-    width: 200,
-    slots: { customRender: 'name' },
-  },
-  {
-    title: '类型',
-    dataIndex: 'type',
-    width: 100,
-    slots: { customRender: 'type' },
-  },
-  {
-    title: '来源',
-    dataIndex: 'from',
-    width: 100,
-    slots: { customRender: 'from' },
-  },
-  {
-    title: '上传时间',
-    dataIndex: 'created_at',
-    width: 200,
-    slots: { customRender: 'create_at' },
-  },
-]);
-
-const columns2 = ref([
-  {
-    title: '图片/视频',
-    dataIndex: 'cover',
-    width: 200,
-    slots: { customRender: 'cover' },
-  },
-  {
-    title: '文件名称',
-    dataIndex: 'name',
-    width: 200,
-    slots: { customRender: 'name' },
-  },
-  {
-    title: '稿件类型',
-    dataIndex: 'type',
-    width: 100,
-    slots: { customRender: 'type' },
-  },
-  {
-    title: '审核状态',
-    dataIndex: 'audit_status',
-    width: 100,
-    slots: { customRender: 'audit_status' },
-  },
-  {
-    title: '最后修改时间',
-    dataIndex: 'last_modified_at',
-    width: 200,
-    slots: { customRender: 'last_modified_at' },
-  },
-  {
-    title: '上传人员',
-    dataIndex: 'uploader',
-    width: 200,
-    slots: { customRender: 'uploader' },
-  },
-]);
-const handleAddMaterial = () => {
-  handleSearch();
-  showDrawer2.value = true;
-};
-const handleAddContent = () => {
-  handleSearchWork();
-  showDrawer3.value = true;
-};
-const handleSelect = (value) => {
-  isActive.value = value;
-  if (value == 'ai') {
-    showDrawer3.value = false;
-  } else {
-    showDrawer2.value = false;
-  }
-};
-
-const choseImgArray = ref([]);
-// 表格分页逻辑
-const { pageInfo, onPageChange, onPageSizeChange, rowSelection, selectedRowKeys } = useTableSelectionWithPagination({
-  rowKey: 'id',
-  onPageChange: () => handleSearch(),
-  onPageSizeChange: () => handleSearch(),
-});
-
-// 监听选中项变化
-watch(selectedRowKeys, (newVal) => {
-  console.log(newVal);
-  query.ids = newVal;
-  const filteredData = materialData.value.filter((item) => newVal.includes(item.id));
-  choseImgArray.value = materialData.value.filter(
-    (item) => newVal.includes(item.id) && (item.type == 0 || item.type == 1),
-  );
-  console.log('+++++', choseImgArray.value);
-  choseText.value = '';
-  const typeCount = filteredData.reduce((acc, item) => {
-    acc[item.type] = (acc[item.type] || 0) + 1;
-    return acc;
-  }, {});
-  console.log('+++++', typeCount);
-  Object.entries(typeCount).forEach(([type, count]) => {
-    console.log('++++tyype', type, getType(type));
-    console.log(`${getType(type)}: ${count}个`);
-    choseText.value += `${getType(type)}: ${count}个 `;
-  });
-});
-
-// 定义props和emit
-const props = defineProps({
-  operators: Array,
-  platformOptions: Array,
-  accountList: Array,
-  query: Object,
-});
-// 查询参数
-const query = reactive({
-  page: pageInfo.value.page,
-  page_size: pageInfo.value.page_size,
-  platforms: undefined,
-  operator_ids: undefined,
-  ids: [],
-  top_execution_time: undefined,
-});
-const materialData = ref([]);
-const handleSearch = async () => {
-  const res = await getRawMaterialsPage(query);
-  pageInfo.value.total = res.data.total;
-  if (pageInfo.value.page == 1) {
-    materialData.value = [];
-  }
-  materialData.value = [...materialData.value, ...res.data.data];
-};
-
-const handleSearchWork = async () => {
-  const res = await getWorksPage(query);
-  pageInfo.value.total = res.data.total;
-  if (pageInfo.value.page == 1) {
-    materialData.value = [];
-  }
-  materialData.value = [...materialData.value, ...res.data.data];
-};
-
+const taskDescription = ref('');
+const hasChoseMaterial = ref(false);
 const isActive = ref('ai');
+const showDriwer = ref(false);
+const showDrawer2 = ref(false);
+const showDrawer3 = ref(false);
+
 // 发布类型选项
 const publishOptions = ref([
   { value: 'immediate', label: '立即发布' },
@@ -475,109 +188,166 @@ const publishOptions = ref([
 // 发布类型，默认为立即发布
 const publishType = ref('immediate');
 
-const getStatus = (status) => {
-  // 处理字符串和数字类型的type值
-  switch (status) {
-    case 0:
-      return '全部';
-    case RawMaterialType.Video:
-    case '1':
-    case 1:
-      return '待审核';
-    case RawMaterialType.Text:
-    case '2':
-    case 2:
-      return '审核中';
-    case RawMaterialType.Text:
-    case '3':
-    case 3:
-      return '已通过';
-    default:
-      return '未知';
-  }
-};
-const getType = (type) => {
-  // 处理字符串和数字类型的type值
-  switch (type) {
-    case RawMaterialType.Image:
-    case '0':
-    case 0:
-      return '图片';
-    case RawMaterialType.Video:
-    case '1':
-    case 1:
-      return '视频';
-    case RawMaterialType.Text:
-    case '2':
-    case 2:
-      return '文本';
-    default:
-      return '未知';
-  }
-};
+// 时间选择相关
+const currentDate = ref(new Date());
+const strValue = ref(dayjs().format('HH:mm'));
 
-const getFrom = (type) => {
-  switch (type) {
-    case 0:
-      return '本地上传';
-    case 1:
-      return 'AI生成';
-    default:
-      return '未知';
-  }
-};
-// 处理发布类型变化
-const handlePublishTypeChange = (value) => {
-  publishType.value = value;
-};
+// 定义props和emit
+const props = defineProps({
+  operators: Array,
+  platformOptions: Array,
+  accountList: Array,
+  query: Object,
+});
 
 // 本地筛选状态（保持上次选择）
 const localQuery = ref({
   accounts: props.query?.ids || [],
 });
-const showDriwer = ref(false);
-const showDrawer2 = ref(false);
-const showDrawer3 = ref(false);
-const emit = defineEmits(['filter-change']);
-const isTiming = ref(true);
-const currentDate = ref(new Date());
-// 将时间选择器默认值设置为当前时间
-const strValue = ref(dayjs().format('HH:mm'));
 
-// 监听抽屉显示状态，每次打开时更新时间为当前时间
+// 原料库查询参数
+const materialQuery = reactive({
+  page: 1,
+  page_size: 10,
+  platforms: undefined,
+  operator_ids: undefined,
+  ids: [],
+  top_execution_time: undefined,
+});
+
+// 成品库查询参数
+const productQuery = reactive({
+  page: 1,
+  page_size: 10,
+  platforms: undefined,
+  operator_ids: undefined,
+  ids: [],
+});
+
+// 选中的素材数据
+const selectedMaterials = ref({
+  keys: [],
+  data: [],
+  text: '',
+  images: []
+});
+
+const selectedProducts = ref({
+  keys: [],
+  data: [],
+  text: '',
+  images: []
+});
+
+// 处理AI/成品库选择切换
+const handleSelect = (value) => {
+  isActive.value = value;
+  if (value === 'ai') {
+    showDrawer3.value = false;
+  } else {
+    showDrawer2.value = false;
+  }
+};
+
+// 打开原料库抽屉
+const handleAddMaterial = () => {
+  materialQuery.page = 1;
+  materialQuery.page_size = 10;
+  showDrawer2.value = true;
+};
+
+// 打开成品库抽屉
+const handleAddContent = () => {
+  productQuery.page = 1;
+  productQuery.page_size = 10;
+  showDrawer3.value = true;
+};
+
+// 处理原料库选择确认
+const handleMaterialConfirm = (result) => {
+  selectedMaterials.value = {
+    keys: result.selectedKeys,
+    data: result.selectedData,
+    text: result.choseText,
+    images: result.choseImgArray
+  };
+  hasChoseMaterial.value = result.selectedKeys.length > 0;
+};
+
+// 处理原料库取消
+const handleMaterialCancel = () => {
+  // 取消逻辑
+};
+
+// 处理成品库选择确认
+const handleProductConfirm = (result) => {
+  selectedProducts.value = {
+    keys: result.selectedKeys,
+    data: result.selectedData,
+    text: result.choseText,
+    images: result.choseImgArray
+  };
+};
+
+// 处理成品库取消
+const handleProductCancel = () => {
+  // 取消逻辑
+};
+
+// 处理发布类型变化
+const handlePublishTypeChange = (value) => {
+  publishType.value = value;
+};
+
+// 处理日期变化
+const handleDateChange = (date) => {
+  // 日期处理逻辑
+};
+
+// 抽屉显示状态变化
+const showDriwerChange = (visible: boolean) => {
+  console.log('Main Drawer visible: ', visible);
+};
+
+// 原料库抽屉显示状态变化
+const handleMaterialDrawerVisibleChange = (visible: boolean) => {
+  console.log('Raw Material Drawer visible: ', visible);
+};
+
+// 成品库抽屉显示状态变化
+const handleProductDrawerVisibleChange = (visible: boolean) => {
+  console.log('Finished Product Drawer visible: ', visible);
+};
+
+// 处理筛选条件变化
+const handleChange = (field, value) => {
+  localQuery.value[field] = value;
+  emit('filter-change', {
+    accounts: localQuery.value.accounts,
+  });
+};
+
+// 监听主抽屉显示状态，每次打开时更新时间为当前时间
 watch(showDriwer, (newVal) => {
   if (newVal) {
     strValue.value = dayjs().format('HH:mm');
   }
 });
 
-const handleDateChange = (date) => {};
 // 暴露方法给父组件
 const showDrawer = (accountInfo = null) => {
   showDriwer.value = true;
-  // 如果传入了账号信息，则设置为默认选中
   if (accountInfo && accountInfo.id) {
-    // 使用 nextTick 确保在 DOM 更新后设置默认值
     nextTick(() => {
       localQuery.value.accounts = [accountInfo.name];
     });
   }
 };
 
-const showDriwerChange = (visible: boolean) => {
-  console.log('Drawer visible: ', visible);
-};
+// 定义事件发射器
+const emit = defineEmits(['filter-change', 'create-task']);
 
-// 处理筛选条件变化（不关闭弹窗，直接触发筛选）
-const handleChange = (field, value) => {
-  localQuery.value[field] = value;
-  // 直接触发筛选变更，不需要确认按钮
-  emit('filter-change', {
-    accounts: localQuery.value.accounts,
-  });
-};
-
-// 使用defineExpose暴露方法
+// 暴露方法
 defineExpose({
   showDrawer,
 });
@@ -591,7 +361,6 @@ defineExpose({
   align-items: center;
 }
 
-/* 抽屉左侧圆角样式 */
 .arco-drawer {
   border-top-left-radius: 8px !important;
   border-bottom-left-radius: 8px !important;
@@ -611,40 +380,6 @@ defineExpose({
   border: #722ed1 1px solid !important;
 }
 
-.main-container {
-  width: 100%;
-  max-width: 600px;
-  background-color: #fff;
-  border: 1px solid #e0e0e0;
-  border-radius: 8px;
-  padding: 24px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-}
-
-.tab-group {
-  margin-bottom: 24px;
-  width: 100%;
-}
-
-.tab-button {
-  flex: 1;
-  height: 48px;
-  font-size: 16px;
-}
-
-.ai-tab .ai-icon {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  background-color: #722ed1;
-  color: white;
-  border-radius: 50%;
-  text-align: center;
-  line-height: 16px;
-  font-size: 12px;
-  margin-right: 8px;
-}
-
 .form-section {
   display: flex;
   flex-direction: column;
@@ -678,7 +413,7 @@ defineExpose({
   height: 126px;
   border: none !important;
   box-shadow: none !important;
-  outline: none !important; /* 去除默认的聚焦轮廓 */
+  outline: none !important;
 }
 
 .task-description::placeholder {
@@ -702,34 +437,12 @@ defineExpose({
   margin-bottom: 8px;
 }
 
-.drag-handle {
-  position: absolute;
-  width: 16px;
-  height: 16px;
-  background-color: #ff7d00;
-  border-radius: 50%;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-}
-
 .material-hint {
   color: #939499;
   font-size: 14px;
   margin: 0 40px;
 }
 
-.size-selector {
-  margin-bottom: 24px;
-  text-align: center;
-}
-
-.size-tag {
-  font-size: 14px;
-  padding: 6px 16px;
-  border-radius: 16px;
-}
-
 .publish-type-select :deep(.ant-select-selection-item) {
   text-align: center;
   display: flex;
@@ -737,22 +450,10 @@ defineExpose({
   justify-content: center;
 }
 
-.publish-select {
-  width: 100%;
-  height: 40px;
-}
 .line {
   background-color: #e6e6e8;
   width: 382px;
   height: 1px;
   margin-top: 16px;
 }
-/* 分页样式 */
-.pagination-box {
-  display: flex;
-  width: 100%;
-  padding: 16px 0;
-  justify-content: flex-end;
-  align-items: center;
-}
 </style>
diff --git a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
new file mode 100644
index 0000000..18bd125
--- /dev/null
+++ b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
@@ -0,0 +1,267 @@
+<template>
+  <a-drawer
+    title="成品库"
+    cancel-text="取消"
+    ok-text="确定"
+    placement="right"
+    :visible="visible"
+    @after-visible-change="onAfterVisibleChange"
+    @close="handleClose"
+    width="904px"
+    class="task-drawer"
+    style="right: 481px"
+  >
+    <!-- 成品库表格 -->
+    <Table
+      :data-source="materialData"
+      bordered
+      :columns="columns"
+      :pagination="false"
+      row-key="id"
+      :row-selection="rowSelection"
+    >
+      <template #cover="{ record }">
+        <div class="flex items-center">
+          <img
+            :src="record.cover ? record.cover : icon4"
+            alt="内容预览"
+            class="w-44px h-44px border-rounded-8px bg-#F0EDFF"
+          />
+        </div>
+      </template>
+      <template #name="{ record }">
+        <div class="flex items-center">{{ record.title }}</div>
+      </template>
+      <template #type="{ record }">
+        <div class="flex items-center">
+          <img :src="record.type === EnumManuscriptType.Image ? icon2 : icon3" width="16" height="16" class="mr-4px" />
+          <span class="cts" :class="record.type === EnumManuscriptType.Image ? '!color-#25C883' : '!color-#6D4CFE'">{{
+            record.type === EnumManuscriptType.Image ? '图文' : '视频'
+          }}</span>
+        </div>
+      </template>
+      <template #uploader="{ record }">
+        <div class="flex items-center">{{ record.last_modifier?.mobile || '-' }}</div>
+      </template>
+      <template #audit_status="{ record }">
+        <div class="flex items-center">{{ getStatus(record.audit_status) }}</div>
+      </template>
+      <template #last_modified_at="{ record }">
+        <div class="flex items-center">
+          {{ record.last_modified_at ? dayjs(record.last_modified_at * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+        </div>
+      </template>
+    </Table>
+
+    <!-- 分页控件 -->
+    <div class="pagination-box">
+      <a-pagination
+        :total="pageInfo.total"
+        size="mini"
+        show-total
+        show-jumper
+        show-page-size
+        :current="pageInfo.page"
+        :page-size="pageInfo.page_size"
+        @change="onPageChange"
+        @page-size-change="onPageSizeChange"
+      />
+    </div>
+
+    <!-- 底部操作栏 -->
+    <template #footer>
+      <div class="flex items-center justify-between">
+        <div class="flex items-center">
+          <div class="color-#737478 font-size-14px">已选择：</div>
+          <div class="color-#737478 font-size-14px">{{ choseText }}</div>
+          <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
+            <img
+              :src="item.cover ? item.cover : icon4"
+              alt="选中的内容"
+              class="w-44px h-44px border-rounded-8px bg-#F0EDFF"
+            />
+          </div>
+        </div>
+        <div class="flex justify-end">
+          <Button @click="handleCancel">取消</Button>
+          <Button class="ml-16px" type="primary" @click="handleOk">确定</Button>
+        </div>
+      </div>
+    </template>
+  </a-drawer>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch, defineProps, defineEmits, watchEffect } from 'vue';
+import { Table, Button, Pagination } from 'ant-design-vue';
+import dayjs from 'dayjs';
+import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
+import { EnumManuscriptType } from '@/views/material-center/components/finished-products/manuscript/list/constants';
+import { getWorksPage } from '@/api/all/generationWorkshop.ts';
+// 引入图片资源
+import icon2 from '@/assets/img/creative-generation-workshop/icon-photo.png';
+import icon3 from '@/assets/img/creative-generation-workshop/icon-video.png';
+import icon4 from '@/assets/img/error-img.png';
+
+// 定义Props
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+  query: {
+    type: Object,
+    required: true,
+    default: () => ({
+      page: 1,
+      page_size: 10,
+      platforms: undefined,
+      operator_ids: undefined,
+      ids: [],
+      keyword: '',
+      audit_status: undefined,
+      type: undefined,
+    }),
+  },
+});
+
+// 定义Emits
+const emit = defineEmits(['update:visible', 'after-visible-change', 'confirm', 'cancel']);
+
+// 内部状态管理
+const materialData = ref([]);
+const choseText = ref('');
+const choseImgArray = ref([]);
+
+// 表格列配置
+const columns = ref([
+  { title: '图片/视频', dataIndex: 'cover', width: 200, slots: { customRender: 'cover' } },
+  { title: '文件名称', dataIndex: 'name', width: 200, slots: { customRender: 'name' } },
+  { title: '稿件类型', dataIndex: 'type', width: 100, slots: { customRender: 'type' } },
+  { title: '审核状态', dataIndex: 'audit_status', width: 100, slots: { customRender: 'audit_status' } },
+  { title: '最后修改时间', dataIndex: 'last_modified_at', width: 200, slots: { customRender: 'last_modified_at' } },
+  { title: '上传人员', dataIndex: 'uploader', width: 200, slots: { customRender: 'uploader' } },
+]);
+
+// 1. 先定义数据获取函数，确保使用最新的query参数
+const fetchProductData = async () => {
+  try {
+    // 使用主组件传递的最新查询参数
+    const params = { ...props.query };
+    console.log('成品库请求参数:', params); // 调试用
+
+    const res = await getWorksPage(params);
+    materialData.value = [];
+    pageInfo.value.total = res.data.total;
+    if (pageInfo.value.page === 1) {
+      materialData.value = res.data.data;
+    } else {
+      materialData.value = [...materialData.value, ...res.data.data];
+    }
+  } catch (error) {
+    console.error('获取成品库数据失败:', error);
+  }
+};
+
+// 2. 初始化表格选择逻辑
+const { pageInfo, onPageChange, onPageSizeChange, rowSelection, selectedRowKeys } = useTableSelectionWithPagination({
+  rowKey: 'id',
+  onPageChange: fetchProductData,
+  onPageSizeChange: fetchProductData,
+});
+
+// 监听query参数变化，当主组件传递的参数变化时重新请求数据
+watchEffect(() => {
+  if (props.visible) {
+    console.log('成品库查询参数变化，重新加载数据');
+    fetchProductData();
+  }
+});
+
+// 监听选中项变化
+watch(selectedRowKeys, (newKeys) => {
+  const filteredData = materialData.value.filter((item) => newKeys.includes(item.id));
+
+  // 统计各类型数量
+  const typeCount = filteredData.reduce((acc, item) => {
+    const typeKey = item.type === EnumManuscriptType.Image ? 'image' : 'video';
+    acc[typeKey] = (acc[typeKey] || 0) + 1;
+    return acc;
+  }, {});
+
+  // 生成选中文本
+  choseText.value = [];
+  if (typeCount.image) choseText.value.push(`图文: ${typeCount.image}个`);
+  if (typeCount.video) choseText.value.push(`视频: ${typeCount.video}个`);
+  choseText.value = choseText.value.join(' ');
+
+  // 筛选选中的内容用于预览
+  choseImgArray.value = filteredData;
+});
+
+// 格式化审核状态显示
+const getStatus = (status: number) => {
+  switch (status) {
+    case 0:
+      return '待审核';
+    case 1:
+      return '审核中';
+    case 2:
+      return '已通过';
+    case 3:
+      return '已拒绝';
+    default:
+      return '未知';
+  }
+};
+
+// 抽屉显示状态变化处理
+const onAfterVisibleChange = (visible: boolean) => {
+  emit('after-visible-change', visible);
+
+  if (visible) {
+    // 当抽屉显示时，使用最新参数请求数据
+    fetchProductData();
+  } else {
+    // 关闭时清空数据
+    materialData.value = [];
+    selectedRowKeys.value = [];
+    choseText.value = '';
+    choseImgArray.value = [];
+  }
+};
+
+// 抽屉关闭事件处理
+const handleClose = () => {
+  emit('update:visible', false);
+};
+
+// 取消按钮处理
+const handleCancel = () => {
+  emit('update:visible', false);
+  emit('cancel');
+};
+
+// 确定按钮处理
+const handleOk = () => {
+  const selectedData = materialData.value.filter((item) => selectedRowKeys.value.includes(item.id));
+  emit('confirm', {
+    selectedKeys: selectedRowKeys.value,
+    selectedData,
+    choseText: choseText.value,
+    choseImgArray: choseImgArray.value,
+  });
+  emit('update:visible', false);
+};
+</script>
+
+<style scoped>
+.pagination-box {
+  display: flex;
+  width: 100%;
+  padding: 16px 0;
+  justify-content: flex-end;
+  align-items: center;
+}
+</style>
diff --git a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
new file mode 100644
index 0000000..f903e6b
--- /dev/null
+++ b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
@@ -0,0 +1,379 @@
+<template>
+  <a-drawer
+    title="原料库"
+    cancel-text="取消"
+    ok-text="确定"
+    placement="right"
+    :visible="visible"
+    @after-visible-change="onAfterVisibleChange"
+    @close="handleClose"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    width="904px"
+    class="task-drawer"
+    style="right: 481px"
+  >
+    <!-- 加载状态 -->
+    <a-spin :spinning="loading" tip="加载中...">
+      <!-- 表格区域 -->
+      <div class="table-container">
+        <Table
+          :data-source="materialData"
+          bordered
+          :columns="columns"
+          :pagination="false"
+          row-key="id"
+          :row-selection="rowSelection"
+        >
+          <!-- 名称列自定义渲染 -->
+          <template #cell:name="{ record }">
+            <div class="name-cell">
+              <img :src="getTypeIcon(record.type)" alt="类型图标" class="type-icon" />
+              <span class="material-name">{{ record.name }}</span>
+            </div>
+          </template>
+
+          <!-- 类型列自定义渲染 -->
+          <template #cell:type="{ record }">
+            <span>{{ getType(record.type) }}</span>
+          </template>
+
+          <!-- 来源列自定义渲染 -->
+          <template #cell:from="{ record }">
+            <span>{{ getFrom(record.from) }}</span>
+          </template>
+
+          <!-- 上传时间列自定义渲染 -->
+          <template #cell:created_at="{ record }">
+            <span>{{ formatDate(record.created_at) }}</span>
+          </template>
+        </Table>
+
+        <!-- 分页控件 -->
+        <div v-if="pageInfo.total > 0" class="pagination-container">
+          <a-pagination
+            :current="pageInfo.page"
+            :page-size="pageInfo.page_size"
+            :total="pageInfo.total"
+            @change="handlePageChange"
+            @showSizeChange="handlePageSizeChange"
+            show-size-changer
+            show-quick-jumper
+            :show-total="(total) => `共 ${total} 条`"
+          />
+        </div>
+      </div>
+    </a-spin>
+  </a-drawer>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch, defineProps, defineEmits } from 'vue';
+import { Table, Button, Pagination } from 'ant-design-vue';
+// // 修正Arco Design图标导入方式
+// import { FileTextOutlined } from '@arco-design/web-vue/es/icons';
+import dayjs from 'dayjs';
+import { RawMaterialType } from '@/views/material-center/components/raw-material/constants';
+import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
+import { getRawMaterialsPage } from '@/api/all/generationWorkshop';
+
+// 引入类型图标
+import imgIcon from '@/assets/img/material/icon-image.png';
+import videoIcon from '@/assets/img/material/icon-video.png';
+import textIcon from '@/assets/img/material/icon-text.png';
+import unknownIcon from '@/assets/img/material/icon-unknown.png';
+
+// 定义Props类型
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+  query: {
+    type: Object as () => {
+      page?: number;
+      page_size?: number;
+      platforms?: any;
+      operator_ids?: any;
+      ids?: any[];
+      top_execution_time?: any;
+      keyword?: string;
+      type?: any;
+    },
+    required: true,
+    default: () => ({
+      page: 1,
+      page_size: 10,
+      platforms: undefined,
+      operator_ids: undefined,
+      ids: [],
+      top_execution_time: undefined,
+      keyword: '',
+      type: undefined,
+    }),
+  },
+});
+
+// 定义Emits类型
+const emit = defineEmits<{
+  (e: 'update:visible', value: boolean): void;
+  (e: 'after-visible-change', visible: boolean): void;
+  (
+    e: 'confirm',
+    data: {
+      selectedKeys: string[];
+      selectedData: any[];
+      choseText: string;
+      choseImgArray: any[];
+    },
+  ): void;
+  (e: 'cancel'): void;
+}>();
+
+// 内部状态管理
+const materialData = ref<any[]>([]);
+const choseText = ref('');
+const choseImgArray = ref<any[]>([]);
+const loading = ref(false);
+const pageInfo = ref({
+  page: 1,
+  page_size: 10,
+  total: 0,
+});
+
+// 数据获取函数
+const fetchMaterialData = async () => {
+  if (!props.visible) return;
+
+  try {
+    loading.value = true;
+    const params = {
+      ...props.query,
+      page: pageInfo.value.page,
+      page_size: pageInfo.value.page_size,
+    };
+
+    const res = await getRawMaterialsPage(params);
+    console.log('获取原料库数据成功:', res);
+    if (res?.code == 200) {
+      materialData.value = res.data.data;
+      pageInfo.value.total = res.data.total || 0;
+      console.log('获取原料库数据成功++++:', res, materialData.value);
+    } else {
+      materialData.value = [];
+      pageInfo.value.total = 0;
+    }
+  } catch (error) {
+    console.error('获取原料库数据失败:', error);
+    materialData.value = [];
+    pageInfo.value.total = 0;
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 表格列配置
+const columns = ref([
+  {
+    title: '文件名称',
+    dataIndex: 'name',
+    key: 'name',
+    width: 200,
+  },
+  {
+    title: '类型',
+    dataIndex: 'type',
+    key: 'type',
+    width: 100,
+  },
+  {
+    title: '来源',
+    dataIndex: 'from',
+    key: 'from',
+    width: 100,
+  },
+  {
+    title: '上传时间',
+    dataIndex: 'created_at',
+    key: 'created_at',
+    width: 200,
+  },
+]);
+
+// 表格选择逻辑
+const { rowSelection, selectedRowKeys } = useTableSelectionWithPagination({
+  rowKey: 'id',
+});
+
+// 分页处理函数
+const handlePageChange = (page: number) => {
+  pageInfo.value.page = page;
+  fetchMaterialData();
+};
+
+const handlePageSizeChange = (current: number, size: number) => {
+  pageInfo.value.page = 1;
+  pageInfo.value.page_size = size;
+  fetchMaterialData();
+};
+
+// 监听查询参数变化
+watch(
+  () => props.query,
+  (newQuery) => {
+    if (props.visible) {
+      pageInfo.value.page = 1;
+      fetchMaterialData();
+    }
+  },
+  { deep: true },
+);
+
+// 监听抽屉显示状态
+watch(
+  () => props.visible,
+  (visible) => {
+    emit('after-visible-change', visible);
+    if (visible) {
+      pageInfo.value.page = 1;
+      fetchMaterialData();
+    } else {
+      materialData.value = [];
+      selectedRowKeys.value = [];
+      choseText.value = '';
+      choseImgArray.value = [];
+    }
+  },
+);
+
+// 监听选中项变化
+watch(selectedRowKeys, (newKeys) => {
+  const filteredData = materialData.value.filter((item) => newKeys.includes(item.id));
+
+  const typeCount: Record<string, number> = {};
+  filteredData.forEach((item) => {
+    typeCount[item.type] = (typeCount[item.type] || 0) + 1;
+  });
+
+  choseText.value = Object.entries(typeCount)
+    .map(([type, count]) => `${getType(Number(type))}: ${count}个`)
+    .join(' ');
+
+  choseImgArray.value = filteredData.filter((item) => [0, 1].includes(item.type));
+});
+
+// 辅助函数
+const getType = (type: number): string => {
+  const typeMap = {
+    [RawMaterialType.Image]: '图片',
+    [RawMaterialType.Video]: '视频',
+    [RawMaterialType.Text]: '文本',
+  };
+  return typeMap[type] || '未知';
+};
+
+const getTypeIcon = (type: number): string => {
+  const iconMap = {
+    [RawMaterialType.Image]: imgIcon,
+    [RawMaterialType.Video]: videoIcon,
+    [RawMaterialType.Text]: textIcon,
+  };
+  return iconMap[type] || unknownIcon;
+};
+
+const getFrom = (from: number): string => {
+  const fromMap = {
+    0: '本地上传',
+    1: 'AI生成',
+  };
+  return fromMap[from] || '未知';
+};
+
+const formatDate = (dateString?: string): string => {
+  if (!dateString) return '';
+  return dayjs(dateString).format('YYYY-MM-DD HH:mm:ss');
+};
+
+// 事件处理函数
+const handleClose = () => {
+  emit('update:visible', false);
+};
+
+const handleCancel = () => {
+  emit('update:visible', false);
+  emit('cancel');
+};
+
+const handleOk = () => {
+  const selectedData = materialData.value.filter((item) => selectedRowKeys.value.includes(item.id));
+  emit('confirm', {
+    selectedKeys: selectedRowKeys.value,
+    selectedData,
+    choseText: choseText.value,
+    choseImgArray: choseImgArray.value,
+  });
+  emit('update:visible', false);
+};
+
+const onAfterVisibleChange = (visible: boolean) => {
+  // 空实现，避免未定义错误
+};
+</script>
+
+<style scoped>
+/* 样式保持不变 */
+.table-container {
+  height: calc(100% - 50px);
+  min-height: 300px;
+  display: flex;
+  flex-direction: column;
+}
+
+.material-table {
+  flex: 1;
+  overflow: auto;
+}
+
+.pagination-container {
+  padding: 16px 0;
+  text-align: right;
+}
+
+.name-cell {
+  display: flex;
+  align-items: center;
+}
+
+.type-icon {
+  width: 24px;
+  height: 24px;
+  margin-right: 8px;
+  object-fit: contain;
+}
+
+.material-name {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 150px;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 0;
+  color: #999;
+}
+
+.empty-icon {
+  margin-bottom: 16px;
+  color: #ccc;
+}
+
+.empty-text {
+  font-size: 14px;
+}
+</style>

From ff7e20f8cf82740952259203d436c53bdeeb2ce1 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Tue, 23 Sep 2025 11:02:24 +0800
Subject: [PATCH 28/39] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/raw-material-drawer.vue        | 472 +++++++-----------
 1 file changed, 182 insertions(+), 290 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
index f903e6b..a059a3b 100644
--- a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
+++ b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
@@ -7,83 +7,94 @@
     :visible="visible"
     @after-visible-change="onAfterVisibleChange"
     @close="handleClose"
-    @ok="handleOk"
-    @cancel="handleCancel"
     width="904px"
     class="task-drawer"
     style="right: 481px"
   >
-    <!-- 加载状态 -->
-    <a-spin :spinning="loading" tip="加载中...">
-      <!-- 表格区域 -->
-      <div class="table-container">
-        <Table
-          :data-source="materialData"
-          bordered
-          :columns="columns"
-          :pagination="false"
-          row-key="id"
-          :row-selection="rowSelection"
-        >
-          <!-- 名称列自定义渲染 -->
-          <template #cell:name="{ record }">
-            <div class="name-cell">
-              <img :src="getTypeIcon(record.type)" alt="类型图标" class="type-icon" />
-              <span class="material-name">{{ record.name }}</span>
-            </div>
-          </template>
+    <!-- 成品库表格 -->
+    <Table
+      :data-source="materialData"
+      bordered
+      :columns="columns"
+      :pagination="false"
+      row-key="id"
+      :row-selection="rowSelection"
+    >
+      <template #name="{ record }">
+        <div class="name-cell flex items-center">
+          <img :src="record.cover" alt="类型图标" class="w-44px h-44px border-rounded-8px bg-#F0EDFF" />
+          <div class="flex flex-col ml-8px">
+            <span class="material-name">{{ record.name }}</span>
+            <span class="material-type">{{ record.uid }}</span>
+          </div>
+        </div>
+      </template>
+      <template #type="{ record }">
+        <div class="flex items-center">
+          <span>{{ getType(record.type) }}</span>
+        </div>
+      </template>
+      <template #origin="{ record }">
+        <span>{{ getOrigin(record.origin) }}</span>
+      </template>
+      <template #created_at="{ record }">
+        <div class="flex items-center">
+          {{ record.created_at ? dayjs(record.created_at * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+        </div>
+      </template>
+    </Table>
 
-          <!-- 类型列自定义渲染 -->
-          <template #cell:type="{ record }">
-            <span>{{ getType(record.type) }}</span>
-          </template>
+    <!-- 分页控件 -->
+    <div class="pagination-box">
+      <a-pagination
+        :total="pageInfo.total"
+        size="mini"
+        show-total
+        show-jumper
+        show-page-size
+        :current="pageInfo.page"
+        :page-size="pageInfo.page_size"
+        @change="onPageChange"
+        @page-size-change="onPageSizeChange"
+      />
+    </div>
 
-          <!-- 来源列自定义渲染 -->
-          <template #cell:from="{ record }">
-            <span>{{ getFrom(record.from) }}</span>
-          </template>
-
-          <!-- 上传时间列自定义渲染 -->
-          <template #cell:created_at="{ record }">
-            <span>{{ formatDate(record.created_at) }}</span>
-          </template>
-        </Table>
-
-        <!-- 分页控件 -->
-        <div v-if="pageInfo.total > 0" class="pagination-container">
-          <a-pagination
-            :current="pageInfo.page"
-            :page-size="pageInfo.page_size"
-            :total="pageInfo.total"
-            @change="handlePageChange"
-            @showSizeChange="handlePageSizeChange"
-            show-size-changer
-            show-quick-jumper
-            :show-total="(total) => `共 ${total} 条`"
-          />
+    <!-- 底部操作栏 -->
+    <template #footer>
+      <div class="flex items-center justify-between">
+        <div class="flex items-center">
+          <div class="color-#737478 font-size-14px">已选择：</div>
+          <div class="color-#737478 font-size-14px">{{ choseText }}</div>
+          <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
+            <img
+              :src="item.cover ? item.cover : icon4"
+              alt="选中的内容"
+              class="w-44px h-44px border-rounded-8px bg-#F0EDFF"
+            />
+          </div>
+        </div>
+        <div class="flex justify-end">
+          <Button @click="handleCancel">取消</Button>
+          <Button class="ml-16px" type="primary" @click="handleOk">确定</Button>
         </div>
       </div>
-    </a-spin>
+    </template>
   </a-drawer>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch, defineProps, defineEmits } from 'vue';
+import { ref, watch, defineProps, defineEmits, watchEffect } from 'vue';
 import { Table, Button, Pagination } from 'ant-design-vue';
-// // 修正Arco Design图标导入方式
-// import { FileTextOutlined } from '@arco-design/web-vue/es/icons';
 import dayjs from 'dayjs';
-import { RawMaterialType } from '@/views/material-center/components/raw-material/constants';
 import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
+import { EnumManuscriptType } from '@/views/material-center/components/finished-products/manuscript/list/constants';
 import { getRawMaterialsPage } from '@/api/all/generationWorkshop';
-
-// 引入类型图标
-import imgIcon from '@/assets/img/material/icon-image.png';
-import videoIcon from '@/assets/img/material/icon-video.png';
-import textIcon from '@/assets/img/material/icon-text.png';
-import unknownIcon from '@/assets/img/material/icon-unknown.png';
-
-// 定义Props类型
+// 引入图片资源
+import icon2 from '@/assets/img/creative-generation-workshop/icon-photo.png';
+import icon3 from '@/assets/img/creative-generation-workshop/icon-video.png';
+import icon4 from '@/assets/img/error-img.png';
+import { RawMaterialType } from '@/views/material-center/components/raw-material/constants';
+// 定义Props
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -91,16 +102,7 @@ const props = defineProps({
     default: false,
   },
   query: {
-    type: Object as () => {
-      page?: number;
-      page_size?: number;
-      platforms?: any;
-      operator_ids?: any;
-      ids?: any[];
-      top_execution_time?: any;
-      keyword?: string;
-      type?: any;
-    },
+    type: Object,
     required: true,
     default: () => ({
       page: 1,
@@ -108,161 +110,12 @@ const props = defineProps({
       platforms: undefined,
       operator_ids: undefined,
       ids: [],
-      top_execution_time: undefined,
       keyword: '',
+      audit_status: undefined,
       type: undefined,
     }),
   },
 });
-
-// 定义Emits类型
-const emit = defineEmits<{
-  (e: 'update:visible', value: boolean): void;
-  (e: 'after-visible-change', visible: boolean): void;
-  (
-    e: 'confirm',
-    data: {
-      selectedKeys: string[];
-      selectedData: any[];
-      choseText: string;
-      choseImgArray: any[];
-    },
-  ): void;
-  (e: 'cancel'): void;
-}>();
-
-// 内部状态管理
-const materialData = ref<any[]>([]);
-const choseText = ref('');
-const choseImgArray = ref<any[]>([]);
-const loading = ref(false);
-const pageInfo = ref({
-  page: 1,
-  page_size: 10,
-  total: 0,
-});
-
-// 数据获取函数
-const fetchMaterialData = async () => {
-  if (!props.visible) return;
-
-  try {
-    loading.value = true;
-    const params = {
-      ...props.query,
-      page: pageInfo.value.page,
-      page_size: pageInfo.value.page_size,
-    };
-
-    const res = await getRawMaterialsPage(params);
-    console.log('获取原料库数据成功:', res);
-    if (res?.code == 200) {
-      materialData.value = res.data.data;
-      pageInfo.value.total = res.data.total || 0;
-      console.log('获取原料库数据成功++++:', res, materialData.value);
-    } else {
-      materialData.value = [];
-      pageInfo.value.total = 0;
-    }
-  } catch (error) {
-    console.error('获取原料库数据失败:', error);
-    materialData.value = [];
-    pageInfo.value.total = 0;
-  } finally {
-    loading.value = false;
-  }
-};
-
-// 表格列配置
-const columns = ref([
-  {
-    title: '文件名称',
-    dataIndex: 'name',
-    key: 'name',
-    width: 200,
-  },
-  {
-    title: '类型',
-    dataIndex: 'type',
-    key: 'type',
-    width: 100,
-  },
-  {
-    title: '来源',
-    dataIndex: 'from',
-    key: 'from',
-    width: 100,
-  },
-  {
-    title: '上传时间',
-    dataIndex: 'created_at',
-    key: 'created_at',
-    width: 200,
-  },
-]);
-
-// 表格选择逻辑
-const { rowSelection, selectedRowKeys } = useTableSelectionWithPagination({
-  rowKey: 'id',
-});
-
-// 分页处理函数
-const handlePageChange = (page: number) => {
-  pageInfo.value.page = page;
-  fetchMaterialData();
-};
-
-const handlePageSizeChange = (current: number, size: number) => {
-  pageInfo.value.page = 1;
-  pageInfo.value.page_size = size;
-  fetchMaterialData();
-};
-
-// 监听查询参数变化
-watch(
-  () => props.query,
-  (newQuery) => {
-    if (props.visible) {
-      pageInfo.value.page = 1;
-      fetchMaterialData();
-    }
-  },
-  { deep: true },
-);
-
-// 监听抽屉显示状态
-watch(
-  () => props.visible,
-  (visible) => {
-    emit('after-visible-change', visible);
-    if (visible) {
-      pageInfo.value.page = 1;
-      fetchMaterialData();
-    } else {
-      materialData.value = [];
-      selectedRowKeys.value = [];
-      choseText.value = '';
-      choseImgArray.value = [];
-    }
-  },
-);
-
-// 监听选中项变化
-watch(selectedRowKeys, (newKeys) => {
-  const filteredData = materialData.value.filter((item) => newKeys.includes(item.id));
-
-  const typeCount: Record<string, number> = {};
-  filteredData.forEach((item) => {
-    typeCount[item.type] = (typeCount[item.type] || 0) + 1;
-  });
-
-  choseText.value = Object.entries(typeCount)
-    .map(([type, count]) => `${getType(Number(type))}: ${count}个`)
-    .join(' ');
-
-  choseImgArray.value = filteredData.filter((item) => [0, 1].includes(item.type));
-});
-
 // 辅助函数
 const getType = (type: number): string => {
   const typeMap = {
@@ -273,38 +126,128 @@ const getType = (type: number): string => {
   return typeMap[type] || '未知';
 };
 
-const getTypeIcon = (type: number): string => {
-  const iconMap = {
-    [RawMaterialType.Image]: imgIcon,
-    [RawMaterialType.Video]: videoIcon,
-    [RawMaterialType.Text]: textIcon,
-  };
-  return iconMap[type] || unknownIcon;
-};
-
-const getFrom = (from: number): string => {
+const getOrigin = (origin: number): string => {
   const fromMap = {
     0: '本地上传',
     1: 'AI生成',
   };
-  return fromMap[from] || '未知';
+  return fromMap[origin] || '未知';
+};
+// 定义Emits
+const emit = defineEmits(['update:visible', 'after-visible-change', 'confirm', 'cancel']);
+
+// 内部状态管理
+const materialData = ref([]);
+const choseText = ref('');
+const choseImgArray = ref([]);
+
+// 表格列配置
+const columns = ref([
+  { title: '文件名称', dataIndex: 'name', width: 200, slots: { customRender: 'name' } },
+  { title: '类型', dataIndex: 'type', width: 100, slots: { customRender: 'type' } },
+  { title: '来源', dataIndex: 'origin', width: 100, slots: { customRender: 'origin' } },
+  { title: '上传时间', dataIndex: 'created_at', width: 200, slots: { customRender: 'created_at' } },
+]);
+
+// 1. 先定义数据获取函数，确保使用最新的query参数
+const fetchProductData = async () => {
+  try {
+    // 使用主组件传递的最新查询参数
+    const params = { ...props.query };
+    console.log('成品库请求参数:', params); // 调试用
+
+    const res = await getRawMaterialsPage(params);
+    materialData.value = [];
+    pageInfo.value.total = res.data.total;
+    if (pageInfo.value.page === 1) {
+      materialData.value = res.data.data;
+    } else {
+      materialData.value = [...materialData.value, ...res.data.data];
+    }
+  } catch (error) {
+    console.error('获取成品库数据失败:', error);
+  }
 };
 
-const formatDate = (dateString?: string): string => {
-  if (!dateString) return '';
-  return dayjs(dateString).format('YYYY-MM-DD HH:mm:ss');
+// 2. 初始化表格选择逻辑
+const { pageInfo, onPageChange, onPageSizeChange, rowSelection, selectedRowKeys } = useTableSelectionWithPagination({
+  rowKey: 'id',
+  onPageChange: fetchProductData,
+  onPageSizeChange: fetchProductData,
+});
+
+// 监听query参数变化，当主组件传递的参数变化时重新请求数据
+watchEffect(() => {
+  if (props.visible) {
+    console.log('成品库查询参数变化，重新加载数据');
+    fetchProductData();
+  }
+});
+
+// 监听选中项变化
+watch(selectedRowKeys, (newKeys) => {
+  const filteredData = materialData.value.filter((item) => newKeys.includes(item.id));
+
+  // 统计各类型数量
+  const typeCount = filteredData.reduce((acc, item) => {
+    const typeKey = item.type === EnumManuscriptType.Image ? 'image' : 'video';
+    acc[typeKey] = (acc[typeKey] || 0) + 1;
+    return acc;
+  }, {});
+
+  // 生成选中文本
+  choseText.value = [];
+  if (typeCount.image) choseText.value.push(`图文: ${typeCount.image}个`);
+  if (typeCount.video) choseText.value.push(`视频: ${typeCount.video}个`);
+  choseText.value = choseText.value.join(' ');
+
+  // 筛选选中的内容用于预览
+  choseImgArray.value = filteredData;
+});
+
+// 格式化审核状态显示
+const getStatus = (status: number) => {
+  switch (status) {
+    case 0:
+      return '待审核';
+    case 1:
+      return '审核中';
+    case 2:
+      return '已通过';
+    case 3:
+      return '已拒绝';
+    default:
+      return '未知';
+  }
 };
 
-// 事件处理函数
+// 抽屉显示状态变化处理
+const onAfterVisibleChange = (visible: boolean) => {
+  emit('after-visible-change', visible);
+  if (visible) {
+    // 当抽屉显示时，使用最新参数请求数据
+    fetchProductData();
+  } else {
+    // 关闭时清空数据
+    materialData.value = [];
+    selectedRowKeys.value = [];
+    choseText.value = '';
+    choseImgArray.value = [];
+  }
+};
+
+// 抽屉关闭事件处理
 const handleClose = () => {
   emit('update:visible', false);
 };
 
+// 取消按钮处理
 const handleCancel = () => {
   emit('update:visible', false);
   emit('cancel');
 };
 
+// 确定按钮处理
 const handleOk = () => {
   const selectedData = materialData.value.filter((item) => selectedRowKeys.value.includes(item.id));
   emit('confirm', {
@@ -315,65 +258,14 @@ const handleOk = () => {
   });
   emit('update:visible', false);
 };
-
-const onAfterVisibleChange = (visible: boolean) => {
-  // 空实现，避免未定义错误
-};
 </script>
 
 <style scoped>
-/* 样式保持不变 */
-.table-container {
-  height: calc(100% - 50px);
-  min-height: 300px;
+.pagination-box {
   display: flex;
-  flex-direction: column;
-}
-
-.material-table {
-  flex: 1;
-  overflow: auto;
-}
-
-.pagination-container {
+  width: 100%;
   padding: 16px 0;
-  text-align: right;
-}
-
-.name-cell {
-  display: flex;
+  justify-content: flex-end;
   align-items: center;
 }
-
-.type-icon {
-  width: 24px;
-  height: 24px;
-  margin-right: 8px;
-  object-fit: contain;
-}
-
-.material-name {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: 150px;
-}
-
-.empty-state {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 40px 0;
-  color: #999;
-}
-
-.empty-icon {
-  margin-bottom: 16px;
-  color: #ccc;
-}
-
-.empty-text {
-  font-size: 14px;
-}
 </style>

From ab319597333b820309bdc893c95272e5add1637b Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Tue, 23 Sep 2025 14:28:20 +0800
Subject: [PATCH 29/39] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=93=E5=92=8C?=
 =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 33 ++++++----
 .../components/finished-product-drawer.vue    | 35 ++++------
 .../components/raw-material-drawer.vue        | 66 ++++++++++++++-----
 3 files changed, 82 insertions(+), 52 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 29d3c5e..aa49955 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -62,14 +62,18 @@
             </div>
             <!-- 素材添加区域 -->
             <div class="form-section material-section">
-              <div v-if="hasChoseMaterial" class="flex items-center"></div>
+              <div class="flex items-center"></div>
+
+              <Button class="add-material-btn" @click="handleAddMaterial">
+                <template #icon>
+                  <icon-plus size="16" class="mr-8px" />
+                </template>
+                从原料库添加
+              </Button>
+              <div v-if="hasChoseMaterial" class="flex flex-col items-center">
+                 
+              </div>
               <div v-else class="flex flex-col items-center">
-                <Button class="add-material-btn" @click="handleAddMaterial">
-                  <template #icon>
-                    <icon-plus size="16" class="mr-8px" />
-                  </template>
-                  从原料库添加
-                </Button>
                 <p class="material-hint">AI会参考添加的文本、图片、视频等素材，完成符合需求的创作</p>
               </div>
             </div>
@@ -134,7 +138,7 @@
     <!-- 原料库子组件：使用:visible和@update:visible替代v-model -->
     <RawMaterialDrawer
       :visible="showDrawer2"
-      @update:visible="val => showDrawer2 = val"
+      @update:visible="(val) => (showDrawer2 = val)"
       :query="materialQuery"
       @after-visible-change="handleMaterialDrawerVisibleChange"
       @confirm="handleMaterialConfirm"
@@ -144,7 +148,7 @@
     <!-- 成品库子组件：使用:visible和@update:visible替代v-model -->
     <FinishedProductDrawer
       :visible="showDrawer3"
-      @update:visible="val => showDrawer3 = val"
+      @update:visible="(val) => (showDrawer3 = val)"
       :query="productQuery"
       @after-visible-change="handleProductDrawerVisibleChange"
       @confirm="handleProductConfirm"
@@ -229,14 +233,15 @@ const selectedMaterials = ref({
   keys: [],
   data: [],
   text: '',
-  images: []
+  images: [],
+  texts: []
 });
 
 const selectedProducts = ref({
   keys: [],
   data: [],
   text: '',
-  images: []
+  images: [],
 });
 
 // 处理AI/成品库选择切换
@@ -265,11 +270,13 @@ const handleAddContent = () => {
 
 // 处理原料库选择确认
 const handleMaterialConfirm = (result) => {
+  console.log('handleMaterialConfirm', result);
   selectedMaterials.value = {
     keys: result.selectedKeys,
     data: result.selectedData,
     text: result.choseText,
-    images: result.choseImgArray
+    images: result.choseImgArray,
+    texts: result.selectedTexts || []
   };
   hasChoseMaterial.value = result.selectedKeys.length > 0;
 };
@@ -285,7 +292,7 @@ const handleProductConfirm = (result) => {
     keys: result.selectedKeys,
     data: result.selectedData,
     text: result.choseText,
-    images: result.choseImgArray
+    images: result.choseImgArray,
   };
 };
 
diff --git a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
index 18bd125..ea327d8 100644
--- a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
+++ b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
@@ -74,13 +74,6 @@
         <div class="flex items-center">
           <div class="color-#737478 font-size-14px">已选择：</div>
           <div class="color-#737478 font-size-14px">{{ choseText }}</div>
-          <div v-for="item in choseImgArray" :key="item.id" class="ml-16px">
-            <img
-              :src="item.cover ? item.cover : icon4"
-              alt="选中的内容"
-              class="w-44px h-44px border-rounded-8px bg-#F0EDFF"
-            />
-          </div>
         </div>
         <div class="flex justify-end">
           <Button @click="handleCancel">取消</Button>
@@ -182,22 +175,22 @@ watchEffect(() => {
 // 监听选中项变化
 watch(selectedRowKeys, (newKeys) => {
   const filteredData = materialData.value.filter((item) => newKeys.includes(item.id));
+  choseText.value = filteredData.length + '个稿件';
+  // // 统计各类型数量
+  // const typeCount = filteredData.reduce((acc, item) => {
+  //   const typeKey = item.type === EnumManuscriptType.Image ? 'image' : 'video';
+  //   acc[typeKey] = (acc[typeKey] || 0) + 1;
+  //   return acc;
+  // }, {});
 
-  // 统计各类型数量
-  const typeCount = filteredData.reduce((acc, item) => {
-    const typeKey = item.type === EnumManuscriptType.Image ? 'image' : 'video';
-    acc[typeKey] = (acc[typeKey] || 0) + 1;
-    return acc;
-  }, {});
+  // // 生成选中文本
+  // choseText.value = [];
+  // if (typeCount.image) choseText.value.push(`图文: ${typeCount.image}个`);
+  // if (typeCount.video) choseText.value.push(`视频: ${typeCount.video}个`);
+  // choseText.value = choseText.value.join(' ');
 
-  // 生成选中文本
-  choseText.value = [];
-  if (typeCount.image) choseText.value.push(`图文: ${typeCount.image}个`);
-  if (typeCount.video) choseText.value.push(`视频: ${typeCount.video}个`);
-  choseText.value = choseText.value.join(' ');
-
-  // 筛选选中的内容用于预览
-  choseImgArray.value = filteredData;
+  // // 筛选选中的内容用于预览
+  // choseImgArray.value = filteredData;
 });
 
 // 格式化审核状态显示
diff --git a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
index a059a3b..18e5688 100644
--- a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
+++ b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
@@ -22,7 +22,11 @@
     >
       <template #name="{ record }">
         <div class="name-cell flex items-center">
-          <img :src="record.cover" alt="类型图标" class="w-44px h-44px border-rounded-8px bg-#F0EDFF" />
+          <img
+            :src="record.type == 2 ? icon5 : record.cover"
+            alt="类型图标"
+            class="w-44px h-44px border-rounded-8px bg-#F0EDFF"
+          />
           <div class="flex flex-col ml-8px">
             <span class="material-name">{{ record.name }}</span>
             <span class="material-type">{{ record.uid }}</span>
@@ -72,6 +76,15 @@
               class="w-44px h-44px border-rounded-8px bg-#F0EDFF"
             />
           </div>
+          <div
+            v-for="item in choseTextArray"
+            :key="item.id"
+            class="ml-16px bg-#F7F8FA h-44px overflow-hidden w-75px border-rounded-8px flex items-center"
+          >
+            <div class="whitespace-nowrap overflow-hidden text-ellipsis w-full px-2" :title="item.name">
+              {{ item.name }}
+            </div>
+          </div>
         </div>
         <div class="flex justify-end">
           <Button @click="handleCancel">取消</Button>
@@ -94,6 +107,7 @@ import icon2 from '@/assets/img/creative-generation-workshop/icon-photo.png';
 import icon3 from '@/assets/img/creative-generation-workshop/icon-video.png';
 import icon4 from '@/assets/img/error-img.png';
 import { RawMaterialType } from '@/views/material-center/components/raw-material/constants';
+import icon5 from '../../../../views/material-center/components/raw-material/img/icon-no-text.png';
 // 定义Props
 const props = defineProps({
   visible: {
@@ -133,14 +147,27 @@ const getOrigin = (origin: number): string => {
   };
   return fromMap[origin] || '未知';
 };
-// 定义Emits
-const emit = defineEmits(['update:visible', 'after-visible-change', 'confirm', 'cancel']);
-
+// 定义Emits类型
+const emit = defineEmits<{
+  (e: 'update:visible', value: boolean): void;
+  (e: 'after-visible-change', visible: boolean): void;
+  (
+    e: 'confirm',
+    data: {
+      selectedKeys: string[];
+      selectedData: any[];
+      choseText: string;
+      choseImgArray: any[];
+      selectedTexts: string[];
+    },
+  ): void;
+  (e: 'cancel'): void;
+}>();
 // 内部状态管理
 const materialData = ref([]);
 const choseText = ref('');
 const choseImgArray = ref([]);
-
+const choseTextArray = ref([]);
 // 表格列配置
 const columns = ref([
   { title: '文件名称', dataIndex: 'name', width: 200, slots: { customRender: 'name' } },
@@ -188,21 +215,20 @@ watchEffect(() => {
 watch(selectedRowKeys, (newKeys) => {
   const filteredData = materialData.value.filter((item) => newKeys.includes(item.id));
 
-  // 统计各类型数量
-  const typeCount = filteredData.reduce((acc, item) => {
-    const typeKey = item.type === EnumManuscriptType.Image ? 'image' : 'video';
-    acc[typeKey] = (acc[typeKey] || 0) + 1;
-    return acc;
-  }, {});
+  const typeCount: Record<string, number> = {};
+  filteredData.forEach((item) => {
+    typeCount[item.type] = (typeCount[item.type] || 0) + 1;
+  });
 
-  // 生成选中文本
-  choseText.value = [];
-  if (typeCount.image) choseText.value.push(`图文: ${typeCount.image}个`);
-  if (typeCount.video) choseText.value.push(`视频: ${typeCount.video}个`);
-  choseText.value = choseText.value.join(' ');
+  choseText.value = Object.entries(typeCount)
+    .map(([type, count]) => {
+      const typeName = getType(Number(type));
+      return `${typeName}: ${count}个`;
+    })
+    .join(' ');
 
-  // 筛选选中的内容用于预览
-  choseImgArray.value = filteredData;
+  choseImgArray.value = filteredData.filter((item) => [0, 1].includes(item.type));
+  choseTextArray.value = filteredData.filter((item) => [2].includes(item.type));
 });
 
 // 格式化审核状态显示
@@ -250,11 +276,15 @@ const handleCancel = () => {
 // 确定按钮处理
 const handleOk = () => {
   const selectedData = materialData.value.filter((item) => selectedRowKeys.value.includes(item.id));
+  const selectedTexts = selectedData
+    .filter((item) => item.type === RawMaterialType.Text)
+    .map((item) => item.content || item.name);
   emit('confirm', {
     selectedKeys: selectedRowKeys.value,
     selectedData,
     choseText: choseText.value,
     choseImgArray: choseImgArray.value,
+    selectedTexts: selectedTexts,
   });
   emit('update:visible', false);
 };

From 288d4ffddf37ed49f5579bec4f0b0089fe70c3b8 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Tue, 23 Sep 2025 17:11:51 +0800
Subject: [PATCH 30/39] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1-?=
 =?UTF-8?q?=E4=BB=8E=E5=8E=9F=E6=96=99=E5=BA=93=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/all/assignment-management.ts          |  4 ++
 .../components/draw-popup.vue                 | 63 +++++++++++++++++--
 .../components/task-item.vue                  |  8 +--
 .../assignment-management/index.vue           | 35 ++++++++---
 4 files changed, 90 insertions(+), 20 deletions(-)

diff --git a/src/api/all/assignment-management.ts b/src/api/all/assignment-management.ts
index 2d7834f..0fdde3c 100644
--- a/src/api/all/assignment-management.ts
+++ b/src/api/all/assignment-management.ts
@@ -22,3 +22,7 @@ export const getTaskSchedulesDetail = (id: string) => {
   console.log('id', id);
   return Http.get(`/v1/task-schedules/${id}`);
 };
+//任务管理-手动添加
+export const createTask = (params = {}) => {
+  return Http.post(`/v1/task-schedules/manual`,params);
+};
\ No newline at end of file
diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index aa49955..6d173e7 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -6,6 +6,7 @@
     placement="right"
     v-model:visible="showDriwer"
     @after-visible-change="showDriwerChange"
+    @ok="handleCreateTask"
     width="480px"
     class="task-drawer"
     style="z-index: 999"
@@ -70,8 +71,22 @@
                 </template>
                 从原料库添加
               </Button>
-              <div v-if="hasChoseMaterial" class="flex flex-col items-center">
-                 
+              <div v-if="hasChoseMaterial" class="flex flex-col items-center w-full">
+                <div
+                  v-for="item in selectedMaterials.texts"
+                  :key="item.id"
+                  class="flex items-center bg-#F7F8FA border-rounded-8px w-full justify-items-center pt-8px pb-8px pl-12px pr-12px mb-16px"
+                >
+                  {{ item }}
+                </div>
+                <div class="flex items-center w-full">
+                  <img
+                    v-for="item in selectedMaterials.images"
+                    :key="item.id"
+                    :src="item.cover"
+                    class="w-88 h-88 mr-8px border-rounded-8px"
+                  />
+                </div>
               </div>
               <div v-else class="flex flex-col items-center">
                 <p class="material-hint">AI会参考添加的文本、图片、视频等素材，完成符合需求的创作</p>
@@ -206,7 +221,8 @@ const props = defineProps({
 
 // 本地筛选状态（保持上次选择）
 const localQuery = ref({
-  accounts: props.query?.ids || [],
+  accounts: props.query?.name || [],
+  ids: props.query?.ids || [],
 });
 
 // 原料库查询参数
@@ -234,7 +250,7 @@ const selectedMaterials = ref({
   data: [],
   text: '',
   images: [],
-  texts: []
+  texts: [],
 });
 
 const selectedProducts = ref({
@@ -276,7 +292,7 @@ const handleMaterialConfirm = (result) => {
     data: result.selectedData,
     text: result.choseText,
     images: result.choseImgArray,
-    texts: result.selectedTexts || []
+    texts: result.selectedTexts || [],
   };
   hasChoseMaterial.value = result.selectedKeys.length > 0;
 };
@@ -341,14 +357,49 @@ watch(showDriwer, (newVal) => {
   }
 });
 
+// 点击创建任务按钮时触发
+const handleCreateTask = () => {
+  // 验证表单
+  if (isActive.value === 'chose' && selectedProducts.value.keys.length === 0) {
+    // 可以添加错误提示：请选择发布内容
+    console.log('请选择发布内容');
+    return;
+  }
+  console.log(localQuery.value);
+  // 准备提交的数据
+  const taskData = {
+    media_account_id: localQuery.value.ids[0],
+    is_ai_generate: isActive.value == 'chose' ? 0 : 1,
+    description: taskDescription.value,
+    raw_material_ids: selectedMaterials.value.keys,
+    products: selectedProducts.value.keys,
+    publish_type: publishType.value == 'immediate' ? 0 : 1,
+    execution_time:
+      publishType.value === 'timing' ? `${dayjs(currentDate.value).format('YYYY-MM-DD')} ${strValue.value}` : null,
+  };
+  // 发射创建任务事件
+  emit('create-task', taskData);
+
+  // 关闭抽屉
+  showDriwer.value = false;
+};
+
 // 暴露方法给父组件
-const showDrawer = (accountInfo = null) => {
+const showDrawer = (accountInfo = null, selectedDate = null) => {
   showDriwer.value = true;
   if (accountInfo && accountInfo.id) {
     nextTick(() => {
       localQuery.value.accounts = [accountInfo.name];
+      localQuery.value.ids = [accountInfo.id];
     });
   }
+  console.log('selectedDate', selectedDate);
+  // 如果传入了日期，则设置为默认日期
+  if (selectedDate) {
+    currentDate.value = selectedDate;
+    console.log('currentDate', currentDate.value);
+    publishType.value = 'timing';
+  }
 };
 
 // 定义事件发射器
diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index 74cdd5d..e5098f9 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -2,7 +2,7 @@
   <a-trigger trigger="click" position="br" @click.stop>
     <div class="task-item">
       <div class="color-indicator" :style="{ background: getTaskColor() }"></div>
-      <div class="task-name" :title="task?.name || '-'">{{ task?.name || '-' }}</div>
+      <div class="task-name" :title="task?.name || '-'">{{ task?.name || 'AI生成内容' }}</div>
     </div>
     <template #content>
       <div class="flex flex-col items-start popup-content" @click="gotoDetail">
@@ -13,7 +13,7 @@
                 :src="getPlatformIcon(record.platform)"
                 style="border-radius: 8px; width: 16px; height: 16px; margin-right: 8px; font-size: 14px"
               />
-              <div class="task-title" :title="record.name || '-'">{{ record.name || '-' }}</div>
+              <div class="task-title" :title="record.name || 'AI生成内容'">{{ record.name || 'AI生成内容' }}</div>
             </div>
             <div
               class="status-tag"
@@ -31,8 +31,8 @@
           </div>
         </div>
 
-        <div class="font-size-14px color-#211F24 color-#211F24 task-description" :title="task.name || '未命名'">
-          {{ task.name || '未命名' }}
+        <div class="font-size-14px color-#211F24 color-#211F24 task-description" :title="task.name || 'AI生成内容'">
+          {{ task.name || 'AI生成内容' }}
         </div>
         <div v-if="task.ai_generate_status == 0" class="AILoding">
           <ASpin />
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 7143b1b..942eb1e 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -29,7 +29,7 @@
           style="width: 100%"
           :pagination="false"
           @change="handleTableChange"
-          @row-click="handleRowClick"
+          @cell-click="handleCellClick"
         >
           <!-- 空数据显示 -->
           <template #empty>
@@ -113,7 +113,7 @@
     <template #title>{{ deleteTitle }}</template>
     <div>{{ deleteContent }}</div>
   </a-modal>
-  <DrowPopup ref="drawerPopupRef" />
+  <DrowPopup ref="drawerPopupRef" @create-task="handleCreateTask" />
 </template>
 
 <script lang="ts" setup>
@@ -128,7 +128,7 @@ import FilterPopup from './components/filter-popup.vue';
 import DrowPopup from './components/draw-popup.vue';
 import TaskItem from './components/task-item.vue';
 // API引入
-import { getTaskSchedules, delTaskSchedules, editTaskSchedules } from '@/api/all/assignment-management';
+import { getTaskSchedules, delTaskSchedules, editTaskSchedules, createTask } from '@/api/all/assignment-management';
 import { fetchAccountOperators, getMediaAccountList } from '@/api/all/propertyMarketing';
 // 工具引入
 import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
@@ -246,6 +246,12 @@ const handleAddTask = () => {
   drawerPopupRef.value?.showDrawer();
 };
 
+const handleCreateTask = async (value) => {
+  console.log('handleCreateTask', value);
+  const res = await createTask(value);
+  console.log('res', res);
+};
+
 // 添加对DrowPopup组件的引用
 const drawerPopupRef = ref();
 
@@ -366,7 +372,6 @@ const handleSearch = () => {
 
 // 添加一个标志位来避免死循环
 let isDateSelectorUpdating = false;
-
 // 日期选择器变化处理
 const handleDateSelectorChange = (value: any) => {
   // 如果正在更新中，则跳过
@@ -439,17 +444,27 @@ const handleTableChange = (pagination: any, sorter: any) => {
   handleSearch();
 };
 
-// 处理表格行单击事件（用于调试）
-const handleRowClick = (record: any, index: number, event: Event) => {
-  console.log('单击行:', record);
-  console.log('行索引:', index);
-  console.log('事件对象:', event);
+const handleCellClick = (record: any, rowIndex: any, column: any) => {
   const accountInfo = {
     id: record.id,
     name: record.name,
     platform: record.platform,
   };
-  drawerPopupRef.value.showDrawer(accountInfo);
+  const selectedDate = rowIndex.date;
+
+  // 检查选中的日期是否小于今天，如果是则不处理
+  const today = new Date();
+  today.setHours(0, 0, 0, 0);
+  const selectedDateTime = new Date(selectedDate);
+  selectedDateTime.setHours(0, 0, 0, 0);
+
+  if (selectedDateTime < today) {
+    console.log('选择的日期已过去，不打开抽屉');
+    return;
+  }
+
+  console.log('selectedDate', selectedDate);
+  drawerPopupRef.value.showDrawer(accountInfo, selectedDate);
 };
 
 // 任务操作处理

From dac4d7a20b48bc18d10995b1819d2800e91555d3 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Tue, 23 Sep 2025 18:16:10 +0800
Subject: [PATCH 31/39] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useTableSelectionWithPagination.ts  | 42 +++++++++++---
 .../components/draw-popup.vue                 | 44 ++++++++++++--
 .../components/finished-product-drawer.vue    | 58 +++++++++----------
 .../assignment-management/index.vue           |  6 +-
 4 files changed, 105 insertions(+), 45 deletions(-)

diff --git a/src/hooks/useTableSelectionWithPagination.ts b/src/hooks/useTableSelectionWithPagination.ts
index 0c30800..563f9b7 100644
--- a/src/hooks/useTableSelectionWithPagination.ts
+++ b/src/hooks/useTableSelectionWithPagination.ts
@@ -4,6 +4,7 @@ import { cloneDeep } from 'lodash-es';
 
 interface UseTableSelectionWithPaginationOptions {
   rowKey?: string; // 主键字段名，默认 'id'
+  type?: 'checkbox' | 'radio'; // 选择类型，默认 'checkbox'
   pageInfo?: {
     page?: number;
     page_size?: number;
@@ -22,6 +23,7 @@ const DEFAULT_PAGE_INFO = {
 
 export function useTableSelectionWithPagination(options: UseTableSelectionWithPaginationOptions = {}) {
   const rowKey = options.rowKey || 'id';
+  const type = options.type || 'checkbox'; // 默认为复选框
 
   const selectedRowKeys = ref<Array<string | number>>([]);
   const selectedRows = ref<Array<any>>([]);
@@ -33,12 +35,24 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa
   // 单行选择
   const handleSelect = (record: any, select: boolean) => {
     const _targetKey = record[rowKey];
-    if (select) {
-      selectedRows.value.push(record);
-      selectedRowKeys.value.push(_targetKey);
+    if (type === 'radio') {
+      // 单选模式
+      if (select) {
+        selectedRows.value = [record];
+        selectedRowKeys.value = [_targetKey];
+      } else {
+        selectedRows.value = [];
+        selectedRowKeys.value = [];
+      }
     } else {
-      selectedRows.value = selectedRows.value.filter((v) => v[rowKey] !== _targetKey);
-      selectedRowKeys.value = selectedRowKeys.value.filter((key) => key !== _targetKey);
+      // 多选模式（默认）
+      if (select) {
+        selectedRows.value.push(record);
+        selectedRowKeys.value.push(_targetKey);
+      } else {
+        selectedRows.value = selectedRows.value.filter((v) => v[rowKey] !== _targetKey);
+        selectedRowKeys.value = selectedRowKeys.value.filter((key) => key !== _targetKey);
+      }
     }
 
     options.onSelectChange?.();
@@ -46,6 +60,9 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa
 
   // 全选/取消全选
   const handleSelectAll = (checked: boolean) => {
+    // 单选模式下不支持全选
+    if (type === 'radio') return;
+    
     const currentPageRows = dataSource.value;
     const currentPageKeys = currentPageRows.map((v) => v[rowKey]);
 
@@ -64,8 +81,15 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa
 
   // 选择变更处理
   const handleSelectChange = (keys: Array<string | number>, rows: Array<any>) => {
-    selectedRowKeys.value = keys;
-    selectedRows.value = rows;
+    if (type === 'radio') {
+      // 单选模式下只保留最后一个选择
+      selectedRowKeys.value = keys.length > 0 ? [keys[keys.length - 1]] : [];
+      selectedRows.value = rows.length > 0 ? [rows[rows.length - 1]] : [];
+    } else {
+      // 多选模式
+      selectedRowKeys.value = keys;
+      selectedRows.value = rows;
+    }
     options.onSelectChange?.();
   };
 
@@ -88,8 +112,8 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa
   };
 
   const rowSelection = computed(() => ({
-    type: 'checkbox',
-    showCheckedAll: true,
+    type: type,
+    showCheckedAll: type === 'checkbox', // 只有复选框模式才显示全选
     width: 48,
     selectedRowKeys: selectedRowKeys.value,
     onChange: handleSelectChange
diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 6d173e7..48a66d3 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -100,7 +100,7 @@
                 <div class="section-title">发布内容</div>
                 <div class="font-size-12px text-[#999999]">（必填）</div>
               </div>
-              <div class="form-section material-section">
+              <div class="form-section material-section" v-if="hasChoseFinishedProducts == false">
                 <Button @click="handleAddContent" class="add-material-btn">
                   <template #icon>
                     <icon-plus size="16" class="mr-8px" />
@@ -110,6 +110,12 @@
 
                 <p class="material-hint">前往成品库，选择要发布的内容</p>
               </div>
+              <div v-else class="flex flex-col items-start w-full">
+                <div class="mb-12px">{{ selectedProducts.data[0].title }}</div>
+                <div v-for="item in selectedProducts.images" :key="item.id">
+                  <img v-if="item.cover" :src="item.cover" class="w-88 h-88 mr-8px border-rounded-8px mb-12px" />
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -188,11 +194,12 @@ import icon4 from '@/assets/img/error-img.png';
 // 引入子组件
 import RawMaterialDrawer from './raw-material-drawer.vue';
 import FinishedProductDrawer from './finished-product-drawer.vue';
-
+import { message } from 'ant-design-vue';
 // 状态管理
 const choseText = ref('');
 const taskDescription = ref('');
 const hasChoseMaterial = ref(false);
+const hasChoseFinishedProducts = ref(false);
 const isActive = ref('ai');
 const showDriwer = ref(false);
 const showDrawer2 = ref(false);
@@ -310,6 +317,19 @@ const handleProductConfirm = (result) => {
     text: result.choseText,
     images: result.choseImgArray,
   };
+
+  // 如果是单选模式，确保只选择一个项目
+  if (result.selectedRows && result.selectedRows.length > 0) {
+    hasChoseFinishedProducts.value = true;
+    // 取第一个选中的项目
+    const selectedProduct = result.selectedRows[0];
+    selectedProducts.value = {
+      keys: [selectedProduct.id],
+      data: [selectedProduct],
+      text: '1个稿件',
+      images: [selectedProduct],
+    };
+  }
 };
 
 // 处理成品库取消
@@ -360,12 +380,24 @@ watch(showDriwer, (newVal) => {
 // 点击创建任务按钮时触发
 const handleCreateTask = () => {
   // 验证表单
-  if (isActive.value === 'chose' && selectedProducts.value.keys.length === 0) {
+  if (localQuery.value.ids.length == 0) {
     // 可以添加错误提示：请选择发布内容
-    console.log('请选择发布内容');
+    message.error('请选择发布账号');
+    return;
+  }
+  console.log('selectedMaterials', selectedMaterials.value);
+  console.log('selectedProducts', selectedProducts.value);
+  console.log('isActive', isActive.value);
+  if (isActive.value === 'chose' && selectedProducts.value.keys.length === 0) {
+    // 可以添加错误提示：请选择发布内容
+    message.error('请选择发布内容');
+    return;
+  }
+  if (isActive.value === 'ai' && selectedMaterials.value.keys.length === 0) {
+    // 可以添加错误提示：请选择发布内容
+    message.error('请选择发布内容');
     return;
   }
-  console.log(localQuery.value);
   // 准备提交的数据
   const taskData = {
     media_account_id: localQuery.value.ids[0],
@@ -376,6 +408,7 @@ const handleCreateTask = () => {
     publish_type: publishType.value == 'immediate' ? 0 : 1,
     execution_time:
       publishType.value === 'timing' ? `${dayjs(currentDate.value).format('YYYY-MM-DD')} ${strValue.value}` : null,
+    work_id: selectedProducts.value.keys[0],
   };
   // 发射创建任务事件
   emit('create-task', taskData);
@@ -445,6 +478,7 @@ defineExpose({
   align-items: center;
   width: 400px;
   border-radius: 8px;
+  padding: 8px;
 }
 
 .publish-section {
diff --git a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
index ea327d8..5a38be8 100644
--- a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
+++ b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
@@ -158,11 +158,13 @@ const fetchProductData = async () => {
 };
 
 // 2. 初始化表格选择逻辑
-const { pageInfo, onPageChange, onPageSizeChange, rowSelection, selectedRowKeys } = useTableSelectionWithPagination({
-  rowKey: 'id',
-  onPageChange: fetchProductData,
-  onPageSizeChange: fetchProductData,
-});
+const { pageInfo, onPageChange, onPageSizeChange, rowSelection, selectedRowKeys, selectedRows } =
+  useTableSelectionWithPagination({
+    rowKey: 'id',
+    type: 'radio', // 改为单选模式
+    onPageChange: fetchProductData,
+    onPageSizeChange: fetchProductData,
+  });
 
 // 监听query参数变化，当主组件传递的参数变化时重新请求数据
 watchEffect(() => {
@@ -173,37 +175,33 @@ watchEffect(() => {
 });
 
 // 监听选中项变化
-watch(selectedRowKeys, (newKeys) => {
-  const filteredData = materialData.value.filter((item) => newKeys.includes(item.id));
-  choseText.value = filteredData.length + '个稿件';
-  // // 统计各类型数量
-  // const typeCount = filteredData.reduce((acc, item) => {
-  //   const typeKey = item.type === EnumManuscriptType.Image ? 'image' : 'video';
-  //   acc[typeKey] = (acc[typeKey] || 0) + 1;
-  //   return acc;
-  // }, {});
-
-  // // 生成选中文本
-  // choseText.value = [];
-  // if (typeCount.image) choseText.value.push(`图文: ${typeCount.image}个`);
-  // if (typeCount.video) choseText.value.push(`视频: ${typeCount.video}个`);
-  // choseText.value = choseText.value.join(' ');
-
-  // // 筛选选中的内容用于预览
-  // choseImgArray.value = filteredData;
+watch(selectedRows, (newRows) => {
+  if (rowSelection.value.type === 'radio') {
+    // 单选模式
+    choseText.value = newRows.length > 0 ? '1个稿件' : '0个稿件';
+    // 如果类型是文本，则choseImgArray为空数组
+    if (newRows.length > 0 && newRows[0].type !== 'text') {
+      choseImgArray.value = [newRows[0]];
+    } else {
+      choseImgArray.value = [];
+    }
+  } else {
+    // 多选模式
+    choseText.value = newRows.length + '个稿件';
+    // 过滤掉文本类型，只保留非文本类型的项目
+    choseImgArray.value = newRows.filter(item => item.type !== 'text');
+  }
 });
 
 // 格式化审核状态显示
 const getStatus = (status: number) => {
   switch (status) {
-    case 0:
-      return '待审核';
     case 1:
-      return '审核中';
+      return '待审核';
     case 2:
-      return '已通过';
+      return '审核中';
     case 3:
-      return '已拒绝';
+      return '已通过';
     default:
       return '未知';
   }
@@ -238,10 +236,10 @@ const handleCancel = () => {
 
 // 确定按钮处理
 const handleOk = () => {
-  const selectedData = materialData.value.filter((item) => selectedRowKeys.value.includes(item.id));
   emit('confirm', {
     selectedKeys: selectedRowKeys.value,
-    selectedData,
+    selectedData: selectedRows.value,
+    selectedRows: selectedRows.value,
     choseText: choseText.value,
     choseImgArray: choseImgArray.value,
   });
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 942eb1e..762757e 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -144,6 +144,7 @@ import iconWb from '@/assets/img/platform/icon-wb.png';
 import iconGzh from '@/assets/img/platform/icon-gzh.png';
 import iconWarn from '@/assets/img/media-account/icon-warn.png';
 import { Checkbox, Button, Space, Pagination, notification } from 'ant-design-vue';
+import { message } from 'ant-design-vue';
 // 表格分页逻辑
 const { pageInfo, onPageChange, onPageSizeChange } = useTableSelectionWithPagination({
   onPageChange: () => handleSearch(),
@@ -249,7 +250,10 @@ const handleAddTask = () => {
 const handleCreateTask = async (value) => {
   console.log('handleCreateTask', value);
   const res = await createTask(value);
-  console.log('res', res);
+  if (res && res.code === 200) {
+    message.success('创建成功');
+    handleSearch();
+  }
 };
 
 // 添加对DrowPopup组件的引用

From aed2681f4e388297b522d4db5156bf1ef05609dc Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Wed, 24 Sep 2025 12:08:21 +0800
Subject: [PATCH 32/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/all/assignment-management.ts          | 11 ++-
 .../components/draw-popup.vue                 | 55 +++++++++--
 .../components/finished-product-drawer.vue    | 22 ++++-
 .../components/task-item.vue                  | 94 ++++++++++++++++---
 .../assignment-management/index.vue           | 20 +++-
 5 files changed, 175 insertions(+), 27 deletions(-)

diff --git a/src/api/all/assignment-management.ts b/src/api/all/assignment-management.ts
index 0fdde3c..76bc5d5 100644
--- a/src/api/all/assignment-management.ts
+++ b/src/api/all/assignment-management.ts
@@ -14,7 +14,7 @@ export const delTaskSchedules = (id: string) => {
 // 任务管理-修改
 export const editTaskSchedules = (id: string, params = {}) => {
   console.log('id', id);
-  return Http.put(`/v1/task-schedules/${id}`,params);
+  return Http.put(`/v1/task-schedules/${id}`, params);
 };
 
 // 任务管理-详情
@@ -24,5 +24,10 @@ export const getTaskSchedulesDetail = (id: string) => {
 };
 //任务管理-手动添加
 export const createTask = (params = {}) => {
-  return Http.post(`/v1/task-schedules/manual`,params);
-};
\ No newline at end of file
+  return Http.post(`/v1/task-schedules/manual`, params);
+};
+
+//任务管理-手动添加
+export const generateContent = (id: string) => {
+  return Http.post(`/v1/task-schedules/${id}/generate-content`);
+};
diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 48a66d3..53e87ba 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -12,11 +12,11 @@
     style="z-index: 999"
   >
     <div class="drawer-content" :style="isActive == 'ai' ? 'height: 376px;' : 'height:216px;'">
-      <div class="flex flex-col justify-center items-start">
+      <div class="flex flex-col justify-center">
         <CommonSelect
           v-model="localQuery.accounts"
           :options="accountList || []"
-          :multiple="true"
+          :multiple="false"
           @change="(val) => handleChange('accounts', val)"
           class="!w-432px select-with-tags"
           placeholder="请选择账号名称"
@@ -110,7 +110,15 @@
 
                 <p class="material-hint">前往成品库，选择要发布的内容</p>
               </div>
-              <div v-else class="flex flex-col items-start w-full">
+              <div v-else class="flex flex-col items-start w-full content-center">
+                <div class="opt-btn">
+                  <SwapOutlined class="bg-#00000060 p-4px rounded-4px cursor-pointer" @click="handleAddContent" />
+                  <DeleteOutlined
+                    style="margin-left: 16px"
+                    class="bg-#00000060 p-4px rounded-4px cursor-pointer"
+                    @click="handleDelte"
+                  />
+                </div>
                 <div class="mb-12px">{{ selectedProducts.data[0].title }}</div>
                 <div v-for="item in selectedProducts.images" :key="item.id">
                   <img v-if="item.cover" :src="item.cover" class="w-88 h-88 mr-8px border-rounded-8px mb-12px" />
@@ -182,6 +190,7 @@
 import { getWorksPage } from '@/api/all/generationWorkshop.ts';
 import { ref, reactive, watch, nextTick } from 'vue';
 import aiIcon from '@/assets/img/media-account/icon-AI.png';
+import { SwapOutlined, DeleteOutlined } from '@ant-design/icons-vue';
 import { Button, DatePicker, TimePicker } from 'ant-design-vue';
 import { TABS_LIST, ORIGIN_LIST, RawMaterialType } from '@/views/material-center/components/raw-material/constants';
 import dayjs from 'dayjs';
@@ -195,6 +204,7 @@ import icon4 from '@/assets/img/error-img.png';
 import RawMaterialDrawer from './raw-material-drawer.vue';
 import FinishedProductDrawer from './finished-product-drawer.vue';
 import { message } from 'ant-design-vue';
+import { fetchAccountOperators, getMediaAccountList } from '@/api/all/propertyMarketing';
 // 状态管理
 const choseText = ref('');
 const taskDescription = ref('');
@@ -204,7 +214,17 @@ const isActive = ref('ai');
 const showDriwer = ref(false);
 const showDrawer2 = ref(false);
 const showDrawer3 = ref(false);
+const accountList = ref([]);
+onMounted(() => {
+  getData();
+});
 
+const getData = async () => {
+  const res = await fetchAccountOperators();
+  if (res.code === 200) {
+    accountList.value = res.data;
+  }
+};
 // 发布类型选项
 const publishOptions = ref([
   { value: 'immediate', label: '立即发布' },
@@ -290,7 +310,15 @@ const handleAddContent = () => {
   productQuery.page_size = 10;
   showDrawer3.value = true;
 };
-
+const handleDelte = () => {
+  hasChoseFinishedProducts.value = false;
+  selectedProducts.value = {
+    keys: [],
+    data: [],
+    text: '',
+    images: [],
+  };
+};
 // 处理原料库选择确认
 const handleMaterialConfirm = (result) => {
   console.log('handleMaterialConfirm', result);
@@ -402,7 +430,7 @@ const handleCreateTask = () => {
   const taskData = {
     media_account_id: localQuery.value.ids[0],
     is_ai_generate: isActive.value == 'chose' ? 0 : 1,
-    description: taskDescription.value,
+    ai_prompt: taskDescription.value,
     raw_material_ids: selectedMaterials.value.keys,
     products: selectedProducts.value.keys,
     publish_type: publishType.value == 'immediate' ? 0 : 1,
@@ -534,6 +562,16 @@ defineExpose({
   font-size: 14px;
   margin: 0 40px;
 }
+.content-center {
+  position: relative;
+}
+
+.opt-btn {
+  display: flex;
+  position: absolute; /* 设置为绝对定位 */
+  top: 0; /* 紧贴顶部 */
+  right: 0; /* 紧贴右侧 */
+}
 
 .publish-type-select :deep(.ant-select-selection-item) {
   text-align: center;
@@ -541,7 +579,12 @@ defineExpose({
   align-items: center;
   justify-content: center;
 }
-
+.select-with-tags :deep(.ant-select-selection-item) {
+  text-align: start;
+  display: flex;
+  align-items: center;
+  justify-content: start;
+}
 .line {
   background-color: #e6e6e8;
   width: 382px;
diff --git a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
index 5a38be8..49e5839 100644
--- a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
+++ b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
@@ -44,7 +44,12 @@
         <div class="flex items-center">{{ record.last_modifier?.mobile || '-' }}</div>
       </template>
       <template #audit_status="{ record }">
-        <div class="flex items-center">{{ getStatus(record.audit_status) }}</div>
+        <div
+          class="flex items-center justify-center font-size-14px p-4px border-rounded-4px"
+          :style="getAuditStatusStyle(record.audit_status)"
+        >
+          {{ getStatus(record.audit_status) }}
+        </div>
       </template>
       <template #last_modified_at="{ record }">
         <div class="flex items-center">
@@ -189,7 +194,7 @@ watch(selectedRows, (newRows) => {
     // 多选模式
     choseText.value = newRows.length + '个稿件';
     // 过滤掉文本类型，只保留非文本类型的项目
-    choseImgArray.value = newRows.filter(item => item.type !== 'text');
+    choseImgArray.value = newRows.filter((item) => item.type !== 'text');
   }
 });
 
@@ -207,6 +212,19 @@ const getStatus = (status: number) => {
   }
 };
 
+const getAuditStatusStyle = (status: number) => {
+  switch (status) {
+    case 1:
+      return { backgroundColor: '#f0f0f0', color: '#666' };
+    case 2:
+      return { backgroundColor: '#fff7ed', color: '#ff9c00' };
+    case 3:
+      return { backgroundColor: '#e6ffe6', color: '#008000' };
+    default:
+      return { backgroundColor: '#f0f0f0', color: '#666' };
+  }
+};
+
 // 抽屉显示状态变化处理
 const onAfterVisibleChange = (visible: boolean) => {
   emit('after-visible-change', visible);
diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index e5098f9..ef4cef0 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -1,7 +1,8 @@
 <template>
-  <a-trigger trigger="click" position="br" @click.stop>
+  <a-trigger trigger="click" position="br" @click.stop @popup-visible-change="onPopupVisibleChange">
     <div class="task-item">
       <div class="color-indicator" :style="{ background: getTaskColor() }"></div>
+      <div>{{ timestampToTime(task.execution_time) }}</div>
       <div class="task-name" :title="task?.name || '-'">{{ task?.name || 'AI生成内容' }}</div>
     </div>
     <template #content>
@@ -34,11 +35,37 @@
         <div class="font-size-14px color-#211F24 color-#211F24 task-description" :title="task.name || 'AI生成内容'">
           {{ task.name || 'AI生成内容' }}
         </div>
-        <div v-if="task.ai_generate_status == 0" class="AILoding">
+        <div v-if="task.ai_generate_status == 1" class="AILoding">
           <ASpin />
           <div style="color: #9a56ba">内容生成中...</div>
           <div style="color: #9a56ba">完成后将自动展示，您可先返回其他操作</div>
         </div>
+
+        <div v-else-if="task.ai_generate_status == 0 && taskDetail" class="w-full pl-16px">
+          <div
+            v-for="item in choseTextArray"
+            :key="item.id"
+            class="flex items-center bg-#F7F8FA border-rounded-8px w-full justify-items-center pt-8px pb-8px pl-12px pr-12px mb-16px"
+          >
+            {{ item }}
+          </div>
+          <div class="flex items-center w-full">
+            <img
+              v-for="item in choseImgArray"
+              :key="item.id"
+              :src="item.cover || item.url"
+              class="w-88 h-88 mr-8px border-rounded-8px"
+            />
+          </div>
+          <div class="flex items-center w-full">
+            <video
+              v-for="item in choseVideoArray"
+              :key="item.id"
+              :src="item.cover || item.url"
+              class="w-44 h-44 mr-8px border-rounded-8px object-fit-contain"
+            />
+          </div>
+        </div>
         <div class="flex items-center mt-12px w-full h-1px bg-#E6E6E8"></div>
         <div class="flex items-center mt-12px mb-16px action-buttons">
           <div class="flex items-center mr-12px" @click.stop="handleDelete">
@@ -53,7 +80,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, onMounted, watch } from 'vue';
 import { Spin as ASpin } from 'ant-design-vue';
 import iconDy from '@/assets/img/platform/icon-dy.png';
 import iconXhs from '@/assets/img/platform/icon-xhs.png';
@@ -63,18 +90,47 @@ import iconSph from '@/assets/img/platform/icon-sph.png';
 import iconWb from '@/assets/img/platform/icon-wb.png';
 import iconGzh from '@/assets/img/platform/icon-gzh.png';
 import iconWarn from '@/assets/img/media-account/icon-warn.png';
-
+import { getTaskSchedulesDetail } from '@/api/all/assignment-management';
 // 定义props和emit
 const props = defineProps({
   task: Object,
   record: Object,
 });
 
-onMounted(() => {
-  console.log('props.task', props.task, props.record);
-});
+const taskDetail = ref(null);
+const choseImgArray = ref([]);
+const choseTextArray = ref([]);
+const choseVideoArray = ref([]);
+const getTaskDetail = async () => {
+  if (!props.task || !props.task.id) return;
 
-const isPanelVisible = ref(false);
+  try {
+    const res = await getTaskSchedulesDetail(props.task.id);
+    if (res && res.data) {
+      if (res.data.type == 1) {
+        taskDetail.value = res.data.work;
+        choseImgArray.value = res.data.work.files.filter((item) => [0].includes(item.type));
+        choseTextArray.value = res.data.work.files.filter((item) => [2].includes(item.type));
+        choseVideoArray.value = res.data.work.files.filter((item) => [1].includes(item.type));
+      } else {
+        taskDetail.value = res.data.raw_materials;
+        console.log('任务详情:', res.data, taskDetail.value);
+        choseImgArray.value = taskDetail.value.filter((item) => [0].includes(item.type));
+        choseTextArray.value = taskDetail.value.filter((item) => [2].includes(item.type));
+        choseVideoArray.value = taskDetail.value.filter((item) => [1].includes(item.type));
+        console.log('任务详情:', choseImgArray.value, choseTextArray.value);
+      }
+    }
+  } catch (error) {
+    console.error('获取任务详情失败:', error);
+  }
+};
+
+const onPopupVisibleChange = (visible) => {
+  if (visible) {
+    getTaskDetail();
+  }
+};
 
 const handleDelete = () => {
   emit('handle-task', 'delete', props.task, props.record);
@@ -84,12 +140,26 @@ const gotoDetail = () => {
   emit('handle-task', 'goto-detail', props.task, props.record);
 };
 const handleTimeChange = (time: string) => {
-  if (time) {
-    emit('handle-task', 'edit-time', props.task, timestampToTime1() + ' ' + time + ':00');
-  }
+  // if (time) {
+  //   emit('handle-task', 'edit-time', props.task, timestampToTime1() + ' ' + time + ':00');
+  // }
 };
-const handleAICreate = (task, record) => {};
+const handleAICreate = () => {
+  emit('handle-task', 'ai-create', props.task, props.record);
+};
+const timestampToTime = (timestamp: number): string => {
+  // 如果没有传入时间戳，则返回空字符串
+  if (!timestamp) return '';
 
+  // 将时间戳转换为毫秒（如果时间戳是秒单位的话）
+  const date = new Date(timestamp * 1000);
+
+  // 格式化为 HH:mm 格式
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+
+  return `${hours}:${minutes}`;
+};
 const timestampToTime1 = (): string => {
   const timestamp = Date.now();
   const date = new Date(timestamp);
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 762757e..611e531 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -128,7 +128,13 @@ import FilterPopup from './components/filter-popup.vue';
 import DrowPopup from './components/draw-popup.vue';
 import TaskItem from './components/task-item.vue';
 // API引入
-import { getTaskSchedules, delTaskSchedules, editTaskSchedules, createTask } from '@/api/all/assignment-management';
+import {
+  getTaskSchedules,
+  delTaskSchedules,
+  editTaskSchedules,
+  createTask,
+  generateContent,
+} from '@/api/all/assignment-management';
 import { fetchAccountOperators, getMediaAccountList } from '@/api/all/propertyMarketing';
 // 工具引入
 import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
@@ -224,7 +230,6 @@ const processTableData = (apiData: any[]) => {
     dateHeaders.forEach((day) => {
       rowData[day] = [];
     });
-
     // 分配任务到对应日期列
     if (account.task_schedules?.length) {
       account.task_schedules.forEach((task: any) => {
@@ -472,12 +477,13 @@ const handleCellClick = (record: any, rowIndex: any, column: any) => {
 };
 
 // 任务操作处理
-const handleTaskAction = (action: string, task: any, ...args: any[]) => {
+const handleTaskAction = async (action: string, task: any, ...args: any[]) => {
+  console.log('handleTaskAction', action, task, args);
   switch (action) {
     case 'delete':
       currentTask.value = task;
       deleteTitle.value = task.type === 1 ? '删除内容稿件排期' : '删除选题排期';
-      deleteContent.value = `确认删除“${task.name}”吗？`;
+      deleteContent.value = `确认删除“${task.name || 'AI生成内容'}”吗？`;
       showModal.value = true;
       break;
     case 'edit-time':
@@ -486,6 +492,12 @@ const handleTaskAction = (action: string, task: any, ...args: any[]) => {
     case 'goto-detail':
       router.push(`/media-account/management-detail/${task.id}`);
       break;
+    case 'ai-create':
+      const res = await generateContent(task.id);
+      if (res.code === 200) {
+        message.success(res.data.message);
+      }
+      break;
   }
 };
 

From 20fb29f3af1f98c86500d952327aa62e71f319f4 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Wed, 24 Sep 2025 16:20:33 +0800
Subject: [PATCH 33/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/all/assignment-management.ts          |  6 ++
 .../components/task-item.vue                  | 70 ++++++++++++++-----
 .../assignment-management/index.vue           | 16 +++--
 3 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/src/api/all/assignment-management.ts b/src/api/all/assignment-management.ts
index 76bc5d5..f9aa270 100644
--- a/src/api/all/assignment-management.ts
+++ b/src/api/all/assignment-management.ts
@@ -31,3 +31,9 @@ export const createTask = (params = {}) => {
 export const generateContent = (id: string) => {
   return Http.post(`/v1/task-schedules/${id}/generate-content`);
 };
+
+// 任务管理-修改
+export const editTaskSchedulesTime = (id: string, params = {}) => {
+  console.log('id', id);
+  return Http.patch(`/v1/task-schedules/${id}/execution-time`, params);
+};
diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index ef4cef0..4b75cfb 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -35,13 +35,13 @@
         <div class="font-size-14px color-#211F24 color-#211F24 task-description" :title="task.name || 'AI生成内容'">
           {{ task.name || 'AI生成内容' }}
         </div>
-        <div v-if="task.ai_generate_status == 1" class="AILoding">
+        <div v-if="task.ai_generate_status == 0" class="AILoding">
           <ASpin />
           <div style="color: #9a56ba">内容生成中...</div>
           <div style="color: #9a56ba">完成后将自动展示，您可先返回其他操作</div>
         </div>
 
-        <div v-else-if="task.ai_generate_status == 0 && taskDetail" class="w-full pl-16px">
+        <div v-else-if="task.ai_generate_status == 1 && taskDetail" class="w-full pl-16px">
           <div
             v-for="item in choseTextArray"
             :key="item.id"
@@ -67,12 +67,30 @@
           </div>
         </div>
         <div class="flex items-center mt-12px w-full h-1px bg-#E6E6E8"></div>
-        <div class="flex items-center mt-12px mb-16px action-buttons">
-          <div class="flex items-center mr-12px" @click.stop="handleDelete">
-            <icon-delete style="font-size: 20px; margin-left: 16px" />
+        <div class="flex items-center mt-12px mb-16px action-buttons w-full px-16px">
+          <div class="flex items-center mr-12px" @click.stop="handleDelete" v-if="task.status != 1">
+            <icon-delete style="font-size: 20px; margin-left: 0" />
+          </div>
+          <div class="flex w-full" :class="{ 'justify-between': task.ai_generate_status == 0 }">
+            <!-- <button class="opt-btn" :class="{ 'flex-1': task.ai_generate_status != 0 }" @click.stop="handleTimeChange">
+              修改发布时间
+            </button> -->
+            <a-date-picker
+              v-model="datePickerValue"
+              placeholder="修改发布时间"
+              show-time
+              format="YYYY-MM-DD HH:mm"
+              value-format="YYYY-MM-DD HH:mm"
+              @change="onChange"
+              @ok="onOk"
+              @click.stop
+              @mousedown.stop
+              @focus.stop
+            />
+            <button v-if="task.ai_generate_status == 0" class="opt-btn ml-12px opt-right" @click.stop="handleAICreate">
+              AI立即生成
+            </button>
           </div>
-          <button class="opt-btn" @click.stop="handleTimeChange">修改发布时间</button>
-          <button class="opt-btn ml-12px opt-right mr-16px" @click.stop="handleAICreate">AI立即生成</button>
         </div>
       </div>
     </template>
@@ -82,6 +100,7 @@
 <script setup lang="ts">
 import { ref, onMounted, watch } from 'vue';
 import { Spin as ASpin } from 'ant-design-vue';
+import dayjs from 'dayjs';
 import iconDy from '@/assets/img/platform/icon-dy.png';
 import iconXhs from '@/assets/img/platform/icon-xhs.png';
 import iconBilibili from '@/assets/img/platform/icon-bilibili.png';
@@ -91,6 +110,7 @@ import iconWb from '@/assets/img/platform/icon-wb.png';
 import iconGzh from '@/assets/img/platform/icon-gzh.png';
 import iconWarn from '@/assets/img/media-account/icon-warn.png';
 import { getTaskSchedulesDetail } from '@/api/all/assignment-management';
+import { DatePicker } from '@arco-design/web-vue';
 // 定义props和emit
 const props = defineProps({
   task: Object,
@@ -106,19 +126,20 @@ const getTaskDetail = async () => {
 
   try {
     const res = await getTaskSchedulesDetail(props.task.id);
+
     if (res && res.data) {
-      if (res.data.type == 1) {
+      datePickerValue.value = dayjs(res.data.execution_time * 1000);
+      console.log('任务详情:', datePickerValue.value);
+      if ('work' in res.data && res.data.work) {
         taskDetail.value = res.data.work;
         choseImgArray.value = res.data.work.files.filter((item) => [0].includes(item.type));
         choseTextArray.value = res.data.work.files.filter((item) => [2].includes(item.type));
         choseVideoArray.value = res.data.work.files.filter((item) => [1].includes(item.type));
       } else {
         taskDetail.value = res.data.raw_materials;
-        console.log('任务详情:', res.data, taskDetail.value);
         choseImgArray.value = taskDetail.value.filter((item) => [0].includes(item.type));
         choseTextArray.value = taskDetail.value.filter((item) => [2].includes(item.type));
         choseVideoArray.value = taskDetail.value.filter((item) => [1].includes(item.type));
-        console.log('任务详情:', choseImgArray.value, choseTextArray.value);
       }
     }
   } catch (error) {
@@ -126,6 +147,17 @@ const getTaskDetail = async () => {
   }
 };
 
+const onChange = (date, dateString) => {
+  console.log('Selected Date: ', date, dateString);
+};
+
+const onOk = (value) => {
+  if (value) {
+    console.log('DatePicker OK: ', value);
+    emit('handle-task', 'edit-time', props.task, value);
+  }
+};
+
 const onPopupVisibleChange = (visible) => {
   if (visible) {
     getTaskDetail();
@@ -139,11 +171,7 @@ const gotoDetail = () => {
   console.log('跳转详情');
   emit('handle-task', 'goto-detail', props.task, props.record);
 };
-const handleTimeChange = (time: string) => {
-  // if (time) {
-  //   emit('handle-task', 'edit-time', props.task, timestampToTime1() + ' ' + time + ':00');
-  // }
-};
+
 const handleAICreate = () => {
   emit('handle-task', 'ai-create', props.task, props.record);
 };
@@ -160,10 +188,13 @@ const timestampToTime = (timestamp: number): string => {
 
   return `${hours}:${minutes}`;
 };
-const timestampToTime1 = (): string => {
-  const timestamp = Date.now();
-  const date = new Date(timestamp);
+const timestampToTime1 = (timestamp: number): string => {
+  // 如果没有传入时间戳，则使用当前时间
+  if (!timestamp) {
+    timestamp = Date.now() / 1000; // 使用秒级时间戳保持一致性
+  }
 
+  const date = new Date(timestamp * 1000);
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, '0'); // 补零
   const day = String(date.getDate()).padStart(2, '0'); // 补零
@@ -173,6 +204,9 @@ const timestampToTime1 = (): string => {
 
 const emit = defineEmits(['filter-change', 'handle-task']);
 
+// 日期选择器的值
+const datePickerValue = ref('2025-09-25 16:18');
+
 // 平台配置
 const platformConfig = {
   icons: {
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 611e531..6e7a8d7 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -131,7 +131,7 @@ import TaskItem from './components/task-item.vue';
 import {
   getTaskSchedules,
   delTaskSchedules,
-  editTaskSchedules,
+  editTaskSchedulesTime,
   createTask,
   generateContent,
 } from '@/api/all/assignment-management';
@@ -370,7 +370,9 @@ const handleSearch = () => {
     .then((response) => {
       if (response.data) {
         const apiData = response.data.data || response.data;
-        data.value = processTableData(apiData);
+        if (apiData) {
+          data.value = processTableData(apiData);
+        }
         pageInfo.value.total = response.data.total || apiData.length;
       }
     })
@@ -487,7 +489,13 @@ const handleTaskAction = async (action: string, task: any, ...args: any[]) => {
       showModal.value = true;
       break;
     case 'edit-time':
-      editTaskSchedules(task.id, { execution_time: args[0] }).then(() => handleSearch());
+      console.log('handleTaskAction edit-time', task, args);
+      editTaskSchedulesTime(task.id, { execution_time: args[0] }).then((res) => {
+        if (res.code === 200) {
+          message.success(res.message);
+          handleSearch();
+        }
+      });
       break;
     case 'goto-detail':
       router.push(`/media-account/management-detail/${task.id}`);
@@ -495,7 +503,7 @@ const handleTaskAction = async (action: string, task: any, ...args: any[]) => {
     case 'ai-create':
       const res = await generateContent(task.id);
       if (res.code === 200) {
-        message.success(res.data.message);
+        message.success(res.message);
       }
       break;
   }

From 7bb1984b3bf70f5f3fcf6dee49471b7b4e549056 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Wed, 24 Sep 2025 16:27:52 +0800
Subject: [PATCH 34/39] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 |  1 +
 .../components/finished-product-drawer.vue    |  1 +
 .../components/raw-material-drawer.vue        |  1 +
 .../components/task-item.vue                  | 19 +++++++++++++------
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 53e87ba..9e5e2f0 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -393,6 +393,7 @@ const handleProductDrawerVisibleChange = (visible: boolean) => {
 // 处理筛选条件变化
 const handleChange = (field, value) => {
   localQuery.value[field] = value;
+  localQuery.value.ids = [value];
   emit('filter-change', {
     accounts: localQuery.value.accounts,
   });
diff --git a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
index 49e5839..97c7609 100644
--- a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
+++ b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
@@ -244,6 +244,7 @@ const onAfterVisibleChange = (visible: boolean) => {
 // 抽屉关闭事件处理
 const handleClose = () => {
   emit('update:visible', false);
+  emit('cancel');
 };
 
 // 取消按钮处理
diff --git a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
index 18e5688..aca89b1 100644
--- a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
+++ b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
@@ -265,6 +265,7 @@ const onAfterVisibleChange = (visible: boolean) => {
 // 抽屉关闭事件处理
 const handleClose = () => {
   emit('update:visible', false);
+  emit('cancel');
 };
 
 // 取消按钮处理
diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index 4b75cfb..964ecd4 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -76,9 +76,9 @@
               修改发布时间
             </button> -->
             <a-date-picker
-              v-model="datePickerValue"
+              v-model:value="datePickerValue"
               placeholder="修改发布时间"
-              show-time
+              :show-time="{ format: 'HH:mm' }"
               format="YYYY-MM-DD HH:mm"
               value-format="YYYY-MM-DD HH:mm"
               @change="onChange"
@@ -149,11 +149,14 @@ const getTaskDetail = async () => {
 
 const onChange = (date, dateString) => {
   console.log('Selected Date: ', date, dateString);
+  if (date) {
+    emit('handle-task', 'edit-time', props.task, dateString);
+  }
 };
 
 const onOk = (value) => {
+  console.log('DatePicker OK: ', value);
   if (value) {
-    console.log('DatePicker OK: ', value);
     emit('handle-task', 'edit-time', props.task, value);
   }
 };
@@ -171,7 +174,11 @@ const gotoDetail = () => {
   console.log('跳转详情');
   emit('handle-task', 'goto-detail', props.task, props.record);
 };
-
+const handleTimeChange = (time: string) => {
+  // if (time) {
+  //   emit('handle-task', 'edit-time', props.task, timestampToTime1() + ' ' + time + ':00');
+  // }
+};
 const handleAICreate = () => {
   emit('handle-task', 'ai-create', props.task, props.record);
 };
@@ -193,7 +200,7 @@ const timestampToTime1 = (timestamp: number): string => {
   if (!timestamp) {
     timestamp = Date.now() / 1000; // 使用秒级时间戳保持一致性
   }
-
+  
   const date = new Date(timestamp * 1000);
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, '0'); // 补零
@@ -205,7 +212,7 @@ const timestampToTime1 = (timestamp: number): string => {
 const emit = defineEmits(['filter-change', 'handle-task']);
 
 // 日期选择器的值
-const datePickerValue = ref('2025-09-25 16:18');
+const datePickerValue = ref(null);
 
 // 平台配置
 const platformConfig = {

From e7a4d9383da4c617b8960352605ffded27d201b3 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Wed, 24 Sep 2025 16:53:14 +0800
Subject: [PATCH 35/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 | 52 ++++++++++++++++---
 .../components/task-item.vue                  |  7 +--
 .../assignment-management/index.vue           |  1 -
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 9e5e2f0..e60a9fe 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -24,6 +24,7 @@
           :maxTagCount="999"
           popup-container=".filter-popup-content"
         />
+
         <div class="ai-content-generator">
           <div class="flex mt-16px">
             <Button
@@ -204,7 +205,17 @@ import icon4 from '@/assets/img/error-img.png';
 import RawMaterialDrawer from './raw-material-drawer.vue';
 import FinishedProductDrawer from './finished-product-drawer.vue';
 import { message } from 'ant-design-vue';
-import { fetchAccountOperators, getMediaAccountList } from '@/api/all/propertyMarketing';
+import { getMediaAccountList } from '@/api/all/propertyMarketing';
+// 平台图标
+import iconDy from '@/assets/img/platform/icon-dy.png';
+import iconXhs from '@/assets/img/platform/icon-xhs.png';
+import iconBilibili from '@/assets/img/platform/icon-bilibili.png';
+import iconKs from '@/assets/img/platform/icon-ks.png';
+import iconSph from '@/assets/img/platform/icon-sph.png';
+import iconWb from '@/assets/img/platform/icon-wb.png';
+import iconGzh from '@/assets/img/platform/icon-gzh.png';
+import iconWarn from '@/assets/img/media-account/icon-warn.png';
+
 // 状态管理
 const choseText = ref('');
 const taskDescription = ref('');
@@ -219,10 +230,38 @@ onMounted(() => {
   getData();
 });
 
+// 平台配置
+const platformConfig = {
+  icons: { 0: iconDy, 1: iconXhs, 2: iconBilibili, 3: iconKs, 4: iconSph, 5: iconWb, 6: iconGzh },
+  names: { 0: '抖音', 1: '小红书', 2: 'B站', 3: '快手', 4: '视频号', 5: '微博', 6: '公众号' },
+  options: [
+    { id: 0, name: '抖音', icon: iconDy },
+    { id: 1, name: '小红书', icon: iconXhs },
+    { id: 2, name: 'B站', icon: iconBilibili },
+    { id: 3, name: '快手', icon: iconKs },
+    { id: 4, name: '视频号', icon: iconSph },
+    { id: 5, name: '微博', icon: iconWb },
+    { id: 6, name: '公众号', icon: iconGzh },
+  ],
+};
+const platformOptions = ref(platformConfig.options);
+
+// 工具函数
+const getPlatformIcon = (platform: number) => platformConfig.icons[platform] || iconWarn;
+const getPlatformName = (platform: number) => platformConfig.names[platform] || '未知平台';
 const getData = async () => {
-  const res = await fetchAccountOperators();
-  if (res.code === 200) {
-    accountList.value = res.data;
+  try {
+    const { code, data: accountData } = await getMediaAccountList();
+    if (code === 200) {
+      accountList.value = accountData.map((account: any) => ({
+        value: account.id,
+        name: `${account.name}(${getPlatformName(account.platform)})`,
+        platform: account.platform,
+        icon: getPlatformIcon(account.platform),
+      }));
+    }
+  } catch (error) {
+    console.error('获取账号列表失败:', error);
   }
 };
 // 发布类型选项
@@ -414,9 +453,6 @@ const handleCreateTask = () => {
     message.error('请选择发布账号');
     return;
   }
-  console.log('selectedMaterials', selectedMaterials.value);
-  console.log('selectedProducts', selectedProducts.value);
-  console.log('isActive', isActive.value);
   if (isActive.value === 'chose' && selectedProducts.value.keys.length === 0) {
     // 可以添加错误提示：请选择发布内容
     message.error('请选择发布内容');
@@ -436,7 +472,7 @@ const handleCreateTask = () => {
     products: selectedProducts.value.keys,
     publish_type: publishType.value == 'immediate' ? 0 : 1,
     execution_time:
-      publishType.value === 'timing' ? `${dayjs(currentDate.value).format('YYYY-MM-DD')} ${strValue.value}` : null,
+      publishType.value === 'timing' ? `${dayjs(currentDate.value).format('YYYY-MM-DD')} ${strValue.value}` : undefined,
     work_id: selectedProducts.value.keys[0],
   };
   // 发射创建任务事件
diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index 964ecd4..c0a7768 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -72,11 +72,8 @@
             <icon-delete style="font-size: 20px; margin-left: 0" />
           </div>
           <div class="flex w-full" :class="{ 'justify-between': task.ai_generate_status == 0 }">
-            <!-- <button class="opt-btn" :class="{ 'flex-1': task.ai_generate_status != 0 }" @click.stop="handleTimeChange">
-              修改发布时间
-            </button> -->
             <a-date-picker
-              v-model:value="datePickerValue"
+              v-model="datePickerValue"
               placeholder="修改发布时间"
               :show-time="{ format: 'HH:mm' }"
               format="YYYY-MM-DD HH:mm"
@@ -200,7 +197,7 @@ const timestampToTime1 = (timestamp: number): string => {
   if (!timestamp) {
     timestamp = Date.now() / 1000; // 使用秒级时间戳保持一致性
   }
-  
+
   const date = new Date(timestamp * 1000);
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, '0'); // 补零
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 6e7a8d7..69bb657 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -253,7 +253,6 @@ const handleAddTask = () => {
 };
 
 const handleCreateTask = async (value) => {
-  console.log('handleCreateTask', value);
   const res = await createTask(value);
   if (res && res.code === 200) {
     message.success('创建成功');

From 6aa532bebe29076f908d6f141160dc1d921c7988 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Wed, 24 Sep 2025 17:12:33 +0800
Subject: [PATCH 36/39] =?UTF-8?q?=E5=89=A9=E4=BD=99=E5=A4=9A=E5=B0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                  | 11 ++---------
 .../assignment-management/index.vue            | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index e60a9fe..16acce9 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -275,7 +275,7 @@ const publishType = ref('immediate');
 
 // 时间选择相关
 const currentDate = ref(new Date());
-const strValue = ref(dayjs().format('HH:mm'));
+const strValue = ref();
 
 // 定义props和emit
 const props = defineProps({
@@ -438,13 +438,6 @@ const handleChange = (field, value) => {
   });
 };
 
-// 监听主抽屉显示状态，每次打开时更新时间为当前时间
-watch(showDriwer, (newVal) => {
-  if (newVal) {
-    strValue.value = dayjs().format('HH:mm');
-  }
-});
-
 // 点击创建任务按钮时触发
 const handleCreateTask = () => {
   // 验证表单
@@ -463,6 +456,7 @@ const handleCreateTask = () => {
     message.error('请选择发布内容');
     return;
   }
+  console.log('有问题已返回');
   // 准备提交的数据
   const taskData = {
     media_account_id: localQuery.value.ids[0],
@@ -491,7 +485,6 @@ const showDrawer = (accountInfo = null, selectedDate = null) => {
       localQuery.value.ids = [accountInfo.id];
     });
   }
-  console.log('selectedDate', selectedDate);
   // 如果传入了日期，则设置为默认日期
   if (selectedDate) {
     currentDate.value = selectedDate;
diff --git a/src/views/property-marketing/assignment-management/index.vue b/src/views/property-marketing/assignment-management/index.vue
index 69bb657..7238362 100644
--- a/src/views/property-marketing/assignment-management/index.vue
+++ b/src/views/property-marketing/assignment-management/index.vue
@@ -60,11 +60,11 @@
               <div v-if="record[column.dataIndex].length >= 3" class="task-more">
                 <TaskItem :task="record[column.dataIndex][0]" :record="record" @handle-task="handleTaskAction" />
                 <a-trigger trigger="click" position="br">
-                  <div class="size-12px color-#8f959f h-19px ml-4px">
+                  <div class="size-12px color-#8f959f h-19px ml-4px rounded-2px cursor-pointer" @click.stop>
                     还有{{ record[column.dataIndex].length - 1 }}项
                   </div>
                   <template #content>
-                    <div class="bg-#fff p-12px shadow-sm rounded-4px">
+                    <div class="bg-#fff w-160px p-12px rounded-4px flex flex-col more-content">
                       <TaskItem
                         v-for="task in record[column.dataIndex]"
                         :key="task.id"
@@ -636,6 +636,12 @@ onMounted(() => {
   border-bottom-left-radius: 8px !important;
 }
 
+/* 任务弹出框样式 */
+:deep(.task-popup-content) {
+  max-height: 300px;
+  overflow-y: auto;
+}
+
 /* 分页样式 */
 .pagination-box {
   display: flex;
@@ -650,4 +656,12 @@ onMounted(() => {
   transform: rotate(180deg);
   transition: transform 0.2s ease;
 }
+
+.more-content {
+  border-radius: 8px;
+  background: #fff;
+
+  /* Shadow 2 */
+  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.1);
+}
 </style>

From cc35c1020f69c62da7b7f735bc8611c439865720 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Wed, 24 Sep 2025 17:27:57 +0800
Subject: [PATCH 37/39] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignment-management/components/draw-popup.vue   |  3 ++-
 .../components/finished-product-drawer.vue            |  9 +--------
 .../components/raw-material-drawer.vue                | 11 ++---------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue
index 16acce9..5ac260f 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -168,7 +168,6 @@
     <!-- 原料库子组件：使用:visible和@update:visible替代v-model -->
     <RawMaterialDrawer
       :visible="showDrawer2"
-      @update:visible="(val) => (showDrawer2 = val)"
       :query="materialQuery"
       @after-visible-change="handleMaterialDrawerVisibleChange"
       @confirm="handleMaterialConfirm"
@@ -374,6 +373,7 @@ const handleMaterialConfirm = (result) => {
 // 处理原料库取消
 const handleMaterialCancel = () => {
   // 取消逻辑
+  showDrawer2.value = false;
 };
 
 // 处理成品库选择确认
@@ -402,6 +402,7 @@ const handleProductConfirm = (result) => {
 // 处理成品库取消
 const handleProductCancel = () => {
   // 取消逻辑
+  showDrawer3.value = false;
 };
 
 // 处理发布类型变化
diff --git a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
index 97c7609..835d499 100644
--- a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
+++ b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue
@@ -6,7 +6,7 @@
     placement="right"
     :visible="visible"
     @after-visible-change="onAfterVisibleChange"
-    @close="handleClose"
+    @cancel="handleCancel"
     width="904px"
     class="task-drawer"
     style="right: 481px"
@@ -241,15 +241,8 @@ const onAfterVisibleChange = (visible: boolean) => {
   }
 };
 
-// 抽屉关闭事件处理
-const handleClose = () => {
-  emit('update:visible', false);
-  emit('cancel');
-};
-
 // 取消按钮处理
 const handleCancel = () => {
-  emit('update:visible', false);
   emit('cancel');
 };
 
diff --git a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
index aca89b1..df5253f 100644
--- a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
+++ b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
@@ -6,7 +6,7 @@
     placement="right"
     :visible="visible"
     @after-visible-change="onAfterVisibleChange"
-    @close="handleClose"
+    @cancel="handleCancel"
     width="904px"
     class="task-drawer"
     style="right: 481px"
@@ -150,7 +150,6 @@ const getOrigin = (origin: number): string => {
 // 定义Emits类型
 const emit = defineEmits<{
   (e: 'update:visible', value: boolean): void;
-  (e: 'after-visible-change', visible: boolean): void;
   (
     e: 'confirm',
     data: {
@@ -262,15 +261,9 @@ const onAfterVisibleChange = (visible: boolean) => {
   }
 };
 
-// 抽屉关闭事件处理
-const handleClose = () => {
-  emit('update:visible', false);
-  emit('cancel');
-};
-
 // 取消按钮处理
 const handleCancel = () => {
-  emit('update:visible', false);
+  console.log('取消');
   emit('cancel');
 };
 

From 5d75d355e6df97f5eb829904618bea5703bd951b Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Wed, 24 Sep 2025 17:47:55 +0800
Subject: [PATCH 38/39] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignment-management/components/task-item.vue             | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index c0a7768..4786bd4 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -146,9 +146,6 @@ const getTaskDetail = async () => {
 
 const onChange = (date, dateString) => {
   console.log('Selected Date: ', date, dateString);
-  if (date) {
-    emit('handle-task', 'edit-time', props.task, dateString);
-  }
 };
 
 const onOk = (value) => {

From 603bf7c207a753c0b422eddc0a39aa299e927d76 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Wed, 24 Sep 2025 17:56:30 +0800
Subject: [PATCH 39/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4@ant-design/icons-vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json   |  1 +
 pnpm-lock.yaml | 99 ++++++++++++++++++++++++++------------------------
 2 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index 651b256..d3fce1d 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@ant-design/icons-vue": "^7.0.1",
     "@arco-design/web-vue": "^2.42.0",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@types/nprogress": "^0.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 02c3be0..08b48c0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,6 +8,9 @@ importers:
 
   .:
     dependencies:
+      '@ant-design/icons-vue':
+        specifier: ^7.0.1
+        version: 7.0.1(vue@3.5.18(typescript@4.9.5))
       '@arco-design/web-vue':
         specifier: ^2.42.0
         version: 2.42.0(vue@3.5.18(typescript@4.9.5))
@@ -450,133 +453,133 @@ packages:
     resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==}
 
   '@esbuild/android-arm64@0.16.17':
-    resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==, tarball: https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz}
+    resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
 
   '@esbuild/android-arm@0.16.17':
-    resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==, tarball: https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz}
+    resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
 
   '@esbuild/android-x64@0.16.17':
-    resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==, tarball: https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz}
+    resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
 
   '@esbuild/darwin-arm64@0.16.17':
-    resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==, tarball: https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz}
+    resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
 
   '@esbuild/darwin-x64@0.16.17':
-    resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==, tarball: https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz}
+    resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
 
   '@esbuild/freebsd-arm64@0.16.17':
-    resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==, tarball: https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz}
+    resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
 
   '@esbuild/freebsd-x64@0.16.17':
-    resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==, tarball: https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz}
+    resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
 
   '@esbuild/linux-arm64@0.16.17':
-    resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==, tarball: https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz}
+    resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
 
   '@esbuild/linux-arm@0.16.17':
-    resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==, tarball: https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz}
+    resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
 
   '@esbuild/linux-ia32@0.16.17':
-    resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==, tarball: https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz}
+    resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
 
   '@esbuild/linux-loong64@0.16.17':
-    resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==, tarball: https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz}
+    resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
 
   '@esbuild/linux-mips64el@0.16.17':
-    resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==, tarball: https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz}
+    resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
 
   '@esbuild/linux-ppc64@0.16.17':
-    resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==, tarball: https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz}
+    resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
 
   '@esbuild/linux-riscv64@0.16.17':
-    resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==, tarball: https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz}
+    resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
 
   '@esbuild/linux-s390x@0.16.17':
-    resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==, tarball: https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz}
+    resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
 
   '@esbuild/linux-x64@0.16.17':
-    resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==, tarball: https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz}
+    resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
 
   '@esbuild/netbsd-x64@0.16.17':
-    resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==, tarball: https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz}
+    resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
 
   '@esbuild/openbsd-x64@0.16.17':
-    resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==, tarball: https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz}
+    resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
 
   '@esbuild/sunos-x64@0.16.17':
-    resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==, tarball: https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz}
+    resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
 
   '@esbuild/win32-arm64@0.16.17':
-    resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==, tarball: https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz}
+    resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
 
   '@esbuild/win32-ia32@0.16.17':
-    resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==, tarball: https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz}
+    resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
 
   '@esbuild/win32-x64@0.16.17':
-    resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==, tarball: https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz}
+    resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -657,91 +660,91 @@ packages:
     engines: {node: ^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0}
 
   '@parcel/watcher-android-arm64@2.5.1':
-    resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==, tarball: https://registry.npmmirror.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz}
+    resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [android]
 
   '@parcel/watcher-darwin-arm64@2.5.1':
-    resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==, tarball: https://registry.npmmirror.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz}
+    resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [darwin]
 
   '@parcel/watcher-darwin-x64@2.5.1':
-    resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==, tarball: https://registry.npmmirror.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz}
+    resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [darwin]
 
   '@parcel/watcher-freebsd-x64@2.5.1':
-    resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==, tarball: https://registry.npmmirror.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz}
+    resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [freebsd]
 
   '@parcel/watcher-linux-arm-glibc@2.5.1':
-    resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==, tarball: https://registry.npmmirror.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz}
+    resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
   '@parcel/watcher-linux-arm-musl@2.5.1':
-    resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==, tarball: https://registry.npmmirror.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz}
+    resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
     libc: [musl]
 
   '@parcel/watcher-linux-arm64-glibc@2.5.1':
-    resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==, tarball: https://registry.npmmirror.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz}
+    resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.5.1':
-    resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==, tarball: https://registry.npmmirror.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz}
+    resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.5.1':
-    resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==, tarball: https://registry.npmmirror.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz}
+    resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.5.1':
-    resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==, tarball: https://registry.npmmirror.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz}
+    resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
   '@parcel/watcher-win32-arm64@2.5.1':
-    resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==, tarball: https://registry.npmmirror.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz}
+    resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [win32]
 
   '@parcel/watcher-win32-ia32@2.5.1':
-    resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==, tarball: https://registry.npmmirror.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz}
+    resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [ia32]
     os: [win32]
 
   '@parcel/watcher-win32-x64@2.5.1':
-    resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==, tarball: https://registry.npmmirror.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz}
+    resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [win32]
 
   '@parcel/watcher@2.5.1':
-    resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==, tarball: https://registry.npmmirror.com/@parcel/watcher/-/watcher-2.5.1.tgz}
+    resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==}
     engines: {node: '>= 10.0.0'}
 
   '@polka/url@1.0.0-next.21':
@@ -800,13 +803,13 @@ packages:
     resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
 
   '@types/sortablejs@1.15.8':
-    resolution: {integrity: sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==, tarball: https://registry.npmmirror.com/@types/sortablejs/-/sortablejs-1.15.8.tgz}
+    resolution: {integrity: sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==}
 
   '@types/svgo@2.6.4':
     resolution: {integrity: sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng==}
 
   '@types/trusted-types@2.0.7':
-    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==, tarball: https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz}
+    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
 
   '@types/web-bluetooth@0.0.16':
     resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
@@ -1687,7 +1690,7 @@ packages:
     resolution: {integrity: sha512-CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw==}
 
   canvg@3.0.11:
-    resolution: {integrity: sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==, tarball: https://registry.npmmirror.com/canvg/-/canvg-3.0.11.tgz}
+    resolution: {integrity: sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==}
     engines: {node: '>=10.0.0'}
 
   chalk@1.1.3:
@@ -1877,7 +1880,7 @@ packages:
     resolution: {integrity: sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==}
 
   core-js@3.45.0:
-    resolution: {integrity: sha512-c2KZL9lP4DjkN3hk/an4pWn5b5ZefhRJnAc42n6LJ19kSnbeRbdQZE5dSeE2LBol1OwJD3X1BQvFTAsa8ReeDA==, tarball: https://registry.npmmirror.com/core-js/-/core-js-3.45.0.tgz}
+    resolution: {integrity: sha512-c2KZL9lP4DjkN3hk/an4pWn5b5ZefhRJnAc42n6LJ19kSnbeRbdQZE5dSeE2LBol1OwJD3X1BQvFTAsa8ReeDA==}
 
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
@@ -2197,7 +2200,7 @@ packages:
     engines: {node: '>=0.12'}
 
   errno@0.1.8:
-    resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==, tarball: https://registry.npmmirror.com/errno/-/errno-0.1.8.tgz}
+    resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
     hasBin: true
 
   error-ex@1.3.2:
@@ -2614,7 +2617,7 @@ packages:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
   fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
@@ -2778,7 +2781,7 @@ packages:
     engines: {node: '>= 0.4'}
 
   graceful-fs@4.2.10:
-    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
+    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
   grapheme-splitter@1.0.4:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
@@ -3716,7 +3719,7 @@ packages:
     resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
 
   make-dir@2.1.0:
-    resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==, tarball: https://registry.npmmirror.com/make-dir/-/make-dir-2.1.0.tgz}
+    resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
     engines: {node: '>=6'}
 
   make-iterator@1.0.1:
@@ -3837,7 +3840,7 @@ packages:
     engines: {node: '>= 0.6'}
 
   mime@1.6.0:
-    resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==, tarball: https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz}
+    resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
     engines: {node: '>=4'}
     hasBin: true
 
@@ -3966,7 +3969,7 @@ packages:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
   needle@3.2.0:
-    resolution: {integrity: sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==, tarball: https://registry.npmmirror.com/needle/-/needle-3.2.0.tgz}
+    resolution: {integrity: sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==}
     engines: {node: '>= 4.4.x'}
     hasBin: true
 
@@ -4872,7 +4875,7 @@ packages:
     engines: {node: '>=0.10.0'}
 
   source-map@0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==, tarball: https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz}
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
   source-map@0.7.4:
@@ -5557,7 +5560,7 @@ packages:
       eslint: '>=6.0.0'
 
   vue-lazyload@3.0.0:
-    resolution: {integrity: sha512-h2keL/Rj550dLgesgOtXJS9qOiSMmuJNeVlfNAYV1/IYwOQYaWk5mFJlwRxmZDK9YC5gECcFLYYj7z1lKSf9ug==, tarball: https://registry.npmmirror.com/vue-lazyload/-/vue-lazyload-3.0.0.tgz}
+    resolution: {integrity: sha512-h2keL/Rj550dLgesgOtXJS9qOiSMmuJNeVlfNAYV1/IYwOQYaWk5mFJlwRxmZDK9YC5gECcFLYYj7z1lKSf9ug==}
 
   vue-router@4.5.1:
     resolution: {integrity: sha512-ogAF3P97NPm8fJsE4by9dwSYtDwXIY1nFY9T6DyQnGHd1E2Da94w9JIolpe42LJGIl0DwOHBi8TcRPlPGwbTtw==}