홈 탐색 도움말
로그인
Web
/
contentCooper
11
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

fixbug

jihuaqiang 1 주 전
부모
fdfc46c8ac
커밋
a4008d978b
8개의 변경된 파일과 63개의 추가작업 그리고 14개의 파일을 삭제
통합 보기 변경상태 보기
  1. 1 1
      index.html
  2. 22 0
      public/logo.svg
  3. 1 1
      src/components/layout/contentbar.tsx
  4. 4 2
      src/views/publishContent/publishContent.router.tsx
  5. 15 2
      src/views/publishContent/weCom/components/videoSelectModal/index.tsx
  6. 4 3
      src/views/publishContent/weCom/index.tsx
  7. 3 1
      src/views/publishContent/weGZH/components/videoSelectModal/index.tsx
  8. 13 4
      src/views/publishContent/weGZH/index.tsx

+ 1 - 1
index.html
파일 보기 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 <html lang="en">
 
   <head>
 
   <head>
 
     <meta charset="UTF-8" />
 
     <meta charset="UTF-8" />
 
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
 
+    <link rel="icon" type="image/svg+xml" href="/logo.svg" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 		<meta name="referrer" content="no-referrer" />
 
 		<meta name="referrer" content="no-referrer" />
 
     <title>票圈对外内容平台</title>
 
     <title>票圈对外内容平台</title>

+ 22 - 0
public/logo.svg
파일 보기 

@@ -0,0 +1,22 @@
 
+<svg width="40" height="22" viewBox="0 0 40 22" fill="none" xmlns="http://www.w3.org/2000/svg">
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9837 13.96C8.8941 13.96 7.19392 12.2598 7.19392 10.1698C7.19392 8.08019 8.8941 6.38001 10.9837 6.38001C13.0734 6.38001 14.7737 8.08019 14.7737 10.1702C14.7737 12.2598 13.0734 13.96 10.9837 13.96M10.9837 1.55679C7.85482 1.55679 5.11017 3.23411 3.60178 5.73679C3.49714 5.70715 3.38696 5.69108 3.27303 5.69108C2.60714 5.69108 2.06714 6.2309 2.06714 6.89679V19.0995C2.06714 19.7654 2.60714 20.3052 3.27303 20.3052C3.9391 20.3052 4.47875 19.7654 4.47875 19.0995V15.8098C6.05928 17.6304 8.38946 18.7834 10.9837 18.7834C15.7332 18.7834 19.597 14.9197 19.597 10.1698C19.597 5.42054 15.7332 1.55679 10.9837 1.55679" fill="#DD134E"/>
 
+<mask id="mask0_0_145" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="18" height="21">
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.62939e-05 0.178619H17.5299V20.3916H7.62939e-05V0.178619Z" fill="white"/>
 
+</mask>
 
+<g mask="url(#mask0_0_145)">
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5286 8.64969C17.4526 3.95808 13.6261 0.178619 8.9165 0.178619C5.7815 0.178619 3.03793 1.8538 1.53133 4.35773C1.42775 4.3288 1.31883 4.31291 1.20597 4.31291C0.539898 4.31291 7.62939e-05 4.85273 7.62939e-05 5.5188V19.1858C7.62939e-05 19.8517 0.539898 20.3917 1.20597 20.3917C1.87186 20.3917 2.41168 19.8517 2.41168 19.1858V14.4372C3.99079 16.2554 6.31936 17.4054 8.9165 17.4054C13.6735 17.4054 17.5299 13.5492 17.5299 8.79201L17.5286 8.64969Z" fill="#53BFD5"/>
 
