diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index b6041468..76edd456 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -26,46 +26,27 @@
日期：
-
+
-
+
审核状态：
-
-
-
-
-
+
+
+
+
+
部门名称：
-
+
-
+
@@ -74,13 +55,8 @@
类型：
-
+
+
@@ -91,7 +67,7 @@
{{
- $t('reset')
+ $t('reset')
}}
@@ -112,25 +88,18 @@
-->
-
+
能力上架统计
-
+
能力使用统计
-
+
@@ -161,17 +124,9 @@
-
+
-
+
@@ -179,14 +134,8 @@
-
+
@@ -194,17 +143,9 @@
-
+
-
+
@@ -216,64 +157,43 @@
-
-
+
+
-
+
-
- 查看详情
- 后台挂接，无详情
-
-
+
+ 查看详情
+ 后台挂接，无详情
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
@@ -295,7 +215,7 @@ import { mapState } from 'vuex'
// })
export default {
components: { componentServices, applicationResources, ComponentUsed, AbilityDetail },
- data () {
+ data() {
return {
exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
exportExcelCondition: '',
@@ -373,6 +293,7 @@ export default {
choseId: 0,
departmentId: 1,
currentPage: 1,
+ pageSize: 10,
homeIsShow: true,
servicesIsShow: false,
resourcesIsShow: false,
@@ -416,7 +337,7 @@ export default {
endDate: '' // 结束时间
}
},
- created () {
+ created() {
// 当前设定的日期时间
// const d = new Date()
// let year1, month1, day1
@@ -430,7 +351,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)
@@ -445,17 +366,27 @@ export default {
...mapState(['departmentSelects'])
},
methods: {
- closeModal () {
+ closeModal() {
this.detailsVisible = false
},
- handleCurrentChange (val) {
- if (this.choseId === 0) {
- this.getFirstTree(val)
- } else if (this.choseId === 1) {
- this.getReleaseTree(val)
+ handleCurrentChange(val) {
+ console.log('val------------>', val);
+ this.currentPage = val;
+ // todo
+ if(this.departmentId === 3) {
+ this.getOneDetail(val)
}
+ 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: {
@@ -485,7 +416,7 @@ export default {
// },
// 组件服务部门发布情况--改为能力上架统计
- getFirstTree (page) {
+ getFirstTree(page) {
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
@@ -549,7 +480,7 @@ export default {
})
},
// 组件服务部门使用情况列表-改为能力使用统计
- getSecondTree () {
+ getSecondTree() {
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
@@ -564,8 +495,8 @@ export default {
this.$http
.get('/census/center/selectApplyDeptDetailTypeCountList', {
params: {
- // page: page || 1,
- // limit: 5,
+ page: page || 1,
+ limit: this.pageSize,
approveStatus: this.status,
deptId: this.abilityDepartment,
params: '',
@@ -613,7 +544,7 @@ export default {
})
},
// 点击查看详情
- detailClick (row) {
+ detailClick(row) {
this.detailParamss = {}
const applyNumber = row.applyNumber
if (this.departmentId == 3) { // 能力上架
@@ -654,8 +585,8 @@ export default {
})
}
},
- // 能力上架明细
- getOneDetail (page) {
+ // 能力上架明细 能力上架统计
+ getOneDetail(page) {
var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') {
this.status = ''
@@ -671,8 +602,8 @@ export default {
this.$http
.get('/census/center/selectCensusResourceTable', {
params: {
- // limit: 5,
- // page: page || 1,
+ limit: this.pageSize,
+ page: this.currentPage,
approveStatus: this.status,
deptId: this.abilityDepartment,
type: this.abilityType,
@@ -682,7 +613,7 @@ export default {
})
.then((res) => {
console.log('111111', this.tableData, res.data.data)
- this.tableData = res.data.data
+ this.tableData = res.data.data.list
this.total = res.data.data.total
this.exportExcelCondition = qs.stringify({
approveStatus: this.status,
@@ -692,8 +623,8 @@ export default {
})
})
},
- // 能力使用明细
- getTwoDetail (page) {
+ // 能力使用明细 能力使用统计
+ getTwoDetail(page) {
var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') {
this.status = ''
@@ -709,8 +640,8 @@ export default {
this.$http
.get('/census/center/selectCensusApplyTable', {
params: {
- // limit: 5,
- // page: page || 1,
+ limit: this.pageSize,
+ page: this.currentPage,
approveStatus: this.status,
deptId: this.abilityDepartment,
type: this.abilityType,
@@ -719,7 +650,7 @@ export default {
}
})
.then((res) => {
- this.tableData = res.data.data
+ this.tableData = res.data.data.list
this.total = res.data.data.total
this.exportExcelCondition = qs.stringify({
approveStatus: this.status,
@@ -729,7 +660,7 @@ export default {
})
})
},
- getReleaseTree (page) {
+ getReleaseTree(page) {
this.$http
.get('/census/center/selectApplyDeptDetailTypeCountList/', {
params: {
@@ -775,7 +706,7 @@ export default {
})
},
// 应用资源部门使用情况列表
- getUsedTree () {
+ getUsedTree() {
this.$http
.get('/census/center/v3/resourceReleaseDetails/', {
params: {
@@ -789,7 +720,7 @@ export default {
this.tableData = res.data.data.list
})
},
- handleClick (row) {
+ handleClick(row) {
if (this.choseId === 0) {
if (this.departmentId === 1) {
this.homeIsShow = false
@@ -810,7 +741,7 @@ export default {
}
},
// 选择组件
- choseBtn (index) {
+ choseBtn(index) {
this.choseId = index
this.handleChose(1)
},
@@ -826,7 +757,8 @@ export default {
// }
// },
// 选择发布or使用表格
- handleChose (index) {
+ handleChose(index) {
+ this.currentPage = 1;
this.departmentId = index
if (index === 1) {
if (this.choseId === 0) {
@@ -867,26 +799,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)
@@ -898,7 +830,7 @@ export default {
}
},
// 返回按钮
- goToBack () {
+ goToBack() {
// departmentId 1，3 2，4 两个值共同判断
this.detailFlag = !this.detailFlag
if (this.departmentId === 3) {
@@ -911,7 +843,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')
@@ -942,7 +874,7 @@ export default {
}
},
// 重置按钮查询数据
- resetDataList () {
+ resetDataList() {
this.value1 = []
this.startDate = ''
this.endDate = ''
@@ -980,7 +912,7 @@ export default {
}
},
// 定义格式化函数：
- handleTime (time, format) {
+ handleTime(time, format) {
if (time == null || time == undefined || time == '') {
return ''
}
@@ -1019,6 +951,7 @@ export default {
display: flex;
flex-direction: column;
}
+
.container-left {
width: 250px;
height: 1000px;
@@ -1026,11 +959,13 @@ export default {
// background-color: #ffffff;
margin-right: 10px;
}
+
.left-search {
width: 250px;
height: 76px;
background-color: #ffffff;
}
+
.input-style {
width: 210px;
height: 36px;
@@ -1040,11 +975,13 @@ export default {
border: 1px solid transparent;
background-color: #f2f4fa;
}
+
input::placeholder {
font-weight: 400;
font-size: 14px;
color: #b0b3ca;
}
+
.input-search {
width: 44px;
height: 30px;
@@ -1054,10 +991,12 @@ input::placeholder {
top: 38px;
left: 196px;
}
+
::v-deep.tree-style {
.el-tree-node__label {
font-size: 16px;
}
+
.el-tree-node__content {
width: 240px;
overflow: hidden;
@@ -1073,6 +1012,7 @@ input::placeholder {
background-color: #fafafc;
display: inline-block;
}
+
.title {
display: flex;
font-size: 20px;
@@ -1081,10 +1021,12 @@ input::placeholder {
padding-left: 15px;
padding-top: 10px;
}
+
.title-list-style {
display: flex;
margin-top: 10px;
}
+
.title-single {
font-size: 14px;
width: 90px;
@@ -1095,6 +1037,7 @@ input::placeholder {
border-radius: 12px;
cursor: pointer;
}
+
.box-style {
width: 90px;
height: 24px;
@@ -1103,11 +1046,13 @@ input::placeholder {
align-items: center;
padding-bottom: 2px;
}
+
.second-title {
margin-top: 20px;
font-size: 14px;
color: #979eb9;
cursor: pointer;
+
.detail-button {
width: 60px;
height: 30px;
@@ -1121,6 +1066,7 @@ input::placeholder {
color: #fff;
}
}
+
.line-style {
width: 100%;
height: 1px;
@@ -1128,23 +1074,28 @@ input::placeholder {
margin-top: 15px;
margin-bottom: 15px;
}
+
.aui-card--fill {
width: 100% !important;
padding: 0px !important;
}
+
.choseStyle {
color: #526aff;
border: 1px solid #526aff;
}
+
.departmentStyle {
color: #526aff;
}
+
::v-deep .tree-text-styleJ {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-all;
}
+
.export {
display: inline-block;
width: 70px;
@@ -1156,18 +1107,21 @@ input::placeholder {
border: 1px solid #dcdfe6;
color: #000;
}
+
.export:hover {
border-color: #c5ddfd;
background-color: #ecf4fe;
color: #0058e1;
text-decoration: none;
}
+
.export:active {
border-color: #c5ddfd;
background-color: #ecf4fe;
color: #0058e1;
text-decoration: none;
}
+
.export:visited {
color: #fff;
text-decoration: none;