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

src/components/EarlyWarning/setEarlyWarning.tsx

@@ -67,7 +67,7 @@ const SetEarlyWarning: React.FC<Props> = (props) => {
                             ((option?.label ?? '') as any).toLowerCase().includes(input.toLowerCase())
                         }
                     >
-                        {getSysWarningRuleList?.data?.map((item: any) => <Select.Option value={item.id} key={item.id}>{item.ruleName}</Select.Option>)}
+                        {getSysWarningRuleList?.data?.filter((item: any) => !item?.defaultRule)?.map((item: any) => <Select.Option value={item.id} key={item.id}>{item.ruleName}</Select.Option>)}
                     </Select>
                 </Form.Item>
             </Form>

src/pages/adMonitor/adMonitorList/config.ts

@@ -82,15 +82,18 @@ const qiliangpaihang = [
         ]
     },
     {
-        label: '公众号转化',
+        label: '转化',
         data: [
-            { title: '公众号关注人数', dataIndex: 'mpFollowUvDay', label: '公众号转化', default: 6, width: 85 },
-            { title: '公众号关注率', dataIndex: 'mpFollowRateDay', label: '公众号转化', width: 70 },
-            { title: '公众号关注成本', dataIndex: 'mpFollowCostDay', label: '公众号转化', width: 85 },
-            { title: '加粉成本', dataIndex: 'addFansCost', label: '公众号转化' },
-            { title: '公众号关注次数成本', dataIndex: 'mpFollowPvCost', label: '公众号转化' },
-            { title: '加粉数', dataIndex: 'addFansCount', label: '公众号转化' },
-            { title: '公众号关注次数', dataIndex: 'mpFollowPv', label: '公众号转化' },
+            { title: '公众号关注人数', dataIndex: 'mpFollowUvDay', label: '转化', default: 6, width: 85 },
+            { title: '公众号关注率', dataIndex: 'mpFollowRateDay', label: '转化', width: 70 },
+            { title: '公众号关注成本', dataIndex: 'mpFollowCostDay', label: '转化', width: 85 },
+            { title: '加粉成本', dataIndex: 'addFansCostDay', label: '转化' },
+            { title: '公众号关注次数成本', dataIndex: 'mpFollowPvCostDay', label: '转化' },
+            { title: '加粉数', dataIndex: 'addFansCountDay', label: '转化' },
+            { title: '公众号关注次数', dataIndex: 'mpFollowPvDay', label: '转化' },
+            { title: '加企业微信客服人数', dataIndex: 'scanFollowUvDay', label: '转化' },
+            { title: '加企业微信客服成本', dataIndex: 'scanFollowCostDay', label: '转化' },
+            { title: '加企业微信客服率', dataIndex: 'scanFollowRateDay', label: '转化' },
         ]
     },
 ]
@@ -179,15 +182,18 @@ const qiliangpaihanghour = [
         ]
     },
     {
-        label: '公众号转化',
+        label: '转化',
         data: [
-            { title: '公众号关注人数', dataIndex: 'mpFollowUvDay', label: '公众号转化', default: 6, width: 85 },
-            { title: '公众号关注率', dataIndex: 'mpFollowRateDay', label: '公众号转化', width: 70 },
-            { title: '公众号关注成本', dataIndex: 'mpFollowCostDay', label: '公众号转化', width: 85 },
-            { title: '加粉成本', dataIndex: 'addFansCost', label: '公众号转化' },
-            { title: '公众号关注次数成本', dataIndex: 'mpFollowPvCost', label: '公众号转化' },
-            { title: '加粉数', dataIndex: 'addFansCount', label: '公众号转化' },
-            { title: '公众号关注次数', dataIndex: 'mpFollowPv', label: '公众号转化' },
+            { title: '公众号关注人数', dataIndex: 'mpFollowUvDay', label: '转化', default: 6, width: 85 },
+            { title: '公众号关注率', dataIndex: 'mpFollowRateDay', label: '转化', width: 70 },
+            { title: '公众号关注成本', dataIndex: 'mpFollowCostDay', label: '转化', width: 85 },
+            { title: '加粉成本', dataIndex: 'addFansCostDay', label: '转化' },
+            { title: '公众号关注次数成本', dataIndex: 'mpFollowPvCostDay', label: '转化' },
+            { title: '加粉数', dataIndex: 'addFansCountDay', label: '转化' },
+            { title: '公众号关注次数', dataIndex: 'mpFollowPvDay', label: '转化' },
+            { title: '加企业微信客服人数', dataIndex: 'scanFollowUvDay', label: '转化' },
+            { title: '加企业微信客服成本', dataIndex: 'scanFollowCostDay', label: '转化' },
+            { title: '加企业微信客服率', dataIndex: 'scanFollowRateDay', label: '转化' },
         ]
     },
 ]
