小区统计

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',
+  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',
-  queryXqHyTdzlList = '/housingestateInfo/blHousingestateInfo/queryXqHyTdzlList',
+  queryXqHyTdzlList = '/zh/blHousingestateInfo/queryXqHyTdzlList',
   housingestateList = '/zh/hy/queryHousingestateList',
 }
 

src/views/zh/housingestateInfo/HousingestateInfo.data.ts

@@ -15,11 +15,11 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'name'
   },
-  {
+  // {
-    title: '地址',
+  //   title: '地址',
-    align: "center",
+  //   align: "center",
-    dataIndex: 'address'
+  //   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'
+  },
 ];
 
 // 高级查询数据

src/views/zh/housingestateInfo/HousingestateInfoList.vue

@@ -7,21 +7,21 @@
           <a-col :lg="6">
             <a-form-item name="name">
               <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-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">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <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: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>
             </span>
           </a-col>

src/views/zh/housingestateInfo/xqHyxzIndex.vue

@@ -23,7 +23,7 @@
           </a-select> -->
         </a-col>
       </a-row>
-      <Bar :chartData="dataSource" height="80vh" :option="{ title: { text: '小区新增会员统计', left: 'center' }}" :seriesLabel="{show: true, position: 'top'}" :seriesName="'个数'"></Bar>
+      <Bar :chartData="dataSource" height="80vh" :option="{ title: { text: '小区新增会员统计', left: 'center' }}" :itemStyle="{ normal: { label: { show: true, position: 'top' } } }" :seriesName="'个数'"></Bar>
     </a-card>
   </div>
 </template>
@@ -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();

src/views/zh/housingestateInfo/xqTdcsIndex.vue

@@ -23,7 +23,7 @@
           </a-select> -->
         </a-col>
       </a-row>
-      <Bar :chartData="dataSource" height="80vh" :option="{ title: { text: '小区投递次数排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递次数'"></Bar>
+      <Bar :chartData="dataSource" height="80vh" :option="{ title: { text: '小区投递次数排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'次数'"></Bar>
     </a-card>
   </div>
 </template>
@@ -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
       });
     }

src/views/zh/housingestateInfo/xqTdzlIndex.vue

@@ -23,7 +23,7 @@
           </a-select> -->
         </a-col>
       </a-row>
-      <Bar :chartData="dataSource" height="80vh" :option="{ title: { text: '小区投递重量排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递重量'"></Bar>
+      <Bar :chartData="dataSource" height="80vh" :option="{ title: { text: '小区投递重量排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'公斤'"></Bar>
     </a-card>
   </div>
 </template>
@@ -83,8 +83,8 @@
     dataSource.value = [];
     for (let i = 0; i < res.length; i++) {
       dataSource.value.push({
-        name: `${res[i].shortHour}`,
+        name: `${res[i].housingestateName}`,
-        value: res[i].cn,
+        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();