fix

src/pages/adMonitor/adMonitorList/config.ts

@@ -94,8 +94,8 @@ const qiliangpaihang = [
     },
 ]
 
-/**起量表分钟原始列表*/
-const qiliangpaihangminute = [
+/**起量表小时列表 */
+const qiliangpaihanghour = [
     {
         label: '设置信息',
         data: [
@@ -126,16 +126,16 @@ const qiliangpaihangminute = [
             // { title: '出价方式', dataIndex: 'biddingMethod', label: '费用' },
             { title: '当前出价', dataIndex: 'bidAmount', label: '费用', width: 80 },
             // { title: '计划预算', dataIndex: 'planBudget', label: '费用' },
-            { title: '广告总消耗', dataIndex: 'costTotal', label: '费用', width: 100 },
-            { title: '今日消耗', dataIndex: 'costDay', label: '费用', width: 90 },
-            { title: '当前小时消耗', dataIndex: 'costHour', label: '费用', width: 80 },
-            { title: '前第1小时消耗', dataIndex: 'costLastHour', label: '费用', width: 80, disabled: true },
-            { title: '前第2小时消耗', dataIndex: 'costLastTwoHour', label: '费用', width: 80, disabled: true },
-            { title: '前第3小时消耗', dataIndex: 'costLastThreeHour', label: '费用', width: 80, disabled: true },
-            { title: '当前小时消耗差额', dataIndex: 'costDiffBeforeHour', label: '费用', width: 80, disabled: true },
-            { title: '前第1小时消耗差额', dataIndex: 'costDiffBeforeTwoHour', label: '费用', width: 90, disabled: true },
-            { title: '前第2小时消耗差额', dataIndex: 'costDiffBeforeThreeHour', label: '费用', width: 90, disabled: true },
-            { title: '前三小时消耗趋势', dataIndex: 'costTrendLastThreeHour', label: '费用', width: 80, disabled: true },
+            { title: '广告总消耗', dataIndex: 'costTotal', label: '费用', default: 24, width: 100 },
+            { title: '今日消耗', dataIndex: 'costDay', label: '费用', default: 15, width: 90 },
+            { title: '当前小时消耗', dataIndex: 'costHour', label: '费用', default: 16, width: 80 },
+            { title: '前第1小时消耗', dataIndex: 'costLastHour', label: '费用', default: 17, width: 80 },
+            { title: '前第2小时消耗', dataIndex: 'costLastTwoHour', label: '费用', default: 18, width: 80 },
+            { title: '前第3小时消耗', dataIndex: 'costLastThreeHour', label: '费用', default: 19, width: 80 },
+            { title: '当前小时消耗差额', dataIndex: 'costDiffBeforeHour', label: '费用', default: 20, width: 80 },
+            { title: '前第1小时消耗差额', dataIndex: 'costDiffBeforeTwoHour', label: '费用', default: 21, width: 90 },
+            { title: '前第2小时消耗差额', dataIndex: 'costDiffBeforeThreeHour', label: '费用', default: 22, width: 90 },
+            { title: '前三小时消耗趋势', dataIndex: 'costTrendLastThreeHour', label: '费用', default: 23, width: 70 },
             { title: '当前5min消耗流速', dataIndex: 'costSpeed', label: '费用', default: 14, width: 70 },
         ]
     },
@@ -167,14 +167,110 @@ const qiliangpaihangminute = [
         label: '商品转化',
         data: [
             { title: '下单量', dataIndex: 'orderCountDay', label: '商品转化', width: 70 },
-            { title: '首日新增下单量', dataIndex: 'firstDayOrderCountDay', label: '商品转化', width: 80 },
+            // { title: '首日新增下单量', dataIndex: 'firstDayOrderCountDay', label: '商品转化', width: 80 },
             { title: '下单成本', dataIndex: 'orderCostDay', label: '商品转化', width: 75 },
             { title: '下单率', dataIndex: 'orderRateDay', label: '商品转化', width: 70 },
             { title: '下单金额', dataIndex: 'orderAmountDay', label: '商品转化', width: 70 },
-            { title: '首日新增下单金额', dataIndex: 'firstDayOrderAmountDay', label: '商品转化', width: 75 },
+            // { title: '首日新增下单金额', dataIndex: 'firstDayOrderAmountDay', label: '商品转化', width: 75 },
             { title: '下单客单价', dataIndex: 'atvDay', label: '商品转化', width: 70 },
-            { title: '下单ROI', dataIndex: 'orderRoiDay', label: '商品转化', width: 75 },
-            { title: '首日新增下单ROI', dataIndex: 'firstDayOrderRoiDay', label: '商品转化', default: 5, width: 90 },
+            { title: '下单ROI', dataIndex: 'orderRoiDay', label: '商品转化', width: 75, default: 5 },
+            // { title: '首日新增下单ROI', dataIndex: 'firstDayOrderRoiDay', label: '商品转化', width: 90 },
+        ]
+    },
+    {
+        label: '公众号转化',
+        data: [
+            { title: '公众号关注人数', dataIndex: 'mpFollowUvDay', label: '公众号转化', default: 6, width: 85 },
+            { title: '公众号关注率', dataIndex: 'mpFollowRateDay', label: '公众号转化', width: 70 },
+            { title: '公众号关注成本', dataIndex: 'mpFollowCostDay', label: '公众号转化', width: 85 },
+            // { title: '注册人数', dataIndex: 'mpRegisterUserCount', label: '公众号转化' },
+            // { title: '注册次数', dataIndex: 'mpRegisterCount', label: '公众号转化' },
+            // { title: '注册成本', dataIndex: 'mpRegisterCost', label: '公众号转化' },
+        ]
+    },
+]
+
+/**起量表分钟原始列表*/
+const qiliangpaihangminute = [
+    {
+        label: '设置信息',
+        data: [
+            { title: '时间', dataIndex: 'currTime', label: '设置信息', default: 1, width: 135 },
+            { title: '广告名称', dataIndex: 'adgroupName', label: '设置信息', default: 2, width: 170 },
+            { title: '广告ID', dataIndex: 'adgroupId', label: '设置信息', default: 9, width: 90 },
+            { title: '计划名称', dataIndex: 'campaignName', label: '设置信息' },
+            { title: '计划ID', dataIndex: 'campaignId', label: '设置信息' },
+            { title: '广告账户', dataIndex: 'accountId', label: '设置信息', default: 10, width: 70 },
+            { title: '投手', dataIndex: 'putUserName', label: '设置信息', default: 11, width: 65 },
+            { title: '创意预览', dataIndex: 'creativePreview', label: '设置信息', width: 80 },
+            // { title: '投放位置', dataIndex: 'pitchSeat', label: '设置信息' },
+            // { title: '自动扩量', dataIndex: 'autoExpand', label: '设置信息' },
+            // { title: '深度优化目标', dataIndex: 'depthOptimizeTarget', label: '设置信息' },
+            // { title: '曝光评估', dataIndex: 'impressionAppraise', label: '设置信息' },
+            { title: '投放时间', dataIndex: 'adBeginTime', label: '设置信息', default: 12, width: 135 },
+            { title: '广告状态', dataIndex: 'adStatus', label: '设置信息', width: 65 },
+            // { title: '创意状态', dataIndex: 'adCreativeStatus', label: '设置信息' },
+            { title: '推广目标', dataIndex: 'promotedObjectType', label: '设置信息' },
+            // { title: '购买类型', dataIndex: 'adBuyType', label: '设置信息' },
+            { title: '操作', dataIndex: 'event', label: '设置信息', default: 13, width: 60 },
+        ]
+    },
+    {
+        label: '费用',
+        data: [
+            { title: '广告预算', dataIndex: 'dailyBudget', label: '费用', width: 80 },
+            // { title: '出价方式', dataIndex: 'biddingMethod', label: '费用' },
+            { title: '当前出价', dataIndex: 'bidAmount', label: '费用', width: 80 },
+            // { title: '计划预算', dataIndex: 'planBudget', label: '费用' },
+            { title: '广告总消耗', dataIndex: 'costTotal', label: '费用', width: 100 },
+            { title: '今日消耗', dataIndex: 'costDay', label: '费用', width: 90 },
+            { title: '当前小时消耗', dataIndex: 'costHour', label: '费用', width: 80 },
+            // { title: '前第1小时消耗', dataIndex: 'costLastHour', label: '费用', width: 80, disabled: true },
+            // { title: '前第2小时消耗', dataIndex: 'costLastTwoHour', label: '费用', width: 80, disabled: true },
+            // { title: '前第3小时消耗', dataIndex: 'costLastThreeHour', label: '费用', width: 80, disabled: true },
+            // { title: '当前小时消耗差额', dataIndex: 'costDiffBeforeHour', label: '费用', width: 80, disabled: true },
+            // { title: '前第1小时消耗差额', dataIndex: 'costDiffBeforeTwoHour', label: '费用', width: 90, disabled: true },
+            // { title: '前第2小时消耗差额', dataIndex: 'costDiffBeforeThreeHour', label: '费用', width: 90, disabled: true },
+            // { title: '前三小时消耗趋势', dataIndex: 'costTrendLastThreeHour', label: '费用', width: 80, disabled: true },
+            { title: '当前5min消耗流速', dataIndex: 'costSpeed', label: '费用', default: 14, width: 70 },
+        ]
+    },
+    {
+        label: '曝光',
+        data: [
+            { title: '曝光量（曝光次数）', dataIndex: 'viewDay', label: '曝光', default: 3, width: 70 },
+            // { title: '千次曝光成本', dataIndex: 'thousandDisplayPriceDay', label: '曝光', width: 80 },
+        ]
+    },
+    {
+        label: '点击',
+        data: [
+            { title: '点击量（点击次数）', dataIndex: 'clickDay', label: '点击', width: 75 },
+            // { title: '点击均价', dataIndex: 'cpcDay', label: '点击', width: 75 },
+            // { title: '点击率', dataIndex: 'ctrDay', label: '点击', width: 75 },
+        ]
+    },
+    {
+        label: '转化指标组',
+        data: [
+            { title: '优化目标（转化目标）', dataIndex: 'optimizationGoal', label: '转化指标组', default: 8, width: 120 },
+            { title: '转化目标量', dataIndex: 'conversionsCountDay', label: '转化指标组', default: 7, width: 75 },
+            // { title: '转化目标成本', dataIndex: 'conversionsCostDay', label: '转化指标组', width: 75 },
+            // { title: '目标转化率', dataIndex: 'conversionsRateDay', label: '转化指标组', width: 75 },
+        ]
+    },
+    {
+        label: '商品转化',
+        data: [
+            { title: '下单量', dataIndex: 'orderCountDay', label: '商品转化', width: 70, default: 4 },
+            // { title: '首日新增下单量', dataIndex: 'firstDayOrderCountDay', label: '商品转化', width: 80 },
+            { title: '下单成本', dataIndex: 'orderCostDay', label: '商品转化', width: 75 },
+            { title: '下单率', dataIndex: 'orderRateDay', label: '商品转化', width: 70 },
+            { title: '下单金额', dataIndex: 'orderAmountDay', label: '商品转化', width: 70 },
+            // { title: '首日新增下单金额', dataIndex: 'firstDayOrderAmountDay', label: '商品转化', width: 75 },
+            { title: '下单客单价', dataIndex: 'atvDay', label: '商品转化', width: 70 },
+            { title: '下单ROI', dataIndex: 'orderRoiDay', label: '商品转化', width: 75, default: 5 },
+            // { title: '首日新增下单ROI', dataIndex: 'firstDayOrderRoiDay', label: '商品转化', width: 90 },
         ]
     },
     {
@@ -277,4 +373,4 @@ const guanggao = [
     },
 ]
 
-export { qiliangpaihang, guanggao, qiliangpaihangminute }
+export { qiliangpaihang, guanggao, qiliangpaihangminute, qiliangpaihanghour }

src/pages/adMonitor/adMonitorList/monitor.tsx

@@ -5,7 +5,7 @@ import useEcharts from '@/Hook/useEcharts'
 import columnsMonitor from './tableMonitorConfig'
 import { useModel } from 'umi'
 import { ListType, downLoadUpAdApi, downLoadDetailApi, downLoadDetailMinuteApi } from '@/services/adMonitor/adMonitor'
-import { qiliangpaihang, qiliangpaihangminute } from './config'
+import { qiliangpaihang, qiliangpaihanghour, qiliangpaihangminute } from './config'
 import { compare } from '@/utils/utils'
 import PlanDetail from './components/planDetail'
 import { formatDate, downloadFile1 } from '@/utils/downloadFile'
@@ -441,7 +441,7 @@ function Monitor(props: { onChange: () => void }) {
                 page={mode === 'total' ? queryForm.pageNum : undefined}
                 pageSize={mode === 'total' ? queryForm.pageSize : undefined}
                 scroll={{ y: 620 }}
-                config={mode === 'minute' ? qiliangpaihangminute : qiliangpaihang}
+                config={mode === 'minute' ? qiliangpaihangminute : mode === 'detail' ? qiliangpaihanghour : qiliangpaihang}
                 configName={mode === 'total' ? '起量广告排行' : mode === 'detail' ? '起量广告排行明细' : '起量广告5min'}
             />
         </div>