@@ -276,15 +282,18 @@ const qiliangpaihangminute = [
         ]
     },
     {
-        label: '公众号转化',
+        label: '转化',
         data: [
-            { title: '公众号关注人数', dataIndex: 'mpFollowUvDay', label: '公众号转化', default: 6, width: 85 },
-            { title: '公众号关注率', dataIndex: 'mpFollowRateDay', label: '公众号转化', width: 85 },
-            { title: '公众号关注成本', dataIndex: 'mpFollowCostDay', label: '公众号转化', width: 85 },
-            { title: '加粉成本', dataIndex: 'addFansCost', label: '公众号转化' },
-            { title: '公众号关注次数成本', dataIndex: 'mpFollowPvCost', label: '公众号转化' },
-            { title: '加粉数', dataIndex: 'addFansCount', label: '公众号转化' },
-            { title: '公众号关注次数', dataIndex: 'mpFollowPv', label: '公众号转化' },
+            { title: '公众号关注人数', dataIndex: 'mpFollowUvDay', label: '转化', default: 6, width: 85 },
+            { title: '公众号关注率', dataIndex: 'mpFollowRateDay', label: '转化', width: 85 },
+            { title: '公众号关注成本', dataIndex: 'mpFollowCostDay', label: '转化', width: 85 },
+            { title: '加粉成本', dataIndex: 'addFansCostDay', label: '转化' },
+            { title: '公众号关注次数成本', dataIndex: 'mpFollowPvCostDay', label: '转化' },
+            { title: '加粉数', dataIndex: 'addFansCountDay', label: '转化' },
+            { title: '公众号关注次数', dataIndex: 'mpFollowPvDay', label: '转化' },
+            { title: '加企业微信客服人数', dataIndex: 'scanFollowUvDay', label: '转化' },
+            { title: '加企业微信客服成本', dataIndex: 'scanFollowCostDay', label: '转化' },
+            { title: '加企业微信客服率', dataIndex: 'scanFollowRateDay', label: '转化' },
         ]
     },
 ]
@@ -367,15 +376,18 @@ const guanggao = [
         ]
     },
     {
-        label: '公众号转化',
+        label: '转化',
         data: [
-            { title: '公众号关注人数', dataIndex: 'mpFollowUser', label: '公众号转化', width: 85 },
-            { title: '公众号关注率', dataIndex: 'mpFollowRate', label: '公众号转化', width: 85 },
-            { title: '公众号关注成本', dataIndex: 'mpFollowCost', label: '公众号转化', width: 85 },
-            { title: '加粉成本（今日）', dataIndex: 'addFansCostDay', label: '公众号转化' },
-            { title: '公众号关注次数成本（今日）', dataIndex: 'mpFollowPvCostDay', label: '公众号转化' },
-            { title: '加粉数（今日）', dataIndex: 'addFansCountDay', label: '公众号转化' },
-            { title: '公众号关注次数（今日）', dataIndex: 'mpFollowPvDay', label: '公众号转化' },
+            { title: '公众号关注人数', dataIndex: 'mpFollowUser', label: '转化', width: 85 },
+            { title: '公众号关注率', dataIndex: 'mpFollowRate', label: '转化', width: 85 },
+            { title: '公众号关注成本', dataIndex: 'mpFollowCost', label: '转化', width: 85 },
+            { title: '加粉成本', dataIndex: 'addFansCost', label: '转化' },
+            { title: '公众号关注次数成本', dataIndex: 'mpFollowPvCost', label: '转化' },
+            { title: '加粉数', dataIndex: 'addFansCount', label: '转化' },
+            { title: '公众号关注次数', dataIndex: 'mpFollowPv', label: '转化' },
+            { title: '加企业微信客服人数', dataIndex: 'scanFollowUv', label: '转化' },
+            { title: '加企业微信客服成本', dataIndex: 'scanFollowCost', label: '转化' },
+            { title: '加企业微信客服率', dataIndex: 'scanFollowRate', label: '转化' },
         ]
     },
 ]

src/pages/adMonitor/adMonitorList/tableMonitorConfig.tsx

