diff --git a/project/fengdu/app/AppIntegralStatistics/AppIntegralStatistics.vue b/project/fengdu/app/AppIntegralStatistics/AppIntegralStatistics.vue index 9ed37454..931f7188 100644 --- a/project/fengdu/app/AppIntegralStatistics/AppIntegralStatistics.vue +++ b/project/fengdu/app/AppIntegralStatistics/AppIntegralStatistics.vue @@ -1,101 +1,115 @@ - - - 总体统计 - - - {{ item }} - + + + + + - - - - - 积分余额汇总 - - - - - {{ data.nowIntegral || 0 }} - - - 发放积分 - {{ data.addIntegral || 0 }} - - - 消耗积分 - {{ Math.abs(data.reduceIntegral) || 0 }} - - - - - 个人积分排行 - - - - - - - 网格积分排行 - - - - - - - - - - + :props="defaultProps" :show-all-levels="false" @change="gridChange" clearable/> + + + - - - - - - + + + 积分余额汇总 + + + + + {{ data.nowIntegral || 0 }} + + + 发放积分 + {{ data.addIntegral || 0 }} + + + 消耗积分 + {{ Math.abs(data.reduceIntegral) || 0 }} + + + + + 个人积分排行 + + + + + + + 网格积分排行 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ row.integralRuleName || row.eventDesc }} + + + + + {{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }} + + + + + 详情 + + + - - - - - - - - {{ row.integralRuleName || row.eventDesc}} - - - - - {{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }} - - - - - 详情 - - - + - - + - + {{ details.integralRuleName }} @@ -116,10 +130,9 @@ 关闭 - + range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> 确认 @@ -127,11 +140,15 @@ @@ -515,133 +563,90 @@ export default { .AppIntegralStatistics { height: 100%; box-sizing: border-box; - padding-top: 20px; - overflow-y: scroll; - .overallStatistics { - width: 100%; - margin-bottom: 16px; - padding: 20px; - box-sizing: border-box; - background: #FFF; - .title { + .shortcut { + display: inline-block; + width: 70px; + height: 32px; + line-height: 32px; + border-radius: 2px; + border: 1px solid #D0D4DC; + margin-right: 8px; + text-align: center; + cursor: pointer; + + &.active { + color: #2266FF; + border: 1px solid #2266FF; + } + } + + .chartBox { + background: #F9F9F9; + box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.1500); + border-radius: 4px; + padding: 16px; + box-sizing: border-box; + + .chart { width: 100%; - display: flex; - justify-content: space-between; - margin-bottom: 16px; - p { + height: 300px; + } + } + + .card_list { + display: flex; + + .card { + flex: 1; + height: 96px; + background: #F9F9F9; + border-radius: 2px; + margin-right: 20px; + padding: 16px 24px; + box-sizing: border-box; + + h2 { + color: #888888; + font-weight: 600; font-size: 16px; - font-family: MicrosoftYaHeiSemibold; - color: #222222; + } + + p { + margin-top: 8px; + font-size: 24px; font-weight: 600; } - .title_right { - display: flex; - align-items: center; - span { - display: inline-block; - width: 70px; - height: 32px; - line-height: 32px; - border-radius: 2px; - border: 1px solid #D0D4DC; - margin-right: 8px; - text-align: center; - cursor: pointer; - } - .active { - color: #2266FF; - border: 1px solid #2266FF; - } + .color1 { + color: #2891FF; + } + + .color2 { + color: #22AA99; + } + + .color3 { + color: #F8B425; } } - .card_list { - display: flex; - .card { - flex: 1; - height: 96px; - background: #F9F9F9; - border-radius: 2px; - margin-right: 20px; - padding: 16px 24px; - box-sizing: border-box; - h2 { - color: #888888; - font-weight: 600; - font-size: 16px; - } - p { - margin-top: 8px; - font-size: 24px; - font-weight: 600; - } - .color1 { - color: #2891FF; - } - .color2 { - color: #22AA99; - } - .color3 { - color: #F8B425; - } - } - .card:last-child { - margin-right: 0; - } - } - .echertsBox { - width: 100%; - margin-top: 20px; - background: #FFF; - display: flex; - .left_Box { - margin-right: 16px; - flex: 1; - } - .right_Box { - width: 100%; - flex: 1; - } - - .left_Box, - .right_Box { - background: #F9F9F9; - box-shadow: 0px 4px 6px -2px rgba(15,15,21,0.1500); - border-radius: 4px; - padding: 16px; - box-sizing: border-box; - #chart1, - #chart2 { - width: 100%; - height: 300px; - } - p { - font-weight: 600; - } - } + .card:last-child { + margin-right: 0; } } - // .chartCss { - // position: absolute; - // color: black; - // background:white; - // font-family: Aril; - // font-size: 12px; - // padding: 5px; - // display: inline; - // } - :deep( .el-dialog__footer ){ + :deep( .el-dialog__footer ) { text-align: center; } - :deep( .el-dialog__header ){ + + :deep( .el-dialog__header ) { border-bottom: 1px solid #DDD; } - :deep( .ai-detail ){ + + :deep( .ai-detail ) { background: #FFF; } - } +}
总体统计
{{ data.nowIntegral || 0 }}
{{ data.addIntegral || 0 }}
{{ Math.abs(data.reduceIntegral) || 0 }}
个人积分排行
网格积分排行