fix:修改分页选择组件 不传pageSize -1

This commit is contained in:
zhangyu
2021-05-07 11:16:17 +08:00
parent db2e553ff0
commit e39e71708b
3 changed files with 39 additions and 11 deletions

View File

@@ -201,7 +201,7 @@
<el-form-item :label='$t("overall.asset")' prop="assetId" class="flex">
<v-selectpage
style="flex: 1"
:data="assetData"
data="asset/asset"
:tb-columns="columns"
key-field="id"
show-field="manageIp"
@@ -835,11 +835,16 @@ export default {
})
},
resultFormat (resp) {
if (resp && resp.data) return resp.data.values.gridResult
if (resp && resp.data) {
const assetData = {}
assetData.list = resp.data.list
assetData.totalRow = resp.data.total
return assetData
}
},
assetShowChange () {
this.assetShow = true
this.getAssetData()
// this.getAssetData()
},
getAssetData () {
this.assetLoading = true

View File

@@ -22,8 +22,11 @@
<!-- ChartTemplate -->
<el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate">
<v-selectpage
:data="chartlList"
:data="'visual/panel/chart'"
:tb-columns="ChartSearchShowFields"
:params="{
varType: 1, panelId: 0
}"
:multiple="true"
language="en"
title="ChartSearch"
@@ -32,6 +35,7 @@
show-field="name"
class="form-control"
@values="(data) => {editModel.chartIds = data.map(d => d.id).join(',')}"
:result-format="resultFormat"
></v-selectpage>
</el-form-item>
<!--remark-->
@@ -109,7 +113,7 @@ export default {
},
created () {
this.getBrandList()
this.ChartTemplateList()
// this.ChartTemplateList()
},
methods: {
clickOutside () {
@@ -185,13 +189,21 @@ export default {
})
})
},
/* 获取chart列表数据 */
ChartTemplateList () {
this.$get('visual/panel/chart', { pageSize: -1, varType: 1, panelId: 0 }).then(res => {
this.chartlList = res.data.list
})
resultFormat (resp) {
if (resp && resp.data) {
const assetData = {}
assetData.list = resp.data.list
assetData.totalRow = resp.data.total
return assetData
}
}
/* 获取chart列表数据 */
// ChartTemplateList () {
// this.$get('visual/panel/chart', { pageSize: -1, varType: 1, panelId: 0 }).then(res => {
// this.chartlList = res.data.list
// })
// }
}
}
</script>
<style lang="scss">

View File

@@ -33,7 +33,18 @@ import bus from '@/libs/bus'
import theme from '@/assets/css/theme.scss'
import myDatePicker from '@/components/common/myDatePicker'
import vSelectPage from 'v-selectpage'
Vue.use(vSelectPage)
Vue.use(vSelectPage, {
dataLoad: function (vue, url, params) {
if (params.pageNumber) {
params.pageNo = params.pageNumber
}
return new Promise((resolve, reject) => {
get(url, params).then(res => {
resolve(res)
}, e => reject(e))
})
}
})
Vue.use(myDatePicker)
Vue.component('Pagination', Pagination)
Vue.component('searchInput', searchInput)