Merge branch 'dev' of http://git.omniview.pro/fangdi/housemanage/web/majorproject into dev

src/components/Layout/sidemenu.vue

@@ -13,6 +13,7 @@
           <a-sub-menu :key="menu.name">
             <span slot="title">
               <a-icon :type="menu.meta.menuIcon?menu.meta.menuIcon:'bars'" />
+              
               <span>{{menu.meta.title}}</span>
             </span>
             <template v-for="child in menu.children">

src/router/routes.js

@@ -24,11 +24,7 @@ const appRoutes = [
     component: resolve => require(['@/components/Layout'], resolve), //Layout,
     children: [
       {
-        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,
+        path: '/portal-home', name: 'home', component: resolve => require(['@/views/commenHome'], resolve), //Home,
         meta: { title: '首页' },
       }, 
       { path: '/person', name: 'person', component: resolve => require(['@/views/person-center'], resolve), //PersonCenter,

src/server/api.js

@@ -64,6 +64,7 @@ default: // 默认环境下（开发环境）
   // BASE_URL = 'http://31.0.161.39/apiv2'
   // BASE_URL = 'http://211.136.105.193/apiv2'
   BASE_URL = 'http://yangpu-hm.omniview.pro/api/v2'
+  // BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
   // BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
   // BASE_URL = 'http://211.136.105.193/apiv2'
   MOCK_URL = 'https://yapi.omniview.pro/mock/283'

src/views/commenHome.vue

+<template>
+  <div class="content">
+    <xuhui v-if="(this.$api.BASE_URL).indexOf('xuhui') > -1 || (this.$api.BASE_URL).indexOf('31.0.161.39') > -1||(this.$api.BASE_URL).indexOf('pudong') > -1 || (this.$api.BASE_URL).indexOf('211.136.105.193') > -1" />
+    <home v-else />
+
+  </div>
+</template>
+
+<script>
+import xuhui from '@/views/homeXuhui'
+import home from '@/views/home'
+
+export default {
+  components: {
+    xuhui,
+    home
+  }
+
+}
+</script>
+
+<style scoped>
+  .content{
+    width: 100%;
+    height: 100%;
+  }
+
+</style>
\ No newline at end of file

src/views/home.vue

@@ -41,13 +41,13 @@
                 </a-row>
                 <a-row style="border-top:1px solid lightgrey;padding-top: 10px;">
                   <a-col :span='7'>
-                      商品 : {{332}}
+                      商品 : {{firstRowInfos.condoRows}}
                   </a-col>
                   <a-col :span='7'>
-                      直管 : {{224}}
+                      直管 : {{firstRowInfos.straightAndMixedRows}}
                   </a-col>
                   <a-col :span='10'>
-                      保障及其他 : {{321}}
+                      保障及其他 : {{firstRowInfos.otherRows}}
                   </a-col>
                 </a-row>
               </div>
@@ -90,7 +90,7 @@
                 </a-row>
                 <a-row style="border-top:1px solid lightgrey;padding-top: 10px;">
                   <a-col :span='12'>
-                    有电梯 : {{332}}
+                    有电梯 : {{firstRowInfos.haveElevatorCount}}
                   </a-col>
                 </a-row>
               </div>
@@ -116,10 +116,10 @@
                 </a-row>
                 <a-row style="border-top:1px solid lightgrey;padding-top: 10px;">
                   <a-col :span='12'>
-                    区属物业 : {{111}}
+                    区属物业 : {{firstRowInfos.areaPropCompanyCount}}
                   </a-col>
                   <a-col :span='12'>
-                    本市注册 : {{222}}
+                    本市注册 : {{firstRowInfos.cityPropCompanyCount}}
                   </a-col>
                 </a-row>
               </div>
@@ -145,10 +145,10 @@
                 </a-row>
                 <a-row style="border-top:1px solid lightgrey;padding-top: 10px;">
                   <a-col :span='12'>
-                    近五个月到期 : {{11}}
+                    近五个月到期 :  {{firstRowInfos.willExpireCount}}
                   </a-col>
                   <a-col :span='12'>
-                    已过期 : {{5}}
+                    已过期 :  {{firstRowInfos.alreadyExpireCount}}
                   </a-col>
                 </a-row>
               </div>
@@ -329,6 +329,20 @@ export default {
       sect: 0, //已完成小区
       theme: 0, //已有主题
       receipts: 0, //已开整改单
+      // 首行四模块下方数据
+      firstRowInfos: {
+        alreadyExpireCount: 0,
+        areaPropCompanyCount: 0,
+        cityPropCompanyCount: 0,
+        condoRatio: 0,
+        condoRows: 0,
+        haveElevatorCount: 0,
+        otherRatio: 0,
+        otherRows: 0,
+        straightAndMixedRatio: 0,
+        straightAndMixedRows: 0,
+        willExpireCount: 0, 
+      },
 
       baseData: {},
       showMonthOrYear: false,
@@ -574,9 +588,32 @@ export default {
         url: this.$api.GET_ALREADY_OR_EXPIRE,
       }).then(res => {
         if (res.code === '200') {
-          let inner = res.data.content
-          this.expired = inner.alreadyExpireCount
-          this.expireInFiveMonth = inner.willExpireCount
+          const { 
+            alreadyExpireCount=0,
+            areaPropCompanyCount=0,
+            cityPropCompanyCount=0,
+            condoRatio=0,
+            condoRows=0,
+            haveElevatorCount=0,
+            otherRatio=0,
+            otherRows=0,
+            straightAndMixedRatio=0,
+            straightAndMixedRows=0,
+            willExpireCount=0, 
+          } = this.$com.confirm(res, 'data.content', {}) 
+          this.firstRowInfos = {
+            alreadyExpireCount,
+            areaPropCompanyCount,
+            cityPropCompanyCount,
+            condoRatio,
+            condoRows,
+            haveElevatorCount,
+            otherRatio,
+            otherRows,
+            straightAndMixedRatio,
+            straightAndMixedRows,
+            willExpireCount,
+          }
         }
       })
     },