Skip to content

H
house-type
Commit 859e8240 authored by wangjiankun's avatar wangjiankun
Browse files
Options

fix：细节优化 1.多级表头缩小时错乱的问题 2.供求数据-供求占比表格百分比取小数问题 3.楼盘详情-户型图-户型图被覆盖问题，banner图中有滚动条问题，指示灯不易见问题

parent e2666a64
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 50 deletions
src/components/bannerDetail/index.vue
View file @ 859e8240
......@@ -7,7 +7,10 @@
</viewer>
<viewer v-else :images="getImgListUrl(item.imgList)" :style="{height: '100%', margin: '0 auto' }">
<img v-for="(src, index) in item.imgList" :key="index" :src="gerImageUrl(src.fileUrl)" :style="{ height: src.fileOrder === 0 ? '100%' : '0' }" alt="无效路径">
<img
v-for="(src, index) in item.imgList"
:key="index" :src="gerImageUrl(src.fileUrl)"
:style="{ width: src.fileOrder === 0 ? '100%' : '0', height: src.fileOrder === 0 ? '100%' : '0' }" alt="无效路径">
</viewer>
</el-carousel-item>
</el-carousel>
......@@ -74,8 +77,31 @@
<style lang="stylus">
.bannerMap{
.el-carousel__container{
text-align center
.el-carousel {
.el-carousel__container{
text-align center
}
.el-carousel__indicators{
.el-carousel__indicator {
padding 0
width 12px;
height 12px;
border-radius 50%
background-color: #fff;
margin-bottom 10px
.el-carousel__button {
width 0
height 0
}
}
.el-carousel__indicator:nth-child(2n) {
margin-left 10px
margin-right 10px
}
.el-carousel__indicator.is-active {
background-color: #DA324D;
}
}
}
}
</style>
src/components/mapOverlay/index.vue
View file @ 859e8240
......@@ -16,12 +16,12 @@
}"
@draw="draw">
<div
:style="{fontSize: fontSize + 'px', fontFamily: 'Arial', textAlign: 'center', fontWeight: 'normal',whiteSpace: 'nowrap'}"
:style="{fontSize: fontSize + 'px', fontFamily: 'Arial', textAlign: 'justify', fontWeight: 'normal',whiteSpace: 'nowrap'}"
v-if="type !== 'icon'">
{{text}}
<div v-if="num" style="font-weight: 600;height: 20px;line-height: 40px">{{num}}</div>
<div v-if="num" style="font-weight: 600;height: 20px;line-height: 40px;text-align: center">{{num}}</div>
</div>
<div v-if="type === 'icon'" class="flex-colum" :title="text">
<div v-if="type === 'icon'" class="flex-column" :title="text">
<i class="el-icon-location"></i>
</div>
</bm-overlay>
......@@ -82,7 +82,7 @@
justify-content: center;
align-items: center;
}
.flex-colum{
.flex-column{
font-size 45px
color red
}
......
src/components/multilHeaderTable/index.vue
View file @ 859e8240
......@@ -98,41 +98,41 @@
data () {
return {
dataMap :{
'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',
'masterRoom-masterBathRoom': 'boolean', // 主卧
'masterRoom-cloakRoom': 'boolean',
'guestRoom-guestBathRoom': 'boolean', // 客卧
'kitchen-LDK': 'boolean', // 厨房
'kitchen-SCWesternCook': 'boolean',
'kitchen-hallwayCFDX': 'boolean',
'kitchen-kitchenStyle': 'string',
'restaurant-LDK': 'boolean', // 餐厅
'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'
'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
'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'// 玄关-是否设置厨房动线
}
}
},
......
src/views/ProductAnalysis/index.vue
View file @ 859e8240
......@@ -260,7 +260,8 @@
productionProjectData: [],
supplyRateMap: {
} // 供应套数占比map
}, // 供应套数占比map
unitDetailJsonExport: '' // 户型详细信息导出json处理后保存
}
},
methods: {
......@@ -390,8 +391,10 @@
singleData.guestRoomWidth = propertySinle.bnsProduct.guestRoomWidth
try {
singleData.fileUrl = propertySinle.productImgList.find(item => { return item.fileOrder === 0 }).fileUrl
singleData.imgUrl = process.env.VUE_APP_OSS_SRC + propertySinle.productImgList.find(item => { return item.fileOrder === 0 }).fileUrl
} catch (e) {
singleData.fileUrl = ''
singleData.imgUrl = ''
}
singleData.imgList = propertySinle.productImgList || []
propertySinle.familyFunc.forEach(item => {
......@@ -414,6 +417,7 @@
})
}
this.productionProjectData = resultArray
this.unitDetailJsonExport = JSON.stringify(resultArray)
})
exportExcelJson(temp).then(res => {
try {
......
src/views/RegionalPlate/index.vue
View file @ 859e8240
......@@ -8,7 +8,7 @@
:zoom="map.setZoom"
@zoomend="zoomChanged"
:scroll-wheel-zoom="true"
:class="{ 'map': true}">
class="map">
<!-- 展示蓝色圆形组件=====区域-->
<my-overlay
v-show="showType === 'region'"
......@@ -20,7 +20,7 @@
:text="item.name"
:num="item.projectSize"
:text-color="'#ffffff'"
:fontSize="16"
:fontSize="15"
:bg-color="'rgba(25,124,230, 0.6)'"
:active-color="'rgba(25,124,230,1)'"
:bg-img-url="null"
......@@ -38,7 +38,7 @@
:type="'circle'"
:text="item.name"
:num="item.projectSize"
:fontSize="14"
:fontSize="13"
:text-color="'#ffffff'"
:bg-color="item.adminRegion === regionClickId ? 'rgba(25,124,230,0.6)' : 'rgba(116, 125, 140, 0.6)'"
:active-color="item.adminRegion === regionClickId ? 'rgba(25,124,230,1)' : 'rgba(116, 125, 140, 1)'"
......@@ -141,7 +141,14 @@
:key="index">
<el-collapse-item :name="item.businessId" :id="'solidInfoCollapse' + item.businessId">
<template slot="title">
<div :style="{ 'text-align': 'center','width': '100%', color: item.businessId === soildInfoChange ? '#409eff': '#303133'}">{{item.code}}</div>
<div
:style="{
'text-align': 'center',
'width': '100%',
color: item.businessId === soildInfoChange ? '#409eff': '#303133',
'white-space': 'nowrap',
'overflow': 'hidden',
textOverflow: 'ellipsis'}">{{item.code}}</div>
</template>
<p><b>行政分区：</b>{{dataType.plateRegion.plateInfo.adminRegionName || '--'}}</p>
<p><b>板块: </b>{{dataType.plateRegion.plateInfo.name || '--'}}</p>
......
src/views/plateSupplyData/index.vue
View file @ 859e8240
......@@ -153,7 +153,7 @@
position: "top",
formatter:function(params){ //标签内容
if(params.data == 0) { return '' }
return (params.data * 100 ).toFixed(0) + '%'
return (params.data * 100 ).toFixed(1) + '%'
}
}
}
......
src/views/propertiesDetail/index.vue
View file @ 859e8240
......@@ -28,7 +28,7 @@
<banner :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 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">
......@@ -704,7 +704,7 @@
padding 0 10px 0 80px
overflow hidden
background-color: #ffffff;
z-index 9999
z-index 999
box-sizing border-box
.back {
position absolute
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment