Prechádzať zdrojové kódy

Merge branch 'feature/work-test' of http://git.tjyourong.com.cn/ctop/adsp-vue into feature/work-test

朱鑫波 3 rokov pred
rodič
commit
fa0ddb3d41

+ 4 - 1
.env.development

@@ -19,4 +19,7 @@ VUE_APP_BASE_MATERIAL_URL = http://192.168.0.195:9999/material
 # 测试环境 http://192.168.0.195:9999
 # 西安环境 http://192.168.1.59:7006
 
-
+#盯盘相关接口
+VUE_APP_BASE_STARE_URL = http://192.168.0.195:9999/material
+# 字安接口 http://192.168.1.43:9999
+# 测试环境 http://192.168.0.195:9999

BIN
src/assets/greendown.png


BIN
src/assets/upred.png


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1023 - 932
src/views/modules/stockWatch/modules/new-keepManage/account-newkeepManage.vue


+ 89 - 148
src/views/modules/stockWatch/modules/new-keepManage/acountProjectData.js

@@ -910,169 +910,146 @@ export const KScustomFields= [
             title: '激活数',
             dataIndex: 'activation',
             width:150,
-            tip: '',
+            tip: '广告主回传的应用激活次数',
             align: 'center',
             scopedSlots: { customRender: 'activation' },
-            
+            sorter:(a, b) => a.activation - b.activation,
           },{
-            title: '激活单价',
+            title: '激活单价',
             dataIndex: 'activationPrice',
             width:150,
-            tip: '',
+            tip: '花费/激活数',
             align: 'center',
             scopedSlots: { customRender: 'activationPrice' },
-            
-          }, {
-            title: '封面曝光数',
-            dataIndex: 'photoShow',
-            width:150,
-            tip: '',
-            align: 'center',
-            scopedSlots: { customRender: 'photoShow' },
-            
-          },{
-            title: '封面点击数',
-            dataIndex: 'photoClick',
-            width:150,
-            tip: '',
-            align: 'center',
-            scopedSlots: { customRender: 'photoClick' },
-            
-          },{
-            title: '有效素材数',
-            dataIndex: 'newEffectNum',
-            width:150,
-            tip: '',
-            align: 'center',
-            scopedSlots: { customRender: 'newEffectNum' },
-            
-          }, {
-            title: '爆款素材数',
-            dataIndex: 'newHotNum',
-            width:150,
-            tip: '',
-            align: 'center',
-            scopedSlots: { customRender: 'newHotNum' },
-            
-          }, {
-            title: '上新素材数',
-            dataIndex: 'newVideoNum',
-            width:150,
-            tip: '',
-            align: 'center',
-            scopedSlots: { customRender: 'newVideoNum' },
-            
+            sorter:(a, b) => a.activationPrice - b.activationPrice,
           }, {
             title: '次留率',
             dataIndex: 'leave',
-            tip: '前一日激活用户在次日继续访问的PV/前一日激活数',
+            tip: '次留数/激活数',
             align: 'center',    
             scopedSlots: { customRender: 'leave' },
-
+            sorter:(a, b) => a.leave - b.leave,
           },{
-            title: '付费数',
+            title: '付费数',
             dataIndex: 'eventPay',
-            tip: '当回传的付费行为次数',
+            tip: '当如回传的付费行为次数',
             align: 'center',    
             scopedSlots: { customRender: 'eventPay' },
+            sorter:(a, b) => a.eventPay - b.eventPay,
           },
           {
-            title: '付费金额',
-            dataIndex: 'eventPayPurchaseAmount',
-            tip: '当日回传的付费行为所带来的付费金额',
+            title: '付费率',
+            dataIndex: 'eventPayRate',
+            tip: '付费数/(激活数+表单数)',
             align: 'center',    
-            scopedSlots: { customRender: 'eventPayPurchaseAmount' },
+            scopedSlots: { customRender: 'eventPayRate' },
+            sorter:(a, b) => a.eventPayRate - b.eventPayRate,
           },
           {
-            title: '付费次数成本',
+            title: '付费成本',
             dataIndex: 'eventPayCost',
             tip: '消耗/付费次数',
             align: 'center',    
             scopedSlots: { customRender: 'eventPayCost' },
+            sorter:(a, b) => a.eventPayCost - b.eventPayCost,
           }, {
             title: '新增付费数',
             dataIndex: 'eventNewUserPay',
-            tip: '消耗/付费次数',
+            tip: '历史30天内首次产生付费的人数',
             align: 'center',    
             scopedSlots: { customRender: 'eventNewUserPay' },
+            sorter:(a, b) => a.eventNewUserPay - b.eventNewUserPay,
           },{
             title: '新增付费成本',
             dataIndex: 'eventNewUserPayCost',
-            tip: '消耗/付费次数',
+            tip: '当日消耗/当日新增付费人数',
             align: 'center',    
             scopedSlots: { customRender: 'eventNewUserPayCost' },
+            sorter:(a, b) => a.eventNewUserPayCost - b.eventNewUserPayCost,
           },{
             title: '新增付费率',
             dataIndex: 'eventNewUserPayRate',
-            tip: '消耗/付费次数',
+            tip: '当日新增付费人数/(当日激活数+表单数)',
             align: 'center',    
             scopedSlots: { customRender: 'eventNewUserPayRate' },
+            sorter:(a, b) => a.eventNewUserPayRate - b.eventNewUserPayRate,
           },{
             title: '唤起应用数',
             dataIndex: 'eventAppInvoked',
-            tip: '消耗/付费次数',
+            tip: '广告主当日回传的唤起应用次数',
             align: 'center',    
             scopedSlots: { customRender: 'eventAppInvoked' },
+            sorter:(a, b) => a.eventAppInvoked - b.eventAppInvoked,
           },{
             title: '唤起应用成本',
             dataIndex: 'eventAppInvokedCost',
-            tip: '消耗/付费次数',
+            tip: '当日消耗/唤起应用数',
             align: 'center',    
             scopedSlots: { customRender: 'eventAppInvokedCost' },
+            sorter:(a, b) => a.eventAppInvokedCost - b.eventAppInvokedCost,
           },{
             title: '注册数',
             dataIndex: 'eventRegister',
-            tip: '消耗/付费次数',
+            tip: '当日回传注册数',
             align: 'center',    
             scopedSlots: { customRender: 'eventRegister' },
+            sorter:(a, b) => a.eventRegister - b.eventRegister,
           },{
             title: '注册成本',
             dataIndex: 'eventRegisterCost',
-            tip: '消耗/付费次数',
+            tip: '当日消耗/当日回传注册数',
             align: 'center',    
             scopedSlots: { customRender: 'eventRegisterCost' },
+            sorter:(a, b) => a.eventRegisterCost - b.eventRegisterCost,
           },{
             title: '关键行为数',
             dataIndex: 'keyAction',
-            tip: '消耗/付费次数',
+            tip: '广告主回传的关键行为数',
             align: 'center',    
             scopedSlots: { customRender: 'keyAction' },
+            sorter:(a, b) => a.keyAction - b.keyAction,
           },{
-            title: '关键行为成本',
+            title: '关键行为成本',
             dataIndex: 'keyActionCost',
-            tip: '消耗/付费次数',
+            tip: '筛选时间内累计消耗/关键行为数',
             align: 'center',    
             scopedSlots: { customRender: 'keyActionCost' },
+            sorter:(a, b) => a.keyActionCost - b.keyActionCost,
           },{
             title: '关键行为率',
             dataIndex: 'keyActionRate',
-            tip: '消耗/付费次数',
+            tip: '关键行为数/激活数',
             align: 'center',    
             scopedSlots: { customRender: 'keyActionRate' },
+            sorter:(a, b) => a.keyActionRate - b.keyActionRate,
           },{
             title: '首日付费金额',
             dataIndex: 'eventPayPurchaseAmountFirstDay',
-            tip: '消耗/付费次数',
+            tip: '当日激活的用户在当天产生的付费行为所带来的付费金额',
             align: 'center',    
             scopedSlots: { customRender: 'eventPayPurchaseAmountFirstDay' },
+            sorter:(a, b) => a.eventPayPurchaseAmountFirstDay - b.eventPayPurchaseAmountFirstDay,
           },{
             title: '首日ROI',
             dataIndex: 'eventPayFirstDayRoi',
-            tip: '消耗/付费次数',
+            tip: '首日付费金额/当日消耗',
             align: 'center',    
             scopedSlots: { customRender: 'eventPayFirstDayRoi' },
+            sorter:(a, b) => a.eventPayFirstDayRoi - b.eventPayFirstDayRoi,
           },{
                 title: '表单提交数',
                 dataIndex: 'formCount',
                 tip: '当日回传表单数',
                 align: 'center',
                 scopedSlots: { customRender: 'formCount' },
+                sorter:(a, b) => a.formCount - b.formCount,
             },{
                 title: '表单提交单价',
                 dataIndex: 'formCountPrice',         
                 tip: '当日消耗/当日回传表单数',
                 align: 'center',
                 scopedSlots: { customRender: 'formCountPrice' },
+                sorter: (a, b) => a.formCountPrice - b.formCountPrice,
               },
 
 
