diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js index 68f930b..5ac221a 100644 --- a/src/api/assess/assessDept.js +++ b/src/api/assess/assessDept.js @@ -2,7 +2,15 @@ export function departmentAssess(params) { return request({ - url: '/assess/departmentAccess/', + 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 index 68f930b..5ac221a 100644 --- a/src/api/assess/assessDept.js +++ b/src/api/assess/assessDept.js @@ -2,7 +2,15 @@ export function departmentAssess(params) { return request({ - url: '/assess/departmentAccess/', + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', method: 'get', params }) diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js index bf5d237..032d7ef 100644 --- a/src/components/CaseCommon/radioMap.js +++ b/src/components/CaseCommon/radioMap.js @@ -21,7 +21,7 @@ }, 'BTY': { // 不同意 showComp: null, - passBack: 'onedeptid' + passBack: 'processPersonId' }, 'BYLA': { // 不予立案 showComp: null, diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js index 68f930b..5ac221a 100644 --- a/src/api/assess/assessDept.js +++ b/src/api/assess/assessDept.js @@ -2,7 +2,15 @@ export function departmentAssess(params) { return request({ - url: '/assess/departmentAccess/', + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', method: 'get', params }) diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js index bf5d237..032d7ef 100644 --- a/src/components/CaseCommon/radioMap.js +++ b/src/components/CaseCommon/radioMap.js @@ -21,7 +21,7 @@ }, 'BTY': { // 不同意 showComp: null, - passBack: 'onedeptid' + passBack: 'processPersonId' }, 'BYLA': { // 不予立案 showComp: null, diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 01d0563..794613a 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -38,6 +38,13 @@ component: () => import('@/views/caseCommon/assessCaseList'), hidden: true, meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } + }, + { + path: '/assessDeptCaseList', + name: 'AssessDeptCaseList', + component: () => import('@/views/deptAccess/assessDeptCaseList'), + hidden: true, + meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } } ] } diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js index 68f930b..5ac221a 100644 --- a/src/api/assess/assessDept.js +++ b/src/api/assess/assessDept.js @@ -2,7 +2,15 @@ export function departmentAssess(params) { return request({ - url: '/assess/departmentAccess/', + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', method: 'get', params }) diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js index bf5d237..032d7ef 100644 --- a/src/components/CaseCommon/radioMap.js +++ b/src/components/CaseCommon/radioMap.js @@ -21,7 +21,7 @@ }, 'BTY': { // 不同意 showComp: null, - passBack: 'onedeptid' + passBack: 'processPersonId' }, 'BYLA': { // 不予立案 showComp: null, diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 01d0563..794613a 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -38,6 +38,13 @@ component: () => import('@/views/caseCommon/assessCaseList'), hidden: true, meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } + }, + { + path: '/assessDeptCaseList', + name: 'AssessDeptCaseList', + component: () => import('@/views/deptAccess/assessDeptCaseList'), + hidden: true, + meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } } ] } diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index 318de50..df579df 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -44,7 +44,7 @@
- + 需要 不需要 @@ -54,7 +54,7 @@
- + 需要 不需要 diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js index 68f930b..5ac221a 100644 --- a/src/api/assess/assessDept.js +++ b/src/api/assess/assessDept.js @@ -2,7 +2,15 @@ export function departmentAssess(params) { return request({ - url: '/assess/departmentAccess/', + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', method: 'get', params }) diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js index bf5d237..032d7ef 100644 --- a/src/components/CaseCommon/radioMap.js +++ b/src/components/CaseCommon/radioMap.js @@ -21,7 +21,7 @@ }, 'BTY': { // 不同意 showComp: null, - passBack: 'onedeptid' + passBack: 'processPersonId' }, 'BYLA': { // 不予立案 showComp: null, diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 01d0563..794613a 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -38,6 +38,13 @@ component: () => import('@/views/caseCommon/assessCaseList'), hidden: true, meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } + }, + { + path: '/assessDeptCaseList', + name: 'AssessDeptCaseList', + component: () => import('@/views/deptAccess/assessDeptCaseList'), + hidden: true, + meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } } ] } diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index 318de50..df579df 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -44,7 +44,7 @@
- + 需要 不需要 @@ -54,7 +54,7 @@
- + 需要 不需要 diff --git a/src/views/deptAccess/assessDeptCaseList.vue b/src/views/deptAccess/assessDeptCaseList.vue new file mode 100644 index 0000000..ac4ac7d --- /dev/null +++ b/src/views/deptAccess/assessDeptCaseList.vue @@ -0,0 +1,102 @@ + + + diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js index 68f930b..5ac221a 100644 --- a/src/api/assess/assessDept.js +++ b/src/api/assess/assessDept.js @@ -2,7 +2,15 @@ export function departmentAssess(params) { return request({ - url: '/assess/departmentAccess/', + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', method: 'get', params }) diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js index bf5d237..032d7ef 100644 --- a/src/components/CaseCommon/radioMap.js +++ b/src/components/CaseCommon/radioMap.js @@ -21,7 +21,7 @@ }, 'BTY': { // 不同意 showComp: null, - passBack: 'onedeptid' + passBack: 'processPersonId' }, 'BYLA': { // 不予立案 showComp: null, diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 01d0563..794613a 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -38,6 +38,13 @@ component: () => import('@/views/caseCommon/assessCaseList'), hidden: true, meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } + }, + { + path: '/assessDeptCaseList', + name: 'AssessDeptCaseList', + component: () => import('@/views/deptAccess/assessDeptCaseList'), + hidden: true, + meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } } ] } diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index 318de50..df579df 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -44,7 +44,7 @@
- + 需要 不需要 @@ -54,7 +54,7 @@
- + 需要 不需要 diff --git a/src/views/deptAccess/assessDeptCaseList.vue b/src/views/deptAccess/assessDeptCaseList.vue new file mode 100644 index 0000000..ac4ac7d --- /dev/null +++ b/src/views/deptAccess/assessDeptCaseList.vue @@ -0,0 +1,102 @@ + + + diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue index 4e9dcf1..7477c12 100644 --- a/src/views/deptAccess/deptAccess.vue +++ b/src/views/deptAccess/deptAccess.vue @@ -19,14 +19,14 @@
- + 列表模式 - + - + 图表模式 - + 考核规则 @@ -120,13 +120,14 @@ 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() { @@ -135,11 +136,18 @@ } - diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js index 68f930b..5ac221a 100644 --- a/src/api/assess/assessDept.js +++ b/src/api/assess/assessDept.js @@ -2,7 +2,15 @@ export function departmentAssess(params) { return request({ - url: '/assess/departmentAccess/', + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', method: 'get', params }) diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js index bf5d237..032d7ef 100644 --- a/src/components/CaseCommon/radioMap.js +++ b/src/components/CaseCommon/radioMap.js @@ -21,7 +21,7 @@ }, 'BTY': { // 不同意 showComp: null, - passBack: 'onedeptid' + passBack: 'processPersonId' }, 'BYLA': { // 不予立案 showComp: null, diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 01d0563..794613a 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -38,6 +38,13 @@ component: () => import('@/views/caseCommon/assessCaseList'), hidden: true, meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } + }, + { + path: '/assessDeptCaseList', + name: 'AssessDeptCaseList', + component: () => import('@/views/deptAccess/assessDeptCaseList'), + hidden: true, + meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } } ] } diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index 318de50..df579df 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -44,7 +44,7 @@
- + 需要 不需要 @@ -54,7 +54,7 @@
- + 需要 不需要 diff --git a/src/views/deptAccess/assessDeptCaseList.vue b/src/views/deptAccess/assessDeptCaseList.vue new file mode 100644 index 0000000..ac4ac7d --- /dev/null +++ b/src/views/deptAccess/assessDeptCaseList.vue @@ -0,0 +1,102 @@ + + + diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue index 4e9dcf1..7477c12 100644 --- a/src/views/deptAccess/deptAccess.vue +++ b/src/views/deptAccess/deptAccess.vue @@ -19,14 +19,14 @@
- + 列表模式 - + - + 图表模式 - + 考核规则 @@ -120,13 +120,14 @@ 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() { @@ -135,11 +136,18 @@ } - diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue index 1d0c0ce..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,6 +93,15 @@ formatter: (params) => tooltip + '
' + params.name + ':' + params.data }, + toolbox: { + show: true, + right: '20', + feature: { + saveAsImage: { + show: true + } + } + }, color: '#5ab1ef', xAxis: { data: this.x, @@ -112,6 +126,7 @@ } }] }) + this.chart.resize() } } } diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js index 68f930b..5ac221a 100644 --- a/src/api/assess/assessDept.js +++ b/src/api/assess/assessDept.js @@ -2,7 +2,15 @@ export function departmentAssess(params) { return request({ - url: '/assess/departmentAccess/', + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', method: 'get', params }) diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js index bf5d237..032d7ef 100644 --- a/src/components/CaseCommon/radioMap.js +++ b/src/components/CaseCommon/radioMap.js @@ -21,7 +21,7 @@ }, 'BTY': { // 不同意 showComp: null, - passBack: 'onedeptid' + passBack: 'processPersonId' }, 'BYLA': { // 不予立案 showComp: null, diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 01d0563..794613a 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -38,6 +38,13 @@ component: () => import('@/views/caseCommon/assessCaseList'), hidden: true, meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } + }, + { + path: '/assessDeptCaseList', + name: 'AssessDeptCaseList', + component: () => import('@/views/deptAccess/assessDeptCaseList'), + hidden: true, + meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } } ] } diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index 318de50..df579df 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -44,7 +44,7 @@
- + 需要 不需要 @@ -54,7 +54,7 @@
- + 需要 不需要 diff --git a/src/views/deptAccess/assessDeptCaseList.vue b/src/views/deptAccess/assessDeptCaseList.vue new file mode 100644 index 0000000..ac4ac7d --- /dev/null +++ b/src/views/deptAccess/assessDeptCaseList.vue @@ -0,0 +1,102 @@ + + + diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue index 4e9dcf1..7477c12 100644 --- a/src/views/deptAccess/deptAccess.vue +++ b/src/views/deptAccess/deptAccess.vue @@ -19,14 +19,14 @@
- + 列表模式 - + - + 图表模式 - + 考核规则 @@ -120,13 +120,14 @@ 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() { @@ -135,11 +136,18 @@ } - diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue index 1d0c0ce..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,6 +93,15 @@ formatter: (params) => tooltip + '
' + params.name + ':' + params.data }, + toolbox: { + show: true, + right: '20', + feature: { + saveAsImage: { + show: true + } + } + }, color: '#5ab1ef', xAxis: { data: this.x, @@ -112,6 +126,7 @@ } }] }) + this.chart.resize() } } } diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue index efa4263..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() { @@ -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 index 68f930b..5ac221a 100644 --- a/src/api/assess/assessDept.js +++ b/src/api/assess/assessDept.js @@ -2,7 +2,15 @@ export function departmentAssess(params) { return request({ - url: '/assess/departmentAccess/', + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', method: 'get', params }) diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js index bf5d237..032d7ef 100644 --- a/src/components/CaseCommon/radioMap.js +++ b/src/components/CaseCommon/radioMap.js @@ -21,7 +21,7 @@ }, 'BTY': { // 不同意 showComp: null, - passBack: 'onedeptid' + passBack: 'processPersonId' }, 'BYLA': { // 不予立案 showComp: null, diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 01d0563..794613a 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -38,6 +38,13 @@ component: () => import('@/views/caseCommon/assessCaseList'), hidden: true, meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } + }, + { + path: '/assessDeptCaseList', + name: 'AssessDeptCaseList', + component: () => import('@/views/deptAccess/assessDeptCaseList'), + hidden: true, + meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } } ] } diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index 318de50..df579df 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -44,7 +44,7 @@
- + 需要 不需要 @@ -54,7 +54,7 @@
- + 需要 不需要 diff --git a/src/views/deptAccess/assessDeptCaseList.vue b/src/views/deptAccess/assessDeptCaseList.vue new file mode 100644 index 0000000..ac4ac7d --- /dev/null +++ b/src/views/deptAccess/assessDeptCaseList.vue @@ -0,0 +1,102 @@ + + + diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue index 4e9dcf1..7477c12 100644 --- a/src/views/deptAccess/deptAccess.vue +++ b/src/views/deptAccess/deptAccess.vue @@ -19,14 +19,14 @@
- + 列表模式 - + - + 图表模式 - + 考核规则 @@ -120,13 +120,14 @@ 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() { @@ -135,11 +136,18 @@ } - diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue index 1d0c0ce..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,6 +93,15 @@ formatter: (params) => tooltip + '
' + params.name + ':' + params.data }, + toolbox: { + show: true, + right: '20', + feature: { + saveAsImage: { + show: true + } + } + }, color: '#5ab1ef', xAxis: { data: this.x, @@ -112,6 +126,7 @@ } }] }) + this.chart.resize() } } } diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue index efa4263..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() { @@ -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 e1c07ed..180d5d6 100644 --- a/src/views/otherComment/highFreq/highFreqChart.vue +++ b/src/views/otherComment/highFreq/highFreqChart.vue @@ -40,13 +40,13 @@ }, 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', diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js index 68f930b..5ac221a 100644 --- a/src/api/assess/assessDept.js +++ b/src/api/assess/assessDept.js @@ -2,7 +2,15 @@ export function departmentAssess(params) { return request({ - url: '/assess/departmentAccess/', + url: '/departmentAssess/departmentAccess/', + method: 'get', + params + }) +} + +export function deptAssessCaseList(params) { + return request({ + url: '/departmentAssess/caseDetail/', method: 'get', params }) diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js index bf5d237..032d7ef 100644 --- a/src/components/CaseCommon/radioMap.js +++ b/src/components/CaseCommon/radioMap.js @@ -21,7 +21,7 @@ }, 'BTY': { // 不同意 showComp: null, - passBack: 'onedeptid' + passBack: 'processPersonId' }, 'BYLA': { // 不予立案 showComp: null, diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 01d0563..794613a 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -38,6 +38,13 @@ component: () => import('@/views/caseCommon/assessCaseList'), hidden: true, meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } + }, + { + path: '/assessDeptCaseList', + name: 'AssessDeptCaseList', + component: () => import('@/views/deptAccess/assessDeptCaseList'), + hidden: true, + meta: { title: '综合查询', icon: 'icon-config', permission: ['/caseList'] } } ] } diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index 318de50..df579df 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -44,7 +44,7 @@
- + 需要 不需要 @@ -54,7 +54,7 @@
- + 需要 不需要 diff --git a/src/views/deptAccess/assessDeptCaseList.vue b/src/views/deptAccess/assessDeptCaseList.vue new file mode 100644 index 0000000..ac4ac7d --- /dev/null +++ b/src/views/deptAccess/assessDeptCaseList.vue @@ -0,0 +1,102 @@ + + + diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue index 4e9dcf1..7477c12 100644 --- a/src/views/deptAccess/deptAccess.vue +++ b/src/views/deptAccess/deptAccess.vue @@ -19,14 +19,14 @@
- + 列表模式 - + - + 图表模式 - + 考核规则 @@ -120,13 +120,14 @@ 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() { @@ -135,11 +136,18 @@ } - diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue index 1d0c0ce..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,6 +93,15 @@ formatter: (params) => tooltip + '
' + params.name + ':' + params.data }, + toolbox: { + show: true, + right: '20', + feature: { + saveAsImage: { + show: true + } + } + }, color: '#5ab1ef', xAxis: { data: this.x, @@ -112,6 +126,7 @@ } }] }) + this.chart.resize() } } } diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue index efa4263..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() { @@ -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 e1c07ed..180d5d6 100644 --- a/src/views/otherComment/highFreq/highFreqChart.vue +++ b/src/views/otherComment/highFreq/highFreqChart.vue @@ -40,13 +40,13 @@ }, 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', diff --git a/src/views/otherComment/sourceStatis/sourceStatisChart.vue b/src/views/otherComment/sourceStatis/sourceStatisChart.vue index 9a90ccd..5aa6a98 100644 --- a/src/views/otherComment/sourceStatis/sourceStatisChart.vue +++ b/src/views/otherComment/sourceStatis/sourceStatisChart.vue @@ -38,6 +38,15 @@ tooltip: { show: true }, + toolbox: { + show: true, + right: '20', + feature: { + saveAsImage: { + show: true + } + } + }, color: [ '#19d4ae', '#5ab1ef', '#fa6e86', '#ffb980', '#0067a6', '#c4b4e4',