Commit 0c8b4f6f authored by wangjiankun's avatar wangjiankun

fix: 修复供求比数据切换时报错问题 fix:多级表头图片被拉伸问题

parent 6909be81
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-row v-for="(value, key) in dataMap" :key="key" :class="{ 'dataCell': true, 'imgHeigth': value === 'img'}"> <el-row v-for="(value, key) in dataMap" :key="key" :class="{ 'dataCell': true, 'imgHeigth': value === 'img'}">
<div v-if="value === 'string'">{{item2[key] || '--'}} <span v-if="key === 'area'">m<sup>2</sup></span> </div> <div v-if="value === 'string'">{{item2[key] || '--'}} <span v-if="key === 'area'">m<sup>2</sup></span> </div>
<viewer :images="[]" v-else-if="value === 'img'"> <viewer :images="[]" v-else-if="value === 'img'">
<el-image :src="getImageUrl(item2[key])" alt="" style="cursor:pointer;height: 80px"></el-image> <el-image :src="getImageUrl(item2[key])" alt="" style="cursor:pointer;height: 80px;max-width: 200px"></el-image>
</viewer> </viewer>
<div v-else-if="value === 'boolean' && item2[key] == 1" class="circle block"></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] == 0" class="circle hollow"></div>
......
...@@ -241,14 +241,15 @@ ...@@ -241,14 +241,15 @@
rate: res.data[key] ? (1 / res.data[key].rate || 0) : 0 rate: res.data[key] ? (1 / res.data[key].rate || 0) : 0
}) })
areaRange.push(areaRangeMap[key]) areaRange.push(areaRangeMap[key])
rate.push(res.data[key] ? (res.data[key].rate ? res.data[key].rate.toFixed(1) : 0 ) : 0) rate.push(res.data[key] ? (Number(res.data[key].rate).toFixed(1) || 0) : 0)
// rate.push(res.data[key] ? (res.data[key].rate ? Number(res.data[key].rate).toFixed(1) : 0 ) : 0)
supplyNumber.push(res.data[key] ? (res.data[key].suplyNumber || 0) : 0) supplyNumber.push(res.data[key] ? (res.data[key].suplyNumber || 0) : 0)
dealNumber.push(res.data[key] ? (res.data[key].dealNumber || 0) : 0) dealNumber.push(res.data[key] ? (res.data[key].dealNumber || 0) : 0)
exportList.push({ exportList.push({
areaRange: areaRangeMap[key], areaRange: areaRangeMap[key],
supplyNumber: res.data[key] ? (res.data[key].suplyNumber || 0) : 0, supplyNumber: res.data[key] ? (res.data[key].suplyNumber || 0) : 0,
dealNumber: res.data[key] ? (res.data[key].dealNumber || 0) : 0, dealNumber: res.data[key] ? (res.data[key].dealNumber || 0) : 0,
gongQiuBi: res.data[key] ? (res.data[key].rate ? res.data[key].rate.toFixed(1) : 0 ) : 0 gongQiuBi:res.data[key] ? (Number(res.data[key].rate).toFixed(1) || 0) : 0
}) })
}) })
this.chartData.rows = supplyChartsData this.chartData.rows = supplyChartsData
......
...@@ -534,14 +534,14 @@ ...@@ -534,14 +534,14 @@
rate: res.data[key] ? (1 / res.data[key].rate || 0) : 0 rate: res.data[key] ? (1 / res.data[key].rate || 0) : 0
}) })
areaRange.push(areaRangeMap[key]) areaRange.push(areaRangeMap[key])
rate.push(res.data[key] ? (res.data[key].rate ? res.data[key].rate.toFixed(1) : 0 ) : 0) rate.push(res.data[key] ? (Number(res.data[key].rate).toFixed(1) || 0) : 0)
supplyNumber.push(res.data[key] ? (res.data[key].suplyNumber || 0) : 0) supplyNumber.push(res.data[key] ? (res.data[key].suplyNumber || 0) : 0)
dealNumber.push(res.data[key] ? (res.data[key].dealNumber || 0) : 0) dealNumber.push(res.data[key] ? (res.data[key].dealNumber || 0) : 0)
exportList.push({ exportList.push({
areaRange: areaRangeMap[key], areaRange: areaRangeMap[key],
supplyNumber: res.data[key] ? (res.data[key].suplyNumber || 0) : 0, supplyNumber: res.data[key] ? (res.data[key].suplyNumber || 0) : 0,
dealNumber: res.data[key] ? (res.data[key].dealNumber || 0) : 0, dealNumber: res.data[key] ? (res.data[key].dealNumber || 0) : 0,
gongQiuBi: res.data[key] ? (res.data[key].rate ? res.data[key].rate.toFixed(1) : 0 ) : 0 gongQiuBi: res.data[key] ? (Number(res.data[key].rate).toFixed(1) || 0) : 0
}) })
}) })
this.supplySaleCharts.rows = supplyChartsData this.supplySaleCharts.rows = supplyChartsData
......
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