Selaa lähdekoodia

Merge branch 'master' of http://39.106.184.70:3000/ctop/adsp-vue

zhuxinbo 5 vuotta sitten
vanhempi
commit
4e1afab3ec

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 729 - 722
src/views/modules/Statistics/videoStatics/selectComponent.vue


+ 64 - 18
src/views/modules/Statistics/videoStatics/vDay.vue

@@ -37,7 +37,7 @@
           <p>可添加的列</p>
           <div class="selectionList">
             <!--  v-for="(item,index) in addColumns" :key="index" -->
-            <selectComponent :showCol="listNum" @getshowlist="getshowlist" />
+            <selectComponent :showCol="listNum" @getshowlist="getshowlist" :fixedColLength='columnsFixd.length' />
           </div>
         </div>
         <div class="listNum">
@@ -78,13 +78,7 @@
       
     >
       <div slot="videoU" slot-scope="test,records">
-        <video
-          @click.stop
-          class="video"
-          :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"
-          controls="controls"
-          style="height:200px;width:112.5px"
-        >您的浏览器不支持 video 标签</video>
+        <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt="" style="height:200px;width:112.5px" @click="openVideo(records.url)">
 
       </div>
       <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
@@ -129,6 +123,15 @@
       <span slot="downloadStartCost" slot-scope="downloadStartCost">{{ downloadStartCost | tofixed }}</span>
       <span slot="installFinishCost" slot-scope="installFinishCost">{{ installFinishCost | tofixed }}</span>
     </a-table>
+    <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>
 
@@ -166,7 +169,7 @@ const columnsFixd = [
     title: '视频链接',
     dataIndex: 'url',
     align: 'center',
-    width: 100,
+    width: 150,
     fixed: 'left'
   },
 
