zhuxinbo 4 năm trước cách đây
mục cha
commit
c5a011f4d1

+ 15 - 2
src/components/uploadFile.vue

@@ -228,13 +228,26 @@
         d = d < 10 ? '0' + d : d
         var timeElse = new Date().getTime()
         var arr = file.name.split('.')
-        console.log(arr[0] + '-' + timeElse + '.' + arr[1])
+
+        var str = ''
+        for (let i = 0; i < arr.length; i++) {
+          if (i == arr.length - 1) {} else {
+            if (i == arr.length - 2) {
+              str += arr[i]
+            } else {
+              str += (arr[i] + '.')
+            }
+          }
+
+        }
+        console.log(str + '-' + timeElse + '.' + arr[arr.length - 1])
         cos.putObject({
           Bucket: 'media-1301855440',
           /* 必须 */
           Region: 'ap-chongqing',
           /* 存储桶所在地域,必须字段 */
-          Key: that.uploadType + '/' + y + '-' + MM + '-' + d + '/' + arr[0] + '-' + timeElse + '.' + arr[1],
+          Key: that.uploadType + '/' + y + '-' + MM + '-' + d + '/' + str + '-' + timeElse + '.' + arr[arr
+            .length - 1],
           /* 必须 */
           StorageClass: 'STANDARD',
           Body: file, // 上传文件对象

+ 68 - 27
src/views/modules/Statistics/dataDisplayStatistics.vue

@@ -204,14 +204,11 @@ th div {
             :columns="columns"
             :dataSource="data"
             bordered
+            id="outTable"
             :pagination="false"
-            :scroll="{ x: scrollX }"
-            ref="accountTable"
-            :width="tableWidth"
-            
-            style="word-break: break-all;font-size:16px;font-weight:600"
+            :scroll="{ x: 2500 }"
           ></a-table>
-          <!-- <customColumn :visible='visible'  :listNum='listNum' :fiexColumn='columnsFixd' :mediaType='2'   @closeCustomColumn='closeCustomColumn' @changeColumn='changeColumn' /> -->
+          <!-- <customColumn :visible='visible'  :listNum='listNum' :fiexColumn='columnsFixd'  @closeCustomColumn='closeCustomColumn' @changeColumn='changeColumn' /> -->
         </a-card>
       </a-col>
     </a-row>
@@ -253,6 +250,7 @@ const columns = [
     dataIndex: 'date',
     align: 'center',
     width: 150,
+    fixed:'left',
     customRender: function(text, record, index) {
       const obj = {
         children: text,
@@ -274,7 +272,8 @@ const columns = [
     title: '账户Id',
     dataIndex: 'accountId',
     align: 'center',
-    width: 150,
+    width: 250,
+    fixed:'left',
     customRender: function(text, record, index) {
       const obj = {
         children: text,
@@ -301,7 +300,8 @@ const columns = [
     dataIndex: 'accountName',
     scopedSlots: { customRender: 'cost' },
     align: 'center',
-    width: 150,
+    width: 250,
+    fixed:'left',
     customRender: function(text, record, index) {
       const obj = {
         children: text,
@@ -431,13 +431,13 @@ const columns = [
 ]
 
 
-const columnsFixd = [
+const columnsWu = [
   {
     title: '时间',
     dataIndex: 'date',
     align: 'center',
     width: 150,
-    fixed:'left',
+     fixed:'left',
     customRender: function(text, record, index) {
       const obj = {
         children: text,
@@ -487,7 +487,7 @@ const columnsFixd = [
     dataIndex: 'accountName',
     scopedSlots: { customRender: 'cost' },
     align: 'center',
-    width: 250,
+    width: 200,
     fixed:'left',
     customRender: function(text, record, index) {
       const obj = {
@@ -542,25 +542,68 @@ const columnsFixd = [
     dataIndex: 'photoClickRatio',
     align: 'center'
   },
-  
+  {
+    title: 'cvr',
+    dataIndex: 'cvr',
+    align: 'center'
+  },
+  {
+    title: 'cpm(¥)',
+    dataIndex: 'cpm',
+    align: 'center'
+  },
   {
     title: '行为数',
     dataIndex: 'bClick',
     align: 'center'
   },
   {
-    title: '行为率',
-    dataIndex: 'bClicks',
+    title: '转化数',
+    dataIndex: 'formCount',
+    align: 'center'
+  },
+  {
+    title: '折前转化单价(¥)',
+    dataIndex: 'beforeFormPrice',
+    align: 'center'
+  },
+  {
+    title: '折后转化单价(¥)',
+    dataIndex: 'afterFormPrice',
+    align: 'center'
+  },
+
+  {
+    title: '注册数',
+    dataIndex: 'eventRegister',
     align: 'center'
   },
   {
-    title: '平均千次封面曝光花费',
-    dataIndex: 'CPM',
+    title: '注册成本(¥)',
+    dataIndex: 'eventRegisterCost',
     align: 'center'
   },
-  
-  
-  
+  {
+    title: '单价区间',
+    dataIndex: 'price',
+    align: 'center',
+    customRender: function(text, record, index) {
+      const obj = {
+        children: text,
+        attrs: {}
+      }
+      for (let i = 0; i < length; i++) {
+        if (index == 0 && i == 0) {
+          obj.attrs.rowSpan = length
+        } else {
+          if (index == i) {
+            obj.attrs.rowSpan = 0
+          }
+        }
+      }
+      return obj
+    }
+  }
 ]
 export default {
   name: 'data-display-statistics',
@@ -579,8 +622,7 @@ export default {
       title: '账户数据展示',
       show: true,
       data: [],
-      columns:JSON.parse(JSON.stringify(columnsFixd)),
-      columnsFixd,
+      columns:columnsWu,
       options: [],
       list: [],
       appId: [],
@@ -642,8 +684,7 @@ export default {
       statDate: '',
       visible:false,//自定义页面的打开
        listNum:[],
-       scrollX:2000,
-       tableWidth:'',
+       scrollX:0,
     }
   },
   filters: {
@@ -678,7 +719,7 @@ export default {
     changeColumn(val){
         this.columns=[...val];
         if(this.columns.length> this.columnsFixd.length){
-              this.scrollX=2000+200*(this.columns.length-this.columnsFixd.length)
+              this.scrollX=200*(this.columns.length-this.columnsFixd.length)
         }else{
           this.scrollX=0
         }
@@ -688,8 +729,8 @@ export default {
         //   console.log(this.listNum.length, this.columns)
 
         if (this.listNum.length >= 9 || this.columns.length >= 9) {
-          this.tableWidth = 160
-          this.scrollX = this.columns.length * 160
+          this.tableWidth = 120
+          this.scrollX = this.columns.length * 120
           // console.log(this.scrollX)
         } else {
           this.scrollX = 0
@@ -1398,4 +1439,4 @@ export default {
     })
   }
 }
-</script>
+</script>

+ 2 - 2
src/views/modules/kuaishouapp/account/copyGroup.vue

@@ -220,7 +220,7 @@
                   <a-form-item label="计费方式" :labelCol="{ lg: { span: 6 }, sm: { span: 7 } }"
                     :wrapperCol="{ lg: { span: 18 }, sm: { span: 17 } }">
                     <a-radio-group :defaultValue="1">
-                      <a-radio :value="1">点击计费</a-radio>
+                      <a-radio :value="1">{{item.bidType == 1?"点击计费":"展示计费(oCPM)"}}</a-radio>
                     </a-radio-group>
                   </a-form-item>
                   <a-form-item label="出价" :labelCol="{ lg: { span: 6 }, sm: { span: 7 } }"
@@ -674,7 +674,7 @@
                 bid: item.bid != '' ? item.bid * 1000 : '',
                 deepConversionBid: item.deepConversionBid != '' ? item.deepConversionBid * 1000 : '',
                 ocpxActionType: item.bidType,
-                bidType: item.bidType == 1 ? 2 : 6
+                bidType: item.bidType == 1 ? 2 : 10
               }
             })
             var json = {

+ 2 - 2
src/views/modules/kuaishouapp/account/editGroup.vue

@@ -239,7 +239,7 @@
                     <a-form-item label="计费方式" :labelCol="{ lg: { span: 6 }, sm: { span: 7 } }"
                       :wrapperCol="{ lg: { span: 18 }, sm: { span: 17 } }">
                       <a-radio-group :defaultValue="1">
-                        <a-radio :value="1">点击计费</a-radio>
+                        <a-radio :value="1">{{item.bidType == 1?"点击计费":"展示计费(oCPM)"}}</a-radio>
                       </a-radio-group>
                     </a-form-item>
                     <a-form-item label="出价" :labelCol="{ lg: { span: 6 }, sm: { span: 7 } }"
@@ -721,7 +721,7 @@
                 bid: item.bid != '' ? item.bid * 1000 : '',
                 deepConversionBid: item.deepConversionBid != '' ? item.deepConversionBid * 1000 : '',
                 ocpxActionType: item.bidType,
-                bidType: item.bidType == 1 ? 2 : 6
+                bidType: item.bidType == 1 ? 2 : 10
               }
             })[0]
             var json = {

+ 2 - 2
src/views/modules/kuaishouapp/account/editGroupNew.vue

@@ -241,7 +241,7 @@
                     <a-form-item label="计费方式" :labelCol="{ lg: { span: 6 }, sm: { span: 7 } }"
                       :wrapperCol="{ lg: { span: 18 }, sm: { span: 17 } }">
                       <a-radio-group :defaultValue="1">
-                        <a-radio :value="1">点击计费</a-radio>
+                        <a-radio :value="1">{{item.bidType == 1?"点击计费":"展示计费(oCPM)"}}</a-radio>
                       </a-radio-group>
                     </a-form-item>
                     <a-form-item label="出价" :labelCol="{ lg: { span: 6 }, sm: { span: 7 } }"
@@ -786,7 +786,7 @@
                   bid: item.bid != '' ? item.bid * 1000 : '',
                   deepConversionBid: item.deepConversionBid != '' ? item.deepConversionBid * 1000 : '',
                   ocpxActionType: item.bidType,
-                  bidType: item.bidType == 1 ? 2 : 6
+                  bidType: item.bidType == 1 ? 2 : 10
                 }
               })[0]
               var param = {

+ 2 - 2
src/views/modules/kuaishouapp/account/stepForm/Step2.vue

@@ -273,7 +273,7 @@
                     <a-form-item label="计费方式" :labelCol="{ lg: { span: 6 }, sm: { span: 7 } }"
                       :wrapperCol="{ lg: { span: 18 }, sm: { span: 17 } }">
                       <a-radio-group defaultValue="1">
-                        <a-radio value="1">点击计费</a-radio>
+                        <a-radio value="1">{{item.bidType == 1?"点击计费":"展示计费(oCPM)"}}</a-radio>
                       </a-radio-group>
                     </a-form-item>
                     <a-form-item label="出价" :labelCol="{ lg: { span: 6 }, sm: { span: 7 } }"
@@ -832,7 +832,7 @@
                 bid: item.bid != '' ? item.bid * 1000 : '',
                 deepConversionBid: item.deepConversionBid != '' ? item.deepConversionBid * 1000 : '',
                 ocpxActionType: item.bidType,
-                bidType: item.bidType == 1 ? 2 : 6
+                bidType: item.bidType == 1 ? 2 : 10
               }
             })
             var json = {