@@ -1103,183 +1080,147 @@ export const KScustomFields= [
             title: '激活数',
             dataIndex: 'activation',
             width:150,
-            tip: '',
+            tip: '广告主回传的应用激活次数',
             align: 'center',
             scopedSlots: { customRender: 'activation' },
-            
+            sorter:(a, b) => a.activation - b.activation,
           },{
-            title: '激活单价',
+            title: '激活单价',
             dataIndex: 'activationPrice',
             width:150,
-            tip: '',
+            tip: '花费/激活数',
             align: 'center',
             scopedSlots: { customRender: 'activationPrice' },
-            
-          }, {
-            title: '封面曝光数',
-            dataIndex: 'photoShow',
-            width:150,
-            tip: '',
-            align: 'center',
-            scopedSlots: { customRender: 'photoShow' },
-            
-          },{
-            title: '封面点击数',
-            dataIndex: 'photoClick',
-            width:150,
-            tip: '',
-            align: 'center',
-            scopedSlots: { customRender: 'photoClick' },
-            
-          },{
-            title: '有效素材数',
-            dataIndex: 'newEffectNum',
-            width:150,
-            tip: '',
-            align: 'center',
-            scopedSlots: { customRender: 'newEffectNum' },
-            
-          }, {
-            title: '爆款素材数',
-            dataIndex: 'newHotNum',
-            width:150,
-            tip: '',
-            align: 'center',
-            scopedSlots: { customRender: 'newHotNum' },
-            
-          }, {
-            title: '上新素材数',
-            dataIndex: 'newVideoNum',
-            width:150,
-            tip: '',
-            align: 'center',
-            scopedSlots: { customRender: 'newVideoNum' },
-            
+            sorter:(a, b) => a.activationPrice - b.activationPrice,
           }, {
             title: '次留率',
             dataIndex: 'leave',
-            tip: '前一日激活用户在次日继续访问的PV/前一日激活数',
+            tip: '次留数/激活数',
             align: 'center',    
             scopedSlots: { customRender: 'leave' },
-
+            sorter:(a, b) => a.leave - b.leave,
           },{
-            title: '付费数',
+            title: '付费数',
             dataIndex: 'eventPay',
-            tip: '当回传的付费行为次数',
+            tip: '当如回传的付费行为次数',
             align: 'center',    
             scopedSlots: { customRender: 'eventPay' },
+            sorter:(a, b) => a.eventPay - b.eventPay,
           },
           {
-            title: '付费金额',
-            dataIndex: 'eventPayPurchaseAmount',
-            tip: '当日回传的付费行为所带来的付费金额',
+            title: '付费率',
+            dataIndex: 'eventPayRate',
+            tip: '付费数/(激活数+表单数)',
             align: 'center',    
-            scopedSlots: { customRender: 'eventPayPurchaseAmount' },
+            scopedSlots: { customRender: 'eventPayRate' },
+            sorter:(a, b) => a.eventPayRate - b.eventPayRate,
           },
           {
-            title: '付费次数成本',
+            title: '付费成本',
             dataIndex: 'eventPayCost',
             tip: '消耗/付费次数',
             align: 'center',    
             scopedSlots: { customRender: 'eventPayCost' },
+            sorter:(a, b) => a.eventPayCost - b.eventPayCost,
           }, {
             title: '新增付费数',
             dataIndex: 'eventNewUserPay',
-            tip: '消耗/付费次数',
+            tip: '历史30天内首次产生付费的人数',
             align: 'center',    
             scopedSlots: { customRender: 'eventNewUserPay' },
+            sorter:(a, b) => a.eventNewUserPay - b.eventNewUserPay,
           },{
             title: '新增付费成本',
             dataIndex: 'eventNewUserPayCost',
-            tip: '消耗/付费次数',
+            tip: '当日消耗/当日新增付费人数',
             align: 'center',    
             scopedSlots: { customRender: 'eventNewUserPayCost' },
+            sorter:(a, b) => a.eventNewUserPayCost - b.eventNewUserPayCost,
           },{
             title: '新增付费率',
             dataIndex: 'eventNewUserPayRate',
-            tip: '消耗/付费次数',
+            tip: '当日新增付费人数/(当日激活数+表单数)',
             align: 'center',    
             scopedSlots: { customRender: 'eventNewUserPayRate' },
+            sorter:(a, b) => a.eventNewUserPayRate - b.eventNewUserPayRate,
           },{
             title: '唤起应用数',
             dataIndex: 'eventAppInvoked',
-            tip: '消耗/付费次数',
+            tip: '广告主当日回传的唤起应用次数',
             align: 'center',    
             scopedSlots: { customRender: 'eventAppInvoked' },
+            sorter:(a, b) => a.eventAppInvoked - b.eventAppInvoked,
           },{
             title: '唤起应用成本',
             dataIndex: 'eventAppInvokedCost',
-            tip: '消耗/付费次数',
+            tip: '当日消耗/唤起应用数',
             align: 'center',    
             scopedSlots: { customRender: 'eventAppInvokedCost' },
+            sorter:(a, b) => a.eventAppInvokedCost - b.eventAppInvokedCost,
           },{
             title: '注册数',
             dataIndex: 'eventRegister',
-            tip: '消耗/付费次数',
+            tip: '当日回传注册数',
             align: 'center',    
             scopedSlots: { customRender: 'eventRegister' },
+            sorter:(a, b) => a.eventRegister - b.eventRegister,
           },{
             title: '注册成本',
             dataIndex: 'eventRegisterCost',
-            tip: '消耗/付费次数',
+            tip: '当日消耗/当日回传注册数',
             align: 'center',    
             scopedSlots: { customRender: 'eventRegisterCost' },
+            sorter:(a, b) => a.eventRegisterCost - b.eventRegisterCost,
           },{
             title: '关键行为数',
             dataIndex: 'keyAction',
-            tip: '消耗/付费次数',
+            tip: '广告主回传的关键行为数',
             align: 'center',    
             scopedSlots: { customRender: 'keyAction' },
+            sorter:(a, b) => a.keyAction - b.keyAction,
           },{
-            title: '关键行为成本',
+            title: '关键行为成本',
             dataIndex: 'keyActionCost',
-            tip: '消耗/付费次数',
+            tip: '筛选时间内累计消耗/关键行为数',
             align: 'center',    
             scopedSlots: { customRender: 'keyActionCost' },
+            sorter:(a, b) => a.keyActionCost - b.keyActionCost,
           },{
             title: '关键行为率',
             dataIndex: 'keyActionRate',
-            tip: '消耗/付费次数',
+            tip: '关键行为数/激活数',
             align: 'center',    
             scopedSlots: { customRender: 'keyActionRate' },
+            sorter:(a, b) => a.keyActionRate - b.keyActionRate,
           },{
             title: '首日付费金额',
             dataIndex: 'eventPayPurchaseAmountFirstDay',
-            tip: '消耗/付费次数',
+            tip: '当日激活的用户在当天产生的付费行为所带来的付费金额',
             align: 'center',    
             scopedSlots: { customRender: 'eventPayPurchaseAmountFirstDay' },
+            sorter:(a, b) => a.eventPayPurchaseAmountFirstDay - b.eventPayPurchaseAmountFirstDay,
           },{
             title: '首日ROI',
             dataIndex: 'eventPayFirstDayRoi',
-            tip: '消耗/付费次数',
+            tip: '首日付费金额/当日消耗',
             align: 'center',    
             scopedSlots: { customRender: 'eventPayFirstDayRoi' },
+            sorter:(a, b) => a.eventPayFirstDayRoi - b.eventPayFirstDayRoi,
           },{
                 title: '表单提交数',
                 dataIndex: 'formCount',
                 tip: '当日回传表单数',
                 align: 'center',
                 scopedSlots: { customRender: 'formCount' },
+                sorter:(a, b) => a.formCount - b.formCount,
             },{
                 title: '表单提交单价',
                 dataIndex: 'formCountPrice',         
                 tip: '当日消耗/当日回传表单数',
                 align: 'center',
                 scopedSlots: { customRender: 'formCountPrice' },
-              },{
-                title: '操作建议',
-                dataIndex: 'operationAgree',
-                tip: '',
-                align: 'center',
-                scopedSlots: { customRender: 'operationAgree' },
-            },{
-                title: '操作',
-                dataIndex: 'operator',         
-                tip: '当日消耗/当日回传表单数',
-                align: 'center',
-                width:150,
-                scopedSlots: { customRender: 'operator' },
-              },
+                sorter: (a, b) => a.formCountPrice - b.formCountPrice,
+              }
 
 
 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 806 - 684
