魏志佳 5 лет назад
Родитель
Сommit
79d972ed64

+ 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
             }

+ 23 - 5
src/views/modules/Statistics/videoStatics/vDay.vue

@@ -2,7 +2,14 @@
   <div class="vsummary">
     <div class="timeDiv">
       <div>
-        <span>时间范围:</span>
+        <!-- <span>项目选择:</span>
+        <a-select  default-value="" style="width: 200px" @change="selectChange"  placeholder="请选择项目账户">
+          <a-select-option v-for="(item,index) in projectArr" :key="index" :value='item.id'>
+            {{ item }}
+          </a-select-option>
+        </a-select> -->
+
+        <span class="timeSpan">时间范围:</span>
         <a-button type="default" @click="yesterdayHandle">昨日</a-button>
         <a-date-picker
           :disabled-date="disabledDate"
@@ -17,7 +24,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 +260,9 @@ let variableCol = [
 export default {
   data() {
     return {
+      //下拉选择框的数据
+      projectArr:[],
+      selectValue:'',
        //gudinglie
       columnsFixd:columnsFixd,
 
@@ -298,6 +308,11 @@ export default {
   mixins: [JeecgListMixin],
   methods: {
     moment,
+    //select切换---项目
+    selectChange(key){
+        this.selectValue=key;
+    },
+
      //打开视频
     openVideo(val){
         this.Videovisible=true;
@@ -534,9 +549,9 @@ export default {
 }
 </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;
@@ -552,6 +567,9 @@ export default {
 .timeDiv {
   display: flex;
   justify-content: space-between;
+  .timeSpan{
+    margin-left: 15px;
+  }
 }
 span {
   margin-left: 5px;

+ 4 - 4
src/views/modules/Statistics/videoStatics/vMonth.vue

@@ -18,7 +18,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>
@@ -722,9 +722,9 @@ export default {
 }
 </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;

+ 19 - 7
src/views/modules/Statistics/videoStatics/vSummary.vue

@@ -18,7 +18,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,7 +84,7 @@
       ref="vSummaryTable"
       :width="tableWidth"
       @customHeaderCell="customHeaderCell(columns)"
-      height="100"
+     
     >
       <div slot="videoU" slot-scope="test,records">
         <img
@@ -340,6 +340,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],
@@ -359,7 +364,6 @@ export default {
         }
       })
     },
-
     //导出报表
     exportExcel() {
       // var params = {}
@@ -615,7 +619,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) {
@@ -626,13 +631,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;

+ 4 - 5
src/views/modules/Statistics/videoStatics/vWeek.vue

@@ -18,7 +18,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 +237,6 @@ let variableCol = [
     title: '点击率',
     dataIndex: 'ctr',
     align: 'center',
-   
     scopedSlots: { customRender: 'ctr' },
     sorter: (a, b) => a.ctr - b.ctr
   },
@@ -714,9 +713,9 @@ export default {
 }
 </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;

+ 2 - 2
vue.config.js

@@ -64,10 +64,10 @@ module.exports = {
          }
        },*/
       '/jeecg-boot': {
-        // target: 'http://39.97.120.42:8080', //请求本地 需要jeecg-boot后台项目  生产环境
+        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:8080', //请求本地 需要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后台项目  孙震