Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
house-type
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangjiankun
house-type
Commits
0c8b4f6f
Commit
0c8b4f6f
authored
Jul 29, 2020
by
wangjiankun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复供求比数据切换时报错问题 fix:多级表头图片被拉伸问题
parent
6909be81
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
index.vue
src/components/multilHeaderTable/index.vue
+1
-1
index.vue
src/views/plateSupplyData/index.vue
+3
-2
index.vue
src/views/propertiesDetail/index.vue
+2
-2
No files found.
src/components/multilHeaderTable/index.vue
View file @
0c8b4f6f
...
@@ -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>
...
...
src/views/plateSupplyData/index.vue
View file @
0c8b4f6f
...
@@ -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
...
...
src/views/propertiesDetail/index.vue
View file @
0c8b4f6f
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment