diff --git a/src/views/childView/growingThroughLife/growingThroughLifeList.vue b/src/views/childView/growingThroughLife/growingThroughLifeList.vue index a1bfea0..8bad00b 100644 --- a/src/views/childView/growingThroughLife/growingThroughLifeList.vue +++ b/src/views/childView/growingThroughLife/growingThroughLifeList.vue @@ -5,6 +5,9 @@
+ + +
@@ -51,13 +54,11 @@ export default defineComponent({ components:{filterComponent}, setup(){ let filter:any = reactive({ - addTime:ref([]) + addTime:ref([]), + salesmanName:'' }) let tableLoading = ref(false) let columns = reactive([ - { title: 'Ranking', align:'center', ellipsis: true, dataIndex: 'ranking', key: 'ranking',sorter: { - compare: (a:any, b:any) => a.incentiveNum - b.incentiveNum, - }, }, { title: 'Sales Name', align:'center', ellipsis: true, dataIndex: 'salesmanName', key: 'salesmanName' }, { title: 'Target Value', align:'center', ellipsis: true, dataIndex: 'incentiveNum', key: 'incentiveNum'}, // { title: 'Add Time', align:'center', ellipsis: true, dataIndex: 'createDate', key: 'createDate',customRender:(record:any)=>{ @@ -95,6 +96,7 @@ export default defineComponent({ // startTime:filter.addTime && filter.addTime.length ? startTime(filter.addTime[0]) : '', // endTime:filter.addTime && filter.addTime.length ? endTime(filter.addTime[1]) : '', endTime:endTime, + salesmanName:filter.salesmanName, page:currentPage.value, size:pageSize.value } @@ -103,9 +105,6 @@ export default defineComponent({ (rv: any) => { if (rv) { tableLoading.value = false - rv.forEach((item:any,index:any) => { - item.ranking = index +1 - }); collectionList.value = rv // total.value = rv.total } diff --git a/vue.config.js b/vue.config.js index a8e8456..b5906ed 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,8 +9,8 @@ module.exports = defineConfig({ proxy: { "/api": { // target: 'http://18.167.251.121:5568', //后端接口地址 - target: 'http://192.168.1.9:5560/', //后端接口地址 - // target: 'http://18.167.251.121:10220/', //后端接口地址 + // target: 'http://192.168.1.9:5560/', //后端接口地址 + target: 'http://18.167.251.121:10220/', //后端接口地址 changeOrigin: true, //是否允许跨越 } },