Browse Source

Merge remote-tracking branch 'origin/feature/lc_otherJob'

# Conflicts:
#	src/main.js
feature/syp_points
liuchuang 5 years ago
parent
commit
0d58476cde
  1. 17
      .gitignore
  2. 54
      package-lock.json
  3. 1
      package.json
  4. 2
      src/main.js
  5. 119
      src/views/modules/points/points-overview.vue
  6. 113
      src/views/modules/points/points-statistics.vue

17
.gitignore

@ -0,0 +1,17 @@
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
*.zip
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
node_modules
dist
epdc-admin
.idea/

54
package-lock.json

@ -4869,6 +4869,14 @@
"safer-buffer": "^2.1.0"
}
},
"echarts": {
"version": "4.8.0",
"resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.8.0.tgz",
"integrity": "sha1-ssHPuSKbE9No7hBPyO6mALV01MQ=",
"requires": {
"zrender": "4.3.1"
}
},
"ee-first": {
"version": "1.1.1",
"resolved": "http://r.cnpmjs.org/ee-first/download/ee-first-1.1.1.tgz",
@ -6388,8 +6396,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"aproba": {
"version": "1.2.0",
@ -6410,14 +6417,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -6432,20 +6437,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
@ -6562,8 +6564,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"ini": {
"version": "1.3.5",
@ -6575,7 +6576,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -6590,7 +6590,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@ -6598,14 +6597,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@ -6624,7 +6621,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -6705,8 +6701,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"object-assign": {
"version": "4.1.1",
@ -6718,7 +6713,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -6804,8 +6798,7 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"safer-buffer": {
"version": "2.1.2",
@ -6841,7 +6834,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -6861,7 +6853,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -6905,14 +6896,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
}
}
},
@ -17524,6 +17513,11 @@
"dev": true
}
}
},
"zrender": {
"version": "4.3.1",
"resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.1.tgz",
"integrity": "sha1-uviqbcgYei+BlpLX1fm+36K5D6M="
}
}
}

1
package.json

@ -16,6 +16,7 @@
"dependencies": {
"axios": "^0.18.1",
"babel-plugin-component": "^1.1.1",
"echarts": "^4.8.0",
"element-theme": "^2.0.1",
"element-theme-chalk": "^2.4.7",
"gulp-autoprefixer": "^6.0.0",

2
src/main.js

@ -13,6 +13,8 @@ import cloneDeep from 'lodash/cloneDeep'
import '@/element-ui/theme/cascader-new.css'
import '@/style/index.scss'
import echarts from 'echarts'
Vue.prototype.$echarts = echarts
Vue.config.productionTip = false
Vue.use(Element, {

119
src/views/modules/points/points-overview.vue

@ -0,0 +1,119 @@
<template>
<el-card shadow="never"
class="aui-card--fill">
<div class="mod-sys__user">
<el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getPointsOverview()">
<span class="demonstration">统计时间</span>&nbsp;&nbsp;
<el-date-picker @change='setRegistTime'
v-model="time"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<el-form-item>
<el-button @click="getPointsOverview()">{{ $t('query') }}</el-button>
</el-form-item>
<div id="myChart"
:style="{width: '700px', height: '400px'}"></div>
</el-form>
</div>
</el-card>
</template>
<script>
// import mixinViewModule from '@/mixins/view-module'
export default {
data () {
return {
dataForm: {
startTime: '',
endTime: ''
},
time: '',
resultData: {
},
myChart: ''
}
},
mounted () {
this.myChart = this.$echarts.init(document.getElementById('myChart'))
this.myChart.setOption({
title: {
text: '积分统计',
subtext: '',
x: 'center'
},
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b} : {c} ({d}%)'
},
legend: {
orient: 'vertical',
bottom: 'bottom',
data: ['剩余积分']
},
series: [
{
name: '访问来源',
type: 'pie',
radius: '55%',
data: [
{ value: this.resultData.allPoints, name: '已兑换积分' },
{ value: this.resultData.residuePoints, name: '剩余积分' }
],
label: {
normal: {
show: true,
position: 'inner',
formatter: '{b} {c} ({d}%)'
}
}
}
]
})
},
created () {
this.getPointsOverview()
},
methods: {
getPointsOverview () {
if (this.time === null) {
this.dataForm.startTime = ''
this.dataForm.endTime = ''
}
console.log(this.dataForm)
this.$http
.get(`points/pointslogs/point/pointsOverview`, { params: this.dataForm })
.then(({ data: res }) => {
this.myChart.setOption({
title: {
subtext: '总积分' + res.data.allPoints
},
series: [{
data: [
{ value: (res.data.allPoints - res.data.residuePoints), name: '剩余积分' },
{ value: res.data.residuePoints, name: '' }
]
}]
})
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.resultData = res.data
console.log(this.resultData)
})
.catch(() => { })
},
setRegistTime () {
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
}
},
components: {
}
}
</script>

113
src/views/modules/points/points-statistics.vue

@ -0,0 +1,113 @@
<template>
<el-card shadow="never"
class="aui-card--fill">
<div class="mod-sys__user">
<el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-select v-model="dataForm.ruleCode"
placeholder="积分类别"
clearable>
<el-option v-for="item in options"
:key="item.ruleCode"
:label="item.ruleDesc"
:value="item.ruleCode">
</el-option>
</el-select>
&nbsp;&nbsp;
<span class="demonstration">统计时间</span>&nbsp;&nbsp;
<el-date-picker @change='setRegistTime'
v-model="time"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column prop="operationDesc"
label="积分类别"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="allPoints"
label="总积分"
header-align="center"
align="center"></el-table-column>
</el-table>
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
</div>
</el-card>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
export default {
mixins: [mixinViewModule],
data () {
return {
mixinViewModuleOptions: {
getDataListURL: 'points/pointslogs/point/listPagePoints',
getDataListIsPage: true
},
dataForm: {
ruleCode: '',
startTime: '',
endTime: ''
},
time: '',
options: []
}
},
created () {
this.$http
.get(`/points/pointsrule/ruleList`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data
})
.catch(() => { })
},
watch: {
'time': function (val) {
if (this.time === null) {
this.dataForm.startTime = ''
this.dataForm.endTime = ''
}
}
},
methods: {
realNameFormat (row, column) {
if (row.realName) {
return row.realName
}
return row.nickname
},
setRegistTime () {
// console.log(this.time[0])
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
}
},
components: {
}
}
</script>
Loading…
Cancel
Save