diff --git a/src/views/zh/housingestateInfo/HousingestateInfo.api.ts b/src/views/zh/housingestateInfo/HousingestateInfo.api.ts index 29844b1..eefd152 100644 --- a/src/views/zh/housingestateInfo/HousingestateInfo.api.ts +++ b/src/views/zh/housingestateInfo/HousingestateInfo.api.ts @@ -14,6 +14,7 @@ enum Api { queryXqHyXzList = '/housingestateInfo/blHousingestateInfo/queryXqHyXzList', queryXqHyTdcsList = '/housingestateInfo/blHousingestateInfo/queryXqHyTdcsList', + queryXqHyTdcsPageList = '/housingestateInfo/blHousingestateInfo/queryXqHyTdcsPageList', queryXqHyTdzlList = '/housingestateInfo/blHousingestateInfo/queryXqHyTdzlList', housingestateList = '/zh/hy/queryHousingestateList', } @@ -23,6 +24,7 @@ enum Api { * @param params */ export const housingestateList = (params) => defHttp.get({ url: Api.housingestateList, params }); +export const queryXqHyTdcsPageList = (params) => defHttp.get({ url: Api.queryXqHyTdcsPageList, params }); /** * 导出api * @param params diff --git a/src/views/zh/housingestateInfo/HousingestateInfo.data.ts b/src/views/zh/housingestateInfo/HousingestateInfo.data.ts index a48a8c7..7394da8 100644 --- a/src/views/zh/housingestateInfo/HousingestateInfo.data.ts +++ b/src/views/zh/housingestateInfo/HousingestateInfo.data.ts @@ -40,3 +40,46 @@ export const superQuerySchema = { status: {title: '状态',order: 3,view: 'text', type: 'string',}, type: {title: '类型',order: 4,view: 'text', type: 'string',}, }; + + +export const tdcsColumns : BasicColumn[] =[ + { + title: '小区名称', + dataIndex: 'name', + key: 'name', + align: 'center' + }, + { + title: '投递次数', + dataIndex: 'value', + key: 'value', + align: 'center' + }, + { + title: '操作', + key: 'action', + align: 'center', + width: '150px', + } +] + +export const xzrsColumns : BasicColumn[] =[ + { + title: '小区名称', + dataIndex: 'name', + key: 'name', + align: 'center' + }, + { + title: '新增人数', + dataIndex: 'value', + key: 'value', + align: 'center' + }, + { + title: '操作', + key: 'action', + align: 'center', + width: '150px', + } +] \ No newline at end of file diff --git a/src/views/zh/housingestateInfo/xqHyxzIndex.vue b/src/views/zh/housingestateInfo/xqHyxzIndex.vue index dc0251a..4e309f1 100644 --- a/src/views/zh/housingestateInfo/xqHyxzIndex.vue +++ b/src/views/zh/housingestateInfo/xqHyxzIndex.vue @@ -22,8 +22,23 @@ {{item.housingestateName}} --> + + + 统计图 + 列表页 + + - + +
+ + + +
@@ -33,10 +48,12 @@ import Bar from '/@/components/chart/Bar.vue'; import { queryXqHyXzList,housingestateList } from './HousingestateInfo.api'; import type { Dayjs } from 'dayjs'; + import { xzrsColumns } from './HousingestateInfo.data'; const valueFormat = 'YYYY-MM-DD'; const dataSource = ref([]); const dateValue = ref(); const housingestates = ref(); +const izList = ref(false) const parmas = reactive({ beginTime: '', @@ -78,7 +95,13 @@ } async function loadDate() { - const res = await queryXqHyXzList(parmas); + if(izList.value){ + parmas.pageSize=-1 + }else{ + parmas.pageSize=10 + } + const resData = await queryXqHyXzList(parmas); + const res = resData.records; dataSource.value = []; for (let i = 0; i < res.length; i++) { dataSource.value.push({ @@ -103,6 +126,7 @@ if(parmas.type=='0'){ parmas.beginTime=getPreviousDate(2)+' 00:00:00'; parmas.endTime=getPreviousDate(0)+' 23:59:59'; + parmas.pageSize=10 } loadDate(); }) diff --git a/src/views/zh/housingestateInfo/xqTdcsIndex.vue b/src/views/zh/housingestateInfo/xqTdcsIndex.vue index 98beb0b..f3061cf 100644 --- a/src/views/zh/housingestateInfo/xqTdcsIndex.vue +++ b/src/views/zh/housingestateInfo/xqTdcsIndex.vue @@ -22,8 +22,23 @@ {{item.housingestateName}} --> + + + 统计图 + 列表页 + + - + +
+ + + +
@@ -32,11 +47,13 @@ import {ref, unref, reactive, onMounted} from 'vue'; import Bar from '/@/components/chart/Bar.vue'; import { queryXqHyTdcsList,housingestateList } from './HousingestateInfo.api'; + import { tdcsColumns } from './HousingestateInfo.data'; import type { Dayjs } from 'dayjs'; const valueFormat = 'YYYY-MM-DD'; const dataSource = ref([]); const dateValue = ref(); const housingestates = ref(); +const izList = ref(false) async function getHousingestates(){ housingestates.value = await housingestateList(null); @@ -79,7 +96,14 @@ }; async function loadDate() { - const res = await queryXqHyTdcsList(parmas); + if(izList.value){ + parmas.pageSize=-1 + }else{ + parmas.pageSize=10 + } + const resData = await queryXqHyTdcsList(parmas); + const res = resData.records; + console.log("🚀 ~ loadDate ~ res:", res) dataSource.value = []; for (let i = 0; i < res.length; i++) { dataSource.value.push({ @@ -104,6 +128,7 @@ if(parmas.type=='1'){ parmas.beginTime=getPreviousDate(0)+' 00:00:00'; parmas.endTime=getPreviousDate(0)+' 23:59:59'; + parmas.pageSize=10 } loadDate(); }) diff --git a/src/views/zh/housingestateInfo/xqTdzlIndex.vue b/src/views/zh/housingestateInfo/xqTdzlIndex.vue index 86af29a..8e0882a 100644 --- a/src/views/zh/housingestateInfo/xqTdzlIndex.vue +++ b/src/views/zh/housingestateInfo/xqTdzlIndex.vue @@ -22,8 +22,23 @@ {{item.housingestateName}} --> + + + 统计图 + 列表页 + + - + +
+ + + +
@@ -33,10 +48,12 @@ import Bar from '/@/components/chart/Bar.vue'; import { queryXqHyTdzlList,housingestateList } from './HousingestateInfo.api'; import type { Dayjs } from 'dayjs'; + import { xzrsColumns } from './HousingestateInfo.data'; const valueFormat = 'YYYY-MM-DD'; const dataSource = ref([]); const dateValue = ref(); const housingestates = ref(); +const izList = ref(false) async function getHousingestates(){ housingestates.value = await housingestateList(null); @@ -79,7 +96,13 @@ }; async function loadDate() { - const res = await queryXqHyTdzlList(parmas); + if(izList.value){ + parmas.pageSize=-1 + }else{ + parmas.pageSize=10 + } + const resData = await queryXqHyTdzlList(parmas); + const res = resData.records; dataSource.value = []; for (let i = 0; i < res.length; i++) { dataSource.value.push({ @@ -104,6 +127,7 @@ if(parmas.type=='0'){ parmas.beginTime=getPreviousDate(2)+' 00:00:00'; parmas.endTime=getPreviousDate(0)+' 23:59:59'; + parmas.pageSize=10 } loadDate(); })