wjx 1 月之前
父节点
当前提交
e7deb1d4c5

+ 3 - 3
src/pages/weComTask/components/filterUser/newFiterUser.tsx

@@ -68,15 +68,15 @@ const NewFilterUser: React.FC<NewFilterUserProps> = ({ bookCityList, configType
             if (groupChatNames?.length) {
                 params.groupChatNames = groupChatNames.join(',')
             }
-            if ((params?.repeatOperateType !== null)) {
+            if (!params?.repeatOperateType || params?.repeatOperateType === 0) {
                 if (params.repeatRang) {
                     params.repeatRang = Object.entries(params.repeatRang || {}).map(([corpId, corpName]: [string, string]) => `${corpId}&&${corpName}`)
                 }
                 params.isRepeat = true
             }
 
-            if (params?.groupOperateType !== null) {
-                params.groupNameList = groupNameList.join(',')
+            if (!params?.groupOperateType || params?.groupOperateType === 0) {
+                params.groupNameList = groupNameList?.join(',')
                 params.isGroupRepeat = true
                 console.log('groupNameList', groupRepeatRang)
                 if (!!groupRepeatRang) {

+ 1 - 1
src/pages/weComTask/page/alarmGl/index.tsx

@@ -49,7 +49,7 @@ const AlarmGl: React.FC = () => {
     return (
         <div className={style.corpUserManage}>
             <div className={style.corpUserManage_bottom} style={{ height: '100%' }}>
-                <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%', overflow: 'hidden' } }}>
+                <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%' } }}>
                     <SearchBox
                         bodyPadding={`16px 16px 12px`}
                         buttons={<>

+ 1 - 1
src/pages/weComTask/page/bookLink/index.tsx

@@ -216,7 +216,7 @@ const BookLink: React.FC<{ weComTaskStore: { data: { bookList: TASK_CREATE.BookL
     }
 
     return <Card
-        styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: 'calc(100vh - 74px)', overflow: 'hidden' } }}
+        styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: 'calc(100vh - 88px)' } }}
     >
         <div>
             <SearchBox

+ 1 - 1
src/pages/weComTask/page/chatRecordManage/chatRecord/index.tsx

@@ -65,7 +65,7 @@ const ChatRecord: React.FC = () => {
     return (
         <div className={style.corpUserManage}>
             <div className={style.corpUserManage_bottom} style={{ height: '100%' }}>
-                <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%', overflow: 'hidden' } }}>
+                <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%' } }}>
                     <SearchBox
                         bodyPadding={`16px 16px 12px`}
                         buttons={<>

+ 1 - 1
src/pages/weComTask/page/chatRecordManage/riskWord/index.tsx

@@ -91,7 +91,7 @@ const RiskWord: React.FC = () => {
     return (
         <div className={style.corpUserManage}>
             <div className={style.corpUserManage_bottom} style={{ height: '100%' }}>
-                <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%', overflow: 'hidden' } }}>
+                <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%' } }}>
                     <SearchBox
                         bodyPadding={`16px 16px 12px`}
                         buttons={<>

+ 1 - 1
src/pages/weComTask/page/corpUserManage/index.less

@@ -6,7 +6,7 @@
 
 .corpUserManage_bottom {
     width: 100%;
-    height: calc(100% - 36px);
+    height: calc(100% - 40px);
     overflow: hidden;
     display: flex;
     gap: 5px;

+ 1 - 1
src/pages/weComTask/page/corpUserManage/index.tsx

@@ -95,7 +95,7 @@ const CorpUserManage: React.FC = () => {
                 }}
                 value={queryForm?.putUserId}
             />}
-            <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%', overflow: 'hidden' } }}>
+            <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%' } }}>
                 <SearchBox
                     bodyPadding={`16px 16px 12px`}
                     buttons={<>

+ 1 - 1
src/pages/weComTask/page/device/index.tsx

@@ -36,7 +36,7 @@ const DevicePage: React.FC = () => {
 
         <div className={style.corpUserManage_bottom} style={{ height: '100%' }}>
 
-            <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%', overflow: 'hidden' } }}>
+            <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%' } }}>
                 <SearchBox
                     bodyPadding={`16px 16px 12px`}
                     buttons={<>

+ 1 - 1
src/pages/weComTask/page/groupLeaderManage/index.tsx

@@ -57,7 +57,7 @@ const GroupLeaderManage: React.FC = () => {
     }
 
     return <Card
-        styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: 'calc(100vh - 88px)', overflow: 'hidden' } }}
+        styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: 'calc(100vh - 88px)' } }}
     >
         <div>
             <SearchBox

+ 1 - 1
src/pages/weComTask/page/groupManage/index.tsx

@@ -48,7 +48,7 @@ const GroupManage: React.FC = () => {
     }
 
     return <Card
-        styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: 'calc(100vh - 88px)', overflow: 'hidden' } }}
+        styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: 'calc(100vh - 88px)' } }}
     >
         <div>
             <SearchBox

+ 2 - 1
src/pages/weComTask/page/home/index.tsx

@@ -347,7 +347,8 @@ const Home: React.FC = () => {
                                 </Space>
                             </>
                         )}
