Merge branch 'master' of http://47.115.223.229:8888/yangjun/huanzi-vue
# Conflicts: # src/views/zh/housingestateInfo/HousingestateInfo.api.ts # src/views/zh/housingestateInfo/xqHyxzIndex.vue # src/views/zh/housingestateInfo/xqTdcsIndex.vue # src/views/zh/housingestateInfo/xqTdzlIndex.vue
This commit is contained in:
commit
b892d57c6c
|
@ -4,18 +4,17 @@ import { useMessage } from "/@/hooks/web/useMessage";
|
||||||
const { createConfirm } = useMessage();
|
const { createConfirm } = useMessage();
|
||||||
|
|
||||||
enum Api {
|
enum Api {
|
||||||
list = '/housingestateInfo/blHousingestateInfo/list',
|
list = '/zh/blHousingestateInfo/list',
|
||||||
save='/housingestateInfo/blHousingestateInfo/add',
|
save='/zh/blHousingestateInfo/add',
|
||||||
edit='/housingestateInfo/blHousingestateInfo/edit',
|
edit='/zh/blHousingestateInfo/edit',
|
||||||
deleteOne = '/housingestateInfo/blHousingestateInfo/delete',
|
deleteOne = '/zh/blHousingestateInfo/delete',
|
||||||
deleteBatch = '/housingestateInfo/blHousingestateInfo/deleteBatch',
|
deleteBatch = '/zh/blHousingestateInfo/deleteBatch',
|
||||||
importExcel = '/housingestateInfo/blHousingestateInfo/importExcel',
|
importExcel = '/zh/blHousingestateInfo/importExcel',
|
||||||
exportXls = '/housingestateInfo/blHousingestateInfo/exportXls',
|
exportXls = '/zh/blHousingestateInfo/exportXls',
|
||||||
|
|
||||||
queryXqHyXzList = '/housingestateInfo/blHousingestateInfo/queryXqHyXzList',
|
queryXqHyXzList = '/zh/blHousingestateInfo/queryXqHyXzList',
|
||||||
queryXqHyTdcsList = '/housingestateInfo/blHousingestateInfo/queryXqHyTdcsList',
|
queryXqHyTdcsList = '/zh/blHousingestateInfo/queryXqHyTdcsList',
|
||||||
queryXqHyTdcsPageList = '/housingestateInfo/blHousingestateInfo/queryXqHyTdcsPageList',
|
queryXqHyTdzlList = '/zh/blHousingestateInfo/queryXqHyTdzlList',
|
||||||
queryXqHyTdzlList = '/housingestateInfo/blHousingestateInfo/queryXqHyTdzlList',
|
|
||||||
housingestateList = '/zh/hy/queryHousingestateList',
|
housingestateList = '/zh/hy/queryHousingestateList',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,11 +15,11 @@ export const columns: BasicColumn[] = [
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'name'
|
dataIndex: 'name'
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
title: '地址',
|
// title: '地址',
|
||||||
align: "center",
|
// align: "center",
|
||||||
dataIndex: 'address'
|
// dataIndex: 'address'
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
title: '状态',
|
title: '状态',
|
||||||
align: "center",
|
align: "center",
|
||||||
|
@ -30,6 +30,16 @@ export const columns: BasicColumn[] = [
|
||||||
align: "center",
|
align: "center",
|
||||||
dataIndex: 'type'
|
dataIndex: 'type'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '设备数量',
|
||||||
|
align: "center",
|
||||||
|
dataIndex: 'dtusCount'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '注册会员数',
|
||||||
|
align: "center",
|
||||||
|
dataIndex: 'hyCount'
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
// 高级查询数据
|
// 高级查询数据
|
||||||
|
|
|
@ -7,21 +7,21 @@
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
<a-form-item name="name">
|
<a-form-item name="name">
|
||||||
<template #label><span title="区域名称">区域名称</span></template>
|
<template #label><span title="区域名称">区域名称</span></template>
|
||||||
<j-input placeholder="请输入区域名称" v-model:value="queryParam.name" allow-clear ></j-input>
|
<a-input placeholder="请输入区域名称" v-model:value="queryParam.name" allow-clear ></a-input>
|
||||||
</a-form-item>
|
|
||||||
</a-col>
|
|
||||||
<a-col :lg="6">
|
|
||||||
<a-form-item name="status">
|
|
||||||
<template #label><span title="状态">状态</span></template>
|
|
||||||
<j-input placeholder="请输入状态" v-model:value="queryParam.status" allow-clear ></j-input>
|
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
<!-- <a-col :lg="6">-->
|
||||||
|
<!-- <a-form-item name="status">-->
|
||||||
|
<!-- <template #label><span title="状态">状态</span></template>-->
|
||||||
|
<!-- <j-input placeholder="请输入状态" v-model:value="queryParam.status" allow-clear ></j-input>-->
|
||||||
|
<!-- </a-form-item>-->
|
||||||
|
<!-- </a-col>-->
|
||||||
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
||||||
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
|
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
|
||||||
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
|
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
|
||||||
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
|
<!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>-->
|
||||||
</a-col>
|
</a-col>
|
||||||
</span>
|
</span>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
|
@ -105,7 +105,7 @@ const izList = ref(false)
|
||||||
dataSource.value = [];
|
dataSource.value = [];
|
||||||
for (let i = 0; i < res.length; i++) {
|
for (let i = 0; i < res.length; i++) {
|
||||||
dataSource.value.push({
|
dataSource.value.push({
|
||||||
name: `${res[i].shortDay}`,
|
name: `${res[i].housingestateName}`,
|
||||||
value: res[i].cn,
|
value: res[i].cn,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -124,7 +124,7 @@ const izList = ref(false)
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
// getHousingestates();
|
// getHousingestates();
|
||||||
if(parmas.type=='0'){
|
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.endTime=getPreviousDate(0)+' 23:59:59';
|
||||||
parmas.pageSize=10
|
parmas.pageSize=10
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,7 +107,7 @@ const izList = ref(false)
|
||||||
dataSource.value = [];
|
dataSource.value = [];
|
||||||
for (let i = 0; i < res.length; i++) {
|
for (let i = 0; i < res.length; i++) {
|
||||||
dataSource.value.push({
|
dataSource.value.push({
|
||||||
name: res[i].phone,
|
name: res[i].housingestateName,
|
||||||
value: res[i].cn
|
value: res[i].cn
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,8 +106,8 @@ const izList = ref(false)
|
||||||
dataSource.value = [];
|
dataSource.value = [];
|
||||||
for (let i = 0; i < res.length; i++) {
|
for (let i = 0; i < res.length; i++) {
|
||||||
dataSource.value.push({
|
dataSource.value.push({
|
||||||
name: `${res[i].shortHour}`,
|
name: `${res[i].housingestateName}`,
|
||||||
value: res[i].cn,
|
value: res[i].weight,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -125,7 +125,7 @@ const izList = ref(false)
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
// getHousingestates();
|
// getHousingestates();
|
||||||
if(parmas.type=='0'){
|
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.endTime=getPreviousDate(0)+' 23:59:59';
|
||||||
parmas.pageSize=10
|
parmas.pageSize=10
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue