diff --git a/src/api/assess/assessRegion.js b/src/api/assess/assessRegion.js index ad190b7..153488f 100644 --- a/src/api/assess/assessRegion.js +++ b/src/api/assess/assessRegion.js @@ -3,7 +3,7 @@ // 行政区域评价列表查询 export function assessArea(params) { return request({ - url: '/assess/supervisor', + url: '/assess/area', method: 'get', params }) @@ -22,7 +22,7 @@ // 整体概况列表查询 export function assessOverview(params) { return request({ - url: '/assess/supervisor', + url: '/assess/overview', method: 'get', params }) diff --git a/src/api/assess/assessRegion.js b/src/api/assess/assessRegion.js index ad190b7..153488f 100644 --- a/src/api/assess/assessRegion.js +++ b/src/api/assess/assessRegion.js @@ -3,7 +3,7 @@ // 行政区域评价列表查询 export function assessArea(params) { return request({ - url: '/assess/supervisor', + url: '/assess/area', method: 'get', params }) @@ -22,7 +22,7 @@ // 整体概况列表查询 export function assessOverview(params) { return request({ - url: '/assess/supervisor', + url: '/assess/overview', method: 'get', params }) diff --git a/src/views/assessRegion/assessArea.vue b/src/views/assessRegion/assessArea.vue index 9c74e99..a8e19ad 100644 --- a/src/views/assessRegion/assessArea.vue +++ b/src/views/assessRegion/assessArea.vue @@ -91,32 +91,32 @@ columns: [ { text: '区域名称', - value: 'name' + value: 'areaName' }, { text: '公众举报率', - value: 'percent' + value: 'publicReportRate' }, { text: '立案数', - value: 'value' + value: 'register' }, { text: '结案数', - value: 'value' + value: 'close' }, { text: '结案率', - value: 'percent' + value: 'closeRate' }, { text: '综合指标', - value: 'percent' + value: 'score' }, { text: '等级', - value: 'level' + value: 'grade' } ], listQuery: { @@ -162,18 +162,11 @@ this.listQuery.beginDate = this.timeRange[0] this.listQuery.endDate = this.timeRange[1] } - // assessArea(this.listQuery).then(res => { - // this.caseList = res.data.rows - // this.total = parseInt(res.data.total) - // this.listLoading = false - // }) - this.list = [ - { name: 'XX镇', value: '0', percent: '100%', level: 'A' }, - { name: 'XX镇', value: '0', percent: '100%', level: 'A' }, - { name: 'XX镇', value: '0', percent: '100%', level: 'A' }, - { name: 'XX镇', value: '0', percent: '100%', level: 'A' } - ] - this.listLoading = false + assessArea(this.listQuery).then(res => { + this.list = res.data + this.total = res.data.length + this.listLoading = false + }) }, showCaseList(row, value) { debugger diff --git a/src/api/assess/assessRegion.js b/src/api/assess/assessRegion.js index ad190b7..153488f 100644 --- a/src/api/assess/assessRegion.js +++ b/src/api/assess/assessRegion.js @@ -3,7 +3,7 @@ // 行政区域评价列表查询 export function assessArea(params) { return request({ - url: '/assess/supervisor', + url: '/assess/area', method: 'get', params }) @@ -22,7 +22,7 @@ // 整体概况列表查询 export function assessOverview(params) { return request({ - url: '/assess/supervisor', + url: '/assess/overview', method: 'get', params }) diff --git a/src/views/assessRegion/assessArea.vue b/src/views/assessRegion/assessArea.vue index 9c74e99..a8e19ad 100644 --- a/src/views/assessRegion/assessArea.vue +++ b/src/views/assessRegion/assessArea.vue @@ -91,32 +91,32 @@ columns: [ { text: '区域名称', - value: 'name' + value: 'areaName' }, { text: '公众举报率', - value: 'percent' + value: 'publicReportRate' }, { text: '立案数', - value: 'value' + value: 'register' }, { text: '结案数', - value: 'value' + value: 'close' }, { text: '结案率', - value: 'percent' + value: 'closeRate' }, { text: '综合指标', - value: 'percent' + value: 'score' }, { text: '等级', - value: 'level' + value: 'grade' } ], listQuery: { @@ -162,18 +162,11 @@ this.listQuery.beginDate = this.timeRange[0] this.listQuery.endDate = this.timeRange[1] } - // assessArea(this.listQuery).then(res => { - // this.caseList = res.data.rows - // this.total = parseInt(res.data.total) - // this.listLoading = false - // }) - this.list = [ - { name: 'XX镇', value: '0', percent: '100%', level: 'A' }, - { name: 'XX镇', value: '0', percent: '100%', level: 'A' }, - { name: 'XX镇', value: '0', percent: '100%', level: 'A' }, - { name: 'XX镇', value: '0', percent: '100%', level: 'A' } - ] - this.listLoading = false + assessArea(this.listQuery).then(res => { + this.list = res.data + this.total = res.data.length + this.listLoading = false + }) }, showCaseList(row, value) { debugger diff --git a/src/views/assessRegion/assessOverview.vue b/src/views/assessRegion/assessOverview.vue index 1468bdc..e3f5813 100644 --- a/src/views/assessRegion/assessOverview.vue +++ b/src/views/assessRegion/assessOverview.vue @@ -90,70 +90,70 @@ columns: [ { text: '总上报数', - value: 'value' + value: 'report' }, { text: '快速上报数', - value: 'value' + value: 'quickReport' }, { text: '普通上报数', - value: 'value' + value: 'normalReport' }, { text: '待核实', - value: 'value', + value: 'toVerify', width: 70 }, { text: '立案数', - value: 'value' + value: 'register' }, { text: '无效案卷数', - value: 'value', + value: 'invalid', width: 70 }, { text: '有效上报率', - value: 'percent', + value: 'validReportRate', width: 70 }, { text: '按期处理数', - value: 'value' + value: 'proOntime' }, { text: '按期处理率', - value: 'percent', + value: 'proOntimeRate', width: 70 }, { text: '处理数', - value: 'value' + value: 'process' }, { text: '处理率', - value: 'percent', + value: 'proRate', width: 60 }, { text: '按期结案数', - value: 'value' + value: 'closeOntime' }, { text: '按期结案率', - value: 'percent', + value: 'closeOntimeRate', width: 70 }, { text: '结案数', - value: 'percent', + value: 'close', width: 70 }, { text: '结案率', - value: 'percent', + value: 'closeRate', width: 60 } ], @@ -200,18 +200,14 @@ this.listQuery.beginDate = this.timeRange[0] this.listQuery.endDate = this.timeRange[1] } - // assessOverview(this.listQuery).then(res => { - // this.caseList = res.data.rows - // this.total = parseInt(res.data.total) - // this.listLoading = false - // }) - this.list = [ - { name: '张三', value: '14254', percent: '100%', level: 'A' } - ] + assessOverview(this.listQuery).then(res => { + this.list = res.data + this.total = res.data.length + this.listLoading = false + }) this.listLoading = false }, showCaseList(row, value) { - debugger const query = { personId: row.personId, beginDate: this.listQuery.beginDate, diff --git a/src/api/assess/assessRegion.js b/src/api/assess/assessRegion.js index ad190b7..153488f 100644 --- a/src/api/assess/assessRegion.js +++ b/src/api/assess/assessRegion.js @@ -3,7 +3,7 @@ // 行政区域评价列表查询 export function assessArea(params) { return request({ - url: '/assess/supervisor', + url: '/assess/area', method: 'get', params }) @@ -22,7 +22,7 @@ // 整体概况列表查询 export function assessOverview(params) { return request({ - url: '/assess/supervisor', + url: '/assess/overview', method: 'get', params }) diff --git a/src/views/assessRegion/assessArea.vue b/src/views/assessRegion/assessArea.vue index 9c74e99..a8e19ad 100644 --- a/src/views/assessRegion/assessArea.vue +++ b/src/views/assessRegion/assessArea.vue @@ -91,32 +91,32 @@ columns: [ { text: '区域名称', - value: 'name' + value: 'areaName' }, { text: '公众举报率', - value: 'percent' + value: 'publicReportRate' }, { text: '立案数', - value: 'value' + value: 'register' }, { text: '结案数', - value: 'value' + value: 'close' }, { text: '结案率', - value: 'percent' + value: 'closeRate' }, { text: '综合指标', - value: 'percent' + value: 'score' }, { text: '等级', - value: 'level' + value: 'grade' } ], listQuery: { @@ -162,18 +162,11 @@ this.listQuery.beginDate = this.timeRange[0] this.listQuery.endDate = this.timeRange[1] } - // assessArea(this.listQuery).then(res => { - // this.caseList = res.data.rows - // this.total = parseInt(res.data.total) - // this.listLoading = false - // }) - this.list = [ - { name: 'XX镇', value: '0', percent: '100%', level: 'A' }, - { name: 'XX镇', value: '0', percent: '100%', level: 'A' }, - { name: 'XX镇', value: '0', percent: '100%', level: 'A' }, - { name: 'XX镇', value: '0', percent: '100%', level: 'A' } - ] - this.listLoading = false + assessArea(this.listQuery).then(res => { + this.list = res.data + this.total = res.data.length + this.listLoading = false + }) }, showCaseList(row, value) { debugger diff --git a/src/views/assessRegion/assessOverview.vue b/src/views/assessRegion/assessOverview.vue index 1468bdc..e3f5813 100644 --- a/src/views/assessRegion/assessOverview.vue +++ b/src/views/assessRegion/assessOverview.vue @@ -90,70 +90,70 @@ columns: [ { text: '总上报数', - value: 'value' + value: 'report' }, { text: '快速上报数', - value: 'value' + value: 'quickReport' }, { text: '普通上报数', - value: 'value' + value: 'normalReport' }, { text: '待核实', - value: 'value', + value: 'toVerify', width: 70 }, { text: '立案数', - value: 'value' + value: 'register' }, { text: '无效案卷数', - value: 'value', + value: 'invalid', width: 70 }, { text: '有效上报率', - value: 'percent', + value: 'validReportRate', width: 70 }, { text: '按期处理数', - value: 'value' + value: 'proOntime' }, { text: '按期处理率', - value: 'percent', + value: 'proOntimeRate', width: 70 }, { text: '处理数', - value: 'value' + value: 'process' }, { text: '处理率', - value: 'percent', + value: 'proRate', width: 60 }, { text: '按期结案数', - value: 'value' + value: 'closeOntime' }, { text: '按期结案率', - value: 'percent', + value: 'closeOntimeRate', width: 70 }, { text: '结案数', - value: 'percent', + value: 'close', width: 70 }, { text: '结案率', - value: 'percent', + value: 'closeRate', width: 60 } ], @@ -200,18 +200,14 @@ this.listQuery.beginDate = this.timeRange[0] this.listQuery.endDate = this.timeRange[1] } - // assessOverview(this.listQuery).then(res => { - // this.caseList = res.data.rows - // this.total = parseInt(res.data.total) - // this.listLoading = false - // }) - this.list = [ - { name: '张三', value: '14254', percent: '100%', level: 'A' } - ] + assessOverview(this.listQuery).then(res => { + this.list = res.data + this.total = res.data.length + this.listLoading = false + }) this.listLoading = false }, showCaseList(row, value) { - debugger const query = { personId: row.personId, beginDate: this.listQuery.beginDate, diff --git a/src/views/caseCommon/assessCaseList.vue b/src/views/caseCommon/assessCaseList.vue index 7ac36c3..8418ad6 100644 --- a/src/views/caseCommon/assessCaseList.vue +++ b/src/views/caseCommon/assessCaseList.vue @@ -1,3 +1,4 @@ +