-                    />}
+                    />
+                }
                 items={[
                     {
                         key: '3',

+ 2 - 2
src/pages/weComTask/page/home/tableConfig.tsx

@@ -16,7 +16,7 @@ export const CorpExternalUserColumns = (): ColumnsType<AnyObject> => {
         },
         {
             title: <Space>
-                <span>粉丝总数</span>
+                <span>主体净值用户数</span>
                 <Tooltip title="非重复人数+重复人数+未识别人数">
                     <QuestionCircleOutlined />
                 </Tooltip>
@@ -216,7 +216,7 @@ export const ExternalUserColumns = (): ColumnsType<AnyObject> => {
             width: 150,
         },
         {
-            title: '主体用户数',
+            title: '主体净值用户数',
             dataIndex: 'corpExternalUserCount',
             key: 'corpExternalUserCount',
             align: 'center',

+ 3 - 3
src/pages/weComTask/page/home/uuidTem.tsx

@@ -1,9 +1,9 @@
 import { useAjax } from "@/Hook/useAjax"
 import React, { useEffect, useState } from "react"
-import { AreaChartOutlined, SearchOutlined, UserOutlined } from "@ant-design/icons"
+import { AreaChartOutlined, SearchOutlined } from "@ant-design/icons"
 
 import { GetExternalUserRepeatByCorpListApiProps, getSelectQcUuidStatisticPageListApi } from "../../API/home"
-import { Avatar, Button, Card, Checkbox, Divider, Input, InputNumber, Select, Space, Table, Typography } from "antd";
+import { Button, Card, Checkbox, Divider, Input, InputNumber, Select, Space, Table, Typography, Image } from "antd";
 import SearchBox from "../../components/searchBox";
 import CorpDetails from "./corpDetails";
 import CorpUserDetails from "./corpUserDetails";
@@ -100,7 +100,7 @@ const UuidTem: React.FC<{ getCorpAllList: { label: string, value: string }[] }>
                         width: 180,
                         render: (text: any, record: any) => {
                             return <Space>
-                                <Avatar shape="square" size={20} icon={<UserOutlined />} src={record?.avatar} />
+                                <Image src={record?.avatar} style={{ width: 20, borderRadius: 4 }} />
                                 <Text>{text}</Text>
                             </Space>
                         }

+ 2 - 0
src/pages/weComTask/page/logs/index.tsx

@@ -229,6 +229,7 @@ const Logs: React.FC = () => {
                                     <span className={style.error}>异常:2</span>
                                 </div>
                             </div>
+
                             <div className={style.moduleCard}>
                                 <div className={style.moduleCard_header}>
                                     <Avatar style={{ backgroundColor: '#dcfce7', color: '#16a34a' }} size={30}>
@@ -244,6 +245,7 @@ const Logs: React.FC = () => {
                                     <span className={style.error}>异常:2</span>
                                 </div>
                             </div>
+                            
                             <div className={style.moduleCard}>
                                 <div className={style.moduleCard_header}>
                                     <Avatar style={{ backgroundColor: '#f3e8ff', color: '#9333ea' }} size={30}>

+ 1 - 1
src/pages/weComTask/page/weAssociation/list/index.tsx

@@ -147,7 +147,7 @@ const WeAssociationList: React.FC = () => {
                 value={userId}
             />}
 
-            <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%', overflow: 'hidden' } }}>
+            <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%' } }}>
                 <SearchBox
                     bodyPadding={`16px 16px 12px`}
                     buttons={<>