@@ -218,7 +221,7 @@ let variableCol = [
     sorter: (a, b) => a.play25FeedBreakRate - b.play25FeedBreakRate
   },
   {
-    title: '整体完播率',
+    title: '播率',
     dataIndex: 'playOverRate',
     align: 'center',
     width:100,
@@ -246,6 +249,12 @@ let variableCol = [
 export default {
   data() {
     return {
+      columnsFixd,
+
+       //是否打开视频
+      Videovisible:false,
+      videoUrl:'',
+
       //消耗的值
       consumeValue: 1000,
       //视频ID
@@ -280,6 +289,14 @@ export default {
   mixins: [JeecgListMixin],
   methods: {
     moment,
+     //打开视频
+    openVideo(val){
+        this.Videovisible=true;
+        this.videoUrl=val
+    },
+    videoOk(){
+        this.Videovisible=false
+    },
     disabledDate(current) {
       // console.log(current)
 
@@ -288,13 +305,15 @@ export default {
 
     consumeOnChange() {},
 
+
+   
     //点击时间的 昨日 按钮
     yesterdayHandle() {
-      this.dateRange = moment()
+      let yesterday = moment()
           .subtract(1, 'days')
           .format('YYYY-MM-DD')
-       
-      // console.log(this.dateRange);
+       this.dateRange=moment(yesterday)
+      console.log(this.dateRange);
       this.timedata=this.dateRange
       // this.totalSelect = 1
       // this.daysFlag = true
@@ -362,15 +381,22 @@ export default {
       //     this.visible = false;
       //     this.loading = false;
       // }, 1000);
-     if (this.listNum.length > 12 && this.listNum.length<15 ) {
-        this.scrollX = (this.listNum.length - 12) * 1000
+     if (this.listNum.length > 12 && this.listNum.length<=13 ) {
+        this.scrollX =1900
         console.log(this.$refs.vSummaryTable)
-      } else if(this.listNum.length >= 15){
-        this.scrollX = (this.listNum.length - 12) * 700
-        
+      } 
+      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
       }
+
       // console.log(this.columns.length)
       if (this.columns.length == 4) {
         // console.log(this.listNum.length)
@@ -552,20 +578,39 @@ span {
     top: 5px;
   }
   .selectlist {
+    width:100%;
     list-style: none;
     margin: 0;
     height: 450px;
     padding: 0 15px 10px;
     overflow: auto;
+    
     li {
+      width: 100%;
       padding: 5px 8px;
       margin: 6px 0;
       border-radius: 10px;
       background: rgb(248, 248, 248);
+      height: 32px;
       position: relative;
       span {
+        width: 80%;
+        height: 100%;
         display: inline-block;
         margin: 0 10px;
+        // overflow:hidden;
+        // text-overflow:ellipsis;
+        // white-space: nowrap;
+      }
+      .listText{
+        position: absolute;
+        top: 2;
+        left: 10;
+        width: 40%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+
       }
       #closeStyle {
         position: absolute;
@@ -573,6 +618,7 @@ span {
         right: 7px;
       }
     }
+  
   }
 }
 </style>

+ 67 - 21
src/views/modules/Statistics/videoStatics/vMonth.vue

@@ -39,7 +39,7 @@
           <p>可添加的列</p>
           <div class="selectionList">
             <!--  v-for="(item,index) in addColumns" :key="index" -->
-            <selectComponent :showCol="listNum" @getshowlist="getshowlist" />
+            <selectComponent :showCol="listNum" @getshowlist="getshowlist"  :fixedColLength='columnsFixd.length'/>
           </div>
         </div>
         <div class="listNum">
@@ -86,13 +86,7 @@
       </span>
 
       <div slot="videoU" slot-scope="test,records">
-        <video
-          @click.stop
-          class="video"
-          :src="records.url"
-          controls="controls"
-          style="height:200px;width:112.5px"
-        >您的浏览器不支持 video 标签。</video>
+        <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt="" style="height:200px;width:112.5px" @click="openVideo(records.url)">
       </div>
       <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
       <span
@@ -152,6 +146,16 @@
         
       </a-table>
     </a-modal>
+
+    <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>
 
@@ -189,7 +193,7 @@ const columnsFixd = [
     title: '视频链接',
     dataIndex: 'videoUrl',
     align: 'center',
-    width: 100,
+    width: 150,
     fixed: 'left'
   },
 
@@ -249,7 +253,7 @@ let variableCol = [
     sorter: (a, b) => a.play25FeedBreakRate - b.play25FeedBreakRate
   },
   {
-    title: '整体完播率',
+    title: '播率',
     dataIndex: 'playOverRate',
     align: 'center',
     tip: '表示广告在投放期内的预估花费金额。当天数据可能会有波动,次日稳定',
@@ -336,6 +340,11 @@ let detailConsum = [
 export default {
   data() {
     return {
+      columnsFixd,
+       //是否打开视频
+      Videovisible:false,
+      videoUrl:'',
+
       //明细的表头
       detailConsum,
       //明细里的数据
@@ -380,6 +389,16 @@ export default {
   mixins: [JeecgListMixin],
   methods: {
     moment,
+    //打开视频
+    openVideo(val){
+        this.Videovisible=true;
+        this.videoUrl=val
+    },
+    videoOk(){
+        this.Videovisible=false
+    },
+
+
     disabledDate(current) {
       // console.log(current)
 
@@ -387,17 +406,19 @@ export default {
     },
     //过去一个月按钮事件
     lastWeekHandle() {
-      this.dateRange = [
+      let lastStart = 
         moment()
           .subtract(1, 'months')
-          .format('YYYY-MM-DD'),
-        moment()
+          .format('YYYY-MM-DD')
+      let lastEnd =   moment()
           .subtract(1, 'days')
           .format('YYYY-MM-DD')
-      ]
-      this.timedata=this.dateRange
+      
+
+      this.dateRange=[moment(lastStart),moment(lastEnd)]
       console.log(this.dateRange)
-      this.totalSelect = 7
+      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],
@@ -510,12 +531,18 @@ export default {
       //     this.visible = false;
       //     this.loading = false;
       // }, 1000);
-      if (this.listNum.length > 12 && this.listNum.length<15 ) {
-        this.scrollX = (this.listNum.length - 12) * 1000
+      if (this.listNum.length > 12 && this.listNum.length<=13 ) {
+        this.scrollX =1900
         console.log(this.$refs.vSummaryTable)
-      } else if(this.listNum.length >= 15){
-        this.scrollX = (this.listNum.length - 12) * 700
-        
+      } 
+      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
       }
@@ -718,20 +745,39 @@ span {
     top: 5px;
   }
   .selectlist {
+    width:100%;
     list-style: none;
     margin: 0;
     height: 450px;
     padding: 0 15px 10px;
     overflow: auto;
+    
     li {
+      width: 100%;
       padding: 5px 8px;
       margin: 6px 0;
       border-radius: 10px;
       background: rgb(248, 248, 248);
+      height: 32px;
       position: relative;
       span {
+        width: 80%;
+        height: 100%;
         display: inline-block;
         margin: 0 10px;
+        // overflow:hidden;
+        // text-overflow:ellipsis;
+        // white-space: nowrap;
+      }
+      .listText{
+        position: absolute;
+        top: 2;
+        left: 10;
+        width: 40%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+
       }
       #closeStyle {
         position: absolute;

+ 88 - 35
src/views/modules/Statistics/videoStatics/vSummary.vue

@@ -40,7 +40,7 @@
           <p>可添加的列</p>
           <div class="selectionList">
             <!--  v-for="(item,index) in addColumns" :key="index" -->
-            <selectComponent :showCol="listNum" @getshowlist="getshowlist" />
+            <selectComponent :showCol="listNum" @getshowlist="getshowlist" :fixedColLength='columnsFixd.length' />
           </div>
         </div>
         <div class="listNum">
@@ -50,11 +50,11 @@
             <li v-for="(item,index) in listNum" :key="index">
               <span v-if=" index <4">
                 <a-icon type="lock" />
-                <span>{{item.title}}</span>
+                <span class="listText">{{item.title}}</span>
               </span>
               <span v-else-if=" index >3">
                 <a-icon type="menu" style="color:#ccc" />
-                <span>{{item.title}}</span>
+                <span class="listText">{{item.title}}</span>
                 <a-icon
                   type="close"
                   @click="deleteCol(item,index)"
@@ -80,13 +80,7 @@
       ref="vSummaryTable"
     >
       <div slot="videoU" slot-scope="test,records"> 
-        <video
-          @click.stop
-          class="video"
-          :src="records.url"
-          controls="controls"
-          style="height:200px;width:112.5px"
-        >您的浏览器不支持 video 标签。</video>
+        <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
@@ -110,6 +104,7 @@
       <span slot="downloadFinishCost" slot-scope="downloadFinishCost">{{ downloadFinishCost | tofixed }}</span>
       <span slot="downloadStartCost" slot-scope="downloadStartCost">{{ downloadStartCost | tofixed }}</span>
       <span slot="installFinishCost" slot-scope="installFinishCost">{{ installFinishCost | tofixed }}</span>
+      <span slot="convertCost" slot-scope="convertCost">{{ convertCost | tofixed }}</span>
 
       <!--  -->
       <span
@@ -133,6 +128,16 @@
       <span slot="cpm" slot-scope="cpm">{{ cpm | tofixed }}</span>
       <span slot="statDatetime" slot-scope>{{ timedata[0]+'~'+timedata[1]}}</span>
     </a-table>
+
+    <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>
 
@@ -163,7 +168,7 @@ const columnsFixd = [
     title: '视频链接',
     dataIndex: 'url',
     align: 'center',
-    width: 100,
+    width: 150,
     fixed: 'left'
   },
 
@@ -179,6 +184,7 @@ let variableCol = [
   {
     title: '消耗',
     dataIndex: 'cost',
+    
     scopedSlots: { customRender: 'cost' },
     align: 'center',
     sorter: (a, b) => a.cost - b.cost
@@ -187,6 +193,7 @@ let variableCol = [
     title: '点击数',
     dataIndex: 'clickMaterial',
     align: 'center',
+  
     scopedSlots: { customRender: 'clickMaterial' },
     sorter: (a, b) => a.clickMaterial - b.clickMaterial
   },
@@ -194,7 +201,7 @@ let variableCol = [
     title: '点击率',
     dataIndex: 'ctr',
     align: 'center',
-    width: 100,
+  
     scopedSlots: { customRender: 'ctr' },
     sorter: (a, b) => a.ctr - b.ctr
   },
@@ -203,6 +210,7 @@ let variableCol = [
     title: '展示数',
     dataIndex: 'showMaterial',
     align: 'center',
+    
     scopedSlots: { customRender: 'showMaterial' },
     sorter: (a, b) => a.showMaterial - b.showMaterial
   },
@@ -210,15 +218,15 @@ let variableCol = [
     title: '25%进度播放率',
     dataIndex: 'play25FeedBreakRate',
     align: 'center',
-    width:160,
+    
     scopedSlots: { customRender: 'play25FeedBreakRate' },
     sorter: (a, b) => a.play25FeedBreakRate - b.play25FeedBreakRate
   },
   {
-    title: '整体完播率',
+    title: '播率',
     dataIndex: 'playOverRate',
     align: 'center',
-    width:110,
+ 
     tip: '表示广告在投放期内的预估花费金额。当天数据可能会有波动,次日稳定',
     scopedSlots: { customRender: 'playOverRate' },
     sorter: (a, b) => a.playOverRate - b.playOverRate
@@ -227,6 +235,7 @@ let variableCol = [
     title: '转化数',
     dataIndex: 'convertMaterial',
     align: 'center',
+    
     scopedSlots: { customRender: 'convertMaterial' },
     sorter: (a, b) => a.convertMaterial - b.convertMaterial
   },
@@ -234,6 +243,7 @@ let variableCol = [
     title: '转化率',
     dataIndex: 'convertRate',
     align: 'center',
+  
     scopedSlots: { customRender: 'convertRate' },
     sorter: (a, b) => a.convertRate - b.convertRate
   }
@@ -242,6 +252,12 @@ let variableCol = [
 export default {
   data() {
     return {
+      //gudinglie
+      columnsFixd:columnsFixd,
+
+      //是否打开视频
+      Videovisible:false,
+      videoUrl:'',
 
       //是否显示导出按钮
       exportExcelIsOk:true,
@@ -273,6 +289,15 @@ export default {
   },
   methods: {
     moment,
+    //打开视频
+    openVideo(val){
+        this.Videovisible=true;
+        this.videoUrl=val
+    },
+    videoOk(){
+        this.Videovisible=false
+    },
+
     disabledDate(current) {
       // console.log(current)
 
@@ -343,16 +368,22 @@ export default {
 
     //日期选择回调
     dateChange(data, dataString) {
-      this.timedata = dataString
-      console.log(data[1]._d - data[0]._d, dataString)
-      this.dateRange[0] = data[0]
-      this.totalSelect = (data[1]._d - data[0]._d) / (24 * 60 * 60 * 1000) + 1
-      this.daysFlag = true
-      if (this.totalSelect > 92) {
-        this.$message.error('时间跨度太长啦,选小一点好嘛?')
-        this.daysFlag = false
-        this.dateRange = []
+      if(data.length){
+          this.timedata = dataString
+          this.dateRange[0] = data[0]
+          this.totalSelect = (data[1]._d - data[0]._d) / (24 * 60 * 60 * 1000) + 1
+          this.daysFlag = true
+          if (this.totalSelect > 92) {
+            this.$message.error('时间跨度太长啦,选小一点好嘛?')
+            this.daysFlag = false
+            this.dateRange = []
+          }
+      }else{
+        this.daysFlag=false
+        this.dateRange=[]
       }
+
+      
     },
 
     //弹出框打开,自定义列
@@ -365,16 +396,21 @@ export default {
       this.loading = false
       this.columns = [...this.listNum]
       this.visible = false
-      // setTimeout(() => {
-      //     this.visible = false;
-      //     this.loading = false;
-      // }, 1000);
-      if (this.listNum.length > 12 && this.listNum.length<15 ) {
-        this.scrollX = (this.listNum.length - 12) * 1000
+
+      // console.log(this.columns)
+
+      if (this.listNum.length > 12 && this.listNum.length<=13 ) {
+        this.scrollX =1900
         console.log(this.$refs.vSummaryTable)
-      } else if(this.listNum.length >= 15){
-        this.scrollX = (this.listNum.length - 12) * 700
-        
+      } 
+      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
       }
@@ -497,7 +533,7 @@ export default {
       if(res.success){
       // console.log(JSON.parse(res.result))
       let columns=JSON.parse(res.result)
-     if(columns.length){
+      if(columns.length){
            columns.map((item,index)=>{
              if(index>columnsFixd.length-1){
                  item.sorter=function(a,b){  return a[item.dataIndex]-b[item.dataIndex]}
@@ -515,6 +551,7 @@ export default {
     postAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
       json: arr,
       columnType: 1
+
     }).then(res => {
       // console.log(res)
     })
@@ -531,7 +568,7 @@ export default {
       return val
     },
     tofixed(val){
-      return val.toFixed(2)
+      return Number(val).toFixed(2)
     }
   },
 
@@ -615,24 +652,40 @@ span {
     top: 5px;
   }
   .selectlist {
+    width:100%;
     list-style: none;
     margin: 0;
     height: 450px;
     padding: 0 15px 10px;
     overflow: auto;
+    
     li {
+      width: 100%;
       padding: 5px 8px;
       margin: 6px 0;
       border-radius: 10px;
       background: rgb(248, 248, 248);
+      height: 32px;
       position: relative;
       span {
+        width: 80%;
+        height: 100%;
         display: inline-block;
         margin: 0 10px;
         // overflow:hidden;
         // text-overflow:ellipsis;
         // white-space: nowrap;
       }
+      .listText{
+        position: absolute;
+        top: 2;
+        left: 10;
+        width: 40%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+
+      }
       #closeStyle {
         position: absolute;
         top: 9px;

+ 69 - 21
src/views/modules/Statistics/videoStatics/vWeek.vue

@@ -39,7 +39,7 @@
           <p>可添加的列</p>
           <div class="selectionList">
             <!--  v-for="(item,index) in addColumns" :key="index" -->
-            <selectComponent :showCol="listNum" @getshowlist="getshowlist" />
+            <selectComponent :showCol="listNum" @getshowlist="getshowlist" :fixedColLength='columnsFixd.length' />
           </div>
         </div>
         <div class="listNum">
@@ -86,13 +86,7 @@
       </span>
 
       <div slot="videoU" slot-scope="test,records">
-        <video
-          @click.stop
-          class="video"
-          :src="records.url"
-          controls="controls"
-          style="height:200px;width:112.5px"
-        >您的浏览器不支持 video 标签。</video>
+       <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt="" style="height:200px;width:112.5px" @click="openVideo(records.url)">
       </div>
       <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
       <span
@@ -151,6 +145,17 @@
         <span slot="huanbi" slot-scope="huanbi">{{ huanbi | toPercentage }}</span>
       </a-table>
     </a-modal>
+
+    <!-- 视频详情 -->
+    <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>
 
@@ -188,7 +193,7 @@ const columnsFixd = [
     title: '视频链接',
     dataIndex: 'url',
     align: 'center',
-    width: 100,
+    width: 150,
     fixed: 'left'
   },
 
@@ -248,7 +253,7 @@ let variableCol = [
     sorter: (a, b) => a.play25FeedBreakRate - b.play25FeedBreakRate
   },
   {
-    title: '整体完播率',
+    title: '播率',
     dataIndex: 'playOverRate',
     align: 'center',
     width:100,
@@ -330,6 +335,10 @@ let detailConsum = [
 export default {
   data() {
     return {
+       //是否打开视频
+      Videovisible:false,
+      videoUrl:'',
+      columnsFixd,
       //明细的表头
       detailConsum,
       //明细里的数据
@@ -374,6 +383,14 @@ export default {
   mixins: [JeecgListMixin],
   methods: {
     moment,
+     //打开视频
+    openVideo(val){
+        this.Videovisible=true;
+        this.videoUrl=val
+    },
+    videoOk(){
+        this.Videovisible=false
+    },
     disabledDate(current) {
       // console.log(current)
 
@@ -381,18 +398,24 @@ export default {
     },
     //过去一周按钮事件
     lastWeekHandle() {
-      this.dateRange = [
+
+      let lastStart = 
         moment()
           .subtract(7, 'days')
-          .format('YYYY-MM-DD'),
-        moment()
+          .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.timedata=this.dateRange
       this.timedata=this.dateRange
-      console.log(this.dateRange)
+      // console.log(this.dateRange)
       this.totalSelect = 7
       this.daysFlag = true
+      this.timedata=[this.dateRange[0]._i,this.dateRange[1]._i]
       postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListWeek', {
         startDate: this.timedata[0],
         endDate: this.timedata[1],
@@ -469,7 +492,7 @@ export default {
 
     //日期选择回调
     dateChange(data, dataString) {
-      // console.log(data[1]._d - data[0]._d, dataString)
+      console.log(data, dataString)
       if(data.length){
           this.timedata = dataString
           this.dateRange[0] = data[0]
@@ -502,12 +525,18 @@ export default {
       //     this.visible = false;
       //     this.loading = false;
       // }, 1000);
-      if (this.listNum.length > 12 && this.listNum.length<15 ) {
-        this.scrollX = (this.listNum.length - 12) * 1000
+     if (this.listNum.length > 12 && this.listNum.length<=13 ) {
+        this.scrollX =1900
         console.log(this.$refs.vSummaryTable)
-      } else if(this.listNum.length >= 15){
-        this.scrollX = (this.listNum.length - 12) * 700
-        
+      } 
+      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
       }
@@ -709,20 +738,39 @@ span {
     top: 5px;
   }
   .selectlist {
+    width:100%;
     list-style: none;
     margin: 0;
     height: 450px;
     padding: 0 15px 10px;
     overflow: auto;
+    
     li {
+      width: 100%;
       padding: 5px 8px;
       margin: 6px 0;
       border-radius: 10px;
       background: rgb(248, 248, 248);
+      height: 32px;
       position: relative;
       span {
+        width: 80%;
+        height: 100%;
         display: inline-block;
         margin: 0 10px;
+        // overflow:hidden;
+        // text-overflow:ellipsis;
+        // white-space: nowrap;
+      }
+      .listText{
+        position: absolute;
+        top: 2;
+        left: 10;
+        width: 40%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+
       }
       #closeStyle {
         position: absolute;