Explorar el Código

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

zhuxinbo hace 5 años
padre
commit
a0cc6f372c
Se han modificado 1 ficheros con 5 adiciones y 6 borrados
  1. 5 6
      src/views/modules/Statistics/materialRank.vue

+ 5 - 6
src/views/modules/Statistics/materialRank.vue

@@ -38,7 +38,7 @@
              <span slot="convertRate" slot-scope="convertRate">{{ convertRate | toPercentage }}</span>
         </a-table>
         <div class="fenye" :v-show="pageShow">
-            <a-pagination :default-current="pageNo" :total="total" />
+            <a-pagination :default-current="pageNo" :total="total"  size="small" style="float:right"/>
         </div>
         <a-modal v-model="Videovisible" title="视频详情" @ok="videoOk" :footer="null" width='50%'>
         <video
@@ -191,10 +191,8 @@ export default {
             this.dateStr = dataString
         },
          //确定按钮的事件
-        getData(){          
-            
-            this.HttpPost()
-            
+        getData(){                     
+            this.HttpPost()            
         },
 
 
@@ -202,6 +200,7 @@ export default {
         HttpPost(){
             this.loading=true;
             this.dataSource=[];
+             this.pageShow=false
             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],
@@ -220,7 +219,7 @@ export default {
                         item.key = index
                         
                     })
-                    this.total=res.total
+                    this.total=res.result.total
                     this.dataSource=res.result.records;
                     
                 }