Commit aa1a801d by 姜雷

Merge branch 'develop' into 'test'

Develop See merge request !137
parents 6223e097 e27b28da
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
}, },
activeTotal() { activeTotal() {
return this.activeUser.reduce((pre, curItem) => { return this.activeUser.reduce((pre, curItem) => {
return pre + curItem.count; return curItem.mark === 'allActive' ? pre + curItem.count : pre;
}, 0); }, 0);
}, },
}, },
...@@ -160,6 +160,7 @@ export default { ...@@ -160,6 +160,7 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
@import '@/assets/styles/variables.scss';
.Dashboard { .Dashboard {
.Dashboard-Row.Dashboard-Register { .Dashboard-Row.Dashboard-Register {
height: auto; height: auto;
...@@ -170,7 +171,16 @@ export default { ...@@ -170,7 +171,16 @@ export default {
} }
} }
} }
.Dashboard-title {
font-size: 20px;
color: #333;
font-weight: 700;
}
@media screen and (max-width: $bigScreenWidth) {
.Dashboard-title {
font-size: 14px;
}
}
.Dashboard-DataCard { .Dashboard-DataCard {
background-color: #fff; background-color: #fff;
border-radius: 8px; border-radius: 8px;
...@@ -182,7 +192,9 @@ export default { ...@@ -182,7 +192,9 @@ export default {
.Dashboard-SearchBar { .Dashboard-SearchBar {
display: flex; display: flex;
padding: 10px 0 20px; padding: 10px 0 20px;
.filter-item {
margin: 0 0 0 34px;
}
.filter-item-input { .filter-item-input {
width: 200px; width: 200px;
.el-input { .el-input {
......
...@@ -43,6 +43,7 @@ export default { ...@@ -43,6 +43,7 @@ export default {
<style lang="scss"> <style lang="scss">
.Home-Dashboard.Dashboard { .Home-Dashboard.Dashboard {
padding: 22px 34px; padding: 22px 34px;
height: 100%;
overflow-y: scroll; overflow-y: scroll;
} }
</style> </style>
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