zhuxinbo 5 năm trước cách đây
mục cha
commit
1fb76ea2a6

+ 3 - 3
src/main.js

@@ -48,8 +48,8 @@ import JeecgComponents from '@/components/jeecg/index'
 // import iView from 'iview'
 import '!style-loader!css-loader!less-loader!./theme/index.less'
 
-import ElementUI from 'element-ui';
-import 'element-ui/lib/theme-chalk/index.css';
+// import ElementUI from 'element-ui';
+// import 'element-ui/lib/theme-chalk/index.css';
 
 import { getDay,allWeeks } from '@/utils/getDay.js'
 
@@ -60,7 +60,7 @@ Vue.prototype.wps = WPS;
 
 Vue.prototype.$getDay = getDay
 Vue.prototype.allWeeks = allWeeks
-Vue.use(ElementUI);
+// Vue.use(ElementUI);
 
 Vue.config.productionTip = false
 // Vue.use(iView)

+ 2 - 2
src/views/modules/Statistics/alipayStatistics.vue

@@ -59,9 +59,9 @@
   top: 65px;
   right: 10px;
 }
-th div {
+/* th div {
   white-space: nowrap;
-}
+} */
 </style>
 <template>
   <div class="data-statistics">

+ 3 - 14
src/views/modules/Statistics/videoStatics/index.vue

@@ -42,26 +42,15 @@
   font-weight: 400;
   margin-left: 10px;
 }
-.ant-modal-wrap .yincang .ant-modal-content .ant-modal-footer {
-  display: none !important;
-}
-.yincang .ant-col-6 p {
-  text-align: left;
-  color: red;
-  font-size: 16px;
-  font-weight: 500;
-}
-.ant-table-thead div {
+/* .ant-table-thead div {
   font-weight: 700;
-}
+} */
 .tool-tip {
   position: absolute;
   top: 65px;
   right: 10px;
 }
-th div {
-  white-space: nowrap;
-}
+
 #mybtn{
     position: relative;
     top: 0;

+ 1 - 0
src/views/modules/Statistics/videoStatics/selectComponent.vue

@@ -1239,6 +1239,7 @@ export default {
     //复选框的点击事件
     checkboxClick(val) {
       // console.log(val)
+    //   this.$emit('update:count',)
       this.$emit('getshowlist', val)
       // console.log(val,this.customFields[0].form)
       // this.customFields[val].checkall=!this.customFields[val].checkall

+ 51 - 33
src/views/modules/Statistics/videoStatics/vDay.vue

@@ -7,7 +7,7 @@
         <a-date-picker
           :disabled-date="disabledDate"
           format="YYYY-MM-DD"
-          style="width: 200px;"
+          style="width: 250px;"
           @change="dateChange"
           v-model="dateRange"
         />
@@ -75,10 +75,12 @@
       :scroll="{ x: scrollX }"
       :loading="loading"
       ref="vSummaryTable"
+      :width='tableWidth'
+      style="word-break: break-all;"
       
     >
       <div slot="videoU" slot-scope="test,records">
-        <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt="" style="height:200px;width:112.5px" @click="openVideo(records.url)">
+        <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt=""  style="width:140px"  @click="openVideo(records.url)">
 
       </div>
       <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
@@ -175,7 +177,7 @@ const columnsFixd = [
 
   {
     title: '视频描述',
-    dataIndex: 'materialName',
+    dataIndex: 'materialDesc',
     align: 'center',
     width: 100,
     fixed: 'left'
@@ -200,7 +202,7 @@ let variableCol = [
     title: '点击率',
     dataIndex: 'ctr',
     align: 'center',
-    width: 120,
+  
     scopedSlots: { customRender: 'ctr' },
     sorter: (a, b) => a.ctr - b.ctr
   },
@@ -216,7 +218,7 @@ let variableCol = [
     title: '25%进度播放率',
     dataIndex: 'play25FeedBreakRate',
     align: 'center',
-    width:170,
+   
     scopedSlots: { customRender: 'play25FeedBreakRate' },
     sorter: (a, b) => a.play25FeedBreakRate - b.play25FeedBreakRate
   },
@@ -224,7 +226,7 @@ let variableCol = [
     title: '播完率',
     dataIndex: 'playOverRate',
     align: 'center',
-    width:100,
+   
     tip: '表示广告在投放期内的预估花费金额。当天数据可能会有波动,次日稳定',
     scopedSlots: { customRender: 'playOverRate' },
 
@@ -249,6 +251,11 @@ let variableCol = [
 export default {
   data() {
     return {
+       //gudinglie
+      columnsFixd:columnsFixd,
+
+      //设置表格的列宽
+      tableWidth:'',
       columnsFixd,
 
        //是否打开视频
@@ -372,34 +379,33 @@ export default {
       this.visible = true
        this.listNum = [...this.columns]
     },
+
+    tableHandle(){
+      // this.listNum = [...this.columns]
+      console.log(this.listNum.length,this.columns)
+
+      if(this.listNum.length > 12|| this.columns.length>12){
+          this.tableWidth=120;
+          this.scrollX=this.columns.length*140
+          console.log(this.scrollX)
+      }else{
+        this.scrollX = 0
+      }
+    },
     //弹出框确定
     handleOk(e) {
       this.loading = false
      
       this.visible = false
      
+      this.tableHandle()
       if(this.listNum.length>=10){
 
-          let newlist=this.listNum.slice(columnsFixd.length)
-          console.log(newlist)
-          this.columns = [...columnsFixd,...newlist]
-      }
-
-
-     if (this.listNum.length > 12 && this.listNum.length<=13 ) {
-        this.scrollX =1900
-        console.log(this.$refs.vSummaryTable)
-      } 
-      else if(this.listNum.length > 13 && this.listNum.length<=15){
-        this.scrollX = (this.listNum.length - 12) * 1000
-      }
-      else if(this.listNum.length >15 && this.listNum.length<=17){
-        this.scrollX = (this.listNum.length - 12) * 600        
-      }
-      else if(this.listNum.length >=18){
-        this.scrollX = (this.listNum.length - 12) * 400        
+        let newlist=this.listNum.slice(columnsFixd.length)
+        console.log(newlist)
+        this.columns = [...columnsFixd,...newlist]
       }else{
-        this.scrollX = 0
+        this.columns = [...this.listNum]
       }
 
       // console.log(this.columns.length)
@@ -413,7 +419,7 @@ export default {
         this.columns.map((item, index) => {
           if (index == 1) {
             item.width = 150
-          } else if (index > 2 && index < 4 && index == 0) {
+          } else if (index >= 2 && index < 5 || index == 0) {
             item.width = 100
           }
         })
@@ -477,7 +483,7 @@ export default {
     // this.getParticipateList()
     this.statDate = moment().subtract(1, 'day')
     moment().format('YYYY-MM-DD_HH:mm')
-
+    
     postAction('/toutiao/videoReportDaily/getColumnJson', {
       columnType:2,
     }).then((res)=>{
@@ -489,13 +495,15 @@ export default {
            columns.map((item,index)=>{
              if(index>columnsFixd.length-1){
                  item.sorter=function(a,b){  return a[item.dataIndex]-b[item.dataIndex]}
-             }
-         
-        })
-        this.columns=columns
+             }})
+             columns=columns.slice(columnsFixd.length);
+            this.columns=[...columnsFixd,...columns]
+            this.tableHandle()
+        }
+           
+        
         // console.log(this.columns)
       }
-      }
 
     })
   },
@@ -523,7 +531,17 @@ export default {
 
 }
 </script>
-
+<style lang="less">
+.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;
+       word-break: break-all;
+}
+</style>
 <style lang="scss" scoped>
 .vsummary {
   width: 100%;

+ 66 - 42
src/views/modules/Statistics/videoStatics/vMonth.vue

@@ -7,7 +7,7 @@
         <a-range-picker
           :disabled-date="disabledDate"
           format="YYYY-MM-DD"
-          style="width: 200px;"
+          style="width: 250px;"
           @change="dateChange"
           v-model="dateRange"
         />
@@ -78,6 +78,8 @@
       :loading="loading"
       tableLayout="auto"
       ref="vSummaryTable"
+      style="word-break: break-all;"
+      :width='tableWidth'
     >
      
 
@@ -86,7 +88,7 @@
       </span>
 
       <div slot="videoU" slot-scope="test,records">
-        <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt="" style="height:200px;width:112.5px" @click="openVideo(records.url)">
+        <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt="" style="width:140px" @click="openVideo(records.url)">
       </div>
       <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
       <span
@@ -141,6 +143,7 @@
         bordered
         tableLayout="auto"
         :pagination="false"
+        style="word-break: break-all;"
       >
             <span slot="huanbi" slot-scope="huanbi">{{ huanbi | toPercentage }}</span>
         
@@ -199,7 +202,7 @@ const columnsFixd = [
 
   {
     title: '视频描述',
-    dataIndex: 'materialName',
+    dataIndex: 'materialDesc',
     align: 'center',
     width: 100,
     fixed: 'left'
@@ -232,7 +235,7 @@ let variableCol = [
     title: '点击率',
     dataIndex: 'ctr',
     align: 'center',
-    width: 50,
+    
     scopedSlots: { customRender: 'ctr' },
     sorter: (a, b) => a.ctr - b.ctr
   },
@@ -248,7 +251,7 @@ let variableCol = [
     title: '25%进度播放率',
     dataIndex: 'play25FeedBreakRate',
     align: 'center',
-     width:170,
+    
     scopedSlots: { customRender: 'play25FeedBreakRate' },
     sorter: (a, b) => a.play25FeedBreakRate - b.play25FeedBreakRate
   },
@@ -340,6 +343,13 @@ let detailConsum = [
 export default {
   data() {
     return {
+
+       //gudinglie
+      columnsFixd:columnsFixd,
+
+      //设置表格的列宽
+      tableWidth:'',
+
       columnsFixd,
        //是否打开视频
       Videovisible:false,
@@ -521,34 +531,37 @@ export default {
       this.visible = true
        this.listNum = [...this.columns]
     },
+
+    tableHandle(){
+      // this.listNum = [...this.columns]
+      console.log(this.listNum.length,this.columns)
+
+      if(this.listNum.length > 12|| this.columns.length>12){
+          this.tableWidth=120;
+          this.scrollX=this.columns.length*140
+          console.log(this.scrollX)
+      }else{
+        this.scrollX = 0
+      }
+    },
+
     //弹出框确定
     handleOk(e) {
       this.loading = false
      
       this.visible = false
+      this.tableHandle()
       if(this.listNum.length>=10){
 
         let newlist=this.listNum.slice(columnsFixd.length)
         console.log(newlist)
         this.columns = [...columnsFixd,...newlist]
-      }
-
-      if (this.listNum.length > 12 && this.listNum.length<=13 ) {
-        this.scrollX =1900
-        console.log(this.$refs.vSummaryTable)
-      } 
-      else if(this.listNum.length > 13 && this.listNum.length<=15){
-        this.scrollX = (this.listNum.length - 12) * 1000
-      }
-      else if(this.listNum.length >15 && this.listNum.length<=17){
-        this.scrollX = (this.listNum.length - 12) * 600        
-      }
-      else if(this.listNum.length >=18){
-        this.scrollX = (this.listNum.length - 12) * 400        
       }else{
-        this.scrollX = 0
+        this.columns = [...this.listNum]
       }
 
+      
+
       if (this.listNum.length == 6) {
         this.columns.map((item, index) => {
           item.width = 300
@@ -557,7 +570,7 @@ export default {
         this.columns.map((item, index) => {
           if (index == 1) {
             item.width = 150
-          } else if (index > 2 && index < 4 && index == 0) {
+          } else if (index >= 2 && index < 6 || index == 0) {
             item.width = 100
           }
         })
@@ -657,30 +670,31 @@ export default {
     this.statDate = moment().subtract(1, 'day')
     moment().format('YYYY-MM-DD_HH:mm')
 
-    postAction('/toutiao/videoReportDaily/getColumnJson', {
-      columnType:4,
-    }).then((res)=>{
-      // console.log(res)
-      if(res.success){
-      // console.log(JSON.parse(res.result))
-      let columns=JSON.parse(res.result)
-      if(columns.length){
-        if(columns.length>=columnsFixd.length){
-            columns.map((item,index)=>{
-             if(index>columnsFixd.length-1){
-                 item.sorter=function(a,b){  return a[item.dataIndex]-b[item.dataIndex]}
-             }})
-             columns=columns.slice(columnsFixd.length);
-            this.columns=[...columnsFixd,...columns]
-        }
+    // postAction('/toutiao/videoReportDaily/getColumnJson', {
+    //   columnType:4,
+    // }).then((res)=>{
+    //   // console.log(res)
+    //   if(res.success){
+    //   // console.log(JSON.parse(res.result))
+    //   let columns=JSON.parse(res.result)
+    //   if(columns.length){
+    //     if(columns.length>=columnsFixd.length){
+    //         columns.map((item,index)=>{
+    //          if(index>columnsFixd.length-1){
+    //              item.sorter=function(a,b){  return a[item.dataIndex]-b[item.dataIndex]}
+    //          }})
+    //          columns=columns.slice(columnsFixd.length);
+    //         this.columns=[...columnsFixd,...columns]
+            this.tableHandle()
+        // }
            
         
-        // console.log(this.columns)
-      }
+    //     // console.log(this.columns)
+    //   }
      
-      }
+    //   }
 
-    })
+    // })
   },
   deactivated() {
       let arr = JSON.stringify(this.columns)
@@ -705,7 +719,17 @@ export default {
   }
 }
 </script>
-
+<style lang="less">
+.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;
+       word-break: break-all;
+}
+</style>
 <style lang="less" scoped>
 .vsummary {
   width: 100%;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 620 - 554
src/views/modules/Statistics/videoStatics/vSummary.vue


+ 45 - 23
src/views/modules/Statistics/videoStatics/vWeek.vue

@@ -7,7 +7,7 @@
         <a-range-picker
           :disabled-date="disabledDate"
           format="YYYY-MM-DD"
-          style="width: 200px;"
+          style="width: 250px;"
           @change="dateChange"
           v-model="dateRange"
         />
@@ -78,6 +78,8 @@
       :loading="loading"
       tableLayout="auto"
       ref="vSummaryTable"
+      style="word-break: break-all;"
+      :width='tableWidth'
     >
      
 
@@ -86,7 +88,7 @@
       </span>
 
       <div slot="videoU" slot-scope="test,records">
-       <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt="" style="height:200px;width:112.5px" @click="openVideo(records.url)">
+       <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt="" style="width:140px" @click="openVideo(records.url)">
       </div>
       <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
       <span
@@ -141,6 +143,7 @@
         bordered
         tableLayout="auto"
         :pagination="false"
+        style="word-break: break-all;"
       >
         <span slot="huanbi" slot-scope="huanbi">{{ huanbi | toPercentage }}</span>
       </a-table>
@@ -199,7 +202,7 @@ const columnsFixd = [
 
   {
     title: '视频描述',
-    dataIndex: 'materialName',
+    dataIndex: 'materialDesc',
     align: 'center',
     width: 100,
     fixed: 'left'
@@ -232,7 +235,7 @@ let variableCol = [
     title: '点击率',
     dataIndex: 'ctr',
     align: 'center',
-    width: 50,
+   
     scopedSlots: { customRender: 'ctr' },
     sorter: (a, b) => a.ctr - b.ctr
   },
@@ -246,7 +249,7 @@ let variableCol = [
   },
   {
     title: '25%进度播放率',
-     width:170,
+   
     dataIndex: 'play25FeedBreakRate',
     align: 'center',
     scopedSlots: { customRender: 'play25FeedBreakRate' },
@@ -256,7 +259,7 @@ let variableCol = [
     title: '播完率',
     dataIndex: 'playOverRate',
     align: 'center',
-    width:100,
+    
     tip: '表示广告在投放期内的预估花费金额。当天数据可能会有波动,次日稳定',
     scopedSlots: { customRender: 'playOverRate' },
 
@@ -329,12 +332,19 @@ let detailConsum = [
   {
     title: '环比',
     dataIndex: 'huanbi',
+    scopedSlots: { customRender: 'huanbi' },
     align: 'center'
   }
 ]
 export default {
   data() {
     return {
+
+       //gudinglie
+      columnsFixd:columnsFixd,
+
+      //设置表格的列宽
+      tableWidth:'',
        //是否打开视频
       Videovisible:false,
       videoUrl:'',
@@ -513,34 +523,35 @@ export default {
       this.visible = true
        this.listNum = [...this.columns]
     },
+    tableHandle(){
+      // this.listNum = [...this.columns]
+      console.log(this.listNum.length,this.columns)
+
+      if(this.listNum.length > 12|| this.columns.length>12){
+          this.tableWidth=120;
+          this.scrollX=this.columns.length*140
+          console.log(this.scrollX)
+      }else{
+        this.scrollX = 0
+      }
+    },
+
     //弹出框确定
     handleOk(e) {
       this.loading = false
       
       this.visible = false
+      this.tableHandle()
       if(this.listNum.length>=10){
 
         let newlist=this.listNum.slice(columnsFixd.length)
         console.log(newlist)
         this.columns = [...columnsFixd,...newlist]
-      }
-
-     if (this.listNum.length > 12 && this.listNum.length<=13 ) {
-        this.scrollX =1900
-        console.log(this.$refs.vSummaryTable)
-      } 
-      else if(this.listNum.length > 13 && this.listNum.length<=15){
-        this.scrollX = (this.listNum.length - 12) * 1000
-      }
-      else if(this.listNum.length >15 && this.listNum.length<=17){
-        this.scrollX = (this.listNum.length - 12) * 600        
-      }
-      else if(this.listNum.length >=18){
-        this.scrollX = (this.listNum.length - 12) * 400        
       }else{
-        this.scrollX = 0
+        this.columns = [...this.listNum]
       }
 
+
       if (this.listNum.length == 6) {
         this.columns.map((item, index) => {
           item.width = 300
@@ -549,7 +560,7 @@ export default {
         this.columns.map((item, index) => {
           if (index == 1) {
             item.width = 150
-          } else if (index > 2 && index < 4 && index == 0) {
+          } else if (index >= 2 && index < 6 || index == 0) {
             item.width = 100
           }
         })
@@ -663,6 +674,7 @@ export default {
              }})
              columns=columns.slice(columnsFixd.length);
             this.columns=[...columnsFixd,...columns]
+            this.tableHandle()
         }
            
         
@@ -699,7 +711,17 @@ export default {
   }
 }
 </script>
-
+<style lang="less">
+.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;
+       word-break: break-all;
+}
+</style>
 <style lang="less" scoped>
 .vsummary {
   width: 100%;

+ 2 - 2
src/views/modules/material/videoMaterial.vue

@@ -1796,7 +1796,7 @@ export default {
               planId: res.ascription.planId,
               shotId: res.ascription.shotId,
             })
-            this.id = item.id
+            this.code = item.code
         })
     },
     edit(item, status, editStatus) {
@@ -1879,7 +1879,7 @@ export default {
                 planId: values.planId,
                 shotId: values.shotId,
                 clipId: values.clipId,
-                materialId:this.id
+                materialId:this.code
             }
             fileEditAll(params).then(res=>{
                 console.log(res)

+ 2 - 2
vue.config.js

@@ -64,13 +64,13 @@ 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.90: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后台项目  孙震
+        target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.165:8080', //请求本地 需要jeecg-boot后台项目  毕洁泉
         ws: false,
         changeOrigin: true