@@ -625,8 +625,8 @@ function columnsMonitor(planDetail: (id: number) => void, getDetailList: (adId:
             },
             {
                 title: '加粉成本',
-                dataIndex: 'addFansCost',
-                key: 'addFansCost',
+                dataIndex: 'addFansCostDay',
+                key: 'addFansCostDay',
                 align: 'center',
                 width: 75,
                 // sorter: true,
@@ -636,8 +636,8 @@ function columnsMonitor(planDetail: (id: number) => void, getDetailList: (adId:
             },
             {
                 title: '公众号关注次数成本',
-                dataIndex: 'mpFollowPvCost',
-                key: 'mpFollowPvCost',
+                dataIndex: 'mpFollowPvCostDay',
+                key: 'mpFollowPvCostDay',
                 align: 'center',
                 width: 80,
                 // sorter: true,
@@ -647,8 +647,8 @@ function columnsMonitor(planDetail: (id: number) => void, getDetailList: (adId:
             },
             {
                 title: '加粉数',
-                dataIndex: 'addFansCount',
-                key: 'addFansCount',
+                dataIndex: 'addFansCountDay',
+                key: 'addFansCountDay',
                 align: 'center',
                 width: 75,
                 // sorter: true,
@@ -658,8 +658,8 @@ function columnsMonitor(planDetail: (id: number) => void, getDetailList: (adId:
             },
             {
                 title: '公众号关注次数',
-                dataIndex: 'mpFollowPv',
-                key: 'mpFollowPv',
+                dataIndex: 'mpFollowPvDay',
+                key: 'mpFollowPvDay',
                 align: 'center',
                 width: 75,
                 // sorter: true,
@@ -667,6 +667,40 @@ function columnsMonitor(planDetail: (id: number) => void, getDetailList: (adId:
                     return <Statistic value={a || 0} />
                 }
             },
+            {
+                title: '加企业微信客服人数',
+                dataIndex: 'scanFollowUvDay',
+                key: 'scanFollowUvDay',
+                align: 'center',
+                width: 80,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
+            {
+                title: '加企业微信客服成本',
+                dataIndex: 'scanFollowCostDay',
+                key: 'scanFollowCostDay',
+                align: 'center',
+                width: 80,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
+            {
+                title: '加企业微信客服率',
+                dataIndex: 'scanFollowRateDay',
+                key: 'scanFollowRateDay',
+                align: 'center',
+                width: 80,
+                // sorter: true,
+                render: (a: any) => {
+                    a = a ? parseFloat((a * 100).toFixed(2)) : 0
+                    return a + '%'
+                }
+            },
             {
                 title: '操作',
                 dataIndex: 'event',

src/pages/adMonitor/adMonitorList/tablePlanListConfig.tsx

@@ -537,9 +537,9 @@ function columnsMonitor(details: (id: number) => void) {
                 }
             },
             {
-                title: '加粉成本（今日）',
-                dataIndex: 'addFansCostDay',
-                key: 'addFansCostDay',
+                title: '加粉成本',
+                dataIndex: 'addFansCost',
+                key: 'addFansCost',
                 align: 'center',
                 width: 80,
                 // sorter: true,
@@ -548,9 +548,9 @@ function columnsMonitor(details: (id: number) => void) {
                 }
             },
             {
-                title: '公众号关注次数成本（今日）',
-                dataIndex: 'mpFollowPvCostDay',
-                key: 'mpFollowPvCostDay',
+                title: '公众号关注次数成本',
+                dataIndex: 'mpFollowPvCost',
+                key: 'mpFollowPvCost',
                 align: 'center',
                 width: 105,
                 // sorter: true,
@@ -559,9 +559,9 @@ function columnsMonitor(details: (id: number) => void) {
                 }
             },
             {
-                title: '加粉数（今日）',
-                dataIndex: 'addFansCountDay',
-                key: 'addFansCountDay',
+                title: '加粉数',
+                dataIndex: 'addFansCount',
+                key: 'addFansCount',
                 align: 'center',
                 width: 80,
                 // sorter: true,
@@ -570,9 +570,9 @@ function columnsMonitor(details: (id: number) => void) {
                 }
             },
             {
-                title: '公众号关注次数（今日）',
-                dataIndex: 'mpFollowPvDay',
-                key: 'mpFollowPvDay',
+                title: '公众号关注次数',
+                dataIndex: 'mpFollowPv',
+                key: 'mpFollowPv',
                 align: 'center',
                 width: 100,
                 // sorter: true,
@@ -580,6 +580,40 @@ function columnsMonitor(details: (id: number) => void) {
                     return <Statistic value={a || 0} />
                 }
             },
+            {
+                title: '加企业微信客服人数',
+                dataIndex: 'scanFollowUv',
+                key: 'scanFollowUv',
+                align: 'center',
+                width: 80,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
+            {
+                title: '加企业微信客服成本',
+                dataIndex: 'scanFollowCost',
+                key: 'scanFollowCost',
+                align: 'center',
+                width: 80,
+                // sorter: true,
+                render: (a: any) => {
+                    return <Statistic value={a || 0} />
+                }
+            },
+            {
+                title: '加企业微信客服率',
+                dataIndex: 'scanFollowRate',
+                key: 'scanFollowRate',
+                align: 'center',
+                width: 80,
+                // sorter: true,
+                render: (a: any) => {
+                    a = a ? parseFloat((a * 100).toFixed(2)) : 0
+                    return a + '%'
+                }
+            },
             {
                 title: '操作',
                 dataIndex: 'event',