Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage

config/config.ts

@@ -2,7 +2,7 @@
 import { defineConfig } from 'umi';
 import defaultSettings from './defaultSettings';
 import proxy from './proxy';
-import {  adMonitor, launchSystem } from './routerConfig';
+import {  adMonitor, launchSystem, launchSystemV3 } from './routerConfig';
 // const CompressionWebpackPlugin = require('compression-webpack-plugin');
 const { REACT_APP_ENV } = process.env;
 export default defineConfig({
@@ -56,6 +56,7 @@ export default defineConfig({
     // operatePage, //运营配置
     // dataStatistics, //数据中心配置
     launchSystem, // 投放系统
+    launchSystemV3,
     adMonitor, // 广告监控
     // enterpriseWeChat,//企业微信
     {

config/routerConfig.ts

@@ -94,12 +94,6 @@ const launchSystem = {
             component: './adMonitor/adMonitorList',
             access: 'adMonitorList',
         },
-        {
-            path: '/launchSystemNew/adMonitorListV3',
-            name: '广告监控3.0',
-            component: './launchSystemNew/adMonitorListV3',
-            access: 'adMonitorListV3',
-        },
         {
             path: '/launchSystemNew/account',
             name: '广告账户管理',
@@ -125,12 +119,6 @@ const launchSystem = {
             component: './launchSystemNew/adq',
             access: 'adq',
         },
-        {
-            path: '/launchSystemNew/adqv3',
-            name: '腾讯广告3.0',
-            component: './launchSystemNew/adqv3',
-            access: 'adqv3',
-        },
         {
             path: '/launchSystemNew/sysWarningRule',
             name: '监控告警',
@@ -185,6 +173,23 @@ const launchSystem = {
     ],
 
 }
+const launchSystemV3 = {
+    path: '/launchSystemV3',
+    routes: [
+        {
+            path: '/launchSystemV3/adMonitorListV3',
+            name: '广告监控',
+            component: './launchSystemV3/adMonitorListV3',
+            access: 'adMonitorListV3',
+        },
+        {
+            path: '/launchSystemV3/adqv3',
+            name: '腾讯广告',
+            component: './launchSystemV3/adqv3',
+            access: 'adqv3',
+        }
+    ]
+}
 /** 头条 */
 const adMonitor = {
     path: '/toutiao',
@@ -202,5 +207,6 @@ export {
     headrRouter,
     getMyMenu,
     launchSystem,
-    adMonitor
+    adMonitor,
+    launchSystemV3
 }

src/pages/launchSystemNew/adMonitorListV3/FilterQuery.tsx → src/pages/launchSystemV3/adMonitorListV3/FilterQuery.tsx

@@ -1,14 +1,13 @@
 import { CloseOutlined, DownOutlined, FilterOutlined, SearchOutlined, UpOutlined } from "@ant-design/icons"
 import { Button, DatePicker, Form, Input, InputNumber, Popover, Select, Space } from "antd"
 import React, { useEffect, useState } from "react"
-import '../adq/ad/index.less'
+import '../../launchSystemNew/adq/ad/index.less'
 import moment from "moment"
 import { useLocalStorageState, useTimeout } from "ahooks"
 import { AdStatusEnum, OptimizationGoalEnum, PromotedObjectType } from "@/services/launchAdq/enum"
 import { AdListProps } from "@/services/adMonitor/adMonitor"
 import { useModel } from "umi"
 import { ADGROUP_STATUS } from "../adqv3/const"
-// import { useModel } from "umi"
 
 type TypeProps = 'DatePicker' | 'Input' | 'InputNumber' | 'Select'
 interface QueryProps {

src/pages/launchSystemNew/adMonitorListV3/TabAd.tsx → src/pages/launchSystemV3/adMonitorListV3/TabAd.tsx

@@ -1,14 +1,15 @@
 import { useAjax } from "@/Hook/useAjax"
 import TimeSeriesLook from "@/pages/launchSystemNew/adq/ad/timeSeriesLook"
 import { addAdToRuleBlackListApi, delAdToRuleBlackListApi, delAdWarningRuleApi, getAdgroupDetailsApi } from "@/services/adMonitor/adMonitor"
-import { AdStatusEnum, BidModeEnum, BidStrategyEnum, OptimizationGoalEnum, PromotedObjectType } from "@/services/launchAdq/enum"
-import { Card, Descriptions, Empty, Popover, Space, Spin, Typography, message } from "antd"
+import { BidModeEnum, BidStrategyEnum, OptimizationGoalEnum } from "@/services/launchAdq/enum"
+import { Card, Descriptions, Empty, Space, Spin, Typography, message } from "antd"
 import React, { useEffect, useMemo, useState } from "react"
 import TableData from "@/pages/launchSystemNew/components/TableData"
 import SetEarlyWarnings from "@/components/EarlyWarning/setEarlyWarnings"
 import RuleLog from "@/components/EarlyWarning/ruleLog"
 import tableConfigEw from "@/pages/adMonitor/adMonitorList/components/tableConfigEw"
 import tableConfig from "../adqv3/creative/tableConfig"
+import { ADGROUP_STATUS } from "../adqv3/const"
 
 export enum EWTypeEnum {
     DEFAULT = '默认告警规则',
@@ -74,8 +75,8 @@ const TabAd: React.FC<Props> = ({ accountId, adgroupId }) => {
 
     const AdContent = useMemo(() => {
         if (getAdgroupDetails?.data?.data) {
-            const { adgroupName, bidAmount, bidMode, optimizationGoal, adgroupId, rejectMessageList, status, smartBidType, beginDate,
-                endDate, targetingTranslation, timeSeries, firstDayBeginTime, dailyBudget, bidStrategy, promotedObjectType, accountId,
+            const { adgroupName, bidAmount, bidMode, optimizationGoal, adgroupId, systemStatus, smartBidType, beginDate,
+                endDate, targetingTranslation, timeSeries, firstDayBeginTime, dailyBudget, bidStrategy, accountId,
                 creativeName
             } = getAdgroupDetails?.data?.data
             return <Spin spinning={getAdgroupDetails.loading}>
@@ -88,20 +89,10 @@ const TabAd: React.FC<Props> = ({ accountId, adgroupId }) => {
                     <Descriptions.Item labelStyle={{ width: 100 }} label="出价">{`${BidModeEnum[bidMode]} ${bidAmount}元/${bidMode === 'BID_MODE_CPM' ? '千次曝光' : bidMode === 'BID_MODE_CPC' ? '点击' : OptimizationGoalEnum[optimizationGoal]}`}</Descriptions.Item>
                     <Descriptions.Item labelStyle={{ width: 100 }} label="广告ID">{adgroupId}</Descriptions.Item>
                     <Descriptions.Item labelStyle={{ width: 100 }} label="状态">
-                        {rejectMessageList?.filter((str: any) => str)?.length > 0 ? <Popover
-                            style={{ width: 500 }}
-                            overlayStyle={{ width: 500, fontSize: 12 }}
-                            placement="left"
-                            content={rejectMessageList?.map((str: string, eq: number) => {
-                                return str ? <><strong style={{ fontSize: 13 }}>{eq + 1}:</strong>{str}<br /></> : ""
-                            })}>
-                            {AdStatusEnum[status]}
-                        </Popover> :
-                            AdStatusEnum[status]}
+                        {ADGROUP_STATUS[systemStatus] || '--'}
                     </Descriptions.Item>
                     <Descriptions.Item label="广告账号" labelStyle={{ width: 100 }}>{accountId}</Descriptions.Item>
                     <Descriptions.Item label="出价类型" labelStyle={{ width: 100 }}>{smartBidType === 'SMART_BID_TYPE_CUSTOM' ? '手动出价' : '自动出价'}</Descriptions.Item>
-                    <Descriptions.Item label="推广目标类型" labelStyle={{ width: 100 }}>{PromotedObjectType[promotedObjectType]}</Descriptions.Item>
                     <Descriptions.Item label="投放日期" labelStyle={{ width: 100 }}>{endDate ? beginDate + '~' + endDate : beginDate + '~' + '长期投放'}</Descriptions.Item>
                     <Descriptions.Item label="定向" labelStyle={{ width: 100 }} span={2}>{targetingTranslation}</Descriptions.Item>
                     <Descriptions.Item label="投放时间" labelStyle={{ width: 100 }}>{<TimeSeriesLook timeSeries={timeSeries} />}</Descriptions.Item>
@@ -115,8 +106,6 @@ const TabAd: React.FC<Props> = ({ accountId, adgroupId }) => {
         return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
     }, [getAdgroupDetails?.data?.data, getAdgroupDetails.loading])
 
-    console.log(getAdgroupDetails?.data?.data?.dynamicCreativeList)
-
     const CreativePreview = useMemo(() => {
 
         return <Card

src/pages/launchSystemNew/adMonitorListV3/adExpandedRowRender.tsx → src/pages/launchSystemV3/adMonitorListV3/adExpandedRowRender.tsx

@@ -1,12 +1,13 @@
 import useEcharts from "@/Hook/useEcharts"
 import { GetColumnTrendProps, getAdgroupDetailsApi } from "@/services/adMonitor/adMonitor"
-import { Card, Descriptions, Empty, Popover, Select, Space, Spin, Typography } from "antd"
+import { Card, Descriptions, Empty, Select, Space, Spin, Typography } from "antd"
 import React, { useEffect, useMemo, useState } from "react"
 import { useModel } from "umi"
-import '../adq/ad/index.less'
+import '../../launchSystemNew/adq/ad/index.less'
 import { useAjax } from "@/Hook/useAjax"
-import { AdStatusEnum, BidModeEnum, BidStrategyEnum, OptimizationGoalEnum } from "@/services/launchAdq/enum"
-import TimeSeriesLook from "../adq/ad/timeSeriesLook"
+import { BidModeEnum, BidStrategyEnum, OptimizationGoalEnum } from "@/services/launchAdq/enum"
+import TimeSeriesLook from "../../launchSystemNew/adq/ad/timeSeriesLook"
+import { ADGROUP_STATUS } from "../adqv3/const"
 
 
 const AdExpandedRowRender: React.FC<{ data: any, scrollLeft: number, width?: number }> = ({ data, scrollLeft, width = 0 }) => {
@@ -41,7 +42,7 @@ const AdExpandedRowRender: React.FC<{ data: any, scrollLeft: number, width?: num
 
     const AdContent = useMemo(() => {
         if (getAdgroupDetails?.data?.data) {
-            const { adgroupName, bidAmount, bidMode, optimizationGoal, rejectMessageList, status, targetingTranslation, timeSeries, firstDayBeginTime, dailyBudget, bidStrategy,
+            const { adgroupName, bidAmount, bidMode, optimizationGoal, systemStatus, targetingTranslation, timeSeries, firstDayBeginTime, dailyBudget, bidStrategy,
             } = getAdgroupDetails?.data?.data
             return <Spin spinning={getAdgroupDetails.loading}>
                 <Descriptions column={2} size="small" colon={false}>
@@ -51,16 +52,7 @@ const AdExpandedRowRender: React.FC<{ data: any, scrollLeft: number, width?: num
                         </div>
                     </Descriptions.Item>
                     <Descriptions.Item labelStyle={{ width: 100 }} label="状态">
-                        {rejectMessageList?.filter((str: any) => str)?.length > 0 ? <Popover
-                            style={{ width: 500 }}
-                            overlayStyle={{ width: 500, fontSize: 12 }}
-                            placement="left"
-                            content={rejectMessageList?.map((str: string, eq: number) => {
-                                return str ? <><strong style={{ fontSize: 13 }}>{eq + 1}:</strong>{str}<br /></> : ""
-                            })}>
-                            {AdStatusEnum[status]}
-                        </Popover> :
-                            AdStatusEnum[status]}
+                        {ADGROUP_STATUS[systemStatus] || '--'}
                     </Descriptions.Item>
                     <Descriptions.Item labelStyle={{ width: 100 }} label="出价">{`${BidModeEnum[bidMode]} ${bidAmount}元/${bidMode === 'BID_MODE_CPM' ? '千次曝光' : bidMode === 'BID_MODE_CPC' ? '点击' : OptimizationGoalEnum[optimizationGoal]}`}</Descriptions.Item>
                     <Descriptions.Item label="投放时间" labelStyle={{ width: 100 }}>{<TimeSeriesLook timeSeries={timeSeries} />}</Descriptions.Item>

src/pages/launchSystemNew/adMonitorListV3/adPlanList.tsx → src/pages/launchSystemV3/adMonitorListV3/adPlanList.tsx

@@ -5,16 +5,16 @@ import React, { useEffect, useCallback, useState, useRef } from 'react'
 import { getPutUserApi, delUserTagApi } from '@/services/launchAdq/adq'
 import { LineChartOutlined, PauseCircleOutlined, PlayCircleOutlined, TransactionOutlined } from '@ant-design/icons'
 import { planAdConfig } from './config'
-import '../adq/ad/index.less'
+import '../../launchSystemNew/adq/ad/index.less'
 import tablePlanConfig from './tablePlanListConfig'
 import { AdListProps, getAdV3ListApi } from '@/services/adMonitor/adMonitor'
 import FilterQuery from './FilterQuery'
 import AdExpandedRowRender from './adExpandedRowRender'
 import { useSize, useUpdateEffect } from 'ahooks'
-import PlanTag from '../adq/ad/planTag'
+import PlanTag from '../../launchSystemNew/adq/ad/planTag'
 import moment from 'moment'
 import ColumnTrend from '@/pages/adMonitor/adMonitorList/columnTrend'
-import TableData from '../components/TableData'
+import TableData from '../../launchSystemNew/components/TableData'
 import RuleAccountLog from '@/components/EarlyWarning/ruleAccountLog'
 import Details from './Details'
 import { modifyStatusBatchApi, syncBatchApi } from '@/services/launchAdq/adqv3'

src/pages/launchSystemNew/adMonitorListV3/tablePlanListConfig.tsx → src/pages/launchSystemV3/adMonitorListV3/tablePlanListConfig.tsx

@@ -1,14 +1,14 @@
-import { AdStatusEnum, BidModeEnum, BidStrategyEnum, OptimizationGoalEnum, PromotedObjectType } from '@/services/launchAdq/enum'
+import { BidModeEnum, BidStrategyEnum, OptimizationGoalEnum } from '@/services/launchAdq/enum'
 import React from 'react'
-import { Badge, Dropdown, Menu, Popover, Space, Statistic } from 'antd'
+import { Badge, Dropdown, Menu, Space, Statistic } from 'antd'
 import { ReactComponent as RocketSvg } from '@/assets/rocket.svg'
-import '../adq/index.less'
+import '../../launchSystemNew/adq/index.less'
 import { copy } from '@/utils/utils'
 import { ColumnsType } from 'antd/lib/table'
 import StatisticNull from '@/components/StatisticNull'
 import { DownOutlined } from '@ant-design/icons'
+import TimeSeriesLook from '../../launchSystemNew/adq/ad/timeSeriesLook'
 import SwitchStatus from '../adqv3/ad/switchStatus'
-import TimeSeriesLook from '../adq/ad/timeSeriesLook'
 import { ADGROUP_STATUS } from '../adqv3/const'
 function tablePlanConfig(
     onChange: () => void,

src/pages/launchSystemNew/adqv3/ad/index.tsx → src/pages/launchSystemV3/adqv3/ad/index.tsx

@@ -4,10 +4,10 @@ import { Button, Checkbox, Col, Input, Row, Select, Space, Tooltip, message } fr
 import React, { useCallback, useEffect, useState } from "react"
 import { ADGROUP_STATUS } from "../const";
 import { getAdqV3AdListApi, modifyStatusBatchApi, syncBatchApi } from "@/services/launchAdq/adqv3";
-import TableData from "../../components/TableData";
 import tableConfig from "./tableConfig";
 import { txAdConfig } from "../config";
 import UpdateAd from "./updateAd";
+import TableData from "@/pages/launchSystemNew/components/TableData";
 
 
 const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {

src/pages/launchSystemNew/adqv3/ad/tableConfig.tsx → src/pages/launchSystemV3/adqv3/ad/tableConfig.tsx

@@ -3,9 +3,9 @@ import React from 'react'
 import { Badge, Space } from 'antd'
 import '../index.less'
 import { copy } from '@/utils/utils'
-import TimeSeriesLook from '../../adq/ad/timeSeriesLook'
 import { ADGROUP_STATUS } from '../const'
 import SwitchStatus from './switchStatus'
+import TimeSeriesLook from '@/pages/launchSystemNew/adq/ad/timeSeriesLook'
 function tableConfig(onChange: () => void, creativeHandle?: (id: number) => void): any {
     return [
         {

src/pages/launchSystemNew/adqv3/creative/index.tsx → src/pages/launchSystemV3/adqv3/creative/index.tsx

@@ -2,9 +2,9 @@ import { useAjax } from "@/Hook/useAjax"
 import { getDynamicCreativeV3ListApi } from "@/services/launchAdq/adqv3"
 import { Button, Col, Form, Input, Row, Select, Space } from "antd"
 import React, { useEffect } from "react"
-import TableData from "../../components/TableData"
 import { txDynamicConfig } from "../config"
 import tableConfig from "./tableConfig"
+import TableData from "@/pages/launchSystemNew/components/TableData"
 
 
 const Creative: React.FC<ADQV3.CreativeProps> = ({ queryForm, setQueryForm, userId }) => {

src/pages/launchSystemNew/adqv3/index.tsx → src/pages/launchSystemV3/adqv3/index.tsx

@@ -3,7 +3,7 @@ import { IdcardFilled, MenuFoldOutlined, MenuUnfoldOutlined } from "@ant-design/
 import { Select, Menu, Spin, Button, Card, Tabs } from "antd"
 import React, { useEffect, useState } from "react"
 import { useModel } from "umi"
-import style from '../adq/index.less'
+import style from '../../launchSystemNew/adq/index.less'
 import { getPicherListApi } from "@/services/operating/account"
 import Ad from "./ad"
 import Creative from "./creative"