From 418cc696343070a8fb5bd57107bb168f0818dcb3 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 15 Aug 2022 11:24:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/gridScoreManage.vue | 29 ++- .../components/gridScoreRules.vue | 207 ++++-------------- .../components/gridScoreStatistics.vue | 70 ++---- 3 files changed, 88 insertions(+), 218 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue index c6fcab54..101b85f2 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue @@ -19,18 +19,18 @@ - + @getList="getTableData()" :col-configs="colConfigs" :dict="dict" @sort-change="changeTableSort"> + - + - + @@ -153,7 +153,8 @@ export default { params: { ...this.page, ...this.search, - current: this.current + current: this.current, + } }).then(res => { if(res?.data) { @@ -209,6 +210,24 @@ export default { this.getTableData() }, + changeTableSort(col) { + // console.log(col); + if(col.prop === 'integral') { // 剩余积分 + // col.order === 'ascending' && + // col.order === 'descending' && + // col.order === null && + } else if(col.prop === 'totalIntegral') { // 累计积分 + // col.order === 'ascending' && + // col.order === 'descending' && + // col.order === null && + } else if(col.prop === 'usedIntegral') { // 已用积分 + // col.order === 'ascending' && + // col.order === 'descending' && + // col.order === null && + } + // this.getTableData() + }, + onConfirm() { if(this.form.file?.length) { this.form.enclosure = this.form.file[0].url diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue index 0b57cfb3..05cc45b5 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue @@ -6,77 +6,26 @@ @@ -141,7 +141,6 @@ export default { endTime: '', }, page: { - size: 10, total: 0, }, @@ -167,10 +166,11 @@ export default { fileDownLoad: [], userSortListX: [], userSortListY: [], - girdSortListX: [ - - ], + girdSortListX: [], girdSortListY: [], + fileOps: { + name: '' + }, } }, computed: { @@ -227,50 +227,12 @@ export default { this.userSortListX = res.data.userSortList.map(e=> e.userName).reverse() this.userSortListY = res.data.userSortList.map(e=> e.changeIntegral).reverse() this.girdSortListX = res.data.girdSortList.map(e=> e.girdName).reverse() - // this.girdSortListX = ['好家伙规定非官方多喝点黑胡椒发布会','好好发挥或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或或'] this.girdSortListY = res.data.girdSortList.map(e=> e.changeIntegral).reverse() this.getColEcherts1(this.userSortListX,this.userSortListY) this.getColEcherts2(this.girdSortListX,this.girdSortListY) } }) }, - // extension(chart){ - // //判断是否创建过div框,如果创建过就不再创建了 - // //该div用来盛放文本显示内容的，方便对其悬浮位置进行处理 - // var id = document.getElementById("extension"); - // if(!id) { - // var div = "
"; - // document.documentElement.append(div); - // } - // chart.on('mouseover', function(params) { - // //注意这里，我是以Y轴显示内容过长为例，如果是x轴的话，需要改为xAxis - // if(params.componentType == "xAxis") { - // //设置悬浮文本的位置以及样式 - // document.getElementById('extension').style.className = "chartCss" - // // ({ - // // "position": "absolute", - // // "color": "black", - // // "background":"white", - // // "font-family": "Arial", - // // "font-size": "12px", - // // "padding": "5px", - // // "display": "inline" - // // }) - // // .text(params.value); - // document.documentElement.mousemove(function(event) { - // var xx = event.pageX - 10; - // var yy = event.pageY + 15; - // document.getElementById('extension').css('top', yy).style('left', xx); - // }); - // } - // }); - // chart.on('mouseout', function(params) { - // //注意这里，我是以Y轴显示内容过长为例，如果是x轴的话，需要改为xAxis - // if(params.componentType == "yAxis") { - // document.getElementById('extension').style('display', 'none'); - // } - // }); - // }, // 积分明细 getTableData() { this.instance.post('/app/appintegraluser/girdIntegralDetail',null,{ @@ -489,6 +451,8 @@ export default { this.details = res.data if(res.data.enclosure) { this.fileDownLoad = [{ url:res.data.enclosure }] + let str = res.data.enclosure.split('/') + this.fileOps.name = str?.[str.length - 1] } } }) @@ -632,15 +596,15 @@ export default { } } - .chartCss { - position: absolute; - color: black; - background:white; - font-family: Aril; - font-size: 12px; - padding: 5px; - display: inline; - } + // .chartCss { + // position: absolute; + // color: black; + // background:white; + // font-family: Aril; + // font-size: 12px; + // padding: 5px; + // display: inline; + // } ::v-deep .el-dialog__footer { text-align: center;