瀏覽代碼

'上线盯盘账户维度'

魏志佳 4 年之前
父節點
當前提交
610cf73c08
共有 29 個文件被更改,包括 378 次插入203 次删除
  1. 1 1
      src/views/modules/BatchCreate/TouTiaoBatch.vue
  2. 1 1
      src/views/modules/BatchCreate/newCreate.vue
  3. 1 1
      src/views/modules/BatchCreate/newDirectedPackage.vue
  4. 0 1
      src/views/modules/BatchCreate/newPlan.vue
  5. 0 1
      src/views/modules/LaunchHousekeeper/newProject.vue
  6. 0 1
      src/views/modules/LaunchHousekeeper/setProjectBudget.vue
  7. 0 1
      src/views/modules/LaunchHousekeeper/setProjectConvert.vue
  8. 0 1
      src/views/modules/LaunchHousekeeper/setProjectCreate.vue
  9. 0 1
      src/views/modules/LaunchHousekeeper/setProjectDirectional.vue
  10. 1 1
      src/views/modules/Statistics/KSAccountReport.vue
  11. 1 1
      src/views/modules/Statistics/accountReport.vue
  12. 0 1
      src/views/modules/Statistics/mediaReport.vue
  13. 1 1
      src/views/modules/autoLaunch/accelerateExplorationList.vue
  14. 1 1
      src/views/modules/autoLaunch/appIdList.vue
  15. 1 1
      src/views/modules/autoLaunch/autoLaunchReport.vue
  16. 21 20
      src/views/modules/autoLaunch/configLaunchInfo.vue
  17. 1 1
      src/views/modules/autoLaunch/configLaunchList.vue
  18. 0 1
      src/views/modules/autoLaunch/createStrategy.vue
  19. 1 1
      src/views/modules/autoLaunch/groupList.vue
  20. 1 1
      src/views/modules/autoLaunch/materialAndBid.vue
  21. 0 1
      src/views/modules/autoLaunch/newAppId.vue
  22. 1 1
      src/views/modules/autoLaunch/planList.vue
  23. 0 1
      src/views/modules/autoLaunch/setDirectional.vue
  24. 1 1
      src/views/modules/autoLaunch/strategyList.vue
  25. 76 22
      src/views/modules/columnConst/stockWatch.js
  26. 0 1
      src/views/modules/kuaishouapp/populationAnalysis/index.vue
  27. 265 134
      src/views/modules/stockWatch/accountPage.vue
  28. 1 1
      src/views/modules/workBench/designLeader/index.vue
  29. 2 2
      vue.config.js

+ 1 - 1
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -1675,7 +1675,7 @@ export default {
 
     }
     
-    .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+    .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 1 - 1
src/views/modules/BatchCreate/newCreate.vue

@@ -825,7 +825,7 @@
 }
 
   .ant-tooltip-inner,
-  .ant-tooltip,
+
   .ant-tooltip-arrow::before {
     background-color: #fff;
     color: #333;

+ 1 - 1
src/views/modules/BatchCreate/newDirectedPackage.vue

@@ -362,7 +362,7 @@
             }
         }
     }
-    .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+    .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #666;
         font-size: 12px;

+ 0 - 1
src/views/modules/BatchCreate/newPlan.vue

