From c6429869a419c06d2a2e19ebc2a07093f7830c77 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 20 Oct 2022 09:38:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/abilityStatistics/index.vue | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index f2b086f6..cffebf5e 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -76,10 +76,7 @@ }} - 导出 - + 导出全部
@@ -376,7 +373,7 @@ export default { // const date2 = new Date(year2, month2, day2, 7) // this.value1.unshift(date2) }, - mounted() { + mounted () { // this.getFirstTree() if (this.departmentId === 1) { this.handleChose(3) @@ -397,30 +394,30 @@ export default { this.total = this.tableData.length } else { this.tableData = this.tableDataClone - this.total = this.tableData.length + this.total = this.tableData.length } }, closeModal () { this.detailsVisible = false }, - handleCurrentChange(val) { - console.log('val------------>', val); - this.currentPage = val; + handleCurrentChange (val) { + console.log('val------------>', val) + this.currentPage = val // todo - if(this.departmentId === 3) { + if (this.departmentId === 3) { this.getOneDetail(val) } - if(this.departmentId === 4) { + if (this.departmentId === 4) { this.getTwoDetail(val) } - + // if (this.choseId === 0) { // this.getFirstTree(val) // } else if (this.choseId === 1) { // this.getReleaseTree(val) // } }, - getTreeName(data) { + getTreeName (data) { this.$http .get('/census/center/v3/treeList/', { params: { @@ -450,7 +447,7 @@ export default { // }, // 组件服务部门发布情况--改为能力上架统计 - getFirstTree(page) { + getFirstTree (page) { if (this.examineStatus == '-1') { this.status = '' } else if (this.examineStatus == '0') { @@ -515,7 +512,7 @@ export default { }) }, // 组件服务部门使用情况列表-改为能力使用统计 - getSecondTree() { + getSecondTree (page) { if (this.examineStatus == '-1') { this.status = '' } else if (this.examineStatus == '0') { @@ -580,7 +577,7 @@ export default { }) }, // 点击查看详情 - detailClick(row) { + detailClick (row) { this.detailParamss = {} const applyNumber = row.applyNumber if (this.departmentId == 3) { // 能力上架 @@ -622,7 +619,7 @@ export default { } }, // 能力上架明细 能力上架统计 - getOneDetail(page) { + getOneDetail (page) { var passAndReview = '' // 转变"通过"字段为通过 if (this.examineStatus == '-1') { this.status = '' @@ -661,7 +658,7 @@ export default { }) }, // 能力使用明细 能力使用统计 - getTwoDetail(page) { + getTwoDetail (page) { var passAndReview = '' // 转变"通过"字段为通过 if (this.examineStatus == '-1') { this.status = '' @@ -698,7 +695,7 @@ export default { }) }) }, - getReleaseTree(page) { + getReleaseTree (page) { this.$http .get('/census/center/selectApplyDeptDetailTypeCountList/', { params: { @@ -744,7 +741,7 @@ export default { }) }, // 应用资源部门使用情况列表 - getUsedTree() { + getUsedTree () { this.$http .get('/census/center/v3/resourceReleaseDetails/', { params: { @@ -758,7 +755,7 @@ export default { this.tableData = res.data.data.list }) }, - handleClick(row) { + handleClick (row) { if (this.choseId === 0) { if (this.departmentId === 1) { this.homeIsShow = false @@ -779,7 +776,7 @@ export default { } }, // 选择组件 - choseBtn(index) { + choseBtn (index) { this.choseId = index this.handleChose(1) }, @@ -837,26 +834,26 @@ export default { } }, // 翻页 - handleSizeChange(val) { + handleSizeChange (val) { console.log(`每页 ${val} 条`) }, - closeChild() { + closeChild () { this.homeIsShow = true this.servicesIsShow = false this.handleCurrentChange(1) }, - closeChild2() { + closeChild2 () { this.homeIsShow = true this.UsedIsShow = false this.handleCurrentChange(1) }, - closeApplication() { + closeApplication () { this.homeIsShow = true this.resourcesIsShow = false this.handleCurrentChange(1) }, // 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数 - goToDetail() { + goToDetail () { this.detailFlag = !this.detailFlag if (this.departmentId === 1) { this.handleChose(3) @@ -882,7 +879,7 @@ export default { } }, // 点击查询按钮查询数据 - getDataList() { + getDataList () { if (this.value1 && this.value1.length > 0) { this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss') this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss') @@ -913,7 +910,7 @@ export default { } }, // 重置按钮查询数据 - resetDataList() { + resetDataList () { this.value1 = [] this.startDate = '' this.endDate = '' @@ -951,7 +948,7 @@ export default { } }, // 定义格式化函数： - handleTime(time, format) { + handleTime (time, format) { if (time == null || time == undefined || time == '') { return '' } From 6b1c3f30a4c422a3b885f07e61f13b40f7862667 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 20 Oct 2022 10:09:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/abilityStatistics.js | 32 +++ .../components/AbilityRanking.vue | 187 ++++++++++++++---- 2 files changed, 179 insertions(+), 40 deletions(-) diff --git a/front/src/api/abilityStatistics.js b/front/src/api/abilityStatistics.js index c2bf733e..2144f144 100644 --- a/front/src/api/abilityStatistics.js +++ b/front/src/api/abilityStatistics.js @@ -47,6 +47,38 @@ export function pageWithAttrs(data) { data, }) } +//获取好评榜 +export function getPraiseList(params) { + return request({ + url: '/resource/getPraiseList', + method: 'get', + params, + }) +} +//获取热门榜 +export function getPopularList(params) { + return request({ + url: '/resource/getPopularList', + method: 'get', + params, + }) +} +//获取明星榜 +export function getStarList(params) { + return request({ + url: '/resource/getStarList', + method: 'get', + params, + }) +} +//获取潜力榜 +export function getPotentialList(params) { + return request({ + url: '/resource/getPotentialList', + method: 'get', + params, + }) +} //能力统计-能力需求 export function capabilityRequirements(params) { return request({ diff --git a/front/src/views/abilityStatistics/components/AbilityRanking.vue b/front/src/views/abilityStatistics/components/AbilityRanking.vue index ea0efca1..2f731501 100644 --- a/front/src/views/abilityStatistics/components/AbilityRanking.vue +++ b/front/src/views/abilityStatistics/components/AbilityRanking.vue @@ -15,10 +15,45 @@ }" >
{{ item }} + + + + + + +
@@ -28,12 +63,54 @@ class="content-son" v-for="(item, index) in dataList" :key="item" - @click="viewDetails(item.id)" + @click="viewDetails(item.resourceId)" > -
+
{{ index + 1 }}
-
{{ item.name }}
-
访问量：{{ item.visits }}
+
{{ item.resourceName }}
+
+ 平均分：{{ item.score }} +
+
+ 申请量：{{ item.applyCount }} +
+
+ 热度值： + + + +
+
+ + +
@@ -46,10 +123,17 @@