diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js new file mode 100644 index 0000000..5ac221a --- /dev/null +++ b/src/api/assess/assessDept.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function departmentAssess(params) { + return request({ + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', + method: 'get', + params + }) +} diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js new file mode 100644 index 0000000..5ac221a --- /dev/null +++ b/src/api/assess/assessDept.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function departmentAssess(params) { + return request({ + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', + method: 'get', + params + }) +} diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index a5678b4..7aa7c2f 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -130,9 +130,10 @@
案卷图片:
- + +
@@ -157,6 +158,7 @@ diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js new file mode 100644 index 0000000..5ac221a --- /dev/null +++ b/src/api/assess/assessDept.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function departmentAssess(params) { + return request({ + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', + method: 'get', + params + }) +} diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index a5678b4..7aa7c2f 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -130,9 +130,10 @@
案卷图片:
- + +
@@ -157,6 +158,7 @@ diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue index b0d696f..7477c12 100644 --- a/src/views/deptAccess/deptAccess.vue +++ b/src/views/deptAccess/deptAccess.vue @@ -19,14 +19,14 @@ - + 列表模式 - + - + 图表模式 - + 考核规则 @@ -48,6 +48,7 @@ import DeptAccessList from './deptAccessList' import DeptAccessChart from './deptAccessChart' import AccessRule from './accessRule' +import { departmentAssess } from '@/api/assess/assessDept' export default { name: 'DeptAccess', @@ -88,26 +89,7 @@ } }] }, - list: [ - { - deptName: '城管监察二大队', - lastCarryOver: 2, - shouldProcess: 166, - totalShouldProcess: 168, - process: 166, - returnJob: 1, - sumary: 100.03 - }, - { - deptName: '渣土站', - lastCarryOver: 0, - shouldProcess: 21, - totalShouldProcess: 21, - process: 21, - returnJob: 1, - sumary: 99.39 - } - ] + list: [] } }, watch: { @@ -122,21 +104,30 @@ } }, mounted() { - this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD') - this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD') - this.timeRange = [this.query.beginTime, this.query.endTime] + this.fetchData() }, methods: { + fetchData() { + if (this.query.beginTime === '' || this.query.endTime === '') { + this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD') + this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD') + this.timeRange = [this.query.beginTime, this.query.endTime] + } + departmentAssess(this.query).then(res => { + this.list = res.data + }) + }, handleClick(tab, event) { this.activeName = tab.name if (tab.name === 'chart') { + console.log(tab.$children[0]) setTimeout(() => { - tab.$children[0].chart.resize() - }, 50) + tab.$children[0].initChart() + }, 100) } }, search() { - + this.fetchData() }, exportFile() { @@ -145,11 +136,18 @@ } - diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js new file mode 100644 index 0000000..5ac221a --- /dev/null +++ b/src/api/assess/assessDept.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function departmentAssess(params) { + return request({ + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', + method: 'get', + params + }) +} diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index a5678b4..7aa7c2f 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -130,9 +130,10 @@
案卷图片:
- + +
@@ -157,6 +158,7 @@ diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue index b0d696f..7477c12 100644 --- a/src/views/deptAccess/deptAccess.vue +++ b/src/views/deptAccess/deptAccess.vue @@ -19,14 +19,14 @@ - + 列表模式 - + - + 图表模式 - + 考核规则 @@ -48,6 +48,7 @@ import DeptAccessList from './deptAccessList' import DeptAccessChart from './deptAccessChart' import AccessRule from './accessRule' +import { departmentAssess } from '@/api/assess/assessDept' export default { name: 'DeptAccess', @@ -88,26 +89,7 @@ } }] }, - list: [ - { - deptName: '城管监察二大队', - lastCarryOver: 2, - shouldProcess: 166, - totalShouldProcess: 168, - process: 166, - returnJob: 1, - sumary: 100.03 - }, - { - deptName: '渣土站', - lastCarryOver: 0, - shouldProcess: 21, - totalShouldProcess: 21, - process: 21, - returnJob: 1, - sumary: 99.39 - } - ] + list: [] } }, watch: { @@ -122,21 +104,30 @@ } }, mounted() { - this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD') - this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD') - this.timeRange = [this.query.beginTime, this.query.endTime] + this.fetchData() }, methods: { + fetchData() { + if (this.query.beginTime === '' || this.query.endTime === '') { + this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD') + this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD') + this.timeRange = [this.query.beginTime, this.query.endTime] + } + departmentAssess(this.query).then(res => { + this.list = res.data + }) + }, handleClick(tab, event) { this.activeName = tab.name if (tab.name === 'chart') { + console.log(tab.$children[0]) setTimeout(() => { - tab.$children[0].chart.resize() - }, 50) + tab.$children[0].initChart() + }, 100) } }, search() { - + this.fetchData() }, exportFile() { @@ -145,11 +136,18 @@ } - diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue index d385f11..85c2320 100644 --- a/src/views/deptAccess/deptAccessChart.vue +++ b/src/views/deptAccess/deptAccessChart.vue @@ -22,15 +22,15 @@ }, data() { return { - radio: 'sumary', + radio: 'score', radioList: [ { text: '总应处置数', - value: 'totalShouldProcess' + value: 'totalCheckNum' }, { text: '本期应处置数', - value: 'CurrentCheckNum' + value: 'currentCheckNum' }, { text: '返工数', @@ -46,32 +46,37 @@ y: [] } }, - activated() { + watch: { + list() { + this.initChart() + } + }, + mounted() { this.initChart() }, methods: { initChart() { - console.log('init chart') + console.log('init chart', this.list) // 取x,y this.x = [] this.y = [] this.list.forEach(item => { - this.x.push(item.deptName) + this.x.push(item.departName) switch (this.radio) { - case 'totalShouldProcess': { - this.y.push(item.totalShouldProcess) + case 'totalCheckNum': { + this.y.push(item.totalCheckNum) break } - case 'process': { - this.y.push(item.process) + case 'currentCheckNum': { + this.y.push(item.currentCheckNum) break } - case 'returnJob': { - this.y.push(item.returnJob) + case 'redoNum': { + this.y.push(item.redoNum) break } - case 'sumary': { - this.y.push(item.sumary) + case 'score': { + this.y.push(item.score) break } default: break @@ -88,7 +93,16 @@ formatter: (params) => tooltip + '
' + params.name + ':' + params.data }, - color: '#2a7bc4', + toolbox: { + show: true, + right: '20', + feature: { + saveAsImage: { + show: true + } + } + }, + color: '#5ab1ef', xAxis: { data: this.x, axisLabel: { @@ -112,6 +126,7 @@ } }] }) + this.chart.resize() } } } diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js new file mode 100644 index 0000000..5ac221a --- /dev/null +++ b/src/api/assess/assessDept.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function departmentAssess(params) { + return request({ + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', + method: 'get', + params + }) +} diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index a5678b4..7aa7c2f 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -130,9 +130,10 @@
案卷图片:
- + +
@@ -157,6 +158,7 @@ diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue index b0d696f..7477c12 100644 --- a/src/views/deptAccess/deptAccess.vue +++ b/src/views/deptAccess/deptAccess.vue @@ -19,14 +19,14 @@ - + 列表模式 - + - + 图表模式 - + 考核规则 @@ -48,6 +48,7 @@ import DeptAccessList from './deptAccessList' import DeptAccessChart from './deptAccessChart' import AccessRule from './accessRule' +import { departmentAssess } from '@/api/assess/assessDept' export default { name: 'DeptAccess', @@ -88,26 +89,7 @@ } }] }, - list: [ - { - deptName: '城管监察二大队', - lastCarryOver: 2, - shouldProcess: 166, - totalShouldProcess: 168, - process: 166, - returnJob: 1, - sumary: 100.03 - }, - { - deptName: '渣土站', - lastCarryOver: 0, - shouldProcess: 21, - totalShouldProcess: 21, - process: 21, - returnJob: 1, - sumary: 99.39 - } - ] + list: [] } }, watch: { @@ -122,21 +104,30 @@ } }, mounted() { - this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD') - this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD') - this.timeRange = [this.query.beginTime, this.query.endTime] + this.fetchData() }, methods: { + fetchData() { + if (this.query.beginTime === '' || this.query.endTime === '') { + this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD') + this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD') + this.timeRange = [this.query.beginTime, this.query.endTime] + } + departmentAssess(this.query).then(res => { + this.list = res.data + }) + }, handleClick(tab, event) { this.activeName = tab.name if (tab.name === 'chart') { + console.log(tab.$children[0]) setTimeout(() => { - tab.$children[0].chart.resize() - }, 50) + tab.$children[0].initChart() + }, 100) } }, search() { - + this.fetchData() }, exportFile() { @@ -145,11 +136,18 @@ } - diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue index d385f11..85c2320 100644 --- a/src/views/deptAccess/deptAccessChart.vue +++ b/src/views/deptAccess/deptAccessChart.vue @@ -22,15 +22,15 @@ }, data() { return { - radio: 'sumary', + radio: 'score', radioList: [ { text: '总应处置数', - value: 'totalShouldProcess' + value: 'totalCheckNum' }, { text: '本期应处置数', - value: 'CurrentCheckNum' + value: 'currentCheckNum' }, { text: '返工数', @@ -46,32 +46,37 @@ y: [] } }, - activated() { + watch: { + list() { + this.initChart() + } + }, + mounted() { this.initChart() }, methods: { initChart() { - console.log('init chart') + console.log('init chart', this.list) // 取x,y this.x = [] this.y = [] this.list.forEach(item => { - this.x.push(item.deptName) + this.x.push(item.departName) switch (this.radio) { - case 'totalShouldProcess': { - this.y.push(item.totalShouldProcess) + case 'totalCheckNum': { + this.y.push(item.totalCheckNum) break } - case 'process': { - this.y.push(item.process) + case 'currentCheckNum': { + this.y.push(item.currentCheckNum) break } - case 'returnJob': { - this.y.push(item.returnJob) + case 'redoNum': { + this.y.push(item.redoNum) break } - case 'sumary': { - this.y.push(item.sumary) + case 'score': { + this.y.push(item.score) break } default: break @@ -88,7 +93,16 @@ formatter: (params) => tooltip + '
' + params.name + ':' + params.data }, - color: '#2a7bc4', + toolbox: { + show: true, + right: '20', + feature: { + saveAsImage: { + show: true + } + } + }, + color: '#5ab1ef', xAxis: { data: this.x, axisLabel: { @@ -112,6 +126,7 @@ } }] }) + this.chart.resize() } } } diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue index 4122976..7336e60 100644 --- a/src/views/deptAccess/deptAccessList.vue +++ b/src/views/deptAccess/deptAccessList.vue @@ -24,6 +24,10 @@ default() { return [] } + }, + query: { + type: Object, + default: null } }, data() { @@ -31,7 +35,7 @@ tableColumns: [ { text: '单位名称', - value: 'deptName', + value: 'departName', type: 'text' }, { @@ -42,7 +46,7 @@ }, { text: '本期应处置数', - value: 'CurrentCheckNum', + value: 'currentCheckNum', width: 60, type: 'button' }, @@ -55,13 +59,13 @@ { text: '工作量比例', value: 'workRate', - width: 60, + width: 65, type: 'text' }, { text: '工作量调节得分', value: 'workGrade', - width: 60, + width: 65, type: 'text' }, { @@ -91,19 +95,19 @@ { text: '超期未处置率', value: 'delayUnCheckRate', - width: 60, + width: 65, type: 'text' }, { text: '超期率', value: 'delayCheckRate', - width: 60, + width: 65, type: 'text' }, { text: '超期未处置扣分', value: 'delayUncheckGrade', - width: 60, + width: 65, type: 'text' }, { @@ -115,7 +119,7 @@ { text: '返工率', value: 'redoRate', - width: 60, + width: 65, type: 'text' }, { @@ -139,7 +143,7 @@ { text: '等级', value: 'grade', - width: 60, + width: 55, type: 'text' } ] @@ -147,7 +151,18 @@ }, methods: { showCaseList(row, value) { - console.log(row, value) + console.log(row, value, row[value]) + if (row[value] > 0) { + this.$router.push({ + path: '/assessDeptCaseList', + query: { + begTime: this.query.beginTime, + endTime: this.query.endTime, + caseType: value, + departmentId: row.depId + } + }) + } } } } diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js new file mode 100644 index 0000000..5ac221a --- /dev/null +++ b/src/api/assess/assessDept.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function departmentAssess(params) { + return request({ + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', + method: 'get', + params + }) +} diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index a5678b4..7aa7c2f 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -130,9 +130,10 @@
案卷图片:
- + +
@@ -157,6 +158,7 @@ diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue index b0d696f..7477c12 100644 --- a/src/views/deptAccess/deptAccess.vue +++ b/src/views/deptAccess/deptAccess.vue @@ -19,14 +19,14 @@ - + 列表模式 - + - + 图表模式 - + 考核规则 @@ -48,6 +48,7 @@ import DeptAccessList from './deptAccessList' import DeptAccessChart from './deptAccessChart' import AccessRule from './accessRule' +import { departmentAssess } from '@/api/assess/assessDept' export default { name: 'DeptAccess', @@ -88,26 +89,7 @@ } }] }, - list: [ - { - deptName: '城管监察二大队', - lastCarryOver: 2, - shouldProcess: 166, - totalShouldProcess: 168, - process: 166, - returnJob: 1, - sumary: 100.03 - }, - { - deptName: '渣土站', - lastCarryOver: 0, - shouldProcess: 21, - totalShouldProcess: 21, - process: 21, - returnJob: 1, - sumary: 99.39 - } - ] + list: [] } }, watch: { @@ -122,21 +104,30 @@ } }, mounted() { - this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD') - this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD') - this.timeRange = [this.query.beginTime, this.query.endTime] + this.fetchData() }, methods: { + fetchData() { + if (this.query.beginTime === '' || this.query.endTime === '') { + this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD') + this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD') + this.timeRange = [this.query.beginTime, this.query.endTime] + } + departmentAssess(this.query).then(res => { + this.list = res.data + }) + }, handleClick(tab, event) { this.activeName = tab.name if (tab.name === 'chart') { + console.log(tab.$children[0]) setTimeout(() => { - tab.$children[0].chart.resize() - }, 50) + tab.$children[0].initChart() + }, 100) } }, search() { - + this.fetchData() }, exportFile() { @@ -145,11 +136,18 @@ } - diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue index d385f11..85c2320 100644 --- a/src/views/deptAccess/deptAccessChart.vue +++ b/src/views/deptAccess/deptAccessChart.vue @@ -22,15 +22,15 @@ }, data() { return { - radio: 'sumary', + radio: 'score', radioList: [ { text: '总应处置数', - value: 'totalShouldProcess' + value: 'totalCheckNum' }, { text: '本期应处置数', - value: 'CurrentCheckNum' + value: 'currentCheckNum' }, { text: '返工数', @@ -46,32 +46,37 @@ y: [] } }, - activated() { + watch: { + list() { + this.initChart() + } + }, + mounted() { this.initChart() }, methods: { initChart() { - console.log('init chart') + console.log('init chart', this.list) // 取x,y this.x = [] this.y = [] this.list.forEach(item => { - this.x.push(item.deptName) + this.x.push(item.departName) switch (this.radio) { - case 'totalShouldProcess': { - this.y.push(item.totalShouldProcess) + case 'totalCheckNum': { + this.y.push(item.totalCheckNum) break } - case 'process': { - this.y.push(item.process) + case 'currentCheckNum': { + this.y.push(item.currentCheckNum) break } - case 'returnJob': { - this.y.push(item.returnJob) + case 'redoNum': { + this.y.push(item.redoNum) break } - case 'sumary': { - this.y.push(item.sumary) + case 'score': { + this.y.push(item.score) break } default: break @@ -88,7 +93,16 @@ formatter: (params) => tooltip + '
' + params.name + ':' + params.data }, - color: '#2a7bc4', + toolbox: { + show: true, + right: '20', + feature: { + saveAsImage: { + show: true + } + } + }, + color: '#5ab1ef', xAxis: { data: this.x, axisLabel: { @@ -112,6 +126,7 @@ } }] }) + this.chart.resize() } } } diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue index 4122976..7336e60 100644 --- a/src/views/deptAccess/deptAccessList.vue +++ b/src/views/deptAccess/deptAccessList.vue @@ -24,6 +24,10 @@ default() { return [] } + }, + query: { + type: Object, + default: null } }, data() { @@ -31,7 +35,7 @@ tableColumns: [ { text: '单位名称', - value: 'deptName', + value: 'departName', type: 'text' }, { @@ -42,7 +46,7 @@ }, { text: '本期应处置数', - value: 'CurrentCheckNum', + value: 'currentCheckNum', width: 60, type: 'button' }, @@ -55,13 +59,13 @@ { text: '工作量比例', value: 'workRate', - width: 60, + width: 65, type: 'text' }, { text: '工作量调节得分', value: 'workGrade', - width: 60, + width: 65, type: 'text' }, { @@ -91,19 +95,19 @@ { text: '超期未处置率', value: 'delayUnCheckRate', - width: 60, + width: 65, type: 'text' }, { text: '超期率', value: 'delayCheckRate', - width: 60, + width: 65, type: 'text' }, { text: '超期未处置扣分', value: 'delayUncheckGrade', - width: 60, + width: 65, type: 'text' }, { @@ -115,7 +119,7 @@ { text: '返工率', value: 'redoRate', - width: 60, + width: 65, type: 'text' }, { @@ -139,7 +143,7 @@ { text: '等级', value: 'grade', - width: 60, + width: 55, type: 'text' } ] @@ -147,7 +151,18 @@ }, methods: { showCaseList(row, value) { - console.log(row, value) + console.log(row, value, row[value]) + if (row[value] > 0) { + this.$router.push({ + path: '/assessDeptCaseList', + query: { + begTime: this.query.beginTime, + endTime: this.query.endTime, + caseType: value, + departmentId: row.depId + } + }) + } } } } diff --git a/src/views/otherComment/highFreq/highFreqChart.vue b/src/views/otherComment/highFreq/highFreqChart.vue index dbb738c..180d5d6 100644 --- a/src/views/otherComment/highFreq/highFreqChart.vue +++ b/src/views/otherComment/highFreq/highFreqChart.vue @@ -40,13 +40,20 @@ }, toolbox: { show: true, + right: '20', feature: { saveAsImage: { show: true } } }, - // color: ['#afa3f5', '#00d488', '#3feed4', '#3bafff', '#f1bb4c', 'rgba(250,250,250,0.5)'], + color: [ + '#19d4ae', '#5ab1ef', '#fa6e86', + '#ffb980', '#0067a6', '#c4b4e4', + '#d87a80', '#9cbbff', '#d9d0c7', + '#87a997', '#d49ea2', '#5b4947', + '#7ba3a8' + ], series: [{ name: '高发问题', type: 'pie', diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js new file mode 100644 index 0000000..5ac221a --- /dev/null +++ b/src/api/assess/assessDept.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function departmentAssess(params) { + return request({ + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', + method: 'get', + params + }) +} diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index a5678b4..7aa7c2f 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -130,9 +130,10 @@
案卷图片:
- + +
@@ -157,6 +158,7 @@ diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue index b0d696f..7477c12 100644 --- a/src/views/deptAccess/deptAccess.vue +++ b/src/views/deptAccess/deptAccess.vue @@ -19,14 +19,14 @@ - + 列表模式 - + - + 图表模式 - + 考核规则 @@ -48,6 +48,7 @@ import DeptAccessList from './deptAccessList' import DeptAccessChart from './deptAccessChart' import AccessRule from './accessRule' +import { departmentAssess } from '@/api/assess/assessDept' export default { name: 'DeptAccess', @@ -88,26 +89,7 @@ } }] }, - list: [ - { - deptName: '城管监察二大队', - lastCarryOver: 2, - shouldProcess: 166, - totalShouldProcess: 168, - process: 166, - returnJob: 1, - sumary: 100.03 - }, - { - deptName: '渣土站', - lastCarryOver: 0, - shouldProcess: 21, - totalShouldProcess: 21, - process: 21, - returnJob: 1, - sumary: 99.39 - } - ] + list: [] } }, watch: { @@ -122,21 +104,30 @@ } }, mounted() { - this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD') - this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD') - this.timeRange = [this.query.beginTime, this.query.endTime] + this.fetchData() }, methods: { + fetchData() { + if (this.query.beginTime === '' || this.query.endTime === '') { + this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD') + this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD') + this.timeRange = [this.query.beginTime, this.query.endTime] + } + departmentAssess(this.query).then(res => { + this.list = res.data + }) + }, handleClick(tab, event) { this.activeName = tab.name if (tab.name === 'chart') { + console.log(tab.$children[0]) setTimeout(() => { - tab.$children[0].chart.resize() - }, 50) + tab.$children[0].initChart() + }, 100) } }, search() { - + this.fetchData() }, exportFile() { @@ -145,11 +136,18 @@ } - diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue index d385f11..85c2320 100644 --- a/src/views/deptAccess/deptAccessChart.vue +++ b/src/views/deptAccess/deptAccessChart.vue @@ -22,15 +22,15 @@ }, data() { return { - radio: 'sumary', + radio: 'score', radioList: [ { text: '总应处置数', - value: 'totalShouldProcess' + value: 'totalCheckNum' }, { text: '本期应处置数', - value: 'CurrentCheckNum' + value: 'currentCheckNum' }, { text: '返工数', @@ -46,32 +46,37 @@ y: [] } }, - activated() { + watch: { + list() { + this.initChart() + } + }, + mounted() { this.initChart() }, methods: { initChart() { - console.log('init chart') + console.log('init chart', this.list) // 取x,y this.x = [] this.y = [] this.list.forEach(item => { - this.x.push(item.deptName) + this.x.push(item.departName) switch (this.radio) { - case 'totalShouldProcess': { - this.y.push(item.totalShouldProcess) + case 'totalCheckNum': { + this.y.push(item.totalCheckNum) break } - case 'process': { - this.y.push(item.process) + case 'currentCheckNum': { + this.y.push(item.currentCheckNum) break } - case 'returnJob': { - this.y.push(item.returnJob) + case 'redoNum': { + this.y.push(item.redoNum) break } - case 'sumary': { - this.y.push(item.sumary) + case 'score': { + this.y.push(item.score) break } default: break @@ -88,7 +93,16 @@ formatter: (params) => tooltip + '
' + params.name + ':' + params.data }, - color: '#2a7bc4', + toolbox: { + show: true, + right: '20', + feature: { + saveAsImage: { + show: true + } + } + }, + color: '#5ab1ef', xAxis: { data: this.x, axisLabel: { @@ -112,6 +126,7 @@ } }] }) + this.chart.resize() } } } diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue index 4122976..7336e60 100644 --- a/src/views/deptAccess/deptAccessList.vue +++ b/src/views/deptAccess/deptAccessList.vue @@ -24,6 +24,10 @@ default() { return [] } + }, + query: { + type: Object, + default: null } }, data() { @@ -31,7 +35,7 @@ tableColumns: [ { text: '单位名称', - value: 'deptName', + value: 'departName', type: 'text' }, { @@ -42,7 +46,7 @@ }, { text: '本期应处置数', - value: 'CurrentCheckNum', + value: 'currentCheckNum', width: 60, type: 'button' }, @@ -55,13 +59,13 @@ { text: '工作量比例', value: 'workRate', - width: 60, + width: 65, type: 'text' }, { text: '工作量调节得分', value: 'workGrade', - width: 60, + width: 65, type: 'text' }, { @@ -91,19 +95,19 @@ { text: '超期未处置率', value: 'delayUnCheckRate', - width: 60, + width: 65, type: 'text' }, { text: '超期率', value: 'delayCheckRate', - width: 60, + width: 65, type: 'text' }, { text: '超期未处置扣分', value: 'delayUncheckGrade', - width: 60, + width: 65, type: 'text' }, { @@ -115,7 +119,7 @@ { text: '返工率', value: 'redoRate', - width: 60, + width: 65, type: 'text' }, { @@ -139,7 +143,7 @@ { text: '等级', value: 'grade', - width: 60, + width: 55, type: 'text' } ] @@ -147,7 +151,18 @@ }, methods: { showCaseList(row, value) { - console.log(row, value) + console.log(row, value, row[value]) + if (row[value] > 0) { + this.$router.push({ + path: '/assessDeptCaseList', + query: { + begTime: this.query.beginTime, + endTime: this.query.endTime, + caseType: value, + departmentId: row.depId + } + }) + } } } } diff --git a/src/views/otherComment/highFreq/highFreqChart.vue b/src/views/otherComment/highFreq/highFreqChart.vue index dbb738c..180d5d6 100644 --- a/src/views/otherComment/highFreq/highFreqChart.vue +++ b/src/views/otherComment/highFreq/highFreqChart.vue @@ -40,13 +40,20 @@ }, toolbox: { show: true, + right: '20', feature: { saveAsImage: { show: true } } }, - // color: ['#afa3f5', '#00d488', '#3feed4', '#3bafff', '#f1bb4c', 'rgba(250,250,250,0.5)'], + color: [ + '#19d4ae', '#5ab1ef', '#fa6e86', + '#ffb980', '#0067a6', '#c4b4e4', + '#d87a80', '#9cbbff', '#d9d0c7', + '#87a997', '#d49ea2', '#5b4947', + '#7ba3a8' + ], series: [{ name: '高发问题', type: 'pie', diff --git a/src/views/otherComment/sourceStatis/sourceStatisChart.vue b/src/views/otherComment/sourceStatis/sourceStatisChart.vue index db0567b..5aa6a98 100644 --- a/src/views/otherComment/sourceStatis/sourceStatisChart.vue +++ b/src/views/otherComment/sourceStatis/sourceStatisChart.vue @@ -38,6 +38,22 @@ tooltip: { show: true }, + toolbox: { + show: true, + right: '20', + feature: { + saveAsImage: { + show: true + } + } + }, + color: [ + '#19d4ae', '#5ab1ef', '#fa6e86', + '#ffb980', '#0067a6', '#c4b4e4', + '#d87a80', '#9cbbff', '#d9d0c7', + '#87a997', '#d49ea2', '#5b4947', + '#7ba3a8' + ], series: [{ name: '问题来源', type: 'pie',