Commit ece37af6 authored by 徐来柯's avatar 徐来柯

update

parent 73305085
...@@ -25,11 +25,6 @@ export default { ...@@ -25,11 +25,6 @@ export default {
type: Number, type: Number,
default: 0, default: 0,
}, },
// 当前页
pageIndex: {
type: Number,
default: 1,
},
//总页数 //总页数
totalPage: { totalPage: {
type: Number, type: Number,
...@@ -44,10 +39,10 @@ export default { ...@@ -44,10 +39,10 @@ export default {
return { return {
num: 1, num: 1,
// 首字母已改为小写 // 首字母已改为小写
// totalCount: 1, // 当前页
// pageIndex: 1, pageIndex: 1,
// totalPage: 1, // 每页显示条数
pageSize: 50, pageSize: 10,
} }
}, },
created () { created () {
......
<template> <template>
<div class="baseTable"> <div class="baseTable">
<el-table <el-table
v-loading="loading"
border border
height="635" height="635"
class="conterFool_middle" class="conterFool_middle"
...@@ -79,10 +78,10 @@ export default { ...@@ -79,10 +78,10 @@ export default {
return [] return []
} }
}, },
loading: { // loading: {
type: Boolean, // type: Boolean,
default: false // default: false
}, // },
tableData: { tableData: {
type: Array, type: Array,
default () { default () {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @searchData="searchData" /> <search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @searchData="searchData" />
<baseTable :tableHead="tableHead" :tableData="tableData" :loading="loading" :rowClassName="tableRowClassName" /> <baseTable :tableHead="tableHead" :tableData="tableData" :rowClassName="tableRowClassName" />
<Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" /> <Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" />
</div> </div>
...@@ -121,7 +121,6 @@ export default { ...@@ -121,7 +121,6 @@ export default {
width: 180, width: 180,
}, },
], ],
loading: false,
deletetext: '', deletetext: '',
deleteShow: false, deleteShow: false,
typeV: '', typeV: '',
...@@ -144,12 +143,10 @@ export default { ...@@ -144,12 +143,10 @@ export default {
searchData () { searchData () {
var $this = this var $this = this
var postData = this.resetData() var postData = this.resetData()
$this.loading = true
this.$axios({ this.$axios({
method:"post", method:"post",
url:`/api/TJStatistics/Statistics_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`, url:`/api/TJStatistics/Statistics_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`,
}).then((res)=>{ }).then((res)=>{
$this.loading = false
if(res.data.data.length != 0 ){ if(res.data.data.length != 0 ){
$this.AllTableData = res.data.data.map(item => ({ $this.AllTableData = res.data.data.map(item => ({
...item, ...item,
...@@ -164,17 +161,15 @@ export default { ...@@ -164,17 +161,15 @@ export default {
$this.tableData = $this.AllTableData $this.tableData = $this.AllTableData
} }
$this.totalCount = $this.AllTableData.length $this.totalCount = $this.AllTableData.length
// this.pageIndex = 1 $this.$refs.page.first()
$this.totalPage = Math.ceil($this.AllTableData.length / $this.$refs.page.pageSize) $this.totalPage = Math.ceil($this.AllTableData.length / $this.$refs.page.pageSize)
$this.pageFun(1) $this.pageFun(1)
}else{ }else{
$this.tableData = [] $this.tableData = []
$this.totalCount = 0 $this.totalCount = 0
// this.pageIndex = 1
$this.totalPage = 1 $this.totalPage = 1
} }
}).catch(function(err){ }).catch(function(err){
$this.loading = false
console.log('err',err) console.log('err',err)
}) })
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment