diff --git a/src/views/zh/housingestateInfo/HousingestateInfo.api.ts b/src/views/zh/housingestateInfo/HousingestateInfo.api.ts index 29844b1..64de5a5 100644 --- a/src/views/zh/housingestateInfo/HousingestateInfo.api.ts +++ b/src/views/zh/housingestateInfo/HousingestateInfo.api.ts @@ -4,17 +4,17 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/housingestateInfo/blHousingestateInfo/list', - save='/housingestateInfo/blHousingestateInfo/add', - edit='/housingestateInfo/blHousingestateInfo/edit', - deleteOne = '/housingestateInfo/blHousingestateInfo/delete', - deleteBatch = '/housingestateInfo/blHousingestateInfo/deleteBatch', - importExcel = '/housingestateInfo/blHousingestateInfo/importExcel', - exportXls = '/housingestateInfo/blHousingestateInfo/exportXls', - - queryXqHyXzList = '/housingestateInfo/blHousingestateInfo/queryXqHyXzList', - queryXqHyTdcsList = '/housingestateInfo/blHousingestateInfo/queryXqHyTdcsList', - queryXqHyTdzlList = '/housingestateInfo/blHousingestateInfo/queryXqHyTdzlList', + list = '/zh/blHousingestateInfo/list', + save='/zh/blHousingestateInfo/add', + edit='/zh/blHousingestateInfo/edit', + deleteOne = '/zh/blHousingestateInfo/delete', + deleteBatch = '/zh/blHousingestateInfo/deleteBatch', + importExcel = '/zh/blHousingestateInfo/importExcel', + exportXls = '/zh/blHousingestateInfo/exportXls', + + queryXqHyXzList = '/zh/blHousingestateInfo/queryXqHyXzList', + queryXqHyTdcsList = '/zh/blHousingestateInfo/queryXqHyTdcsList', + queryXqHyTdzlList = '/zh/blHousingestateInfo/queryXqHyTdzlList', housingestateList = '/zh/hy/queryHousingestateList', } diff --git a/src/views/zh/housingestateInfo/HousingestateInfo.data.ts b/src/views/zh/housingestateInfo/HousingestateInfo.data.ts index a48a8c7..2596ea5 100644 --- a/src/views/zh/housingestateInfo/HousingestateInfo.data.ts +++ b/src/views/zh/housingestateInfo/HousingestateInfo.data.ts @@ -15,11 +15,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'name' }, - { - title: '地址', - align: "center", - dataIndex: 'address' - }, + // { + // title: '地址', + // align: "center", + // dataIndex: 'address' + // }, { title: '状态', align: "center", @@ -30,6 +30,16 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'type' }, + { + title: '设备数量', + align: "center", + dataIndex: 'dtusCount' + }, + { + title: '注册会员数', + align: "center", + dataIndex: 'hyCount' + }, ]; // 高级查询数据 diff --git a/src/views/zh/housingestateInfo/HousingestateInfoList.vue b/src/views/zh/housingestateInfo/HousingestateInfoList.vue index d6408f8..0d0f777 100644 --- a/src/views/zh/housingestateInfo/HousingestateInfoList.vue +++ b/src/views/zh/housingestateInfo/HousingestateInfoList.vue @@ -7,21 +7,21 @@ - - - - - - - + + + + + + + 查询 重置 - 导出 + @@ -92,8 +92,8 @@ xs: 24, sm: 20, }); - - + + /** * 成功回调 */ @@ -106,7 +106,7 @@ function searchQuery() { reload(); } - + /** * 重置 */ @@ -116,7 +116,7 @@ //刷新数据 reload(); } - + diff --git a/src/views/zh/housingestateInfo/xqHyxzIndex.vue b/src/views/zh/housingestateInfo/xqHyxzIndex.vue index dc0251a..5bd5e98 100644 --- a/src/views/zh/housingestateInfo/xqHyxzIndex.vue +++ b/src/views/zh/housingestateInfo/xqHyxzIndex.vue @@ -23,7 +23,7 @@ --> - + @@ -82,7 +82,7 @@ dataSource.value = []; for (let i = 0; i < res.length; i++) { dataSource.value.push({ - name: `${res[i].shortDay}`, + name: `${res[i].housingestateName}`, value: res[i].cn, }); } @@ -101,7 +101,7 @@ onMounted(() => { // getHousingestates(); if(parmas.type=='0'){ - parmas.beginTime=getPreviousDate(2)+' 00:00:00'; + parmas.beginTime=getPreviousDate(0)+' 00:00:00'; parmas.endTime=getPreviousDate(0)+' 23:59:59'; } loadDate(); diff --git a/src/views/zh/housingestateInfo/xqTdcsIndex.vue b/src/views/zh/housingestateInfo/xqTdcsIndex.vue index 98beb0b..a486e5a 100644 --- a/src/views/zh/housingestateInfo/xqTdcsIndex.vue +++ b/src/views/zh/housingestateInfo/xqTdcsIndex.vue @@ -23,7 +23,7 @@ --> - + @@ -83,7 +83,7 @@ dataSource.value = []; for (let i = 0; i < res.length; i++) { dataSource.value.push({ - name: res[i].phone, + name: res[i].housingestateName, value: res[i].cn }); } diff --git a/src/views/zh/housingestateInfo/xqTdzlIndex.vue b/src/views/zh/housingestateInfo/xqTdzlIndex.vue index 86af29a..2c43b52 100644 --- a/src/views/zh/housingestateInfo/xqTdzlIndex.vue +++ b/src/views/zh/housingestateInfo/xqTdzlIndex.vue @@ -23,7 +23,7 @@ --> - + @@ -83,8 +83,8 @@ dataSource.value = []; for (let i = 0; i < res.length; i++) { dataSource.value.push({ - name: `${res[i].shortHour}`, - value: res[i].cn, + name: `${res[i].housingestateName}`, + value: res[i].weight, }); } } @@ -102,7 +102,7 @@ onMounted(() => { // getHousingestates(); if(parmas.type=='0'){ - parmas.beginTime=getPreviousDate(2)+' 00:00:00'; + parmas.beginTime=getPreviousDate(0)+' 00:00:00'; parmas.endTime=getPreviousDate(0)+' 23:59:59'; } loadDate();