Browse Source

上线拉取

zhuxinbo 5 years ago
parent
commit
5f8f46dd03

+ 0 - 5
src/components/ctop/vm-image-list.vue

@@ -38,15 +38,10 @@
       <div class="panel-heading">{{ title }}</div>
       <a-row type="flex" align="middle" justify="space-between" class="panel-body">
         <div class="search-bar">
-<<<<<<< HEAD
-          <a-button @click="handleAdd" v-show="show" type="primary" icon="plus">新增</a-button>
-          <a-input placeholder="请输入搜索内容" v-model="keyword" style="width: 300px"></a-input>
-=======
           <a-button @click="handleAdd" type="primary" icon="plus" style="margin-right:10px">新增</a-button>
           <a-input placeholder="请输入搜索内容" v-model="keyword" style="width: 300px">
             <a-icon slot="addonAfter" type="search" style="cursor: pointer;" @click="search" />
           </a-input>
->>>>>>> test-2
           <!--          <Button type="ghost" @click="search"><i class="fa fa-search"></i></Button>-->
         </div>
         <a-row type="flex" align="middle" class="page">

+ 5 - 9
src/views/modules/Statistics/chuanshanjia/checkBill.vue

@@ -15,8 +15,7 @@
                 @change="monthChange"
                 @panelChange="monthPanelChange"
                 style="width: 250px;"
-               :openChange='monthOpenChange'
-                :loading="loading"
+                :loading="loading"     
             />
             <span class="caozuoxitong">操作系统:</span>
              <a-select default-value="all" style="width: 150px" @change="handleChange">
@@ -124,22 +123,19 @@ export default {
             this.selectValue=value
         },
         //月份选择器value
+      
         monthChange(value){
             console.log(value)
             this.monthRange=value
         },
         monthPanelChange(value, mode){
+            
             this.monthRange=value
-            console.log(value)
+            // console.log(value,mode)
             this.mode2 = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
             this.monthStr=[moment(this.monthRange[0]).format('YYYY-MM'),moment(this.monthRange[1]).format('YYYY-MM')]
         },
-        monthOpenChange(val){
-            console.log(val)
-            if(open){
-                 this.monthRange=[]
-            }
-        },
+
         //确定按钮的事件
         getData(){
            

+ 10 - 5
src/views/modules/Statistics/chuanshanjia/realTimeData.vue

@@ -246,7 +246,7 @@ export default {
     },
     //获取echart的值
     getEchartData() {
-        console.log('echart')
+        // console.log('echart')
       const chart = this.$refs.chart
       if (chart) {
         const myChart = echarts.init(document.getElementById('echart'))
@@ -328,7 +328,12 @@ export default {
             } 
           })
             console.log(total)
-            this.dataSource =[total,...res.data] ;
+            if(this.tabKey!='rate'){
+              this.dataSource =[total,...res.data] ;
+            }else{
+              this.dataSource =[...res.data] ;
+            }
+            
             this.echartHandle(res.data);
            
             resolve(res)
@@ -341,11 +346,11 @@ export default {
   mounted() {
     //   this.HttpPost()
     
-    console.log(this.dateStr)
+    // console.log(this.dateStr)
     this.option=JSON.parse(JSON.stringify(option))
-    console.log(this.option.legend.data,option,'------------------------------')
+    // console.log(this.option.legend.data,option,'------------------------------')
     postAction('/pangolin/api/app/list').then(res=>{
-            console.log(res)
+            // console.log(res)
             if(res.success){
                 this.optionArr=res.data
             }

+ 279 - 0
src/views/modules/Statistics/materialRank.vue

@@ -0,0 +1,279 @@
+<template>
+    <div class="materialRank">
+        <div class="optionLine">
+            <span class="timedate">日期选择:</span>
+            <a-range-picker
+            :disabled-date="disabledDate"
+            format="YYYY-MM-DD"
+            style="width: 250px;"
+            @change="dateChange"
+            v-model="dateRange"
+            />
+            <span class="caozuoxitong">指标选择:</span>
+            <a-select default-value="cost" style="width: 150px" @change="indexSelect">
+                    <a-select-option value="cost">消耗</a-select-option>
+                    <a-select-option value="click">点击数</a-select-option>
+                    <a-select-option value="showNum">展示数</a-select-option>
+                    <a-select-option value="convertRate">转化率</a-select-option>
+                    <a-select-option value="play3s">3s播放数</a-select-option>
+                    <a-select-option value="play10s">10s播放数</a-select-option>
+                    <a-select-option value="active">行为数</a-select-option>
+                    <a-select-option value="pay">支付数</a-select-option>
+                    <a-select-option value="residue">次留数</a-select-option>
+                    <a-select-option value="register">注册数</a-select-option>                                  
+            </a-select>
+            <span class="caozuoxitong">排序规则:</span>
+            <a-radio-group name="radioGroup" default-value="desc" @change="radioChange">
+                <a-radio key="asc" value="asc">升序</a-radio>
+                <a-radio key="desc" value="desc">降序</a-radio>               
+            </a-radio-group>
+            <div class="btn">
+                <a-button type='primary'  @click="getData">查询</a-button>
+            </div>
+        </div>
+         <a-table :columns="columns" :data-source="dataSource" tableLayout='auto' bordered :pagination='false'>
+             <div slot="videoU" slot-scope="test,records">
+                <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt=""  style="width:140px"  @click="openVideo(records.url)">
+            </div>
+             <span slot="convertRate" slot-scope="convertRate">{{ convertRate | toPercentage }}</span>
+        </a-table>
+        <div class="fenye" :v-show="pageShow">
+            <a-pagination :default-current="pageNo" :total="total" />
+        </div>
+        <a-modal v-model="Videovisible" title="视频详情" @ok="videoOk" :footer="null" width='50%'>
+        <video
+          @click.stop
+          class="video"
+          :src="videoUrl"
+          controls="controls"
+          style="height:600px;width:100%"
+        >您的浏览器不支持 video 标签。</video>
+    </a-modal>
+    </div>
+</template>
+
+<script>
+import moment from 'moment'
+import { getAction, postAction, downFile, downFilePost } from '@/api/manage'
+let columns=[
+    {
+        title: '视频',
+        dataIndex: 'videoU',
+        align: 'center',
+        width: 150,
+        fixed: 'left',
+        key: 'videoU',
+        scopedSlots: { customRender: 'videoU' }
+    },
+    {
+        title: '素材名',
+        dataIndex: 'name',
+        key: 'name',
+        scopedSlots: { customRender: 'name' },
+        align: 'center',
+    },
+    {
+        title: '消耗',
+        dataIndex: 'cost',
+        key: 'cost',
+        scopedSlots: { customRender: 'cost' },
+        align: 'center',
+    },
+    {
+        title: '点击数',
+        dataIndex: 'click',
+        key: 'click',
+        scopedSlots: { customRender: 'click' },
+        align: 'center',
+    },
+    {
+        title: '展示数',
+        dataIndex: 'showNum',
+        key: 'showNum',
+        scopedSlots: { customRender: 'showNum' },
+        align: 'center',
+    },
+    {
+        title: '转化率',
+        dataIndex: 'convertRate',
+        key: 'convertRate',
+        scopedSlots: { customRender: 'convertRate' },
+        align: 'center',
+    },
+    {
+        title: '3s播放数',
+        dataIndex: 'play3s',
+        key: 'play3s',
+        scopedSlots: { customRender: 'play3s' },
+        align: 'center',
+    },
+    {
+        title: '10s播放数',
+        dataIndex: 'play10s',
+        key: 'play10s',
+        scopedSlots: { customRender: 'play10s' },
+        align: 'center',
+    },
+    {
+        title: '行为数',
+        dataIndex: 'active',
+        key: 'active',
+        scopedSlots: { customRender: 'active' },
+        align: 'center',
+    },
+    {
+        title: '支付数',
+        dataIndex: 'pay',
+        key: 'pay',
+        scopedSlots: { customRender: 'pay' },
+        align: 'center',
+    },
+    {
+        title: '次留数',
+        dataIndex: 'residue',
+        key: 'residue',
+        scopedSlots: { customRender: 'residue' },
+        align: 'center',
+    },
+    {
+        title: '注册数',
+        dataIndex: 'register',
+        key: 'register',
+        scopedSlots: { customRender: 'register' },
+        align: 'center',
+    },
+]
+export default {
+    data() {
+        return {
+            columns,
+            dataSource:[],
+            pageNo:1,
+            pageSize:10,
+            target:'cost',
+            order:'desc',
+            dateStr:[],
+            dateRange:[],
+            optionArr:[],
+
+            total:0,
+            pageShow:false,
+
+            
+            //是否打开视频
+            Videovisible:false,
+            videoUrl:'',
+        }
+    },
+    methods: {
+        moment,
+        openVideo(val){
+        this.Videovisible=true;
+        this.videoUrl=val
+    },
+        videoOk(){
+        this.Videovisible=false
+        },
+        disabledDate(current) {
+        // console.log(current)
+            return current && current > moment().subtract(1, 'day')
+        },
+        radioChange(e){
+            
+            this.order=e.target.value
+        },
+        indexSelect(key){
+            console.log(key)
+            this.target=key
+        },
+        //日期改变事件
+        dateChange(data, dataString) {
+            this.dateStr = dataString
+        },
+         //确定按钮的事件
+        getData(){          
+            
+            this.HttpPost()
+            
+        },
+
+
+        //请求事件
+        HttpPost(){
+            this.loading=true;
+            this.dataSource=[];
+            postAction(`/ctop/material/top/cost?pageSize=${this.pageSize}&pageNo=${this.pageNo}&target=${this.target}&order=${this.order}`,{
+                startDate:this.dateStr[0],
+                endDate:this.dateStr[1],
+                
+            }).then(res => {
+                this.loading=false;
+                
+                console.log(res)
+                if (res.success) {
+                    
+                    
+                    if(res.result.records.length>0){
+                        this.pageShow=true
+                    }
+                    res.result.records.map((item, index) => {
+                        item.key = index
+                        
+                    })
+                    this.total=res.total
+                    this.dataSource=res.result.records;
+                    
+                }
+            })
+        }
+    },
+    mounted() {
+        this.dateStr=[moment().subtract(1,'days').format('YYYY-MM-DD'),moment().subtract(1,'days').format('YYYY-MM-DD')]
+        this.dateRange=[moment().subtract(1,'days'),moment().subtract(1,'days')]
+        this.HttpPost();
+        
+    },
+    filters: {
+    toPercentage(val) {
+      return (val * 100).toFixed(2) + '%'
+      // return val
+    },
+    tofixed(val){
+      return Number(val).toFixed(2)
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.materialRank{
+    width: 100%;
+    height: 100%;
+    background: #fff;
+    padding: 10px 15px;
+}
+.optionLine{
+    padding: 30px 5px;
+    position: relative;
+    margin-top: 20px;;
+    margin-bottom: 15px;
+    border: 1px solid #ccc;
+    span{
+        display: inline-block;
+        padding: 0 3px;
+    }
+    .timedate,.caozuoxitong{
+        margin-left: 30px;;
+    }
+    .btn{
+        position: absolute;
+        right: 10px;
+        top: 30px;
+    }
+}
+
+.fenye{
+    margin: 30px 15px 10px;
+    overflow: hidden;
+}
+</style>

+ 38 - 27
src/views/modules/Statistics/videoStatics/vDay.vue

@@ -1,8 +1,16 @@
 <template>
   <div class="vsummary">
+    <div class="xiangmuxuanze">
+      <span>项目选择:</span>
+        <a-select  default-value="" style="width: 500px" @change="selectChange"  placeholder="请选择项目账户">
+          <a-select-option v-for="(item,index) in projectArr" :key="index" :value='item.id'>
+            {{ item }}
+          </a-select-option>
+        </a-select>
+    </div>
     <div class="timeDiv">
       <div>
-        <span>时间范围:</span>
+        <span >时间范围:</span>
         <a-button type="default" @click="yesterdayHandle">昨日</a-button>
         <a-date-picker
           :disabled-date="disabledDate"
@@ -17,7 +25,7 @@
         <a-input-number id="inputNumber" v-model="consumeValue" :min="0" @change="consumeOnChange" />
 
         <span>视频ID:</span>
-        <a-input class="myinput" v-model="videoID" />
+        <a-input class="myinput" v-model="videoID" style="width:250px" />
       </div>
 
       <a-button type="primary" @click="searchRes">查询</a-button>
@@ -253,6 +261,9 @@ let variableCol = [
 export default {
   data() {
     return {
+      //下拉选择框的数据
+      projectArr:[],
+      selectValue:'',
        //gudinglie
       columnsFixd:columnsFixd,
 
@@ -298,6 +309,11 @@ export default {
   mixins: [JeecgListMixin],
   methods: {
     moment,
+    //select切换---项目
+    selectChange(key){
+        this.selectValue=key;
+    },
+
      //打开视频
     openVideo(val){
         this.Videovisible=true;
@@ -322,11 +338,17 @@ export default {
       let yesterday = moment()
           .subtract(1, 'days')
           .format('YYYY-MM-DD')
-       this.dateRange=moment(yesterday)
+      this.dateRange=moment(yesterday)
       console.log(this.dateRange);
       this.timedata=moment(yesterday).format('YYYY-MM-DD')
       // this.totalSelect = 1
       // this.daysFlag = true
+      this.HttpPost();
+    },
+    //table数据查询时间
+    HttpPost(){
+      this.loading = true
+      this.date = []
       postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListDaily', {
         date: this.timedata,
         cost: this.consumeValue,
@@ -345,29 +367,10 @@ export default {
         }
       })
     },
-
     //查询按钮
     searchRes() {
       console.log(this.timedata[0])
-      this.date = []
-      this.loading = true
-      postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListDaily', {
-        date: this.timedata,
-        cost: this.consumeValue,
-        signature:this.videoID
-      }).then(res => {
-        let resArr = []
-        this.loading = false
-        console.log(res)
-        if (res.success) {
-          let result = res.result
-          this.data.push({ ...result, key: 1 })
-          result.map((item, index) => {
-            item.key = index
-          })
-          this.data = result
-        }
-      })
+      this.HttpPost();
     },
 
    
@@ -530,14 +533,18 @@ export default {
       return Number(val).toFixed(2)
     }
   },
-
+  mounted() {
+      this.dateRange=moment().subtract(1,'days')  
+      this.timedata=moment().subtract(1,'days').format('YYYY-MM-DD')
+      this.HttpPost();
+  },
 
 }
 </script>
 <style lang="less">
-.ant-table .ant-table-fixed-left .ant-table-thead {
-  height: 108px !important ;
-}
+// .ant-table .ant-table-fixed-left .ant-table-thead {
+//   height: 108px !important ;
+// }
 .ant-table .ant-table-thead .ant-table-header-column .ant-table-column-title{
        
       // display:block;
@@ -550,9 +557,13 @@ export default {
   width: 100%;
   height: 100%;
 }
+.xiangmuxuanze{
+  margin-bottom: 20px;;
+}
 .timeDiv {
   display: flex;
   justify-content: space-between;
+  
 }
 span {
   margin-left: 5px;

+ 50 - 30
src/views/modules/Statistics/videoStatics/vMonth.vue

@@ -1,5 +1,13 @@
 <template>
   <div class="vsummary">
+    <div class="xiangmuxuanze">
+      <span>项目选择:</span>
+        <a-select  default-value="" style="width: 500px" @change="selectChange"  placeholder="请选择项目账户">
+          <a-select-option v-for="(item,index) in projectArr" :key="index" :value='item.id'>
+            {{ item }}
+          </a-select-option>
+        </a-select>
+    </div>
     <div class="timeDiv">
       <div>
         <span>时间范围:</span>
@@ -18,7 +26,7 @@
         <a-input-number id="inputNumber" v-model="consumeValue" :min="0" @change="consumeOnChange" />
 
         <span>视频ID:</span>
-        <a-input class="myinput" v-model="videoID" />
+        <a-input class="myinput" v-model="videoID" style="width:250px" />
       </div>
 
       <a-button type="primary" @click="searchRes">查询</a-button>
@@ -345,7 +353,9 @@ let detailConsum = [
 export default {
   data() {
     return {
-
+       //下拉选择框的数据
+      projectArr:[],
+      selectValue:'',
        //gudinglie
       columnsFixd:columnsFixd,
 
@@ -401,6 +411,10 @@ export default {
   mixins: [JeecgListMixin],
   methods: {
     moment,
+    //select切换---项目
+    selectChange(key){
+        this.selectValue=key;
+    },
     //打开视频
     openVideo(val){
         this.Videovisible=true;
@@ -432,34 +446,16 @@ export default {
       this.totalSelect = (this.dateRange[1]._d - this.dateRange[0]._d) / (24 * 60 * 60 * 1000) + 1;
       this.timedata=[this.dateRange[0]._i,this.dateRange[1]._i]
       this.daysFlag = true
-      postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListMonth', {
-        startDate: this.timedata[0],
-        endDate: this.timedata[1],
-        cost: this.consumeValue,
-        signature: this.videoID
-      }).then(res => {
-        let resArr = []
-        this.loading = false
-        console.log(res)
-        if (res.success) {
-          let result = res.result
-          this.data.push({ ...result, key: 1 })
-          result.map((item, index) => {
-            item.key = index
-          })
-          this.data = result;
-          
-        }
-      })
+     this.HttpPost();
 
     },
 
     consumeOnChange() {},
-    //查询按钮
-    searchRes() {
-      this.date = []
-      this.loading = true
-      postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListMonth', {
+    //获取table数据请求
+    HttpPost(){
+      this.loading=true;
+      this.date=[];
+       postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListMonth', {
         startDate: this.timedata[0],
         endDate: this.timedata[1],
         cost: this.consumeValue,
@@ -479,6 +475,10 @@ export default {
         }
       })
     },
+    //查询按钮
+    searchRes() {
+      this.HttpPost();      
+    },
 
     //导出报表
     exportExcel() {
@@ -718,13 +718,30 @@ export default {
     tofixed(val){
       return Number(val).toFixed(2)
     }
-  }
+  },
+  mounted() {
+    let lastStart = 
+        moment()
+          .subtract(1, 'months')
+          .format('YYYY-MM-DD')
+      let lastEnd =   moment()
+          .subtract(1, 'days')
+          .format('YYYY-MM-DD')
+      
+
+      this.dateRange=[moment(lastStart),moment(lastEnd)]
+      // console.log(this.dateRange)
+      this.totalSelect = (this.dateRange[1]._d - this.dateRange[0]._d) / (24 * 60 * 60 * 1000) + 1;
+      this.timedata=[this.dateRange[0]._i,this.dateRange[1]._i]
+      this.daysFlag = true
+    this.HttpPost();
+  },
 }
 </script>
 <style lang="less">
-.ant-table .ant-table-fixed-left .ant-table-thead {
-  height: 108px !important ;
-}
+// .ant-table .ant-table-fixed-left .ant-table-thead {
+//   height: 108px !important ;
+// }
 .ant-table .ant-table-thead .ant-table-header-column .ant-table-column-title{
        
       // display:block;
@@ -737,6 +754,9 @@ export default {
   width: 100%;
   height: 100%;
 }
+.xiangmuxuanze{
+  margin-bottom: 20px;;
+}
 .timeDiv {
   display: flex;
   justify-content: space-between;

+ 40 - 6
src/views/modules/Statistics/videoStatics/vSummary.vue

@@ -1,5 +1,13 @@
 <template>
   <div class="vsummary">
+    <div class="xiangmuxuanze">
+      <span>项目选择:</span>
+        <a-select  default-value="" style="width: 500px" @change="selectChange"  placeholder="请选择项目账户">
+          <a-select-option v-for="(item,index) in projectArr" :key="index" :value='item.id'>
+            {{ item }}
+          </a-select-option>
+        </a-select>
+    </div>
     <div class="timeDiv">
       <div>
         <span>时间范围:</span>
@@ -18,7 +26,7 @@
         <a-input-number id="inputNumber" v-model="consumeValue" :min="0" @change="consumeOnChange" />
 
         <span>视频ID:</span>
-        <a-input class="myinput" v-model="videoID" />
+        <a-input class="myinput" v-model="videoID" style="width:250px" />
       </div>
 
       <a-button type="primary" @click="searchRes">查询</a-button>
@@ -84,8 +92,12 @@
       ref="vSummaryTable"
       :width="tableWidth"
       @customHeaderCell="customHeaderCell(columns)"
+<<<<<<< HEAD
       height="100"
       style="word-break: break-all;"
+=======
+     
+>>>>>>> 536646d72ad55d4ae0958ced6fabeaed3636f1de
     >
       <div slot="videoU" slot-scope="test,records">
         <img
@@ -281,6 +293,9 @@ let variableCol = [
 export default {
   data() {
     return {
+       //下拉选择框的数据
+      projectArr:[],
+      selectValue:'',
       //设置表格的列宽
       tableWidth: '',
 
@@ -321,6 +336,10 @@ export default {
   },
   methods: {
     moment,
+    //select切换---项目
+    selectChange(key){
+        this.selectValue=key;
+    },
     //打开视频
     openVideo(val) {
       this.Videovisible = true
@@ -341,6 +360,11 @@ export default {
     searchRes() {
       this.date = []
       this.loading = true
+      this.HttpPost();
+    },
+    //网络请求table数据函数
+    HttpPost(){
+      
       postAction('/toutiao/videoReportDaily/videoInfoListTotal', {
         startDate: this.timedata[0],
         endDate: this.timedata[1],
@@ -360,7 +384,6 @@ export default {
         }
       })
     },
-
     //导出报表
     exportExcel() {
       // var params = {}
@@ -616,7 +639,8 @@ export default {
 
   mounted() {
     this.columns = [...columnsFixd, ...variableCol]
-    console.log('mounted')
+    // console.log('mounted')
+    //请求自定义列的数据
     postAction('/toutiao/videoReportDaily/videoInfoListTotalExportExcelPermission').then(res => {
       console.log(res)
       if (res.success) {
@@ -627,13 +651,20 @@ export default {
         }
       }
     })
+
+    //进入页面默认展示昨天到今天的数据
+    this.dateRange=[moment().subtract(1,'days'),moment()]
+    this.timedata=[moment().subtract(1,'days').format('YYYY-MM-DD'),moment().format('YYYY-MM-DD')]
+    this.loading=true;
+    this.HttpPost();
+    
   }
 }
 </script>
 <style lang="less">
-.ant-table .ant-table-fixed-left .ant-table-thead {
-  height: 108px !important ;
-}
+// .ant-table .ant-table-fixed-left .ant-table-thead {
+//   height: 108px !important ;
+// }
 .ant-table .ant-table-thead .ant-table-header-column .ant-table-column-title {
   // display:block;
   white-space: normal;
@@ -646,6 +677,9 @@ export default {
   width: 100%;
   height: 100%;
 }
+.xiangmuxuanze{
+  margin-bottom: 20px;;
+}
 .timeDiv {
   display: flex;
   justify-content: space-between;

+ 35 - 32
src/views/modules/Statistics/videoStatics/vWeek.vue

@@ -1,5 +1,13 @@
 <template>
   <div class="vsummary">
+    <div class="xiangmuxuanze">
+      <span>项目选择:</span>
+        <a-select  default-value="" style="width: 500px" @change="selectChange"  placeholder="请选择项目账户">
+          <a-select-option v-for="(item,index) in projectArr" :key="index" :value='item.id'>
+            {{ item }}
+          </a-select-option>
+        </a-select>
+    </div>
     <div class="timeDiv">
       <div>
         <span>时间范围:</span>
@@ -18,7 +26,7 @@
         <a-input-number id="inputNumber" v-model="consumeValue" :min="0" @change="consumeOnChange" />
 
         <span>视频ID:</span>
-        <a-input class="myinput" v-model="videoID" />
+        <a-input class="myinput" v-model="videoID" style="width:250px" />
       </div>
 
       <a-button type="primary" @click="searchRes">查询</a-button>
@@ -237,7 +245,6 @@ let variableCol = [
     title: '点击率',
     dataIndex: 'ctr',
     align: 'center',
-   
     scopedSlots: { customRender: 'ctr' },
     sorter: (a, b) => a.ctr - b.ctr
   },
@@ -341,7 +348,9 @@ let detailConsum = [
 export default {
   data() {
     return {
-
+       //下拉选择框的数据
+      projectArr:[],
+      selectValue:'',
        //gudinglie
       columnsFixd:columnsFixd,
 
@@ -395,6 +404,10 @@ export default {
   mixins: [JeecgListMixin],
   methods: {
     moment,
+    //select切换---项目
+    selectChange(key){
+        this.selectValue=key;
+    },
      //打开视频
     openVideo(val){
         this.Videovisible=true;
@@ -419,37 +432,17 @@ export default {
       
 
       this.dateRange=[lastStart,lastEnd]
-      console.log(this.dateRange);
-      this.timedata=this.dateRange
-    //   this.timedata=this.dateRange
-      console.log(this.dateRange)
+      
       this.totalSelect = 7
       this.daysFlag = true
-      this.timedata=[moment(this.dateRange[0]._d).format('YYYY-MM-DD'),moment(this.dateRange[1]._d).format('YYYY-MM-DD')]
-      postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListWeek', {
-        startDate: this.timedata[0],
-        endDate: this.timedata[1],
-        cost: this.consumeValue,
-        signature: this.videoID
-      }).then(res => {
-        let resArr = []
-        this.loading = false
-        console.log(res)
-        if (res.success) {
-          let result = res.result
-          this.data.push({ ...result, key: 1 })
-          result.map((item, index) => {
-            item.key = index
-          })
-          this.data = result
-        }
-      })
+      this.timedata=[moment(this.dateRange[0]).format('YYYY-MM-DD'),moment(this.dateRange[1]).format('YYYY-MM-DD')]
+      this.HttpPost();
 
     },
 
     consumeOnChange() {},
-    //查询按钮
-    searchRes() {
+    //tableshuju请求
+    HttpPost(){
       this.date = []
       this.loading = true
       postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListWeek', {
@@ -471,6 +464,10 @@ export default {
         }
       })
     },
+    //查询按钮
+    searchRes() {
+      this.HttpPost();
+    },
 
     //导出报表
     exportExcel() {
@@ -710,13 +707,16 @@ export default {
     tofixed(val){
       return Number(val).toFixed(2)
     }
-  }
+  },
+  mounted() {
+    this.lastWeekHandle();
+  },
 }
 </script>
 <style lang="less">
-.ant-table .ant-table-fixed-left .ant-table-thead {
-  height: 108px !important ;
-}
+// .ant-table .ant-table-fixed-left .ant-table-thead {
+//   height: 108px !important ;
+// }
 .ant-table .ant-table-thead .ant-table-header-column .ant-table-column-title{
        
       // display:block;
@@ -729,6 +729,9 @@ export default {
   width: 100%;
   height: 100%;
 }
+.xiangmuxuanze{
+  margin-bottom: 20px;;
+}
 .timeDiv {
   display: flex;
   justify-content: space-between;

+ 1 - 1
vue.config.js

@@ -67,7 +67,7 @@ module.exports = {
         // target: 'http://39.97.120.42:8080', //请求本地 需要jeecg-boot后台项目  生产环境
         // target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.13:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        target: 'http://192.168.1.22:8080', //请求本地 需要jeecg-boot后台项目  英豪
+        target: 'http://192.168.1.22:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.103:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震