feats: 2 reprots

VUECODE/smart-property-manage/src/components/chart/barChart.vue

@@ -39,13 +39,14 @@ export default {
           container: _self.id,
           forceFit: true,
           height: 282,
-        padding: [80, 20, 30, 40]
+          padding: [80, 20, 30, 40]
         });
       }
 
       const chart = this.chart;
       chart.source(_self.data);
 
+      chart.scale('value', {});
 
       chart.axis("value", {
         line: {
@@ -75,9 +76,9 @@ export default {
           }
         }
       });
-      chart.tooltip({
-        crosshairs: true
-      });
+      // chart.tooltip({
+      //   crosshairs: true
+      // });
 
       chart.guide().html({
         position: ["5%", "-35%"],
@@ -92,6 +93,8 @@ export default {
         html: `<div class="line-chat"><p class="title">${_self.axisX}</p></div>`
       });
 
+      chart.interval().position('item*value').color('item');
+
       chart.render();
     }
   }

VUECODE/smart-property-manage/src/views/index/index.vue

@@ -11,9 +11,9 @@
       <line-chart id="chat6" :data="data6" title="临时车总缴费统计" axis-x="日期" axis-y="金额(元)" />
     </div>
     <div class="right">
-      <chart7/>
+      <bar-chart id="chat7" :data="data7" title="注册用户总数" axis-x="" axis-y="数量(个)" />
       <line-chart id="chat8" :data="data8" title="日活跃用户" axis-x="日期" axis-y="数量(个)" />
-      <chart9/>
+      <bar-chart id="chat9" :data="data9" title="已发布内容统计" axis-x="" axis-y="数量(个)" />
     </div>
   </div>
 </template>
@@ -25,7 +25,7 @@ import chart1 from "@/components/chart/chart1.vue";
 import LineChart from "@/components/chart/lineChart.vue";
 import chart2 from "@/components/chart/chart2.vue";
 import chart3 from "@/components/chart/chart3.vue";
-import chart7 from "@/components/chart/chart7.vue";
+import BarChart from "@/components/chart/barChart.vue";
 import chart9 from "@/components/chart/chart9.vue";
 
 export default {
@@ -42,7 +42,7 @@ export default {
     chart2,
     chart3,
     LineChart,
-    chart7,
+    BarChart,
     chart9
   },
   computed: {
@@ -137,16 +137,52 @@ export default {
         })
       })
     },
+    data7 () {
+      let { houseOwnerCount = 0, houseRelationCount = 0, houseTenantCount = 0 } = (this.IndexInfo || {}).registerUserMap || {}
+
+      return [
+        {
+          item: '户主',
+          value: houseOwnerCount,
+        },
+        {
+          item: '家属',
+          value: houseRelationCount,
+        },
+        {
+          item: '租客',
+          value: houseTenantCount,
+        },
+      ]
+    },
     data8 () {
-      let billList = (this.IndexInfo || {}).taBriskUserList || []
+      let usrList = (this.IndexInfo || {}).taBriskUserList || []
 
-      return billList.map(({ createDate, briskCount }) => {
+      return usrList.map(({ createDate, briskCount }) => {
         return ({
           item: dayjs(createDate).format('M.D'),
           value: briskCount,
         })
       })
     },
+    data9 () {
+      let { activityCount = 0, announcementCount = 0, topicCount = 0 } = (this.IndexInfo || {}).publishContentMap || {}
+
+      return [
+        {
+          item: '活动',
+          value: activityCount,
+        },
+        {
+          item: '公告',
+          value: announcementCount,
+        },
+        {
+          item: '话题',
+          value: topicCount,
+        },
+      ]
+    },
   },
   methods: {
     ...mapActions("trunkIndex", ["getIndexCount"])