Ver Fonte

经理页面修改

liubei@c-top.com.cn há 3 anos atrás
pai
commit
6f9db646e2

+ 9 - 6
src/views/modules/stockWatch/modules/new-keepManage/account-newkeepManage.vue

@@ -34,7 +34,7 @@
 
                 <a-card class="card-content echarts-card" style="margin-bottom: 20px;">
                 <div slot="title">
-                    数据趋势 <span style="font-size: 12px;">更新时间:{{updateTime | formatDate}}</span> 
+                    <span style="font-weight: bolder;">数据趋势</span> &nbsp;&nbsp; <span style="font-size: 12px;">更新时间:{{updateTime | formatDate}}</span> 
                 </div>
                 <div class="person-content-title" slot="extra">
                     <div class="content-title-acount"></div>
@@ -70,7 +70,7 @@
 
             <a-card class="card-content echarts-card" style="margin-bottom: 20px;">
                 <div slot="title">
-                    组投放数据 <span style="font-size: 12px;">更新时间:{{updateTimeGroup | formatDate}}</span> 
+                  <span style="font-weight: bolder;">组投放数据</span> &nbsp;&nbsp;  <span style="font-size: 12px;">更新时间:{{updateTimeGroup | formatDate}}</span> 
                 </div>
                 <div class="person-content-title" slot="extra">
                     <div class="content-title-acount"></div>
@@ -149,7 +149,7 @@
             
             <a-card class="card-content echarts-card" style="margin-bottom: 20px;">
                 <div slot="title">
-                    素材相关 <span style="font-size: 12px;">更新时间:{{updateRelated | formatDate}}</span> 
+                  <span style="font-weight:bolder">素材相关</span>  &nbsp;&nbsp; <span style="font-size: 12px;">更新时间:{{updateRelated | formatDate}}</span> 
                 </div>
                 <div class="person-content-title" slot="extra">
                     <div class="content-title-acount"></div>
@@ -348,16 +348,19 @@
                     dataIndex: 'bid',
                     key: 'bid',
                     align: 'center',
+                    sorter: (a, b) => a.bid - b.bid,
                     },{
                     title: '激活数',
                     dataIndex: 'activation',
                     key: 'activation',
                     align: 'center',
+                    sorter: (a, b) => a.activation - b.activation,
                     },{
                     title: '激活成本',
                     dataIndex: 'activationCost',
                     key: 'activationCost',
                     align: 'center',
+                    sorter: (a, b) => a.activationCost - b.activationCost,
                     },{
                     title: '操作建议',
                     dataIndex: 'operationAgree',
@@ -490,7 +493,7 @@
             this.getAccountNameData();
             this.getGroupLaunchData();
             this.getEchartOnePieData();
-            // this.showColumn();
+            this.showColumn();
         },
         
         methods: {
@@ -505,7 +508,7 @@
             },
             showColumn() {
             this.postDataAction('/toutiao/videoReportDaily/getColumnJson', {
-                columnType: 13,
+                columnType: 102,
             }).then((res) => {
                 // console.log(res)
                 if (res.success) {
@@ -569,7 +572,7 @@
             let arr = JSON.stringify(this.columns)
             this.postDataAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
                 json: arr,
-                columnType: 13,
+                columnType: 102,
             }).then((res) => {
                 // console.log(res)
             })

+ 83 - 129
src/views/modules/stockWatch/modules/new-keepManage/acountProjectData.js

@@ -910,78 +910,40 @@ export const KScustomFields= [
             title: '激活数',
             dataIndex: 'activation',
             width:150,
-            tip: '',
+            tip: '广告主回传的应用激活次数',
             align: 'center',
             scopedSlots: { customRender: 'activation' },
-            
+            sorter:(a, b) => a.activation - b.activation,
           },{
             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: '付费次数',
             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: '付费次数成本',
@@ -989,90 +951,105 @@ export const KScustomFields= [
             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: '关键行为数',
+            title: '行为数',
             dataIndex: 'keyAction',
-            tip: '消耗/付费次数',
+            tip: '广告主回传的关键行为数',
             align: 'center',    
             scopedSlots: { customRender: 'keyAction' },
+            sorter:(a, b) => a.keyAction - b.keyAction,
           },{
             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,78 +1080,40 @@ export const KScustomFields= [
             title: '激活数',
             dataIndex: 'activation',
             width:150,
-            tip: '',
+            tip: '广告主回传的应用激活次数',
             align: 'center',
             scopedSlots: { customRender: 'activation' },
-            
+            sorter:(a, b) => a.activation - b.activation,
           },{
             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: '付费次数',
             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: '付费次数成本',
@@ -1182,90 +1121,105 @@ export const KScustomFields= [
             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: '关键行为数',
+            title: '行为数',
             dataIndex: 'keyAction',
-            tip: '消耗/付费次数',
+            tip: '广告主回传的关键行为数',
             align: 'center',    
             scopedSlots: { customRender: 'keyAction' },
+            sorter:(a, b) => a.keyAction - b.keyAction,
           },{
             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,
               },{
                 title: '操作建议',
                 dataIndex: 'operationAgree',
@@ -1275,7 +1229,7 @@ export const KScustomFields= [
             },{
                 title: '操作',
                 dataIndex: 'operator',         
-                tip: '当日消耗/当日回传表单数',
+                tip: '',
                 align: 'center',
                 width:150,
                 scopedSlots: { customRender: 'operator' },

+ 147 - 38
src/views/modules/stockWatch/modules/new-keepManage/group-keepManage.vue

@@ -4,7 +4,7 @@
             <a-col :sm="18" :md="18" :xl="18" class="keep-manage-col">
                 <a-card class="card-content echarts-card">
                     <div slot="title">
-                        数据总览 更新时间:{{updateAccountEchart | formatDate}}
+                       <span style="font-weight:bolder;">数据总览</span> &nbsp;&nbsp; <span style="font-size:13px;">更新时间:{{updateAccountEchart | formatDate}}</span> 
                     </div>
                     <div class="person-content-title" slot="extra">
 
@@ -37,38 +37,42 @@
 
             <a-col :sm="6" :md="6" :xl="6"  class="keep-manage-col">
                 
-                    <a-card title="运营组数据" class="card-content">
-                        
+                    <a-card  class="card-content">
+                        <div slot="title">
+                            <span style="font-weight:bolder;">运营组数据</span> 
+                         </div>
                             <div style="width: 100%;height: 315px;">
                                 <ul class="group-keep-ul">
                                     <li>
-                                        今日消耗: <span style="font-weight: bold;">{{todayCost}}</span> 
+                                         今日消耗: <span style="font-weight: bold;">{{todayCost | formatNum}}</span> 
                                     </li>
                                     <li>
-                                        <span  style="margin-left:20%;" v-if="compare.indexOf('-') == -1">
-                                            <img style=" width: 25px;height: 25px;" class="title-radio-img" src="@/assets/up.png" alt="">
-                                            <span style="color: green;">{{compare}}</span>
-                                        </span>
-                                        <span style="margin-left:20%;" v-else-if="compare.indexOf('-') == 0">
+                                        <span  style="margin-left:20%;" v-if="compare.indexOf('-') == 0">
                                             <img style=" width: 25px;height: 25px;" class="title-radio-img" src="@/assets/down.png" alt="">
                                             <span style="color: red;">{{compare}}</span>
                                         </span>
+                                        <span style="margin-left:20%;" v-else-if="compare.indexOf('-') == -1">
+                                            <img style=" width: 25px;height: 25px;" class="title-radio-img" src="@/assets/up.png" alt="">
+                                            <span style="color: green;">{{compare}}</span>
+                                            
+                                        </span>
+                                        
                                         <a-tooltip placement="top">
                                             <template slot="title">
-                                              <span>截止此时今日与昨日的消耗同比</span>
+                                              <span>今天截止此时的消耗跟昨天截止同个时段的消耗变化</span>
                                             </template>
                                             <a-icon style="margin-left: 10px;" type="question-circle" />
                                           </a-tooltip>
                                          
                                     </li>
                                     <li>
-                                        消耗:{{sectionCost}}
+                                       <span style="margin-left: 31px;">消耗:</span> {{sectionCost | formatNum}}
                                     </li>
                                     <li>
-                                        人均带户:{{userAverageAccount}}
+                                        人均带户: {{userAverageAccount | formatNum}}
                                     </li>
                                     <li>
-                                        人均消耗:{{userAveragecost}}
+                                        人均消耗: {{userAveragecost | formatNum}}
                                     </li>
                                 </ul>
                                 
@@ -79,7 +83,10 @@
         </a-row>
         <a-row :gutter="24" style="margin-bottom: 20px;">
             <a-col>
-            <a-card title="运营数据详情" >
+            <a-card >
+                <div slot="title">
+                    <span style="font-weight:bolder;">运营数据详情</span> 
+                 </div>
                 <div class="person-content-title" slot="extra">
                     <div class="content-title-acount"></div>
                     <div class="content-title-checkout">
@@ -106,7 +113,21 @@
                 :loading="echartsLoadingYun"
                 @change="sortDataoperate"
                 ref="accountTable"
-                ></a-table>
+                >
+                <a slot="userName" slot-scope="text,record" @click="userNameClick(record)">{{ text }}</a>
+                <span slot="newEffectNum" slot-scope="text">
+                    <span v-if="text">{{text}}</span>
+                    <span v-else>-</span>
+                </span>
+                <span slot="newCampaignNum" slot-scope="text">
+                    <span v-if="text">{{text}}</span>
+                    <span v-else>-</span>
+                </span>
+                <span slot="newUnitNum" slot-scope="text">
+                    <span v-if="text">{{text}}</span>
+                    <span v-else>-</span>
+                </span>
+            </a-table>
                 
                
             </a-card>
@@ -114,7 +135,10 @@
         </a-row>
         <a-row :gutter="24">
             <a-col>
-                <a-card title="项目列表" >
+                <a-card>
+                    <div slot="title">
+                        <span style="font-weight:bolder;">{{titleList}}</span> 
+                     </div>
                     <div class="person-content-title" slot="extra">
                         <div class="content-title-acount"></div>
                         <div class="content-title-checkout">
@@ -194,6 +218,7 @@
         data() {
             return {
                 visible:false,
+                titleList:'项目列表',
                 listNum:[],
                 columnsFixd:keepPersonData.setNoDeleteColumns(),
                 selectValue: '1',
@@ -249,7 +274,8 @@
                     {
                     title: '运营人员',
                     align: "center",
-                    dataIndex: 'userName'
+                    dataIndex: 'userName',
+                    scopedSlots: { customRender: 'userName' },
                     }, {
                     title: '账户数量',
                     align: "center",
@@ -270,18 +296,21 @@
                     dataIndex: 'newEffectNum',
                     sorter: true,
                     sorter: (a, b) => a.newEffectNum - b.newEffectNum,
+                    scopedSlots: { customRender: 'newEffectNum' },
                     }, {
                     title: '新上计划数',
                     align: "center",
                     dataIndex: 'newCampaignNum',
                     sorter: true,
                     sorter: (a, b) => a.newCampaignNum - b.newCampaignNum,
+                    scopedSlots: { customRender: 'newCampaignNum' },
                     }, {
                     title: '新上组数',
                     align: "center",
                     dataIndex: 'newUnitNum',
                     sorter: true,
                     sorter: (a, b) => a.newUnitNum - b.newUnitNum,
+                    scopedSlots: { customRender: 'newUnitNum' },
                     },
                 ],
                 columnsProject:[
@@ -295,13 +324,14 @@
                     align: "center",
                     dataIndex: 'accountNum'
                     }, {
-                    title: '运营人员数量',
+                    title: '运营人员',
                     align: "center",
                     dataIndex: 'userNum',
                     }, {
                     title: '花费',
                     align: "center",
-                    dataIndex: 'totalCost'
+                    dataIndex: 'totalCost',
+                    sorter: (a, b) => a.totalCost - b.totalCost,
                     }, {
                     title: '花费环比',
                     align: "center",
@@ -368,11 +398,19 @@
             return '-'
         }
         
-      }
+      },
+      formatNum:function(value){
+        if(!value){
+            return '暂无数据'
+        }else if(value == '暂无数据'){
+            return '暂无数据'
+        }
+        return Number(value).toFixed(3).toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,");
+            },
     },
         mounted() {
             this.getQueryNewlyData();
-            // this.showColumn();
+            this.showColumn();
             this.getOperationGroupData();
             this.getOperateDetails();
             this.getItemList();
@@ -398,8 +436,13 @@
             },
             dateMiddleProjectChange(){
                 this.echartsLoading = true;
-                this.echartsIpagination.current = 1;
-                this.getItemList()
+                this.echartsIpaginationProject.current = 1;
+                if (this.projectAccount == 'a') {
+                    this.getItemList()
+                }else{
+                    this.getAccountData();
+                }
+                
             },
             sort(pagination, filters, sorter, { currentDataSource }){
                 this.echartsLoading = true;
@@ -435,6 +478,7 @@
                 this.echartsLoading = true;
                 this.columnsFixd = keepPersonData.setNoDeleteProjectColumns();
                 this.listNum = keepPersonData.setNoDeleteProjectColumns();
+                this.titleList = '账户列表列表'
                 this.columnsProject=[
                 {
                     title: '账户名称',
@@ -448,7 +492,8 @@
                     }, {
                     title: '花费',
                     align: "center",
-                    dataIndex: 'totalCost'
+                    dataIndex: 'totalCost',
+                    sorter: (a, b) => a.totalCost - b.totalCost,
                     }, {
                     title: '花费环比',
                     align: "center",
@@ -467,7 +512,7 @@
                     align: "center",
                     dataIndex: 'activationPrice',
                     },{
-                    title: '关键行为数',
+                    title: '行为数',
                     align: "center",
                     dataIndex: 'keyAction',
                     },{
@@ -488,6 +533,7 @@
             projectAccountChange(ent){
                 this.echartsLoading = true;
                 if (ent.target.value == 'a') {
+                    this.titleList = '项目列表'
                     this.columnsFixd = keepPersonData.setNoDeleteColumns();
                     this.listNum = keepPersonData.setNoDeleteColumns();
                     this.projectId = '';
@@ -502,13 +548,14 @@
                     align: "center",
                     dataIndex: 'accountNum'
                     }, {
-                    title: '运营人员数量',
+                    title: '运营人员',
                     align: "center",
                     dataIndex: 'userNum',
                     }, {
                     title: '花费',
                     align: "center",
-                    dataIndex: 'totalCost'
+                    dataIndex: 'totalCost',
+                    sorter: (a, b) => a.totalCost - b.totalCost,
                     }, {
                     title: '花费环比',
                     align: "center",
@@ -543,6 +590,7 @@
                 this.echartsIpaginationProject.current = 1;
                     this.getItemList()
                 }else{
+                    this.titleList = '账户列表'
                     this.columnsFixd = keepPersonData.setNoDeleteProjectColumns();
                     this.listNum = keepPersonData.setNoDeleteProjectColumns();
                     console.log(this.columnsFixd);
@@ -559,7 +607,8 @@
                     }, {
                     title: '花费',
                     align: "center",
-                    dataIndex: 'totalCost'
+                    dataIndex: 'totalCost',
+                    sorter: (a, b) => a.totalCost - b.totalCost,
                     }, {
                     title: '花费环比',
                     align: "center",
@@ -578,7 +627,7 @@
                     align: "center",
                     dataIndex: 'activationPrice',
                     },{
-                    title: '关键行为数',
+                    title: '行为数',
                     align: "center",
                     dataIndex: 'keyAction',
                     },{
@@ -598,6 +647,10 @@
             accountNameClick(row){
                 this.$router.push({path:'/modules/stockWatch/modules/new-keepManage/account-newkeepManage',query:{accountId:row.accountId}})
             },
+            userNameClick(row){
+                console.log(row);
+                this.$router.push({path:'/modules/stockWatch/modules/new-keepManage/personal-keepManage',query:{userId:row.userId}})
+            },
             // 运营组数据
             getOperationGroupData(){
                 let params = {
@@ -608,11 +661,30 @@
                 }
                 this.getAction(process.env.VUE_APP_BASE_STARE_URL+'/kuaiShouOpreate/kuaiShouMaterialStareController/kuaiShouOperateDateTotal',params).then(res=>{
                     if (res.code == 0) {
-                        this.todayCost = res.result.todayCost;
+                        if (res.result.todayCost) {
+                            this.todayCost = res.result.todayCost
+                        }else{
+                            this.todayCost = '暂无数据'
+                        }
+                       
                         this.compare = res.result.compare;
-                        this.sectionCost = res.result.sectionCost;
-                        this.userAverageAccount = res.result.userAverageAccount;
-                        this.userAveragecost = res.result.userAveragecost;
+                        if (res.result.sectionCost) {
+                            this.sectionCost = res.result.sectionCost;
+                        }else{
+                            this.sectionCost = '暂无数据'
+                        }
+                        if (res.result.userAverageAccount) {
+                            this.userAverageAccount = res.result.userAverageAccount;
+                        }else{
+                            this.userAverageAccount = '暂无数据'
+                        }
+                        if (res.result.userAveragecost) {
+                            this.userAveragecost = res.result.userAveragecost;
+                        }else{
+                            this.userAveragecost = '暂无数据'
+                        }
+                        
+                       
                     }
                 })
             },
@@ -820,11 +892,30 @@
 
                 // this.clientWidth  =  document.documentElement.clientWidth - 224
                 // var myChart = echarts.init(document.getElementById('accountIndexEchart'))
+                var iconNone = require('../../../../../assets/nodata.png');
                 let option = {
                   
                     tooltip: {
                         trigger: 'axis'
-                    },
+                    }, 
+                    title:{
+                    x: 'center',
+                    y: 'center',
+                    text:timeData.length == 0?`{a| ${''}}`:'',
+                    show: true,
+                    textStyle:{
+                        rich: {
+                            a:{
+                            height: 200,
+                            width: 280,
+                            backgroundColor: {
+                                image: iconNone,
+                            }
+                            }
+                        }
+
+                    }
+                },
                     legend: {
                         data: lengthData
                     },
@@ -904,11 +995,30 @@
             acctowecharts(lengthData,timeData,series){
                 // this.clientWidth  =  document.documentElement.clientWidth - 224
                 // var myChart = echarts.init(document.getElementById('accountIndexEchart'))
+                var iconNoneAcc = require('../../../../../assets/nodata.png');
                 let option = {
                   
                     tooltip: {
                         trigger: 'axis'
                     },
+                    title:{
+                    x: 'center',
+                    y: 'center',
+                    text:timeData.length == 0?`{a| ${''}}`:'',
+                    show: true,
+                    textStyle:{
+                        rich: {
+                            a:{
+                            height: 200,
+                            width: 280,
+                            backgroundColor: {
+                                image: iconNoneAcc,
+                            }
+                            }
+                        }
+
+                    }
+                },
                     legend: {
                         data: lengthData
                     },
@@ -940,7 +1050,6 @@
             // 自定义列
             customColumn(){
                 this.visible = true;
-                console.log(this.columns);
                 this.listNum = [...this.columnsProject]
             },
             //自定义列相关
@@ -949,7 +1058,7 @@
             },
             showColumn() {
             this.postDataAction('/toutiao/videoReportDaily/getColumnJson', {
-                columnType: 13,
+                columnType: 101,
             }).then((res) => {
                 // console.log(res)
                 if (res.success) {
@@ -980,7 +1089,7 @@
 
             changeColumn(val) {
             this.columnsProject = [...val]
-            if (this.columnsProject.length > this.columnsFixd.length && this.columns.length < 8) {
+            if (this.columnsProject.length > this.columnsFixd.length && this.columnsProject.length < 8) {
                 this.columnsProject.forEach((element, index) => {
                 if (index < this.columnsProject.length - 1) {
                    
@@ -1015,7 +1124,7 @@
             let arr = JSON.stringify(this.columnsProject)
             this.postDataAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
                 json: arr,
-                columnType: 13,
+                columnType: 101,
             }).then((res) => {
                 // console.log(res)
             })

+ 6 - 9
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: '花费环比',
@@ -64,8 +63,8 @@
         return [
             {
                 title: '账户名称',
-                dataIndex: 'authName',
-                scopedSlots: { customRender: 'authName' },
+                dataIndex: 'accountName',
+                scopedSlots: { customRender: 'accountName' },
                 align: 'center',
                 key: 'date',
                 width: 200,
@@ -73,7 +72,7 @@
             },
             {
                 title: '运营人员',
-                dataIndex: 'realname',
+                dataIndex: 'userName',
                 align: 'center',
                 width: 100,
                 fixed: 'left',
@@ -85,7 +84,7 @@
                 align: 'center',
                 width: 100,
                 fixed: 'left',
-                sorter: () => {},
+                sorter: (a, b) => a.totalCost - b.totalCost,
             },
             {
                 title: '花费环比',
@@ -93,14 +92,12 @@
                 align: 'center',
                 width: 100,
                 fixed: 'left',
-                sorter: () => {},
             },{
                 title: '花费同比',
                 dataIndex: 'equallyRate',
                 align: 'center',
                 width: 100,
                 fixed: 'left',
-                sorter: () => {},
             },
             
         ]