@@ -1335,7 +1335,6 @@ export default {
 
 
 .ant-tooltip-inner,
-.ant-tooltip,
 .ant-tooltip-arrow::before {
   background-color: #fff;
   color: #333;

+ 0 - 1
src/views/modules/LaunchHousekeeper/newProject.vue

@@ -547,7 +547,6 @@ export default {
 
 
 .ant-tooltip-inner,
-.ant-tooltip,
 .ant-tooltip-arrow::before {
   background-color: #fff;
   color: #333;

+ 0 - 1
src/views/modules/LaunchHousekeeper/setProjectBudget.vue

@@ -555,7 +555,6 @@ export default {
 
 
 .ant-tooltip-inner,
-.ant-tooltip,
 .ant-tooltip-arrow::before {
   background-color: #fff;
   color: #333;

+ 0 - 1
src/views/modules/LaunchHousekeeper/setProjectConvert.vue

@@ -585,7 +585,6 @@ export default {
 
 
 .ant-tooltip-inner,
-.ant-tooltip,
 .ant-tooltip-arrow::before {
   background-color: #fff;
   color: #333;

+ 0 - 1
src/views/modules/LaunchHousekeeper/setProjectCreate.vue

@@ -1292,7 +1292,6 @@ let MonitoringTypeColumns=[
 }
 
   .ant-tooltip-inner,
-  .ant-tooltip,
   .ant-tooltip-arrow::before {
     background-color: #fff;
     color: #333;

+ 0 - 1
src/views/modules/LaunchHousekeeper/setProjectDirectional.vue

@@ -857,7 +857,6 @@ export default {
 
 
 .ant-tooltip-inner,
-.ant-tooltip,
 .ant-tooltip-arrow::before {
   background-color: #fff;
   color: #333;

+ 1 - 1
src/views/modules/Statistics/KSAccountReport.vue

@@ -1424,7 +1424,7 @@ export default {
 }
 </script>
 <style lang="scss">
-     .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+     .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 1 - 1
src/views/modules/Statistics/accountReport.vue

@@ -1350,7 +1350,7 @@ export default {
 }
 </script>
 <style lang="scss">
-     .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+     .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 0 - 1
src/views/modules/Statistics/mediaReport.vue

@@ -742,7 +742,6 @@
 </style>
 <style lang="scss">
   .ant-tooltip-inner,
-  .ant-tooltip,
   .ant-tooltip-arrow::before {
     background-color: #fff;
     color: #666;

+ 1 - 1
src/views/modules/autoLaunch/accelerateExplorationList.vue

@@ -641,7 +641,7 @@ export default {
 
     }
     
-    .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+    .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 1 - 1
src/views/modules/autoLaunch/appIdList.vue

@@ -529,7 +529,7 @@ export default {
 
     }
     
-    .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+    .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 1 - 1
src/views/modules/autoLaunch/autoLaunchReport.vue

@@ -1987,7 +1987,7 @@ const publicColumns = [
 .autoLaunchReport{
 
 
-     .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+     .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 21 - 20
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -35,10 +35,10 @@
                     <a-form-item >
                         <a-radio-group   v-decorator="['campaignType',{initialValue:2 }]" @change="campaignTypeChange">
                             <a-radio-button :value="2">提升应用安装</a-radio-button>
-                            <a-radio-button :value="3">获取电商下单</a-radio-button>                                   
-                            <a-radio-button :value="4">推广品牌活动</a-radio-button>                                   
-                            <a-radio-button :value="5">收集销售线索</a-radio-button>                                   
-                            <a-radio-button :value="7">提高应用活跃</a-radio-button>                                   
+                            <a-radio-button :value="3" :disabled='true'>获取电商下单</a-radio-button>                                   
+                            <a-radio-button :value="4" :disabled='true'>推广品牌活动</a-radio-button>                                   
+                            <a-radio-button :value="5" :disabled='true'>收集销售线索</a-radio-button>                                   
+                            <a-radio-button :value="7" :disabled='true'>提高应用活跃</a-radio-button>                                   
                         </a-radio-group>
                     </a-form-item>
                 </div>
@@ -303,7 +303,7 @@
                                 </a-radio-group>
                             </a-form-item>
 
-                            <div style="margin-top:24px"  v-if="getFormData('platformOs')!=0">
+                            <!-- <div style="margin-top:24px"  v-if="getFormData('platformOs')!=0">
                                 <div v-if="getFormData('platformOs')==1">
                                     <a-form-item>
                                     <a-radio-group v-decorator="['androidOsv',{initialValue: 3,}]">
@@ -327,10 +327,10 @@
                                     </a-form-item>
                                 </div>
                                 
-                            </div>
+                            </div> -->
                         </div>
                     </div>
-                    <div class="row-item" v-if="getFormData('platformOs')!=2">
+                    <!-- <div class="row-item" v-if="getFormData('platformOs')!=2">
                         <div class="hint-item"></div>
                         <div class="label-item">
                         <div class="text-item">设备品牌</div>
@@ -366,18 +366,9 @@
                                 </a-checkbox-group>
                             </div>
                         </div>                  
-                        <!-- <div style="width: 400px; margin-top: 24px;" class="inventoryTypes" v-show="adposition=='inventoryTypes'">
-                            <div class="inventory-tags-lists-header">
-                                <a-checkbox :indeterminate="indeterminate" :checked="checkAll" @change="onCheckAllChange">
-                                </a-checkbox>
-                            <div class="inventory-tags-lists-name"><strong>品牌名称</strong></div>
-                            </div>
-                            <div class="inventory-tags-lists-container">
-                                <a-checkbox-group v-model="checkedList" :options="plainOptions" @change="onChange" />
-                            </div>
-                        </div> -->
+                        
                         </div>
-                    </div>
+                    </div> -->
                     <div class="row-item">
                         <div class="hint-item"></div>
                             <div class="label-item">
@@ -888,7 +879,8 @@
                         </div>
                         <div class="input-item">
                         <a-form-item>
-                            <a-input v-decorator="['clickTrackUrl']" />
+                            <a-input v-decorator="['clickTrackUrl']"  @focus="clickTrackUrlFocus"  @blur="clickTrackUrlBlur"/>
+                            <span v-show="clickTrackUrlTip" style="font-size:14px;color:red;">填写点击检测连接的话,开始播放链接必须填写</span>
                         </a-form-item>
                         </div>
                     </div>
@@ -1289,6 +1281,7 @@ export default {
     },
     data() {
         return {
+            clickTrackUrlTip:false,
             deviceBrand:0,
             tongbuLoading:false,
             refreshPopulationLoading:false,
@@ -2463,6 +2456,15 @@ export default {
                     
                 }
             })
+        },
+
+        clickTrackUrlFocus(){
+            // console.log('focus')
+            this.clickTrackUrlTip=true;
+        },
+        clickTrackUrlBlur(){
+            // console.log('blur')
+            this.clickTrackUrlTip=false;
         }
     },
     created() {
@@ -2584,7 +2586,6 @@ export default {
 
 
 .ant-tooltip-inner,
-.ant-tooltip,
 .ant-tooltip-arrow::before {
   background-color: #fff;
   color: #333;

+ 1 - 1
src/views/modules/autoLaunch/configLaunchList.vue

@@ -585,7 +585,7 @@ export default {
 
     }
     
-    .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+    .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 0 - 1
src/views/modules/autoLaunch/createStrategy.vue

@@ -367,7 +367,6 @@ export default {
 
 
 .ant-tooltip-inner,
-.ant-tooltip,
 .ant-tooltip-arrow::before {
   background-color: #fff;
   color: #333;

+ 1 - 1
src/views/modules/autoLaunch/groupList.vue

@@ -977,7 +977,7 @@ export default {
 
     }
     
-    .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+    .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 1 - 1
src/views/modules/autoLaunch/materialAndBid.vue

@@ -1982,7 +1982,7 @@ const publicColumns = [
 .autoLaunchReport{
 
 
-     .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+     .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 0 - 1
src/views/modules/autoLaunch/newAppId.vue

@@ -375,7 +375,6 @@ export default {
 
 
 .ant-tooltip-inner,
-.ant-tooltip,
 .ant-tooltip-arrow::before {
   background-color: #fff;
   color: #333;

+ 1 - 1
src/views/modules/autoLaunch/planList.vue

@@ -986,7 +986,7 @@ export default {
 
     }
     
-    .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+    .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 0 - 1
src/views/modules/autoLaunch/setDirectional.vue

@@ -1775,7 +1775,6 @@ export default {
     //     line-height: 32px;
     // }
 .ant-tooltip-inner,
-.ant-tooltip,
 .ant-tooltip-arrow::before {
   background-color: #fff;
   color: #333;

+ 1 - 1
src/views/modules/autoLaunch/strategyList.vue

@@ -974,7 +974,7 @@ export default {
 
     }
     
-    .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
+    .ant-tooltip-inner,.ant-tooltip-arrow::before{
         background-color: #fff;
         color: #333;
     }

+ 76 - 22
src/views/modules/columnConst/stockWatch.js

@@ -904,6 +904,7 @@ export const KScustomFields= [
           width:150,
           tip: '广告在投放期间的花费总额',
           align: 'center',
+          type:'double',
           scopedSlots: { customRender: 'charge' },
           sorter: () => {}
         },
@@ -911,7 +912,8 @@ export const KScustomFields= [
           title: '封面曝光数',
           dataIndex: 'photoShow',
           tip: '广告在瀑布流被观看次数',
-          align: 'center',       
+          align: 'center',    
+          type:'int',   
           scopedSlots: { customRender: 'photoShow' },
           sorter:() => {}
         },
@@ -920,6 +922,7 @@ export const KScustomFields= [
           dataIndex: 'photoClick',
           tip: '用户点击封面进入视频播放页的次数(数据会进行反作弊去重)',
           align: 'center',
+          type:'int',
         
           scopedSlots: { customRender: 'photoClick' },
           sorter: () => {}
@@ -929,16 +932,16 @@ export const KScustomFields= [
           dataIndex: 'aclick',
           tip: '用户进入视频播放页观看的次数(数据会进行反作弊去重)',
           align: 'center',
-       
+          type:'int',
           scopedSlots: { customRender: 'aclick' },
           sorter:() => {}
         },
         {
           title: '行为数',
           dataIndex: 'bclick',
-          tip: '用户在视频播放页单击转化按钮的次数/展示数*100%',
+          tip: '用户在视频播放页单击转化按钮的次数',
           align: 'center',
-        
+          type:'int',
           scopedSlots: { customRender: 'bclick' },
           sorter:() => {}
         },
@@ -947,6 +950,7 @@ export const KScustomFields= [
           dataIndex: 'photoClickRatio',
           tip: '封面点击数占封面曝光数百分比',
           align: 'center',    
+          type:'string',
           scopedSlots: { customRender: 'photoClickRatio' },
           sorter:() => {}
         },
@@ -955,6 +959,7 @@ export const KScustomFields= [
           dataIndex: 'actionRatio',
           tip: '行为数占素材曝光数百分比',
           align: 'center',    
+          type:'string',
           scopedSlots: { customRender: 'actionRatio' },
           sorter:() => {}
         },
@@ -971,6 +976,7 @@ export const KScustomFields= [
           dataIndex: 'impression1kCost',
           tip: '花费/素材曝光数*1000',
           align: 'center',    
+          type:'double',
           scopedSlots: { customRender: 'impression1kCost' },
           sorter:() => {}
         },
@@ -979,6 +985,7 @@ export const KScustomFields= [
           dataIndex: 'photoClickCost',
           tip: '花费/封面点击数',
           align: 'center',    
+          type:'double',
           scopedSlots: { customRender: 'photoClickCost' },
           sorter:() => {}
         },
@@ -987,6 +994,7 @@ export const KScustomFields= [
           dataIndex: 'actionCost',
           tip: '总花费/行为数',
           align: 'center',    
+          type:'double',
           scopedSlots: { customRender: 'actionCost' },
           sorter:() => {}
         },
@@ -1004,6 +1012,7 @@ export const KScustomFields= [
           width:150,
           tip: '安卓端调起下载器并开始下载的次数',
           align: 'center',
+          type:'int',
           scopedSlots: { customRender: 'downloadStarted' },
           sorter: () => {}
         },
@@ -1011,7 +1020,8 @@ export const KScustomFields= [
           title: '安卓下载开始率',
           dataIndex: 'downloadStartedRatio',
           tip: '安卓下载开始数/行为数',
-          align: 'center',       
+          align: 'center',   
+          type:'string',    
           scopedSlots: { customRender: 'downloadStartedRatio' },
           sorter:() => {}
         },
@@ -1020,7 +1030,7 @@ export const KScustomFields= [
           dataIndex: 'downloadStartedCost',
           tip: '花费/安卓下载开始数',
           align: 'center',
-        
+          type:'double', 
           scopedSlots: { customRender: 'downloadStartedCost' },
           sorter: () => {}
         },
@@ -1029,7 +1039,7 @@ export const KScustomFields= [
           dataIndex: 'downloadCompleted',
           tip: '安卓端调起下载器并完成下载的次数',
           align: 'center',
-       
+          type:'int', 
           scopedSlots: { customRender: 'downloadCompleted' },
           sorter:() => {}
         },
@@ -1038,7 +1048,7 @@ export const KScustomFields= [
           dataIndex: 'downloadCompletedRatio',
           tip: '安卓下载完成数/安卓下载开始数',
           align: 'center',
-        
+          type:'string', 
           scopedSlots: { customRender: 'downloadCompletedRatio' },
           sorter:() => {}
         },
@@ -1046,7 +1056,8 @@ export const KScustomFields= [
           title: '安卓下载完成单价(元)',
           dataIndex: 'downloadCompletedCost',
           tip: '花费/安卓下载完成数',
-          align: 'center',    
+          align: 'center', 
+          type:'double',    
           scopedSlots: { customRender: 'downloadCompletedCost' },
           sorter:() => {}
         },
@@ -1055,6 +1066,7 @@ export const KScustomFields= [
           dataIndex: 'activation',
           tip: '广告主回传的应用激活次数',
           align: 'center',    
+          type:'int', 
           scopedSlots: { customRender: 'activation' },
           sorter:() => {}
         },
@@ -1063,6 +1075,7 @@ export const KScustomFields= [
           dataIndex: 'activationCost',
           tip: '花费/激活数',
           align: 'center',    
+          type:'double', 
           scopedSlots: { customRender: 'activationCost' },
           sorter:() => {}
         },
@@ -1070,7 +1083,8 @@ export const KScustomFields= [
           title: '下载完成激活率',
           dataIndex: 'activationRatio',
           tip: '激活数/安卓下载完成数',
-          align: 'center',    
+          align: 'center',   
+          type:'string',  
           scopedSlots: { customRender: 'activationRatio' },
           sorter:() => {}
         },
@@ -1079,6 +1093,7 @@ export const KScustomFields= [
           dataIndex: 'eventPayFirstDay',
           tip: '当日激活的用户在当天产生的付费行为次数',
           align: 'center',    
+          type:'int', 
           scopedSlots: { customRender: 'eventPayFirstDay' },
           sorter:() => {}
         },
@@ -1087,22 +1102,25 @@ export const KScustomFields= [
           dataIndex: 'eventPayPurchaseAmountFirstDay',
           tip: '当日激活的用户在当天产生的付费行为所带来的付费金额',
           align: 'center',    
+          type:'double', 
           scopedSlots: { customRender: 'eventPayPurchaseAmountFirstDay' },
           sorter:() => {}
         },
         {
           title: '首日付费成本',
-          dataIndex: 'firstDayPayCost',
+          dataIndex: 'eventPayFirstDayCost',
           tip: '消耗/首日付费次数',
           align: 'center',    
-          scopedSlots: { customRender: 'firstDayPayCost' },
+          type:'double', 
+          scopedSlots: { customRender: 'eventPayFirstDayCost' },
           sorter:() => {}
         },
         {
           title: '首日ROI',
           dataIndex: 'eventPayFirstDayRoi',
           tip: '首日付费金额/当日消耗',
-          align: 'center',    
+          align: 'center', 
+          type:'string',    
           scopedSlots: { customRender: 'eventPayFirstDayRoi' },
           sorter:() => {}
         },
@@ -1111,6 +1129,7 @@ export const KScustomFields= [
           dataIndex: 'eventPay',
           tip: '当日回传的付费行为次数',
           align: 'center',    
+          type:'int', 
           scopedSlots: { customRender: 'eventPay' },
           sorter:() => {}
         },
@@ -1118,7 +1137,8 @@ export const KScustomFields= [
           title: '付费金额',
           dataIndex: 'eventPayPurchaseAmount',
           tip: '当日回传的付费行为所带来的付费金额',
-          align: 'center',    
+          align: 'center',  
+          type:'double',   
           scopedSlots: { customRender: 'eventPayPurchaseAmount' },
           sorter:() => {}
         },
@@ -1127,6 +1147,7 @@ export const KScustomFields= [
           dataIndex: 'eventPayFirstDayCost',
           tip: '消耗/付费次数',
           align: 'center',    
+          type:'int', 
           scopedSlots: { customRender: 'eventPayFirstDayCost' },
           sorter:() => {}
         },
@@ -1135,14 +1156,16 @@ export const KScustomFields= [
           dataIndex: 'eventPayRoi',
           tip: '付费金额/当日消耗',
           align: 'center',    
+          type:'string', 
           scopedSlots: { customRender: 'eventPayRoi' },
           sorter:() => {}
         },
         {
           title: '注册数',
           dataIndex: 'eventRegister',
-          tip: '付费金额/当日消耗',
-          align: 'center',    
+          tip: '当日回传注册数',
+          align: 'center',   
+          type:'int',  
           scopedSlots: { customRender: 'eventRegister' },
           sorter:() => {}
         },
@@ -1151,6 +1174,7 @@ export const KScustomFields= [
           dataIndex: 'eventRegisterCost',
           tip: '当日消耗/当日回传注册数',
           align: 'center',    
+          type:'double', 
           scopedSlots: { customRender: 'eventRegisterCost' },
           sorter:() => {}
         },
@@ -1159,6 +1183,7 @@ export const KScustomFields= [
           dataIndex: 'eventRegisterRatio',
           tip: '当日回传注册数/当日激活数',
           align: 'center',    
+          type:'string', 
           scopedSlots: { customRender: 'eventRegisterRatio' },
           sorter:() => {}
         },
@@ -1166,7 +1191,8 @@ export const KScustomFields= [
             title: '次留数',
             dataIndex: 'eventNextDayStay',
             tip: '前一日激活用户在次日继续访问的PV',
-            align: 'center',    
+            align: 'center',  
+            type:'int',   
             scopedSlots: { customRender: 'eventNextDayStay' },
             sorter:() => {}
           },
@@ -1182,7 +1208,8 @@ export const KScustomFields= [
             title: '次留率',
             dataIndex: 'eventNextDayStayRatio',
             tip: '前一日激活用户在次日继续访问的PV/前一日激活数',
-            align: 'center',    
+            align: 'center',   
+            type:'string',  
             scopedSlots: { customRender: 'eventNextDayStayRatio' },
             sorter:() => {}
           },
@@ -1190,7 +1217,8 @@ export const KScustomFields= [
           title: '完件数',
           dataIndex: 'eventJinJianApp',
           tip: '当日回传完件数',
-          align: 'center',    
+          align: 'center', 
+          type:'int',    
           scopedSlots: { customRender: 'eventJinJianApp' },
           sorter:() => {}
         },
@@ -1199,6 +1227,7 @@ export const KScustomFields= [
           dataIndex: 'eventJinJianAppCost',
           tip: '当日消耗/当日回传完件数',
           align: 'center',    
+          type:'double', 
           scopedSlots: { customRender: 'eventJinJianAppCost' },
           sorter:() => {}
         },
@@ -1207,6 +1236,7 @@ export const KScustomFields= [
           dataIndex: 'eventCreditGrantApp',
           tip: '当日回传授信数',
           align: 'center',    
+          type:'int', 
           scopedSlots: { customRender: 'eventCreditGrantApp' },
           sorter:() => {}
         },
@@ -1215,6 +1245,7 @@ export const KScustomFields= [
           dataIndex: 'eventCreditGrantAppCost',
           tip: '当日消耗/当日回传授信数',
           align: 'center',    
+          type:'double', 
           scopedSlots: { customRender: 'eventCreditGrantAppCost' },
           sorter:() => {}
         },
@@ -1223,6 +1254,7 @@ export const KScustomFields= [
           dataIndex: 'eventCreditGrantAppRatio',
           tip: '当日回传授信数/当日回传的完件数',
           align: 'center',    
+          type:'string', 
           scopedSlots: { customRender: 'eventCreditGrantAppRatio' },
           sorter:() => {}
         },
@@ -1231,6 +1263,7 @@ export const KScustomFields= [
           dataIndex: 'play3sCount',
           tip: '',
           align: 'center',    
+          type:'int', 
           scopedSlots: { customRender: 'play3sCount' },
           sorter:() => {}
         },
@@ -1238,7 +1271,8 @@ export const KScustomFields= [
           title: '3s播放率',
           dataIndex: 'play3sRatio',
           tip: '3s播放数/素材曝光数',
-          align: 'center',    
+          align: 'center',
+          type:'string',     
           scopedSlots: { customRender: 'play3sRatio' },
           sorter:() => {}
         },
@@ -1246,7 +1280,8 @@ export const KScustomFields= [
           title: '付款成功数',
           dataIndex: 'eventOrderPaid',
           tip: '',
-          align: 'center',    
+          align: 'center',  
+          type:'int',   
           scopedSlots: { customRender: 'eventOrderPaid' },
           sorter:() => {}
         },
@@ -1254,7 +1289,8 @@ export const KScustomFields= [
           title: '付款成功金额',
           dataIndex: 'eventOrderPaidPurchaseAmount',
           tip: '',
-          align: 'center',    
+          align: 'center',  
+          type:'double',   
           scopedSlots: { customRender: 'eventOrderPaidPurchaseAmount' },
           sorter:() => {}
         },
@@ -1271,6 +1307,7 @@ export const KScustomFields= [
           dataIndex: 'formCount',
           tip: '当日回传表单数',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'formCount' },
           sorter: () => {}
         },
@@ -1279,6 +1316,7 @@ export const KScustomFields= [
           dataIndex: 'formActionRatio',         
           tip: '当日回传表单数/当日行为数',
           align: 'center',
+          type:'string', 
           scopedSlots: { customRender: 'formActionRatio' },
           sorter: () => {}
         },
@@ -1287,6 +1325,7 @@ export const KScustomFields= [
           dataIndex: 'formCost',         
           tip: '当日消耗/当日回传表单数',
           align: 'center',
+          type:'double', 
           scopedSlots: { customRender: 'formCost' },
           sorter: () => {}
         },
@@ -1295,6 +1334,7 @@ export const KScustomFields= [
           dataIndex: 'eventJinJianLandingPage',         
           tip: '当日回传完件数',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'eventJinJianLandingPage' },
           sorter: () => {}
         },
@@ -1303,6 +1343,7 @@ export const KScustomFields= [
           dataIndex: 'eventJinJianLandingPageCost',         
           tip: '当日消耗/当日回传完件数',
           align: 'center',
+          type:'double', 
           scopedSlots: { customRender: 'eventJinJianLandingPageCost' },
           sorter: () => {}
         },
@@ -1311,6 +1352,7 @@ export const KScustomFields= [
           dataIndex: 'eventCreditGrantLandingPage',         
           tip: '当日回传授信数',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'eventCreditGrantLandingPage' },
           sorter: () => {}
         },
@@ -1319,6 +1361,7 @@ export const KScustomFields= [
           dataIndex: 'eventCreditGrantLandingPageCost',         
           tip: '当日消耗/当日回传授信数',
           align: 'center',
+          type:'double', 
           scopedSlots: { customRender: 'eventCreditGrantLandingPageCost' },
           sorter: () => {}
         },
@@ -1335,6 +1378,7 @@ export const KScustomFields= [
           dataIndex: 'submit',         
           tip: '用户当日点击按钮的次数',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'submit' },
           sorter: () => {}
         },
@@ -1343,11 +1387,13 @@ export const KScustomFields= [
           dataIndex: 'submitRatio',         
           tip: '当日按钮点击数 / 当日行为数',
           align: 'center',
+          type:'string', 
           scopedSlots: { customRender: 'submitRatio' },
           sorter: () => {}
         },
         {
           title: '按钮点击成本',
+          type:'double', 
           dataIndex: 'submitCost',         
           tip: '当日消耗 / 当日按钮点击数',
           align: 'center',
@@ -1367,6 +1413,7 @@ export const KScustomFields= [
           dataIndex: 'follow',
           tip: '广告被受众新增关注的数量,目前抖音、头条号外、微头条、抖音火山版可新增关注',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'follow' },
           sorter:() => {}
         },
@@ -1375,6 +1422,7 @@ export const KScustomFields= [
           dataIndex: 'cancelFollow',
           tip: '',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'cancelFollow' },
           sorter:() => {}
         },
@@ -1383,6 +1431,7 @@ export const KScustomFields= [
           dataIndex: 'photoLike',
           tip: '广告被用户点赞的数量',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'photoLike' },
           sorter: () => {}
         },
@@ -1391,12 +1440,14 @@ export const KScustomFields= [
           dataIndex: 'photoComment',
           tip: '用户在评论区对广告创意输入评论并点击提交的次数,仅限有评论区的APP(西瓜目前没有评论区)',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'photoComment' },
           sorter: () => {}
         },
         {
           title: '分享数',
           dataIndex: 'report',
+          type:'int', 
           tip: '用户把分享广告到其他社交媒体的次数,成功完成一次分享行为记一次分享数',
           align: 'center',
           scopedSlots: { customRender: 'report' },
@@ -1407,6 +1458,7 @@ export const KScustomFields= [
           dataIndex: 'photoShare',
           tip: '',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'photoShare' },
           sorter:() => {}
         },
@@ -1415,6 +1467,7 @@ export const KScustomFields= [
           dataIndex: 'block',
           tip: '',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'block' },
           sorter:() => {}
         },
@@ -1423,6 +1476,7 @@ export const KScustomFields= [
           dataIndex: 'negative',
           tip: '',
           align: 'center',
+          type:'int', 
           scopedSlots: { customRender: 'negative' },
           sorter:() => {}
         },

+ 0 - 1
src/views/modules/kuaishouapp/populationAnalysis/index.vue

@@ -1287,7 +1287,6 @@ export default {
 
 <style lang="scss">
 .ant-tooltip-inner,
-.ant-tooltip,
 .ant-tooltip-arrow::before {
   background-color: #fff;
   color: #333;

+ 265 - 134
src/views/modules/stockWatch/accountPage.vue

@@ -6,10 +6,10 @@
                 <div class="accountBodyLeftCost">
                     <div class="accountBodyLeftCostLeft">
                         <div class="top">
-                            <p class="title" >花费</p>
+                            <div class="title" >花费</div>
                             <a-range-picker 
                                 v-model="dateValue"
-                                style="width:170px;"
+                                style="width:180px;"
                                 :allowClear=false
                                 :disabled-date="disabledDate"
                                 @change="onChange"
@@ -17,20 +17,20 @@
                         </div>
                         <div class="costInfo">
                             <div class="yesterdayInfo">
-                                <p>上阶段花费</p>
-                                <p style="font-size:16px;font-weight:600">{{columnsFixd[0].yesterday | decimalsHandle}}</p>
+                                <div style="margin-bottom:8px">上阶段花费</div>
+                                <div style="font-size:14px;font-weight:600">{{columnsFixd[0].yesterday | decimalsHandle}}</div>
                             </div>
                             <a-divider type="vertical" />
                             <div class="tongbi">
-                                <p>同比
+                                <div style="margin-bottom:8px">同比
                                     <a-tooltip >
                                         <template slot="title">
                                         <span>截止此时与上一阶段的花费同比</span>
                                         </template>
                                         <a-icon type="question-circle" />
                                     </a-tooltip>
-                                </p>
-                                <p style="font-size:16px;font-weight:600">{{AggregateByHourList.today?AggregateByHourList.today.grew:0}}%</p>
+                                </div>
+                                <div style="font-size:14px;font-weight:600">{{AggregateByHourList.today?AggregateByHourList.today.grew:0}}%</div>
                             </div>
                         </div>
                         <div class="costNum">
@@ -38,6 +38,7 @@
                         </div>
                     </div>
                     <div class="accountBodyLeftCostRight">
+                        
                         <div class="gaugeEchart" id="gaugeEchart"  style='width:100%;height:200px;margin:0 auto' ref="gaugeEchart">
                             <a-empty  />
                         </div>
@@ -48,7 +49,9 @@
                     <div class="top">                       
                         <div class="item" v-for="(item,index) in columns" :key='item.dataIndex' v-show="index>0">
                             <div class="todyCost">
-                                <span>{{item.today | decimalsHandle}}</span>
+                                <span v-if="item.type=='double'">{{item.today | decimalsHandle}}</span>
+                                <span v-else-if="item.type=='string'">{{item.today +'%'}}</span>
+                                <span v-else-if="item.type=='int'">{{item.today | formatCurrency}}</span>
                                 <span class="sign">
                                     <a-icon type="rise"  class="rise" v-show="item.today-item.yesterday>0"/>
                                     <a-icon type="fall" class="fall" v-show="item.today-item.yesterday<0" />
@@ -58,12 +61,15 @@
                                 /<a-tooltip >
                                     <template slot="title">
                                     <span>
-                                        {{dateValue[0].format('YYYY-MM-DD')==dateValue[1].format('YYYY-MM-DD')?dateValue[0].format('YYYY-MM-DD'):''}}
+                                        {{dateValue[0].format('YYYY-MM-DD')==dateValue[1].format('YYYY-MM-DD')?moment(dateValue[0]).subtract(1,'days').format('YYYY-MM-DD'):dateStringShow}}
                                         的{{item.title}}
                                     </span>
                                     </template>
                                     <a-icon type="question-circle" />
-                                </a-tooltip>:{{item.yesterday | decimalsHandle}}
+                                </a-tooltip>:
+                                <span v-if="item.type=='double'">{{item.yesterday | decimalsHandle}}</span>
+                                <span v-else-if="item.type=='string'">{{item.yesterday +'%'}}</span>
+                                <span v-else-if="item.type=='int'">{{item.yesterday | formatCurrency}}</span>
                             </div>
                             <span class="IndexName" :class="{'IndexNameActive':isActive==item.dataIndex}"  @click="getActiveIndexName(item)">
                                 <a-tooltip >
@@ -76,9 +82,12 @@
                             </span>
                         </div>
                     </div>
-                    <div class="echart" style="margin-top:10px">
+                    <div class="echart" style="margin-top:20px;position:relative">
+                        <div style="position:absolute;right:5px;top:-15px">
+                            更新时间:{{updateAccountEchart||'-'}}
+                        </div>
                         <a-spin :spinning="accountIndexEchartSpinning">
-                            <div class="accountIndexEchart" id="accountIndexEchart"  style='width:100%;height:160px;margin:0 auto;' ref="accountIndexEchart">
+                            <div class="accountIndexEchart" id="accountIndexEchart"  style='width:100%;height:150px;margin:0 auto;' ref="accountIndexEchart">
                                  <a-empty  />
                             </div>
                         </a-spin>
@@ -88,32 +97,32 @@
             <div class="accountBodyRight">
                 <div class="accountBodyRighTitle" @click="changeAccount">
                     <h1>{{currentAccount.accountName}}<a-icon type="down" style="font-size:14px" /></h1>
-                    <p class="accountBodyRighTitleID">账户ID:{{currentAccount.accountId || 9647490}}</p>
+                    <div class="accountBodyRighTitleID">账户ID:{{currentAccount.accountId || accountId}}</div>
                 </div> 
                 <div class="accountBodyRightInfo">
-                    <p class="accountBodyRightInfoItem">
+                    <div class="accountBodyRightInfoItem">
                         <span class="name">余额:</span>
                         {{currentAccount.totalBalance |decimalsHandle }}
-                    </p>
-                    <p class="accountBodyRightInfoItem">
+                    </div>
+                    <div class="accountBodyRightInfoItem">
                         <span class="name">投放状态:</span>
                         {{currentAccount.statusStr}}
-                    </p>
-                    <p class="accountBodyRightInfoItem createNum" @click="gorejectCreativePage">
+                    </div>
+                    <div class="accountBodyRightInfoItem createNum" @click="gorejectCreativePage">
                         <span class="name">被拒创意数:</span>
-                        {{currentAccount.rejectedCounts}}
-                    </p>
+                        {{currentAccount.rejectedCounts}}<a-icon type="right" style="font-size:12px;position:absolute;right:10px;top:16px"/>
+                    </div>
                 </div>
             </div>
         </div>
         <div class="bodyBox planBody">
             <div class="planBodyLeft">
                 <div class="title">
-                    <p class="titleContext">
+                    <div class="titleContext">
                         <span class="spot"> </span>
                         广告上新
                         <span class="titleTip">该广告账户近七天上新数据</span>
-                    </p>
+                    </div>
                 </div>
                 <div class="echart">
                     <a-spin :spinning="planBodyEchartSpinning">
@@ -125,13 +134,13 @@
             </div>
             <div class="planBodyRight">
                 <div class="title">
-                    <p class="titleContext">
+                    <div class="titleContext">
                         <span class="spot"> </span>
                         投放数据
                         <span class="titleTip">更新时间:{{data.length?data[0].updateTime: '-'}}</span>
-                    </p>
+                    </div>
                 </div>
-                <div class="table">
+                <div class="table" style="height:400px">
                     <a-table
                     :columns="newColumns"
                     :data-source="data"
@@ -139,7 +148,8 @@
                     :pagination="ipagination"
                     :loading="loading"
                     @change="sort"
-                    :scroll="{ x: 950,}"
+                    :scroll="{ x: 950,y:300}"
+                    size='middle'
                     style="font-size:14px">
                     <div style='' slot="unitName" slot-scope="text">
                         <a-tooltip placement="topLeft">
@@ -219,11 +229,20 @@
             </div>           
             <div class="materialBodyLeft">
                 <div class="title">
-                    <p class="titleContext">
+                    <div class="titleContext">
                         <span class="spot"> </span>
                         素材相关
+                        <a-tooltip >
+                            <template slot="title">
+                            <div style="margin-bottom:8px">新上素材数:前一日上传的素材数</div>
+                            <div style="margin-bottom:8px">有效素材:素材上线14天内消耗超过5000的素材数量</div>
+                            <div style="margin-bottom:8px">爆量素材:素材上线7天内消耗超过50000的素材数量</div>
+                            <div >素材总数:账户的素材总数</div>
+                            </template>
+                            <a-icon type="question-circle" />
+                        </a-tooltip>
                         <span class="titleTip">更新时间:{{materialBodyUpdateTime || '-'}}</span>
-                    </p>
+                    </div>
                 </div>
                 <div class="echart">
                     <a-spin :spinning="materialBodyEchartSpinning">
@@ -239,10 +258,11 @@
                     <a-table
                     :columns="materialColumns"
                     :data-source="materialData"
-                    :scroll="{ x: 950,}"
+                    :scroll="{ x: 950,y:260}"
                     :pagination="materialIpagination"
                     :loading="materialLoading"
                     @change="materialChange"
+                    size='middle'
                     style="font-size:14px">
                     
                     <span slot="coverUrl" slot-scope="text,record" >  
@@ -289,10 +309,10 @@
             <div class="dataMode">
                 <div class="adPositionMode">
                     <div class="title">
-                        <p class="titleContext">
+                        <div class="titleContext">
                             <span class="spot"> </span>
                             分版位数据
-                        </p>
+                        </div>
                     </div>
                     <div class="eachrt">
                         <a-spin :spinning="adPositionEchartSpinning">
@@ -305,10 +325,10 @@
                 <a-divider type="vertical" />
                 <div class="ageMode">
                     <div class="title">
-                        <p class="titleContext">
+                        <div class="titleContext">
                             <span class="spot"> </span>
                             分年龄数据
-                        </p>
+                        </div>
                     </div>
                     <div class="eachrt">
                         <a-spin :spinning="ageEchartSpinning">
@@ -319,10 +339,10 @@
                 <a-divider type="vertical" />
                 <div class="genderMode">
                     <div class="title">
-                        <p class="titleContext">
+                        <div class="titleContext">
                             <span class="spot"> </span>
                             分性别数据
-                        </p>
+                        </div>
                     </div>
                     <div class="eachrt">
                         <a-spin :spinning="genderEchartSpinning">
@@ -339,20 +359,20 @@
 
 
         <!-- 修改检测链接的modal -->
-        <a-modal v-model="linkVisible" title="修改链接" @ok="linkhandleOk" :width='800' @cancel='linkhandleCancel'>
+        <a-modal v-model="linkVisible" title="修改链接" @ok="linkhandleOk" :width='800' :height='400' @cancel='linkhandleCancel'>
             <div class="linkBody">
                 <a-row>
                     <a-col :span="4">
-                        <p style="text-align:right">第三方检测链接:</p>
+                        <div style="text-align:right">第三方检测链接:</div>
                     </a-col>
                     <a-col :span="18">
                         <span>{{oldLink || '-'}}</span>
                     </a-col>
                 </a-row>
-                <p></p>
+                <div style="margin-bottom:20px"></div>
                 <a-row>
                     <a-col :span="4">
-                        <p style="text-align:right">修改链接:</p>
+                        <div style="text-align:right">修改链接:</div>
                     </a-col>
                     <a-col :span="18">
                         <a-input placeholder="请输入监测链接" style="300px"  v-model="newLink"/>
@@ -364,14 +384,14 @@
         <a-modal v-model="targetVisible" title="修改定向" @ok="targethandleOk" @cancel='targethandleCancel'>
             <div class="linkBody">
                 
-                <p></p>
+ 
                 <a-row>
                     <a-col :span="6">
-                        <p style="text-align:right">修改定向包:</p>
+                        <div style="text-align:right">修改定向包:</div>
                     </a-col>
                     <a-col :span="16">
                         <a-select size="default" v-model="selectDirectionalId" style="width: 300px" >
-                            <a-select-option v-for="i in directionalList" :key="i.id" :value='i.id'>
+                            <a-select-option v-for="i in directionalList" :key="i.templateId" :value='i.templateId'>
                                 {{ i.templateName }}
                             </a-select-option>
                         </a-select>
@@ -517,7 +537,7 @@ const materialColumns = [
     title: '素材ID',
     dataIndex: 'signature',
     key: 'signature',
-    width:170,
+    width:150,
     align: 'center',
     scopedSlots: { customRender: 'signature' },   
   },
@@ -583,6 +603,7 @@ const indexValue = [
         label:'激活数',
         value:'activation',
         type:'pie',
+        
     },
     {
         label:'激活成本',
@@ -639,28 +660,32 @@ const columns=[
         dataIndex: 'activationCost',     
         key:'activationCost',
         today:0,
-        yesterday:0
+        yesterday:0,
+        type:'double'
     },
     {
         title: '激活数',
         dataIndex: 'activation',     
         key:'activation',
         today:0,
-        yesterday:0
+        yesterday:0,
+        type:'int'
     },
     {
         title: '行为数',
         dataIndex: 'bclick',     
         key:'bclick',
         today:0,
-        yesterday:0
+        yesterday:0,
+        type:'int'
     },
     {
         title: '表单提交数',
         dataIndex: 'formCount',     
         key:'formCount',
         today:0,
-        yesterday:0
+        yesterday:0,
+        type:'int'
     },
 ]
 
@@ -676,6 +701,8 @@ const columns=[
         },
         data() {
             return {
+                dateStringShow:'',//为了账户哪儿的问号显示对应段时间
+                updateAccountEchart:'',//账户图标的更新时间
                 selectaccountId:'',
                 adPositionEchartSpinning:false,
                 ageEchartSpinning:false,
@@ -709,7 +736,7 @@ const columns=[
                 loading:false,
                 ipagination: {
                     current: 1,
-                    pageSize: 4,
+                    pageSize: 10,
                     //   pageSizeOptions: ['10', '20', '30'],
                     showTotal: (total, range) => {
                         return range[0] + "-" + range[1] + " 共" + total + "条"
@@ -733,7 +760,7 @@ const columns=[
                 materialLoading:false,
                 materialIpagination:{
                     current: 1,
-                    pageSize: 3,
+                    pageSize: 10,
                     //   pageSizeOptions: ['10', '20', '30'],
                     showTotal: (total, range) => {
                         return range[0] + "-" + range[1] + " 共" + total + "条"
@@ -808,7 +835,7 @@ const columns=[
                 this.currentUnit=record;
                 this.targetVisible=true;
 
-                getAction('/kuaishou/batch/getDirectionalTemplate',{
+                getAction('/batch/kuaishouTemplate/list',{
                     accountId:this.accountId,
                 }).then(res=>{
                     // console.log(res);(res);
@@ -837,7 +864,10 @@ const columns=[
             },
             accounthandleOk(){
                 this.accountVisible=false;
-                this.accountId=this.selectaccountId
+                this.dateValue=[moment(),moment()];
+                this.materialDate=[moment().subtract(1,'days'),moment().subtract(1,'days')]
+                this.accountId=this.selectaccountId;
+                
                 // this.getCurrentAccountInfo();
             },
             accountCancel(){                
@@ -951,10 +981,10 @@ const columns=[
                     templateId:this.selectDirectionalId
                 }).then(res=>{
                     
-                    if(res.success){mat
-                        this.$message.success('修改成功')
+                    if(res.success){
+                        this.$message.success(res.message)
                     }else{
-                        this.$message.error('修改失败,请重试')
+                        this.$message.error(res.message)
                     }
                     this.selectDirectionalId=undefined
                 })
@@ -976,15 +1006,22 @@ const columns=[
                 return current  && !(current > (moment().subtract(1,'months')) && current < moment())
             }, 
             onChange(date, dateString) {                
-                // console.log(res);(date, dateString);
+                console.log(date, dateString);
                 this.getAllIndex();
-                this.getAccountIndexData()
+                this.getAccountIndexData();
+
+                if(dateString.length>0&&dateString[0]!=dateString[1]){
+                    let interval=date[1].diff(date[0],'days')
+                    console.log(interval);
+                    this.dateStringShow=`${moment(date[0]).subtract(1+interval,'days').format('YYYY-MM-DD')}~${moment(date[0]).subtract(1,'days').format('YYYY-MM-DD')}`
+                    console.log(this.dateStringShow)
+                }
             },
             materialDataChange(date, dateString){
                 // console.log(res);(date, dateString);
                 this.materialIpagination.current=1
                 this.getMaterialData()
-                this.getMaterialOverview()
+                // this.getMaterialOverview()
             },
             initAccountIndexEchart(type,data){
                 // let type='激活'
@@ -992,7 +1029,15 @@ const columns=[
                 let option = {
                     tooltip: {
                         trigger: 'axis',
-                        formatter: `${type}<br />{a0}  {b0}: {c0}<br />{a1}  {b1}: {c1}`
+                        // `${type}<br />{a0}  {b0}: {c0}<br />{a1}  {b1}: {c1}`
+                        formatter: function(params){
+                            // console.log(params);
+                            let option=type+'<br/>';
+                            for (var i = 0, length = params.length; i < length; i++) {
+                                option +=`<span style="width:8px;height:8px;border-radius:50%;background:${params[i].color};display:inline-block;position:relative;top:-2px;margin-right:5px"></span>`+ params[i].seriesName + ' '+ params[i].axisValue + '  '+params[i].data+ '<br/>'
+                            }
+                            return option
+                        }
                     },
                     grid:{
                         left:'5px',
@@ -1005,13 +1050,20 @@ const columns=[
                             type: 'category',
                             show:false,
                             boundaryGap: false,
-                            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+                            data:  ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                            axisPointer: {
+                                type: 'none'
+                            },
+                            
                         },
                         {
                             type: 'category',
                             show:false,
                             boundaryGap: false,
-                            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+                            data: ['1', '2', '3', '4', '5', '6', '7'],
+                            axisPointer: {
+                                type: 'none'
+                            },
                         },
                     ] ,
                     yAxis: {
@@ -1021,7 +1073,7 @@ const columns=[
                     series: [
                         {
                         name: '昨天',
-                        data: [800, 962, 930, 950, 1200, 1380, 1420],
+                        data: [100, 290, 204, 258, 105, 117, 290],
                         type: 'line',
                         smooth: true,
                         xAxisIndex: 0,
@@ -1040,7 +1092,7 @@ const columns=[
                     },
                         {
                         name: '今天',
-                        data: [820, 932, 901, 934, 1290, 1330, 1320],
+                        data: [150, 230, 224, 218, 135, 147, 260],
                         type: 'line',
                         smooth: true,
                         showSymbol: false,
@@ -1073,23 +1125,30 @@ const columns=[
                     
                     ]
                 };
-                // 单一天数
-                if(this.dateValue[0]==this.dateValue[1]){
+                //单一天数
+                console.log(data)
+                
+                if(this.dateValue[0].format('YYYY-MM-DD')==this.dateValue[1].format('YYYY-MM-DD')){
                     option.xAxis[0].data=data.xData;
                     option.xAxis[1].data=data.xData;
-                    
-                }else{
+
+                }else {
                     // 时间段
+                    // let xdata=[]
                     option.xAxis[0].data=data.xData?data.xData.yesterday:[]
                     option.xAxis[1].data=data.xData?data.xData.today:[]
                    
                 }
-                option.series[0].name=data.yData.yesterday.name
-                option.series[1].name=data.yData.today.name
-                option.series[0].data=data.yData.yesterday.data
-                option.series[1].data=data.yData.today.data
+                option.series[0].name=data.yData?data.yData.yesterday.name:''
+                option.series[1].name=data.yData?data.yData.today.name:''
+                option.series[0].data=data.yData?data.yData.yesterday.data:[]
+                option.series[1].data=data.yData?data.yData.today.data:[] 
+                console.log(option)
                 return option
             },  
+
+            
+
             initGaugechart(value){
                 var dataArr = value;
                 var colorSet = {
@@ -1112,7 +1171,7 @@ const columns=[
                             axisLine: {
                                 lineStyle: {
                                     color: [
-                                        [dataArr / 100, colorSet.color],
+                                        [dataArr / 100 || 0, colorSet.color],
                                         [1, "#111F42"]
                                     ],
                                     width: 8
@@ -1342,6 +1401,12 @@ const columns=[
                     legend: {
                         data: ['新上计划数', '新上组数', '新上创意数']
                     },
+                    grid:{
+                        left:'15px',
+                        // top:'20px',
+                        right:'15px',
+                        // bottom:'20px'
+                    },
                     xAxis:[
                         {   
                             // ['新上素材数量', '有效素材', '爆量素材','新上素材使用数', '新上素材使用率',''],
@@ -1354,6 +1419,10 @@ const columns=[
                             },
                             axisTick:{
                                 show:false,
+                            },
+                            axisLabel: {
+                                interval: 0,      // 坐标轴刻度标签的显示间隔
+                                // rotate: 40        // 标签倾斜的角度
                             }
                         },
                         {   
@@ -1478,19 +1547,24 @@ const columns=[
             initAdpositionChart(type,data){
                 
                 // console.log(res);(type,data)
-                
+                let indexName='';
+                this.indexValue.forEach(item=>{
+                    if(item.value==this.echartIndex){
+                        indexName= item.label
+                    }
+                })
                 let option={};
                 if(type=='line'){
-                    option=  this.getLineOption(data);                   
+                    option=  this.getLineOption(indexName,data);                   
                     
                 }else if( type=='pie'){
-                    option= this.getPieOption(data);
+                    option= this.getPieOption(indexName,data);
                     
                 }
                 return option
             },
 
-            getLineOption(data){
+            getLineOption(name,data){
                 const colorList = ['#58D5FF', '#73ACFF', '#FDD56A', '#FDB36A', '#FD866A','#9E87FF']
                 let lineOption = {
                     tooltip: {
@@ -1557,13 +1631,13 @@ const columns=[
             },
 
 
-            getPieOption(data){
+            getPieOption(name,data){
                 const colorList = ['#58D5FF', '#73ACFF', '#FDD56A', '#FDB36A', '#FD866A','#9E87FF']
                 let option = {
                     
                     tooltip: {
                         trigger: 'item',
-                        formatter: '{a} <br/>{b} : {c} ({d}%)'
+                        formatter: `${name} <br/>{a} <br/>{b} : {c} ({d}%)`
                     },
                     legend: {
                         // orient: 'vertical',
@@ -1592,7 +1666,7 @@ const columns=[
                 option.series=[];
                 option.series.push(
                     {
-                        name:'',
+                        name:`${moment().subtract(8,'days').format('YYYY-MM-DD')}~${moment().subtract(2,'days').format('YYYY-MM-DD')}`,
                         type: 'pie',
                         radius: ['40%', '70%'],
                         labelLine:{
@@ -1840,8 +1914,8 @@ const columns=[
                             item.today=res.result.today?res.result.today[item.dataIndex]:0;
                             item.yesterday=res.result.yesterday?res.result.yesterday[item.dataIndex]:0
                         })
-                       let activationRatio=res.result.today?res.result.today.activationRatio:0
-                       this.initEchart('gaugeEchart',this.initGaugechart(activationRatio))
+                       let clickOnActivationRatio=res.result.today?res.result.today.clickOnActivationRatio:0
+                       this.initEchart('gaugeEchart',this.initGaugechart(clickOnActivationRatio))
                     }
                 })
             },
@@ -1871,7 +1945,7 @@ const columns=[
                     }else{
                         this.accountPageSpinning=false;
                         this.$message.error(res.message)
-                        this.currentAccount={};
+                        this.currentAccount=res.result;
                     }
                 })
             },
@@ -1894,20 +1968,20 @@ const columns=[
                     // console.log(res);(res);
                     this.accountIndexEchartSpinning=false;
                     if(res.success){
-                        let data={
-                            xData:null,
-                            yData:{
-                            yesterday:{
-                                name:"",
-                                data:[]
-                            },
-                            today:{
-                                name:"",
-                                data:[]
-                            },
-                        }
+                            let data={
+                                xData:null,
+                                yData:{
+                                yesterday:{
+                                    name:"",
+                                    data:[]
+                                },
+                                today:{
+                                    name:"",
+                                    data:[]
+                                },
+                            }
                         };
-                       
+                       this.updateAccountEchart=res.result.updateTime
                         
                         // 单天的数据
                      
@@ -1923,6 +1997,10 @@ const columns=[
                             data.yData.today.data=res.result.today.map((item,index)=>{
                                 return item.value?item.value:0
                             })
+                            data.yData.today.data=Array.apply(null, Array(24)).map((item, i)=> {
+                                
+                                return data.yData.today.data[i]?data.yData.today.data[i]:0
+                            });
                             // console.log(data)
                             this.initEchart('accountIndexEchart',this.initAccountIndexEchart(indexName,data))
                             
@@ -1944,7 +2022,7 @@ const columns=[
                             this.initEchart('accountIndexEchart',this.initAccountIndexEchart(indexName,data))
                            
                         }else{
-
+                            this.initEchart('accountIndexEchart',this.initAccountIndexEchart(indexName,{}))
                         }
                         
                         
@@ -1955,7 +2033,7 @@ const columns=[
                         
                     }else{
                        this.accountIndexEchartSpinning=false;
-                       this.initEchart('accountIndexEchart',this.initAccountIndexEchart(indexName,[]))
+                       this.initEchart('accountIndexEchart',this.initAccountIndexEchart(indexName,{}))
                     }
                 })
             },
@@ -1963,6 +2041,7 @@ const columns=[
             getAgeData(){
                 this.ageEchartSpinning=true
                 let type=this.handlerTypeOfIndex(this.echartIndex);
+                
                 // // console.log(res);(this.echartIndex)
                 postAction('/etl/audienceAccountDaily/getAgeInfo',{
                     accountId:this.accountId,
@@ -1997,29 +2076,40 @@ const columns=[
             },
             handlerLineData(res){
                 let data;
+                let xData=Array.apply(null, Array(7)).map((item, i)=> {return moment().subtract(2+i,'days').format('YYYY-MM-DD')}).reverse();
+                         
                 data={
                     yData:[],
                     legend:[],
                 };
                 data.legend=[];
-                res.result.forEach(item=>{
+                Object.keys(res.result).forEach((key)=>{
+                    // console.log(key)
+                })
+                res.result[xData[0]].forEach(item=>{
                     if(data.legend.indexOf(item.type)==-1){
                         data.legend.push(item.type)
                     }   
                 });
-                // // console.log(res);(data)
-                
+                console.log(data)
                 data.legend.forEach((item,index)=>{
                     data.yData.push({
                         name:item,
                         data:[]
                     })
-                    res.result.forEach((ele)=>{
-                        if(item==ele.type){
-                            data.yData[index].data.push(ele.value)
-                        }   
+                    
+                })
+                xData.forEach(item=>{
+                    res.result[item].forEach(ele=>{
+                        data.yData.forEach((element)=>{
+                            if(ele.type==element.name){
+                                element.data.push(ele.value)
+                            }
+                        })
+                         
                     });
                 })
+                console.log(data)
                 return data       
             },
             // 性别对应数据图
@@ -2037,12 +2127,15 @@ const columns=[
                     let data=[]
                     if(res.success&&res.result){
                         if(type=='pie'){
-                            data=res.result.map(item=>{
-                                return {
-                                    name:item.type,
-                                    value:item.value
-                                }
-                            });
+                                data=res.result.map(item=>{
+                                    
+                                    return {
+                                        name:item.type,
+                                        value:item.value
+                                    }
+                                });
+                            
+                            
                             this.initEchart('genderEchart',this.initAdpositionChart(type,data))
                         }else{
                             this.initEchart('genderEchart',this.initAdpositionChart(type,this.handlerLineData(res)))
@@ -2187,7 +2280,12 @@ const columns=[
     }
 </script>
 <style lang="scss">
+
 .accountPage .accountBody{
+    
+
+
+    line-height: 1;
     .ant-input {
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
@@ -2213,25 +2311,27 @@ const columns=[
     transition: all 0.3s;
     }
     .ant-calendar-range-picker-separator {
-    display: inline-block;
-    min-width: 10px;
-    height: 100%;
-    color: white;
-    white-space: nowrap;
-    text-align: center;
-    vertical-align: top;
-    pointer-events: none;
+        display: inline-block;
+        min-width: 10px;
+        height: 100%;
+        color: white;
+        white-space: nowrap;
+        text-align: center;
+        vertical-align: top;
+        pointer-events: none;
     }
 
     .ant-divider, .ant-divider-vertical {
-    position: relative;
-    top: -0.06em;
-    display: inline-block;
-    width: 1px;
-    height: 2.9em;
-    margin: 0 8px;
-    vertical-align: middle;
+        position: relative;
+        top: -0.06em;
+        display: inline-block;
+        width: 1px;
+        height: 2.9em;
+        margin: 0 8px;
+        vertical-align: middle;
     }
+    
+
 }
 .accountPage .materialBody{
     .ant-divider, .ant-divider-vertical {
@@ -2256,7 +2356,13 @@ const columns=[
         vertical-align: middle;
     }
 }
-
+// .accountPage{
+        .ant-tooltip {
+       
+        max-width: 400px;
+       
+        }
+// }
 </style>
 <style lang="scss" scoped>
 // #
@@ -2314,14 +2420,19 @@ const columns=[
             font-size: 26px;
             font-weight: 700;
             padding: 0;
+            margin-bottom: 10px;
         }
         .costInfo{
             margin: 20px 0 0 0;
             width: 70%;
             display: flex;
-            justify-content: space-between;
-            
+            justify-content: space-between;    
+        }
+        .yesterdayInfo{
+            width:50%;
+            flex-shrink: 0;
         }
+        
         .costNum{
             width: 90%;
             font-size: 26px;
@@ -2330,9 +2441,25 @@ const columns=[
             background: white;
             text-align: center;
             border-radius: 10px;
-            margin: 15px 0;
-            padding: 3px 0px;
+            margin: 20px 0;
+            padding: 10px 0px;
+        }
+        @media screen and (max-width:1980px) and (min-width:1560px) {
+            .costNum {
+                font-size: 22px;
+            }
         }
+        @media screen and (max-width:1560px) and (min-width:1280px) {
+            .costNum {
+                font-size: 20px;
+            }
+        }
+        @media screen and (max-width:1280px) {
+            .costNum {
+                font-size: 18px;
+            }
+        }
+        
     }
     .accountBodyLeftCostRight{
         width: 45%;
@@ -2358,7 +2485,7 @@ const columns=[
             font-size: 1.2rem;
             font-weight: 700;
             color:#303133;
-            margin-bottom: 3px;
+            margin-bottom: 10px;
             width: 100%;
             
         }
@@ -2399,7 +2526,7 @@ const columns=[
             font-size: 0.89rem;
             font-weight: 500;
             color:#303133;
-            margin-bottom:3px ;
+            margin-bottom:8px ;
         }
         .IndexName{
             // width: 100%;
@@ -2422,7 +2549,7 @@ const columns=[
             height: 3px;
             background: #2461F1;
             position: relative;
-            top: 5px;
+            top: 3px;
             left: 50%;
             margin-left: -8px;
         }
@@ -2544,10 +2671,13 @@ const columns=[
     }
     .accountBodyRightInfoItem{
         background: rgb(238,241,255);
-        padding:10px 15px;
-        margin: 15px 0 0;
+        padding:15px 15px;
+        margin: 20px 0 0;
         border-radius: 5px;
         font-size: 16px;
+        white-space:nowrap;
+        overflow:hidden;
+        text-overflow:ellipsis;
         .name{
             font-size: 16px;
             font-weight: 600;
@@ -2555,6 +2685,7 @@ const columns=[
     }
     .createNum{
         cursor: pointer;
+        position: relative;
     }
 
 

+ 1 - 1
src/views/modules/workBench/designLeader/index.vue

@@ -20,7 +20,7 @@ export default {
 
     data() {
         return {
-            currentTabComponent:'designleaderPlatform',
+            currentTabComponent:'designleaderPlatform',//当前加载的组件名称
             orderStatus:undefined,//跳转到订单详情时需要里面的参数  status订单参数 role 当前角色
             role:'designLeader',
             materialStatus:undefined,

+ 2 - 2
vue.config.js

@@ -77,7 +77,7 @@ module.exports = {
         // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8087', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
+        target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://192.168.1.193:31012', //请求本地 需要jeecg-boot后台项目  李煜一
         //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
@@ -87,7 +87,7 @@ module.exports = {
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
       //  target:'http://139.186.151.174:8804', //测试
-       target:'http://139.186.165.84:8806', //测试
+      //  target:'http://139.186.165.84:8806', //测试
 
         ws: false,