src/views/modules/stockWatch/modules/new-keepManage/group-keepManage.vue


+ 75 - 10
src/views/modules/stockWatch/modules/new-keepManage/new-keep-data.js

@@ -26,13 +26,12 @@
                  fixed: 'left',
              },
              {
-                 title: '运营人员数量',
+                 title: '运营人员',
                  dataIndex: 'userNum',
                  scopedSlots: { customRender: 'userNum' },
                  align: 'center',
                  width: 100,
                  fixed: 'left',
-                 sorter: () => {},
              },
              {
                  title: '花费',
@@ -40,7 +39,7 @@
                  align: 'center',
                  width: 100,
                  fixed: 'left',
-                 sorter: () => {},
+                 sorter: (a, b) => a.totalCost - b.totalCost,
              },
              {
                  title: '花费环比',
@@ -56,6 +55,20 @@
                 tip: '',
                 align: 'center',
                 
+            },{
+                title: '有效素材数',
+                dataIndex: 'newEffectNum',
+                width: 150,
+                tip: '',
+                align: 'center',
+                
+            },{
+                title: '爆款素材数',
+                dataIndex: 'newHotNum',
+                width: 150,
+                tip: '',
+                align: 'center',
+                
             },
          ]
      }
@@ -64,16 +77,23 @@
         return [
             {
                 title: '账户名称',
-                dataIndex: 'authName',
-                scopedSlots: { customRender: 'authName' },
+                dataIndex: 'accountName',
+                scopedSlots: { customRender: 'accountName' },
                 align: 'center',
                 key: 'date',
                 width: 200,
                 fixed: 'left',
+            },{
+                title: '账户ID',
+                dataIndex: 'accountId',
+                scopedSlots: { customRender: 'accountId' },
+                align: 'center',
+                width: 100,
+                fixed: 'left',
             },
             {
                 title: '运营人员',
-                dataIndex: 'realname',
+                dataIndex: 'userName',
                 align: 'center',
                 width: 100,
                 fixed: 'left',
@@ -85,7 +105,7 @@
                 align: 'center',
                 width: 100,
                 fixed: 'left',
-                sorter: () => {},
+                sorter: (a, b) => a.totalCost - b.totalCost,
             },
             {
                 title: '花费环比',
@@ -93,19 +113,64 @@
                 align: 'center',
                 width: 100,
                 fixed: 'left',
-                sorter: () => {},
             },{
                 title: '花费同比',
                 dataIndex: 'equallyRate',
                 align: 'center',
                 width: 100,
                 fixed: 'left',
-                sorter: () => {},
             },
             
         ]
     }
