Merge branch 'develop' into 'master'

fix: 导出表格时 0、1换为是和否

fix: 楼盘详情-产品类型分组展示
fix: 楼盘详情 产品面宽数据柱状图修改
fix: 楼盘详情 下载技术资料没有时置灰

See merge request !41

src/components/Layout/SidebarItem.vue

@@ -2,15 +2,15 @@
   <div v-if="!item.hidden" class="menu-wrapper">
 
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <app-link :to="resolvePath(onlyOneChild.path)" v-if="onlyOneChild.path !== '/tenioStore'">
+      <app-link :to="resolvePath(onlyOneChild.path)" v-if="onlyOneChild.meta.outerNet !== true">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
           <item :meta="Object.assign({},item.meta,onlyOneChild.meta)" />
         </el-menu-item>
       </app-link>
-      <a  v-else @click="toTenioStore">
-        <el-menu-item>
+      <a class="tenioStore"  v-else @click="toTenioStore">
+        <li>
           <item :meta="Object.assign({},item.meta,onlyOneChild.meta)" />
-        </el-menu-item>
+        </li>
       </a>
     </template>
 
@@ -125,6 +125,35 @@ export default {
        background-color: #EC7F5F!important
      }
     }
+    .tenioStore {
+      display: inline-block;
+      overflow: hidden;
+      width 90%;
+      margin 0 auto;
+      border-radius 10px
+      text-decoration none
+      li {
+        background-color transparent
+        padding 0 20px!important
+        height 44px
+        cursor pointer
+        box-sizing border-box
+        span {
+          margin-left 10px
+          font-size 14px
+        }
+        i {
+          margin-right: 5px;
+          width: 24px;
+          text-align: center;
+          font-size: 18px;
+          vertical-align: middle;
+        }
+      }
+      li:hover {
+        background-color: #EC7F5F!important
+      }
+    }
     .svg-icon {
       margin-right: 12px;
     }

src/router/index.js

@@ -82,13 +82,14 @@ let routes = [
     path: '/tenioStore',
     hidden: false,
     name: 'tenioStore',
+    meta: { title: '天友户型库', icon: 'el-icon-s-platform', outerNet: true },
     component: Layout,
     children: [
       {
-        path: '/tenioStore',
+        path: 'index',
         name: 'tenioStore',
         hidden: false,
-        meta: { title: '天友户型库', icon: 'el-icon-s-platform' },
+        meta: { title: '天友户型库', icon: 'el-icon-s-platform', outerNet: true },
         component: () => import('@/views/tenioStore/index.vue'),
       }
     ]

src/views/ProductAnalysis/index.vue

@@ -174,7 +174,7 @@
   import { getRegionPlate } from "../../assets/js/api/plateSupplyManage";
   import { unitArea } from "./unitArea";
   import {plateAnalysis, queryProductionType, exportExcelJson, exportAsExcel, plateAnalysisHouseImg} from "@assets/js/api/projectManage";
-  import { propertyMapFunction } from "../propertiesDetail/propertyFunctionMap";
+  import { propertyMapFunction, tableDataType } from "../propertiesDetail/propertyFunctionMap";
   import {downloadFile} from "../../assets/js/public";
   export default {
     name: "ProductAnalysis",
@@ -420,9 +420,24 @@
             })
           }
           this.productionProjectData = resultArray
-          this.unitDetailJsonExport = JSON.stringify(resultArray)
-          console.log(resultArray, 'ddddddddddddddddddddddddd')
-          console.log(this.unitDetailJsonExport, 'eeeeeeeeeeeeeeeeeeeeeeeeeeee')
+          let dealArr = JSON.stringify(JSON.parse(resultArray)).map((item => {
+            if(item.productionProperties && item.productionProperties.length > 0) {
+              item.productionProperties.map(item2 => {
+                 Object.keys(tableDataType).forEach(key => {
+                   if(tableDataType[key] === 'string') {
+                    item2[key] = item2[key] ? item2[key] : '无'
+                   }
+                   else if(tableDataType[key] === 'boolean') {
+                    item2[key] = item2[key] == 1 ? '是' : '否'
+                   } else if(tableDataType[key] === 'img') {
+                     item2[key] = item2[key] ? item2[key] : null
+                   }
+                 })
+              })
+              return item
+            }
+          }))
+          this.unitDetailJsonExport = JSON.stringify(dealArr)
         })
         exportExcelJson(temp).then(res => {
           try {

src/views/propertiesDetail/propertyFunctionMap.js

@@ -15,3 +15,41 @@ export  const propertyMapFunction = {
   other: '其他',
   null: ''
 }
+
+export const tableDataType = {
+  'unitArea': 'string',
+  'imgUrl': 'img',
+  'bayNumber': 'string',
+  'roomNumber': 'string',
+  'hallNumber': 'string',
+  'toiletNumber': 'string',
+  'southWidth': 'string',
+  'liveRoomWidth': 'string',
+  'masterRoomWidth': 'string',
+  'guestRoomWidth': 'string',
+  'liveRoom-largeHorizontalHall': 'boolean', // 起居室-大横厅
+  'liveRoom-balcony': 'boolean', // 起居室-外设阳台
+  'liveRoom-LDK': 'boolean', // 起居室-LDK
+  'masterRoom-masterBathRoom': 'boolean', // 主卧-主卫
+  'masterRoom-cloakRoom': 'boolean', // 主卧-衣帽间
+  'guestRoom-guestBathRoom': 'boolean', // 客卧-客卫
+  'kitchen-LDK': 'boolean', // 厨房-LDK
+  'kitchen-SCWesternCook': 'boolean', // 厨房-中西厨分离
+  'kitchen-hallwayCFDX': 'boolean', // 厨房-玄关设厨房独立动线
+  'kitchen-kitchenStyle': 'string',  // 厨房-厨房形式
+  'restaurant-LDK': 'boolean', // 餐厅-LDK
+  'restaurant-independentWindow': 'boolean', // 餐厅-独立开窗
+  'bookRoom-wideHallSingleGuard': 'string', // 书房-大宽厅/独立
+  'restRoom-brightBathRoom': 'boolean', // 卫生间-明卫
+  'restRoom-dryWetDepart': 'boolean', // 卫生间-干湿分离
+  'restRoom-function': 'string', // 卫生间-功能
+  'bathRoom-brightBathRoom': 'boolean', // 主卫
+  'bathRoom-dryWetDepart': 'boolean',
+  'bathRoom-function': 'string',
+  'balcony-designHalcony': 'boolean', // 阳台
+  'balcony-location': 'string',
+  'storeRoom-designStoreRoom': 'boolean', //储藏间
+  'houseSpace-designHouseSpace': 'boolean', // 家政间
+  'hallway-designHallway': 'boolean',  // 玄关
+  'hallway-designHallwayCFDX': 'boolean'
+}