Merge branch 'dev-newDashBoard' into dev

src/router/routes.js

@@ -27,6 +27,10 @@ const appRoutes = [
         path: '/portal-home', name: 'home', component: resolve => require(['@/views/home'], resolve), //Home,
         meta: { title: '首页' },
       }, 
+      {
+        path: '/dashBoard', name: 'dashBoard', component: resolve => require(['@/views/dashBoard'], resolve), //Home,
+        meta: { title: '首页' },
+      }, 
       { path: '/person', name: 'person', component: resolve => require(['@/views/person-center'], resolve), //PersonCenter,
         meta: { title: '个人中心' },
       },

src/server/api.js

@@ -204,4 +204,6 @@ export default {
 
   GET_LABEL_LIST: MOCK_URL + '/service-customkey-ddd/labels', // 获取标签列表
 
+  GET_FB_WY_MANAGE_CHECK: '/service-documents-ddd/checkOrder/dahboard/countDatas', //首页-房办月查-物业双周查-经理自查
+
 }

src/views/home/ComplaintsTrain.vue

@@ -7,18 +7,21 @@
         <p :class="`${active=='month'?'active':''}`" @click="changeRank('month')">月排行</p>
         <p :class="`${active=='year'?'active':''}`" @click="changeRank('year')">年排行</p>
         <p :class="`${active=='total'?'active':''}`" @click="changeRank('total')">总排行</p>
-        <p @click="toMore">···</p>
+        <!-- <p @click="toMore">···</p> -->
       </div>
     </div>
-    <div class="content">
+    <div class="content" >
       <div class="list" v-for="(item,index) in list" :key="index">
         <div class="left">
           <span :style="`background:${index>2?'rgb(229,230,231)':'#000'};color:${index>2?'rgb(96,97,98)':'#FFF'};`">{{++index}}</span>
           <span>{{item.complaintType}}</span>
         </div>
-        <div class="danwei">{{item.num}} 件</div>
+        <!-- <div class="danwei">{{item.num}} 件</div> -->
       </div>
     </div>
+    <!-- <div class="content" v-else style="">
+       <p> 暂无数据...   </p>
+    </div> -->
   </div>
 </template>
  
@@ -45,6 +48,27 @@ export default {
       })
     }
 
+    if (this.moduletitle == '投诉问题') {
+      this.getList()
+    }
+
+    if (this.moduletitle == '报修') { // 没接口  假数据
+      this.list =[
+        {
+          complaintType: '供电供水设备经常出现故障',
+          _id: '高空坠物隐患',
+        },
+        {
+          complaintType: '日常运作出现状况',
+          _id: '高空坠物隐患',
+        },
+        {
+          complaintType: '各种分摊费和特约维修费',
+          _id: '高空坠物隐患',
+        },
+      ]
+    }
+
   },
   methods: {
     ...mapActions([
@@ -57,6 +81,52 @@ export default {
           this.list = this.$com.confirm(res, 'data.content', []).slice(0, 5)
         })
       }
+      if (this.moduletitle == '投诉问题') {
+        this.getList()
+      }
+      if (this.moduletitle == '报修') { // 没接口  假数据
+        this.list =[
+          {
+            complaintType: '高空坠物隐患',
+            _id: '高空坠物隐患',
+          },
+          {
+            complaintType: '日常运作出现状况',
+            _id: '高空坠物隐患',
+          },
+          {
+            complaintType: '各种分摊费和特约维修费',
+            _id: '高空坠物隐患',
+          },
+
+        ]
+      }
+    },
+    getList(){
+      const date = new Date()
+      const year = date.getFullYear()
+      const month = date.getMonth()+1 
+      const params = {}
+      if(this.active == 'month'){
+        params.type = 'M' 
+        params.tsMonthly = year + '' + (String(month).length==1?'-0'+month:'-'+month)
+      }else if(this.active == 'year'){
+        params.type = 'Y' 
+        params.dateTime = year + ''
+      }else if(this.active == 'total'){
+        params.type = 'S' 
+      }  
+      params.tsNum_desc = 'desc'
+      params.pageNo = 1
+      params.pageSize = 8
+      this.$ajax.get({
+        url: this.$api.GET_TOUSUQUESTION_LIST,
+        params: params
+      }).then(res => {
+        if (res.code === '200') {
+          this.list = this.$com.confirm(res, 'data.content.content', [])
+        }
+      })
     },
     toMore(){
       switch (this.moduletitle) {
@@ -105,16 +175,17 @@ export default {
 .box .title >div .active{
   color: rgb(68,136,245);
 }
-.box .title >div p:last-child{
+/* .box .title >div p:last-child{
   color: rgb(68,136,245);
   font-weight: 800;
   font-size: 20px;
   margin: 0;
-} 
+}  */
 .box .content{
   padding:15px;
   flex:1;
   display: flex;
+  min-height:200px;
   flex-direction: column;
 }
 .box .content .list{