- 
+    groupDelivery(){
+        return [
+            {
+                title: '状态操作',
+                dataIndex: 'status',
+                align: 'center',
+                scopedSlots: { customRender: 'status' },
+                },
+                {
+                title: '组名称',
+                dataIndex: 'unitName',
+                align: 'center',
+                width:350,
+                },{
+                title: '花费',
+                dataIndex: 'charge',
+                align: 'center',
+                sorter: (a, b) => a.charge - b.charge,
+                },{
+                title: '出价',
+                dataIndex: 'bid',
+                align: 'center',
+                sorter: (a, b) => a.bid - b.bid,
+                },{
+                title: '激活数',
+                dataIndex: 'activation',
+                align: 'center',
+                sorter: (a, b) => a.activation - b.activation,
+                },{
+                title: '激活成本',
+                dataIndex: 'activationCost',
+                align: 'center',
+                sorter: (a, b) => a.activationCost - b.activationCost,
+                },{
+                    title: '操作建议',
+                    dataIndex: 'operationAgree',
+                    key: 'operationAgree',
+                    align: 'center',
+                     
+                    },{
+                    title: '操作',
+                    dataIndex: 'operator',
+                    key: 'operator',
+                    align: 'center',
+                    scopedSlots: { customRender: 'operator' },
+                    },
+        ]
+    }
      // 默认初始展示列
      setDefaultColumns() {
          return [