diff --git a/src/views/zh/housingestateInfo/HousingestateInfo.api.ts b/src/views/zh/housingestateInfo/HousingestateInfo.api.ts
index eefd152..33d1420 100644
--- a/src/views/zh/housingestateInfo/HousingestateInfo.api.ts
+++ b/src/views/zh/housingestateInfo/HousingestateInfo.api.ts
@@ -4,18 +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',
- queryXqHyTdcsPageList = '/housingestateInfo/blHousingestateInfo/queryXqHyTdcsPageList',
- 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 7394da8..27cb205 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 4e309f1..c63d41c 100644
--- a/src/views/zh/housingestateInfo/xqHyxzIndex.vue
+++ b/src/views/zh/housingestateInfo/xqHyxzIndex.vue
@@ -105,7 +105,7 @@ const izList = ref(false)
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,
});
}
@@ -124,7 +124,7 @@ const izList = ref(false)
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';
parmas.pageSize=10
}
diff --git a/src/views/zh/housingestateInfo/xqTdcsIndex.vue b/src/views/zh/housingestateInfo/xqTdcsIndex.vue
index f3061cf..1c6e432 100644
--- a/src/views/zh/housingestateInfo/xqTdcsIndex.vue
+++ b/src/views/zh/housingestateInfo/xqTdcsIndex.vue
@@ -107,7 +107,7 @@ const izList = ref(false)
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 8e0882a..b76275d 100644
--- a/src/views/zh/housingestateInfo/xqTdzlIndex.vue
+++ b/src/views/zh/housingestateInfo/xqTdzlIndex.vue
@@ -106,8 +106,8 @@ const izList = ref(false)
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,
});
}
}
@@ -125,7 +125,7 @@ const izList = ref(false)
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';
parmas.pageSize=10
}