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

config/proxy.ts

@@ -10,8 +10,8 @@
  export default {
   dev: {
     '/api/': {
-      target: 'http://test.api.zanxiangwl.com',
-      // target: 'http://api.zanxiangwl.com',
+      // target: 'http://test.api.zanxiangwl.com',
+      target: 'http://api.zanxiangwl.com',
       changeOrigin: true,
       pathRewrite: { '/api': '' },
     },

src/pages/adMonitor/adMonitorList/components/planDetail.tsx

@@ -9,6 +9,7 @@ import columns from './tableConfig'
 import { compare } from '@/utils/utils'
 import { formatDate, downloadFile1 } from '@/utils/downloadFile'
 import { downLoadSpeedApi } from "@/services/adMonitor/adMonitor";
+import '../index.less'
 
 type Props = {
     visible?: boolean,
@@ -77,7 +78,7 @@ function PlanDetail(props: Props) {
 
     return <Modal
         title={<><Space>
-            <span style={{ fontSize: 15, color: '#999' }}>计划名称:<span style={{ color: '#40a9ff' }}>{props?.data?.campaignName}</span></span>
+            <span style={{ fontSize: 15, color: '#999' }}>计划名称:<span style={{ color: '#40a9ff' }}>{props?.data?.campaignName || '--'}</span></span>
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <span style={{ fontSize: 15, color: '#999' }}>广告名称:<span style={{ color: '#40a9ff' }}>{props?.data?.adgroupName}</span></span>
         </Space></>}

src/pages/adMonitor/adMonitorList/tablePlanListConfig.tsx

@@ -2,7 +2,7 @@ import { Statistic, Tooltip } from 'antd'
 import React from 'react'
 import './index.less'
 import { ReactComponent as RocketSvg } from '@/assets/rocket.svg'
-import { GOUMAILEIXING, GUANGGAOZHUANGTAI, TUIGUANGMUBIAO, CHUANGYIZHUANGTAI, YOUHUAMUBIAO, CHUJIAFANGSHI } from './enum'
+import { TUIGUANGMUBIAO, YOUHUAMUBIAO, CHUJIAFANGSHI } from './enum'
 import Box from './components/box'
 import { GGStateData } from './data'
 import { copy } from '@/utils/utils'

src/pages/launchSystemNew/adq/ad/index.tsx

@@ -9,7 +9,7 @@ import { putAdqAdgroupsSync, getAdqAdgroupsList, delListAdqAdgroupsApi, newEditA
 import { CopyOutlined, DeleteOutlined, FieldTimeOutlined, PauseCircleOutlined, PlayCircleOutlined, TransactionOutlined } from '@ant-design/icons'
 import UpdateAd from './updateAd'
 import Copy from './copy'
-import { DataType } from '@/components/Tables'
+import PlanDetail from '@/pages/adMonitor/adMonitorList/components/planDetail'
 
 type Props = {
     accountId: string,
@@ -43,6 +43,8 @@ const Ad: React.FC<Props> = (props) => {
     const [update, setUpdate] = useState<{ visible: boolean, title: string }>({ visible: false, title: '' })
     const [model, setModel] = useState(true)
     const [copyData, setCopyData] = useState<{ visible: boolean }>({ visible: false })
+    const [detailShow, setDetailShow] = useState<boolean>(false)
+    const [detailData, setDetailData] = useState<any>({})
     const [queryFrom, set_queryFrom] = useState<{
         pageNum: number;
         pageSize: number;
@@ -163,12 +165,21 @@ const Ad: React.FC<Props> = (props) => {
     }
 
     const handleSave = (row: any) => {
+        const hide = message.loading(`广告“${row.adgroupId}”广告名称修改成<${row.adgroupName}>,修改中`, 0, () => {
+            message.success('修改成功');
+        });
         editAdqAdgroups.run({ adgroupIds: [row.adgroupId], adgroupName: row.adgroupName }).then(res => {
             message.success('修改广告名称成功')
             listAjax.refresh()
+            hide()
         })
     }
 
+    const details = (data: any) => {
+        setDetailData(data)
+        setDetailShow(true)
+    }
+
     return <div>
         {/* 修改广告 */}
         {update.visible && <UpdateAd
@@ -185,7 +196,7 @@ const Ad: React.FC<Props> = (props) => {
         {copyData.visible && <Copy selectedRows={selectedRows} {...copyData} onClose={() => setCopyData({ visible: false })} onChange={() => { setCopyData({ visible: false }); listAjax.refresh(); setSelectedRows([]) }} />}
         <TableData
             isCard={false}
-            columns={() => tableConfig(onChange, tableIdClick)}
+            columns={() => tableConfig(onChange, details, tableIdClick)}
             ajax={listAjax}
             syncAjax={sync}
             dataSource={listAjax?.data?.data?.records}
@@ -541,6 +552,7 @@ const Ad: React.FC<Props> = (props) => {
                 getList({ ...queryFrom, pageNum: current, pageSize })
             }}
         />
+        {detailShow && <PlanDetail visible={detailShow} onClose={() => { setDetailShow(false) }} data={detailData} />}
     </div>
 }
 export default Ad

src/pages/launchSystemNew/adq/ad/tableConfig.tsx

@@ -1,12 +1,14 @@
 import { AdStatusEnum, BidModeEnum, BidStrategyEnum, OptimizationGoalEnum, PromotedObjectType } from '@/services/launchAdq/enum'
 import React from 'react'
-import { Badge, Switch } from 'antd'
+import { Badge } from 'antd'
 import Box from '@/pages/adMonitor/adMonitorList/components/box'
-import { copy } from '@/utils/utils'
 import SwitchStatus from './switchStatus'
 import TimeSeriesLook from './timeSeriesLook'
+import { ReactComponent as RocketSvg } from '@/assets/rocket.svg'
+import '../index.less'
 function tableConfig(
     onChange: () => void,
+    details: (data: any) => void,
     tableIdClick: (props: {
         activeKey: string,
         parma: {
@@ -244,6 +246,20 @@ function tableConfig(
                 return <Box b={b} />
             }
         },
+        {
+            title: '单位时间消耗速度',
+            dataIndex: 'costSpeed',
+            key: 'costSpeed',
+            align: 'center',
+            width: 80,
+            className: 'padding2',
+            fixed: 'right',
+            render: (a: any, b: any) => {
+                return <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', lineHeight: 'normal', fontSize: 10 }}>
+                    <RocketSvg /> <a onClick={() => details(b)} style={{ marginLeft: 10 }}>详情</a>
+                </div>
+            }
+        },
         // {
         //     title: '操作',
         //     dataIndex: 'cz',

src/pages/launchSystemNew/adq/index.less

@@ -25,4 +25,8 @@
             z-index: 10;
         }
     }
+}
+
+.padding2 {
+    padding: 2px 5px !important;
 }