fix

src/pages/adMonitor/adMonitorList/config.ts

@@ -10,15 +10,15 @@ const qiliangpaihang = [
             { 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: '设置信息', default: 12, width: 80 },
+            { 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: '设置信息', width: 145 },
-            { title: '广告状态', dataIndex: 'adStatus', label: '设置信息' },
+            { title: '广告状态', dataIndex: 'adStatus', default: 12, label: '设置信息' },
             // { title: '创意状态', dataIndex: 'adCreativeStatus', label: '设置信息' },
-            { title: '推广目标', dataIndex: 'promotedObjectName', label: '设置信息' },
+            { title: '推广目标', dataIndex: 'promotedObjectType', label: '设置信息' },
             // { title: '购买类型', dataIndex: 'adBuyType', label: '设置信息' },
             { title: '操作', dataIndex: 'event', label: '设置信息', default: 13, width: 60 },
         ]
@@ -30,17 +30,17 @@ const qiliangpaihang = [
             // { title: '出价方式', dataIndex: 'biddingMethod', label: '费用' },
             { title: '当前出价', dataIndex: 'bidAmount', label: '费用', width: 80 },
             // { title: '计划预算', dataIndex: 'planBudget', label: '费用' },
-            { title: '广告总消耗', dataIndex: 'costTotal', label: '费用', default: 24, width: 110 },
-            { title: '今日消耗', dataIndex: 'costDay', label: '费用', default: 15, width: 100 },
-            { title: '当前小时消耗', dataIndex: 'costHour', label: '费用', default: 16, width: 100 },
-            { title: '前第1小时消耗', dataIndex: 'costLastHour', label: '费用', default: 17, width: 100 },
-            { title: '前第2小时消耗', dataIndex: 'costLastTwoHour', label: '费用', default: 18, width: 100 },
-            { title: '前第3小时消耗', dataIndex: 'costLastThreeHour', label: '费用', default: 19, width: 100 },
-            { title: '当前小时消耗差额', dataIndex: 'costDiffBeforeHour', label: '费用', default: 20, width: 100 },
-            { title: '前第1小时消耗差额', dataIndex: 'costDiffBeforeTwoHour', label: '费用', default: 21, width: 100 },
-            { title: '前第2小时消耗差额', dataIndex: 'costDiffBeforeThreeHour', label: '费用', default: 22, width: 100 },
+            { 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: 80 },
+            { title: '当前5min消耗流速', dataIndex: 'costSpeed', label: '费用', default: 14, width: 70 },
         ]
     },
     {
@@ -106,15 +106,15 @@ const qiliangpaihangminute = [
             { 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: '设置信息', default: 12, width: 80 },
+            { 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: '设置信息', width: 145 },
-            { title: '广告状态', dataIndex: 'adStatus', label: '设置信息' },
+            { title: '广告状态', dataIndex: 'adStatus', default: 12, label: '设置信息' },
             // { title: '创意状态', dataIndex: 'adCreativeStatus', label: '设置信息' },
-            { title: '推广目标', dataIndex: 'promotedObjectName', label: '设置信息' },
+            { title: '推广目标', dataIndex: 'promotedObjectType', label: '设置信息' },
             // { title: '购买类型', dataIndex: 'adBuyType', label: '设置信息' },
             { title: '操作', dataIndex: 'event', label: '设置信息', default: 13, width: 60 },
         ]
@@ -126,17 +126,17 @@ const qiliangpaihangminute = [
             // { title: '出价方式', dataIndex: 'biddingMethod', label: '费用' },
             { title: '当前出价', dataIndex: 'bidAmount', label: '费用', width: 80 },
             // { title: '计划预算', dataIndex: 'planBudget', label: '费用' },
-            { title: '广告总消耗', dataIndex: 'costTotal', label: '费用', width: 110, disabled: true },
-            { title: '今日消耗', dataIndex: 'costDay', label: '费用', width: 100, disabled: true },
-            { title: '当前小时消耗', dataIndex: 'costHour', label: '费用', width: 100, disabled: true },
-            { title: '前第1小时消耗', dataIndex: 'costLastHour', label: '费用', width: 100, disabled: true },
-            { title: '前第2小时消耗', dataIndex: 'costLastTwoHour', label: '费用', width: 100, disabled: true },
-            { title: '前第3小时消耗', dataIndex: 'costLastThreeHour', label: '费用', width: 100, disabled: true },
-            { title: '当前小时消耗差额', dataIndex: 'costDiffBeforeHour', label: '费用', width: 100, disabled: true },
-            { title: '前第1小时消耗差额', dataIndex: 'costDiffBeforeTwoHour', label: '费用', width: 100, disabled: true },
-            { title: '前第2小时消耗差额', dataIndex: 'costDiffBeforeThreeHour', label: '费用', width: 100, disabled: true },
-            { title: '前三小时消耗趋势', dataIndex: 'costTrendLastThreeHour', label: '费用', width: 100, disabled: true },
-            { title: '当前5min消耗流速', dataIndex: 'costSpeed', label: '费用', default: 14, width: 80 },
+            { title: '广告总消耗', dataIndex: 'costTotal', label: '费用', width: 100, disabled: true },
+            { title: '今日消耗', dataIndex: 'costDay', label: '费用', width: 90, disabled: true },
+            { title: '当前小时消耗', dataIndex: 'costHour', label: '费用', width: 80, disabled: true },
+            { 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 },
         ]
     },
     {
@@ -195,12 +195,12 @@ const guanggao = [
     {
         label: '设置信息',
         data: [
-            { title: '数据日期', dataIndex: 'beginToEnd', label: '设置信息', default: 1, width: 110 },
+            { title: '数据日期', dataIndex: 'beginToEnd', label: '设置信息', default: 1, width: 85 },
             { title: '广告名称/ID', dataIndex: 'adgroupName', label: '设置信息', default: 2 },
             { title: '投放计划名称/ID', dataIndex: 'campaignName/campaignId', label: '设置信息', default: 3 },
             { title: '创意名称/ID', dataIndex: 'creativeName/creativeId', label: '设置信息', default: 4 },
-            { title: '创意预览', dataIndex: 'creativePreview', label: '设置信息', default: 5, width: 80 },
-            { title: '广告账户', dataIndex: 'accountId', label: '设置信息', width: 70 },
+            { title: '创意预览', dataIndex: 'creativePreview', label: '设置信息', width: 80 },
+            { title: '广告账户', dataIndex: 'accountId', label: '设置信息', default: 5, width: 70 },
             { title: '投手', dataIndex: 'putUserName', label: '设置信息', default: 6 },
             { title: '创建日期', dataIndex: 'adCreateTime', label: '设置信息' },
             { title: '广告状态', dataIndex: 'adStatus', label: '设置信息', default: 7, width: 75 },
@@ -210,7 +210,7 @@ const guanggao = [
             // { title: '曝光评估', dataIndex: 'impressionAppraise', label: '设置信息', default: 15 },
             { title: '投放时间', dataIndex: 'adBeginTime', label: '设置信息', default: 8, width: 90 },
             // { title: '当日成本偏差', dataIndex: 'dayCostOffset', label: '设置信息' },
-            { title: '推广目标', dataIndex: 'promotedObjectName', label: '设置信息', default: 9 },
+            { title: '推广目标', dataIndex: 'promotedObjectType', label: '设置信息', default: 9 },
             // { title: '深度优化目标', dataIndex: 'depthOptimizeTarget', label: '设置信息' },
         ]
     },

src/pages/adMonitor/adMonitorList/enum.ts

@@ -44,14 +44,20 @@ enum CHUANGYIZHUANGTAI {
 }
 /**推广目标*/
 enum TUIGUANGMUBIAO {
-    'PRODUCTTYPE_WECHAT_ARTICLE' = '推广品牌活动',
-    'PRODUCTTYPE_WECHAT_LBS' = '推广门店',
-    'PRODUCTTYPE_LEAD_AD' = '收集销售线索',
-    'PRODUCTTYPE_WECHAT_SHOP' = '推广商品',
-    'PRODUCTTYPE_APPLE_APP_STORE' = '推广应用',
-    'PRODUCTTYPE_WECHAT_CARD' = '派发优惠券',
-    'PRODUCTTYPE_WECHAT' = '推广公众号',
-    'PRODUCTTYPE_WECHAT_MINI_GAME' = '推广小游戏',
+    'PROMOTED_OBJECT_TYPE_APP_ANDROID' = 'Android 应用',
+    'PROMOTED_OBJECT_TYPE_APP_IOS' = 'IOS 应用',
+    'PROMOTED_OBJECT_TYPE_ECOMMERCE' = '电商推广',
+    'PROMOTED_OBJECT_TYPE_LINK_WECHAT' = '品牌活动推广',
+    'PROMOTED_OBJECT_TYPE_APP_ANDROID_MYAPP' = '应用宝推广',
+    'PROMOTED_OBJECT_TYPE_LOCAL_ADS_WECHAT' = '本地广告',
+    'PROMOTED_OBJECT_TYPE_QQ_BROWSER_MINI_PROGRAM' = 'QQ 浏览器小程序',
+    'PROMOTED_OBJECT_TYPE_QQ_MESSAGE' = 'QQ 消息',
+    'PROMOTED_OBJECT_TYPE_QZONE_VIDEO_PAGE' = '视频说说',
+    'PROMOTED_OBJECT_TYPE_LEAD_AD' = '销售线索收集',
+    'PROMOTED_OBJECT_TYPE_MINI_GAME_WECHAT' = '微信小游戏',
+    'PROMOTED_OBJECT_TYPE_MINI_GAME_QQ' = 'QQ 小游戏',
+    'PROMOTED_OBJECT_TYPE_WECHAT_OFFICIAL_ACCOUNT' = '微信公众号',
+    'PROMOTED_OBJECT_TYPE_APP_QUICK_APP' = '快应用',
 }
 /**优化目标*/
 enum YOUHUAMUBIAO {

src/pages/adMonitor/adMonitorList/tableMonitorConfig.tsx

@@ -159,8 +159,8 @@ function columnsMonitor(planDetail: (id: number) => void, getDetailList: (adId:
             // },
             {
                 title: '推广目标',
-                dataIndex: 'promotedObjectName',
-                key: 'promotedObjectName',
+                dataIndex: 'promotedObjectType',
+                key: 'promotedObjectType',
                 align: 'center',
                 width: 80,
                 render: (a: any) => {

src/pages/adMonitor/adMonitorList/tablePlanListConfig.tsx

@@ -165,13 +165,12 @@ function columnsMonitor(details: (id: number) => void) {
             // },
             {
                 title: '推广目标',
-                dataIndex: 'promotedObjectName',
-                key: 'promotedObjectName',
+                dataIndex: 'promotedObjectType',
+                key: 'promotedObjectType',
                 align: 'center',
                 width: 80,
                 render: (a: any) => {
-                    // return TUIGUANGMUBIAO[a] || '推广公众号'
-                    return a
+                    return TUIGUANGMUBIAO[a] || '推广公众号'
                 }
             },
             // {