aidlab/sora_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
X1627315083
2024-09-14 21:54:46 +08:00
parent 6acc1434f1
commit 5ebff67eb1
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/views/childView/growingThroughLife/growingThroughLifeList.vue
View File

@@ -5,6 +5,9 @@
<div class="list_top_search_content"> <div class="list_top_search_content">
<div class="search_content_left"> <div class="search_content_left">
<filterComponent :title="'Date'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent> <filterComponent :title="'Date'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent>
<filterComponent :title="'Name'">
<a-input v-model:value="salesmanName" size="large" placeholder="Please enter your name"/>
</filterComponent>
</div> </div>
</div> </div>
<div class="list_top_button_content"> <div class="list_top_button_content">
@@ -51,13 +54,11 @@ export default defineComponent({
components:{filterComponent}, components:{filterComponent},
setup(){ setup(){
let filter:any = reactive({ let filter:any = reactive({
addTime:ref<Moment[]>([]) addTime:ref<Moment[]>([]),
salesmanName:''
}) })
let tableLoading = ref(false) let tableLoading = ref(false)
let columns = reactive([ 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: 'Sales Name', align:'center', ellipsis: true, dataIndex: 'salesmanName', key: 'salesmanName' },
{ title: 'Target Value', align:'center', ellipsis: true, dataIndex: 'incentiveNum', key: 'incentiveNum'}, { 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)=>{ // { 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]) : '', // startTime:filter.addTime && filter.addTime.length ? startTime(filter.addTime[0]) : '',
// endTime:filter.addTime && filter.addTime.length ? endTime(filter.addTime[1]) : '', // endTime:filter.addTime && filter.addTime.length ? endTime(filter.addTime[1]) : '',
endTime:endTime, endTime:endTime,
salesmanName:filter.salesmanName,
page:currentPage.value, page:currentPage.value,
size:pageSize.value size:pageSize.value
} }
@@ -103,9 +105,6 @@ export default defineComponent({
(rv: any) => { (rv: any) => {
if (rv) { if (rv) {
tableLoading.value = false tableLoading.value = false
rv.forEach((item:any,index:any) => {
item.ranking = index +1
});
collectionList.value = rv collectionList.value = rv
// total.value = rv.total // total.value = rv.total
} }

4
vue.config.js
View File

@@ -9,8 +9,8 @@ module.exports = defineConfig({
proxy: { proxy: {
"/api": { "/api": {
// target: 'http://18.167.251.121:5568', //后端接口地址 // target: 'http://18.167.251.121:5568', //后端接口地址
target: 'http://192.168.1.9:5560/', //后端接口地址 // target: 'http://192.168.1.9:5560/', //后端接口地址
// target: 'http://18.167.251.121:10220/', //后端接口地址 target: 'http://18.167.251.121:10220/', //后端接口地址
changeOrigin: true, //是否允许跨越 changeOrigin: true, //是否允许跨越
} }
}, },