+</g>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.73847 13.4661C7.64865 13.4661 5.94847 11.766 5.94847 9.67596C5.94847 7.58632 7.64865 5.88614 9.73847 5.88614C11.8281 5.88614 13.5283 7.58632 13.5283 9.67632C13.5283 11.766 11.8281 13.4661 9.73847 13.4661M9.73847 1.06274C6.63382 1.06274 3.90811 2.71399 2.39204 5.18417C2.34204 5.17774 2.29115 5.17417 2.23954 5.17417C1.57347 5.17417 1.03365 5.71399 1.03365 6.38007V19.0708C1.03365 19.7367 1.57347 20.2767 2.23954 20.2767C2.90543 20.2767 3.44525 19.7367 3.44525 19.0708V15.5504C5.01829 17.2347 7.25722 18.2895 9.73847 18.2895C14.4878 18.2895 18.3515 14.4258 18.3515 9.67596C18.3515 4.92667 14.4878 1.06274 9.73847 1.06274" fill="#160A19"/>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.73846 3.47452C6.31328 3.47452 3.53685 6.25095 3.53685 9.67595V9.6763C3.53685 13.1013 6.31328 15.8777 9.73846 15.8777C13.1635 15.8777 15.9401 13.1013 15.9401 9.6763V9.67595C15.9401 6.25095 13.1635 3.47452 9.73846 3.47452" fill="#1892CC"/>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5628 7.8782C10.7353 7.71427 11.0078 7.72123 11.1717 7.89355C11.3322 8.06248 11.3289 8.32748 11.1667 8.4923L11.1564 8.50248L10.2151 9.3973H10.428C10.7558 9.3973 11.0224 9.65909 11.0306 9.98498L11.0308 10.0002C11.0308 10.1596 10.9678 10.3123 10.8558 10.4252L10.843 10.4375L9.4335 11.7757C9.261 11.9394 8.9885 11.9323 8.82475 11.7598C8.66421 11.5909 8.66778 11.3259 8.8301 11.1612L8.84028 11.1511L9.78046 10.2587H9.56814C9.40885 10.2587 9.25635 10.1957 9.14367 10.0837L9.13117 10.0711C8.90564 9.83391 8.91117 9.46105 9.14064 9.23052L9.15278 9.21873L10.5628 7.8782Z" fill="white"/>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.6696 5.69105C38.5555 5.69105 38.4455 5.70712 38.3409 5.73676C36.8325 3.23408 34.088 1.55676 30.9587 1.55676C26.2096 1.55676 22.3457 5.42051 22.3457 10.1702C22.3457 14.9196 26.2096 18.7834 30.9587 18.7834C33.5534 18.7834 35.8832 17.6303 37.4637 15.8098V19.0994C37.4637 19.7653 38.0037 20.3052 38.6696 20.3052C39.3355 20.3052 39.8755 19.7653 39.8755 19.0994V6.89676C39.8755 6.23087 39.3355 5.69105 38.6696 5.69105" fill="#CF1D58"/>
 
+<mask id="mask1_0_145" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="20" y="0" width="18" height="21">
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.2785 0.178619H37.8084V20.3916H20.2785V0.178619Z" fill="white"/>
 
+</mask>
 
+<g mask="url(#mask1_0_145)">
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.0037 5.89666C35.8119 2.56719 32.6257 0.178619 28.8916 0.178619C24.1425 0.178619 20.2785 4.04237 20.2785 8.79201C20.2785 13.5415 24.1425 17.4054 28.8916 17.4054C31.4862 17.4054 33.816 16.2522 35.3966 14.4317V19.1858C35.3966 19.8517 35.9364 20.3917 36.6025 20.3917C37.2684 20.3917 37.8084 19.8517 37.8084 19.1858V7.0338C37.8084 6.50862 37.4725 6.06201 37.0037 5.89666" fill="#63BECD"/>
 
+</g>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.6361 5.17426C37.4732 5.17426 37.3179 5.20676 37.1761 5.26534C35.6704 2.75034 32.9191 1.06284 29.7807 1.06284C25.0314 1.06284 21.1675 4.92659 21.1675 9.67623C21.1675 14.4257 25.0314 18.2894 29.7807 18.2894C32.4554 18.2894 34.8493 17.0641 36.4302 15.145V19.0707C36.4302 19.7368 36.9702 20.2766 37.6361 20.2766C38.302 20.2766 38.842 19.7368 38.842 19.0707V6.37998C38.842 5.71409 38.302 5.17426 37.6361 5.17426" fill="#160A19"/>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.7806 3.47452C33.2058 3.47452 35.9823 6.25095 35.9823 9.67595V9.6763C35.9823 13.1013 33.2058 15.8777 29.7806 15.8777C26.3556 15.8777 23.579 13.1013 23.579 9.6763V9.67595C23.579 6.25095 26.3556 3.47452 29.7806 3.47452" fill="#E7457C"/>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.3105 7.8782C30.4828 7.71427 30.7555 7.72123 30.9192 7.89355C31.0799 8.06248 31.0765 8.32748 30.9142 8.4923L30.9039 8.50248L29.9628 9.3973H30.1755C30.5033 9.3973 30.7701 9.65909 30.7783 9.98498L30.7785 10.0002C30.7785 10.1596 30.7155 10.3123 30.6033 10.4252L30.5906 10.4375L29.1812 11.7757C29.0085 11.9394 28.736 11.9323 28.5722 11.7598C28.4117 11.5909 28.4155 11.3259 28.5778 11.1612L28.588 11.1511L29.528 10.2587H29.3158C29.1565 10.2587 29.004 10.1957 28.8912 10.0837L28.8787 10.0711C28.6533 9.83391 28.6587 9.46105 28.8883 9.23052L28.9005 9.21873L30.3105 7.8782Z" fill="white"/>
 
+</svg>

+ 1 - 1
src/components/layout/contentbar.tsx
파일 보기 

@@ -6,7 +6,7 @@ import { Card } from 'antd';
 
 const PageContent: React.FC = () => {
 
 const PageContent: React.FC = () => {
 
   return (
 
   return (
 
     <div className='w-full px-[10px] h-[calc(100vh-64px)] overflow-auto'>
 
     <div className='w-full px-[10px] h-[calc(100vh-64px)] overflow-auto'>
 
-      <Card className='w-full h-full overflow-auto rounded-[0]'>
 
+      <Card className='w-full h-full overflow-auto rounded-[0px]'>
 
         <Outlet />
 
         <Outlet />
 
       </Card>
 
       </Card>
 
     </div>
 
     </div>

+ 4 - 2
src/views/publishContent/publishContent.router.tsx
파일 보기 

@@ -3,6 +3,7 @@ import { AdminRouterItem } from "../../router";
 
 import React, { Suspense } from 'react';
 
 import React, { Suspense } from 'react';
 
 import WeComIcon from "@src/assets/images/publishContent/wxCom.svg?react";
 
 import WeComIcon from "@src/assets/images/publishContent/wxCom.svg?react";
 
 import WeGZHIcon from "@src/assets/images/publishContent/wxGzh.svg?react";
 
 import WeGZHIcon from "@src/assets/images/publishContent/wxGzh.svg?react";
 
+import LogoIcon from "@src/assets/images/login/logo.svg?react";
 
 import { Outlet } from "react-router-dom";
 
 import { Outlet } from "react-router-dom";
 
 
 
 // Lazy load components
 
 // Lazy load components
 
@@ -12,8 +13,9 @@ const WeGZH = React.lazy(() => import('./weGZH/index'));
 
 // Loading fallback component
 
 // Loading fallback component
 
 // eslint-disable-next-line react-refresh/only-export-components
 
 // eslint-disable-next-line react-refresh/only-export-components
 
 const LazyLoadingFallback = () => (
 
 const LazyLoadingFallback = () => (
 
-  <div className="flex items-center justify-center h-[50vh]">
 
-    <div className="text-blue-500 text-xl">加载中...</div>
 
+  <div className="flex items-center justify-center flex-col h-[50vh]">
 
+		<Icon component={LogoIcon} className="text-[50px] opacity-50" />
 
+		<div className="text-gray-500 text-xl">加载中</div>
 
   </div>
 
   </div>
 
 );
 
 );

+ 15 - 2
src/views/publishContent/weCom/components/videoSelectModal/index.tsx
파일 보기 

@@ -37,6 +37,7 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ planType, visible,
 
 	const [total, setTotal] = useState(0);
 
 	const [total, setTotal] = useState(0);
 
 	const [loading, setLoading] = useState(false);
 
 	const [loading, setLoading] = useState(false);
 
 	const [videoList, setVideoList] = useState<WeVideoItem[]>([]);
 
 	const [videoList, setVideoList] = useState<WeVideoItem[]>([]);
 
+	const [videoListAll, setVideoListAll] = useState<WeVideoItem[]>([]);
 
 	const [selectedVideoIds, setSelectedVideoIds] = useState<Set<number>>(new Set(initialSelectedIds));
 
 	const [selectedVideoIds, setSelectedVideoIds] = useState<Set<number>>(new Set(initialSelectedIds));
 
 	const [playingVideo, setPlayingVideo] = useState<WeVideoItem | null>(null);
 
 	const [playingVideo, setPlayingVideo] = useState<WeVideoItem | null>(null);
 
 	const MAX_SELECTION = 3;
 
 	const MAX_SELECTION = 3;
 
@@ -55,7 +56,9 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ planType, visible,
 
 			setLoading(false);
 
 			setLoading(false);
 
 		});
 
 		});
 
 		if (res && res.code === 0) {
 
 		if (res && res.code === 0) {
 
-			setVideoList(res.data.objs);
 
+			const mappedVideos = res.data.objs.map(video => ({ ...video, scene: 0 as const }));
 
+			setVideoList(mappedVideos);
 
+			setVideoListAll(old => [...old, ...mappedVideos]);
 
 			setTotal(res.data.totalSize);
 
 			setTotal(res.data.totalSize);
 
 		}
 
 		}
 
 	}
 
 	}
 
