fix:修改分页选择组件 不传pageSize -1
This commit is contained in:
@@ -201,7 +201,7 @@
|
|||||||
<el-form-item :label='$t("overall.asset")' prop="assetId" class="flex">
|
<el-form-item :label='$t("overall.asset")' prop="assetId" class="flex">
|
||||||
<v-selectpage
|
<v-selectpage
|
||||||
style="flex: 1"
|
style="flex: 1"
|
||||||
:data="assetData"
|
data="asset/asset"
|
||||||
:tb-columns="columns"
|
:tb-columns="columns"
|
||||||
key-field="id"
|
key-field="id"
|
||||||
show-field="manageIp"
|
show-field="manageIp"
|
||||||
@@ -835,11 +835,16 @@ export default {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
resultFormat (resp) {
|
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 () {
|
assetShowChange () {
|
||||||
this.assetShow = true
|
this.assetShow = true
|
||||||
this.getAssetData()
|
// this.getAssetData()
|
||||||
},
|
},
|
||||||
getAssetData () {
|
getAssetData () {
|
||||||
this.assetLoading = true
|
this.assetLoading = true
|
||||||
|
|||||||
@@ -22,8 +22,11 @@
|
|||||||
<!-- ChartTemplate -->
|
<!-- ChartTemplate -->
|
||||||
<el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate">
|
<el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate">
|
||||||
<v-selectpage
|
<v-selectpage
|
||||||
:data="chartlList"
|
:data="'visual/panel/chart'"
|
||||||
:tb-columns="ChartSearchShowFields"
|
:tb-columns="ChartSearchShowFields"
|
||||||
|
:params="{
|
||||||
|
varType: 1, panelId: 0
|
||||||
|
}"
|
||||||
:multiple="true"
|
:multiple="true"
|
||||||
language="en"
|
language="en"
|
||||||
title="ChartSearch"
|
title="ChartSearch"
|
||||||
@@ -32,6 +35,7 @@
|
|||||||
show-field="name"
|
show-field="name"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
@values="(data) => {editModel.chartIds = data.map(d => d.id).join(',')}"
|
@values="(data) => {editModel.chartIds = data.map(d => d.id).join(',')}"
|
||||||
|
:result-format="resultFormat"
|
||||||
></v-selectpage>
|
></v-selectpage>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!--remark-->
|
<!--remark-->
|
||||||
@@ -109,7 +113,7 @@ export default {
|
|||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
this.getBrandList()
|
this.getBrandList()
|
||||||
this.ChartTemplateList()
|
// this.ChartTemplateList()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
clickOutside () {
|
clickOutside () {
|
||||||
@@ -185,13 +189,21 @@ export default {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
/* 获取chart列表数据 */
|
resultFormat (resp) {
|
||||||
ChartTemplateList () {
|
if (resp && resp.data) {
|
||||||
this.$get('visual/panel/chart', { pageSize: -1, varType: 1, panelId: 0 }).then(res => {
|
const assetData = {}
|
||||||
this.chartlList = res.data.list
|
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>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|||||||
@@ -33,7 +33,18 @@ import bus from '@/libs/bus'
|
|||||||
import theme from '@/assets/css/theme.scss'
|
import theme from '@/assets/css/theme.scss'
|
||||||
import myDatePicker from '@/components/common/myDatePicker'
|
import myDatePicker from '@/components/common/myDatePicker'
|
||||||
import vSelectPage from 'v-selectpage'
|
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.use(myDatePicker)
|
||||||
Vue.component('Pagination', Pagination)
|
Vue.component('Pagination', Pagination)
|
||||||
Vue.component('searchInput', searchInput)
|
Vue.component('searchInput', searchInput)
|
||||||
|
|||||||
Reference in New Issue
Block a user