fix: bug 手机端最小宽度正常展示

feat: 连接到天友户型库的页面

src/assets/css/normailze.css

@@ -10,6 +10,7 @@
 
  html {
     line-height: 1.15; /* 1 */
+    min-width: 800px;
     -webkit-text-size-adjust: 100%; /* 2 */
   }
 
@@ -22,6 +23,7 @@
 
   body {
     margin: 0;
+    min-width: 800px;
   }
 
   /**

src/components/bannerDetail/index.vue

 <template>
   <div class="bannerMap">
-    <el-carousel :height="height" :autoplay="autoPlay" :interval="5000" arrow="always"  @change="bannerChange">
-      <el-carousel-item class="carouselCenter" v-for="(item, index) in bannerData" :key="index">
+    <el-carousel :height="height" :autoplay="autoPlay" :interval="5000" :ref="bannerType + 'banner'" arrow="always"   @change="bannerChange">
+      <el-carousel-item class="carouselCenter" v-for="(item, index) in bannerData" :key="index" >
         <viewer v-if="!item.imgList" :images="[]" :style="{height: '100%', margin: '0 auto' }">
           <img   :src="gerImageUrl(item.fileUrl)" :style="{  height: '100%' }" alt="无效路径">
         </viewer>
@@ -42,6 +42,10 @@
       height: {
         type: String,
         default: '100%'
+      },
+      bannerType: {
+        type: String,
+        default: ''
       }
     },
     data() {

src/components/multilHeaderTable/index.vue

@@ -38,9 +38,9 @@
                        alt="失效链接"
                        :style="{ 'cursor': 'pointer', height: src.fileOrder === 0 ? '80px' : '0'}">
                 </viewer>
-                 <div v-else-if="value === 'boolean' && item2[key] == 1" class="circle block"></div>
-                 <div v-else-if="value === 'boolean' && item2[key] == 0" class="circle hollow"></div>
-                 <div v-else-if="value === 'boolean' && item2[key] == undefined" >--</div>
+                 <div v-else-if="value === 'boolean' && item2[key] === 1" class="circle block"></div>
+                 <div v-else-if="value === 'boolean' && item2[key] === 0" class="circle hollow"></div>
+                 <div v-else-if="value === 'boolean' && !item2[key]" >--</div>
               </el-row>
            </el-col>
          </el-col>
@@ -61,7 +61,7 @@
            </viewer>
            <div v-else-if="value === 'boolean' && tableData[key] == 1" class="circle block"></div>
            <div v-else-if="value === 'boolean' && tableData[key] == 0" class="circle hollow"></div>
-           <div v-else-if="value === 'boolean' && tableData[key] == undefined" >--</div>
+           <div v-else-if="value === 'boolean' && !tableData[key]" >--</div>
          </el-row>
        </el-col>
      </div>
@@ -98,16 +98,16 @@
     data () {
       return {
         dataMap :{
-          'unitArea': 'string', // 户型面积
-          'fileUrl': 'img', // 户型图
-          'bayNumber': 'string', // 开间数
-          'roomNumber': 'string', // 居室数
-          'hallNumber': 'string', // 厅数
-          'toiletNumber': 'string', // 卫生间数
-          'southWidth': 'string', // 南向面宽
-          'liveRoomWidth': 'string', //起居室面宽
-          'masterRoomWidth': 'string', // 主卧面宽
-          'guestRoomWidth': 'string', // 客卧面宽
+          'unitArea': 'string',
+          'fileUrl': '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
@@ -124,15 +124,15 @@
           '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'// 玄关-是否设置厨房动线
+          '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'
         }
       }
     },

src/router/index.js

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

src/views/ProductAnalysis/index.vue

@@ -276,7 +276,8 @@
           this.exportLoading = true
           exportAsExcel({
             title: this.exportExcelSave.title,
-            dataJsonTwo: JSON.stringify(this.exportExcelSave.detilProductJsonDtoList)
+            dataJsonTwo: JSON.stringify(this.exportExcelSave.detilProductJsonDtoList),
+            dataJson: JSON.stringify(this.productionProjectData)
           }).then(res => {
             if(res) {
               const title = this.exportExcelSave.title.replace(/;/g, '-')
@@ -391,7 +392,9 @@
                   singleData.guestRoomWidth = propertySinle.bnsProduct.guestRoomWidth
                   try {
                     singleData.fileUrl = propertySinle.productImgList.find(item => { return item.fileOrder === 0 }).fileUrl
+                    // singleData.fileUrl = '/2020-07-29/project/33d5876350b04258b7c560a413689a47.jpg'
                     singleData.imgUrl = process.env.VUE_APP_OSS_SRC + propertySinle.productImgList.find(item => { return item.fileOrder === 0 }).fileUrl
+                    // singleData.imgUrl = process.env.VUE_APP_OSS_SRC + '/2020-07-29/project/33d5876350b04258b7c560a413689a47.jpg'
                   } catch (e) {
                     singleData.fileUrl = ''
                     singleData.imgUrl = ''
@@ -418,6 +421,8 @@
           }
           this.productionProjectData = resultArray
           this.unitDetailJsonExport = JSON.stringify(resultArray)
+          console.log(resultArray, 'ddddddddddddddddddddddddd')
+          console.log(this.unitDetailJsonExport, 'eeeeeeeeeeeeeeeeeeeeeeeeeeee')
         })
         exportExcelJson(temp).then(res => {
           try {

src/views/RegionalPlate/index.vue

@@ -59,8 +59,8 @@
         :text="item.name"
         :fontSize="12"
         :text-color="'#ffffff'"
-        :bg-color="item.saleStatus == 1 ? 'rgba(25,124,230,0.7)' : 'rgba(169,209,142,0.6)'"
-        :active-color="item.saleStatus == 1 ? 'rgba(25,124,230,1)' : 'rgba(46,204,113,0.6)'"
+        :bg-color="item.saleStatus == 1 ? 'rgba(25,124,230,0.7)' : 'rgba(169,209,142,0.8)'"
+        :active-color="item.saleStatus == 1 ? 'rgba(25,124,230,1)' : 'rgba(46,204,113,0.8)'"
         :bg-img-url="null"
         :circle="'10px'"
         :height="30"></my-overlay>
@@ -76,8 +76,8 @@
         :fontSize="12"
         :text-color="'#ffffff'"
         :bg-color="item.isHave == 0 ? (item.businessId === soildInfoChange ? 'rgba(25,124,230,1)': 'rgba(25,124,230,0.6)') :
-           (item.businessId === soildInfoChange ? 'rgba(46,204,113, 0.6)': 'rgba(169,209,142,0.6)')"
-        :active-color="item.isHave == 0 ? 'rgba(25,124,230,1)' : 'rgba(46,204,113, 0.6)'"
+           (item.businessId === soildInfoChange ? 'rgba(46,204,113, 0.6)': 'rgba(169,209,142,0.8)')"
+        :active-color="item.isHave == 0 ? 'rgba(25,124,230,1)' : 'rgba(46,204,113, 0.8)'"
         :bg-img-url="null"
         :circle="'10px'"
         :height="30"></my-overlay>
@@ -241,7 +241,7 @@
         map: {
           center: {
             lng: 117.2300, // 经度
-            lat: 39.44000  // 纬度 天津市中心坐标点
+            lat: 39.15000  // 纬度 天津市中心坐标点
           },
           saveCenter: { lng: 117.2300, lat: 39.44000 },
           setZoom: 11 // 放大倍数
@@ -660,6 +660,7 @@
          })
        }
         window.eventBus.$on('searchParamChange', (searchResult) => {
+          console.log(JSON.stringify(searchResult))
           if(searchResult.type === 'plateRegion') {
             let productionTypeName = '' // 产品类型
             let resultData = JSON.parse(searchResult.data) // 解码data

src/views/propertiesDetail/index.vue

@@ -22,13 +22,13 @@
         <!--     banner图划分-->
         <div :class="{'banner': true, 'unitInfo': bannerType === 2 }">
           <div v-if="bannerType === 0">
-            <banner :height="'600px'" :auto-play="true" :banner-data="propertyData.propertyBanner.ztBanner"/>
+            <banner :bannerType="'zt'"  :height="'600px'" :auto-play="true" :banner-data="propertyData.propertyBanner.ztBanner"/>
           </div>
           <div v-if="bannerType === 1">
-            <banner :height="'600px'" :auto-play="true" :banner-data="propertyData.propertyBanner.lmBanner"/>
+            <banner :bannerType="'lm'"  :height="'600px'" :auto-play="true" :banner-data="propertyData.propertyBanner.lmBanner"/>
           </div>
           <div v-if="bannerType === 2" class="unitBannerContainer">
-            <banner  height="'100%'" :auto-play="false" class="unitPicture" :img-width="100" @bannerChange="saleingChange"  :banner-data="propertyData.propertyBanner.hxBanner" />
+            <banner :bannerType="'unit'"  height="'100%'" :auto-play="false" class="unitPicture" :img-width="100" @bannerChange="saleingChange"  :banner-data="propertyData.propertyBanner.hxBanner" />
           </div>
           <!--     户型信息 只在banner类型为户型时才显示-->
           <div class="unitInformation" v-if="bannerType === 2">

src/views/propertiesDetail/propertyFunctionMap.js

@@ -13,5 +13,5 @@ export  const propertyMapFunction = {
   suit3: '三件套',
   suit4: '四件套',
   other: '其他',
-  null: undefined
+  null: ''
 }

src/views/tenioStore/index.vue

+<template>
+  <section class="storeMain">
+    <iframe src="http://yanfa.tenio.com:2020" @load="loading = false"></iframe>
+  </section>
+</template>
+
+<script>
+  export default {
+    name: "index",
+    data() {
+      return {
+        loading: true
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.storeMain{
+  width: 100%;
+  height: 100%;
+}
+iframe {
+  width: 100%;
+  height: 100%;
+}
+</style>