@@ -93,7 +96,7 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ planType, visible,
 
 	};
 
 	};
 
 
 
 	const handleOk = () => {
 
 	const handleOk = () => {
 
-		const selectedVideos = videoList.filter(video => selectedVideoIds.has(video.videoId));
 
+		const selectedVideos = videoListAll.filter(video => selectedVideoIds.has(video.videoId));
 
 		onOk(selectedVideos);
 
 		onOk(selectedVideos);
 
 	};
 
 	};
 
 
 
@@ -115,6 +118,15 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ planType, visible,
 
 			});
 
 			});
 
 			return newList;
 
 			return newList;
 
 		});
 
 		});
 
+		setVideoListAll((prev: WeVideoItem[]) => {
 
+			const newList = prev.map(video => {
 
+				if (video.videoId === videoId) {
 
+					return { ...video, scene: scene as 0 | 1 };
 
+				}
 
+				return video;
 
+			});
 
+			return newList;
 
+		});
 
 	}
 
 	}
 
 
 
 	return (
 
 	return (
 
@@ -211,6 +223,7 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ planType, visible,
 
 										<Select
 
 										<Select
 
 											placeholder="选择场景"
 
 											placeholder="选择场景"
 
 											style={{ width: 180 }}
 
 											style={{ width: 180 }}
 
+											defaultValue={video.scene || 0}
 
 											value={video.scene}
 
 											value={video.scene}
 
 											onChange={(value) => handleChangeSelectVideo(video.videoId, value)}
 
 											onChange={(value) => handleChangeSelectVideo(video.videoId, value)}
 
 											options={ planType === WeComPlanType.每日推送 ?
 
 											options={ planType === WeComPlanType.每日推送 ?

+ 4 - 3
src/views/publishContent/weCom/index.tsx
파일 보기 

@@ -13,11 +13,11 @@ import copy from 'copy-to-clipboard';
 
 import VideoPlayModal from './components/videoPlayModal';
 
 import VideoPlayModal from './components/videoPlayModal';
 
 import modal from 'antd/es/modal';
 
 import modal from 'antd/es/modal';
 
 // Define a type for the expected API response (adjust if needed based on actual API)
 
 // Define a type for the expected API response (adjust if needed based on actual API)
 
-
 
+const TableHeight = window.innerHeight - 380;
 
 const WeGZHContent: React.FC = () => {
 
 const WeGZHContent: React.FC = () => {
 
 	// 状态管理
 
 	// 状态管理
 
 	const [videoTitle, setVideoTitle] = useState<string>('');
 
 	const [videoTitle, setVideoTitle] = useState<string>('');
 
-	const [selectedPublisher, setSelectedPublisher] = useState<string>();
 
+	const [selectedPublisher, setSelectedPublisher] = useState<number>();
 
 	const [isShowAddPunlishPlan, setIsShowAddPunlishPlan] = useState<boolean>(false);
 
 	const [isShowAddPunlishPlan, setIsShowAddPunlishPlan] = useState<boolean>(false);
 
 	const [editPlanData, setEditPlanData] = useState<WeComPlan>();
 
 	const [editPlanData, setEditPlanData] = useState<WeComPlan>();
 
 	const [activeKey, setActiveKey] = useState<WeComPlanType>(WeComPlanType.每日推送);
 
 	const [activeKey, setActiveKey] = useState<WeComPlanType>(WeComPlanType.每日推送);
 
@@ -174,7 +174,7 @@ const WeGZHContent: React.FC = () => {
 
 
 
 	return (
 
 	return (
 
 		<div>
 
 		<div>
 
-			<div className="rounded-lg p-4">
 
+			<div className="rounded-lg">
 
 				<div className="text-lg font-medium mb-3">企业微信内容库</div>
 
 				<div className="text-lg font-medium mb-3">企业微信内容库</div>
 
 				
 				
 				{/* 搜索区域 */}
 
 				{/* 搜索区域 */}
 
@@ -229,6 +229,7 @@ const WeGZHContent: React.FC = () => {
 
 					className={styles.antTable}
 
 					className={styles.antTable}
 
 					columns={columns}
 
 					columns={columns}
 
 					dataSource={tableData}
 
 					dataSource={tableData}
 
+					scroll={{ x: 'max-content', y: TableHeight }}
 
 					pagination={{
 
 					pagination={{
 
 						current: pageNum,
 
 						current: pageNum,
 
 						total: totalSize,
 
 						total: totalSize,

+ 3 - 1
src/views/publishContent/weGZH/components/videoSelectModal/index.tsx
파일 보기 

@@ -35,6 +35,7 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ visible, onClose, o
 
 	const [total, setTotal] = useState(0);
 
 	const [total, setTotal] = useState(0);
 
 	const [loading, setLoading] = useState(false);
 
 	const [loading, setLoading] = useState(false);
 
 	const [videoList, setVideoList] = useState<VideoItem[]>([]);
 
 	const [videoList, setVideoList] = useState<VideoItem[]>([]);
 
+	const [videoListAll, setVideoListAll] = useState<VideoItem[]>([]);
 
 	const [selectedVideoIds, setSelectedVideoIds] = useState<Set<number>>(new Set(initialSelectedIds));
 
 	const [selectedVideoIds, setSelectedVideoIds] = useState<Set<number>>(new Set(initialSelectedIds));
 
 	const [playingVideo, setPlayingVideo] = useState<VideoItem | null>(null);
 
 	const [playingVideo, setPlayingVideo] = useState<VideoItem | null>(null);
 
 	const MAX_SELECTION = 3;
 
 	const MAX_SELECTION = 3;
 
@@ -54,6 +55,7 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ visible, onClose, o
 
 		});
 
 		});
 
 		if (res && res.code === 0) {
 
 		if (res && res.code === 0) {
 
 			setVideoList(res.data.objs);
 
 			setVideoList(res.data.objs);
 
+			setVideoListAll(old => [...old, ...res.data.objs]);
 
 			setTotal(res.data.totalSize);
 
 			setTotal(res.data.totalSize);
 
 		}
 
 		}
 
 	}
 
 	}
 
@@ -91,7 +93,7 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ visible, onClose, o
 
 	};
 
 	};
 
 
 
 	const handleOk = () => {
 
 	const handleOk = () => {
 
-		const selectedVideos = videoList.filter(video => selectedVideoIds.has(video.videoId));
 
+		const selectedVideos = videoListAll.filter(video => selectedVideoIds.has(video.videoId));
 
 		onOk(selectedVideos);
 
 		onOk(selectedVideos);
 
 		onClose();
 
 		onClose();
 
 	};
 
 	};

+ 13 - 4
src/views/publishContent/weGZH/index.tsx
파일 보기 

@@ -10,11 +10,14 @@ import { useGzhPlanList, GzhPlanType } from '@src/views/publishContent/weGZH/hoo
 
 import http from '@src/http';
 
 import http from '@src/http';
 
 import { saveGzhPlanApi } from '@src/http/api';
 
 import { saveGzhPlanApi } from '@src/http/api';
 
 import PunlishPlanDetailModal from './components/PunlishPlanDetailModal';
 
 import PunlishPlanDetailModal from './components/PunlishPlanDetailModal';
 
+
 
+const TableHeight = window.innerHeight - 380;
 
+
 
 const WeGZHContent: React.FC = () => {
 
 const WeGZHContent: React.FC = () => {
 
 	// 状态管理
 
 	// 状态管理
 
 	const [selectedAccount, setSelectedAccount] = useState<string>();
 
 	const [selectedAccount, setSelectedAccount] = useState<string>();
 
 	const [videoTitle, setVideoTitle] = useState<string>('');
 
 	const [videoTitle, setVideoTitle] = useState<string>('');
 
-	const [selectedPublisher, setSelectedPublisher] = useState<string>();
 
+	const [selectedPublisher, setSelectedPublisher] = useState<number>();
 
 	const [dateRange, setDateRange] = useState<[Dayjs | null, Dayjs | null]>();
 
 	const [dateRange, setDateRange] = useState<[Dayjs | null, Dayjs | null]>();
 
 	const [isShowAddPunlishPlan, setIsShowAddPunlishPlan] = useState<boolean>(false);
 
 	const [isShowAddPunlishPlan, setIsShowAddPunlishPlan] = useState<boolean>(false);
 
 	const [actionType, setActionType] = useState<'add' | 'edit'>('add');
 
 	const [actionType, setActionType] = useState<'add' | 'edit'>('add');
 
@@ -55,6 +58,11 @@ const WeGZHContent: React.FC = () => {
 
 			dataIndex: 'title',
 
 			dataIndex: 'title',
 
 			key: 'title',
 
 			key: 'title',
 
 			ellipsis: true,
 
 			ellipsis: true,
 
+			render: (_, record) => {
 
+				return record.videoList.map(video => {
 
+					return <div className="text-gray-600 text-sm truncate" key={video.videoId}>{video.title}</div>
 
+				})
 
+			}
 
 		},
 
 		},
 
 		{
 
 		{
 
 			title: '计划创建时间',
 
 			title: '计划创建时间',
 
@@ -139,7 +147,7 @@ const WeGZHContent: React.FC = () => {
 
 			pageSize: 10,
 
 			pageSize: 10,
 
 			title: videoTitle,
 
 			title: videoTitle,
 
 			accountId: selectedAccount ? parseInt(selectedAccount) : undefined,
 
 			accountId: selectedAccount ? parseInt(selectedAccount) : undefined,
 
-			publishStage: selectedPublisher ? parseInt(selectedPublisher) : undefined,
 
+			publishStage: selectedPublisher,
 
 			createTimestampStart: dateRange?.[0]?.unix(),
 
 			createTimestampStart: dateRange?.[0]?.unix(),
 
 			createTimestampEnd: dateRange?.[1]?.unix(),
 
 			createTimestampEnd: dateRange?.[1]?.unix(),
 
 		});
 
 		});
 
@@ -184,8 +192,8 @@ const WeGZHContent: React.FC = () => {
 
 							onChange={setSelectedPublisher}
 
 							onChange={setSelectedPublisher}
 
 							allowClear
 
 							allowClear
 
 							options={[
 
 							options={[
 
-								{ label: '平台发布', value: 'platform' },
 
-								{ label: '用户发布', value: 'user' },
 
+								{ label: '平台发布', value: 0 },
 
+								{ label: '用户发布', value: 1 },
 
 							]}
 
 							]}
 
 						/>
 
 						/>
 
 					</div>
 
 					</div>
 
@@ -223,6 +231,7 @@ const WeGZHContent: React.FC = () => {
 
 					className={styles.antTable}
 
 					className={styles.antTable}
 
 					columns={columns}
 
 					columns={columns}
 
 					dataSource={gzhPlanList}
 
 					dataSource={gzhPlanList}
 
+					scroll={{ x: 'max-content', y: TableHeight }}
 
 					pagination={{
 
 					pagination={{
 
 						total: totalSize,
 
 						total: totalSize,
 
 						pageSize: 10,
 
 						pageSize: 10,