diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js
new file mode 100644
index 0000000..68f930b
--- /dev/null
+++ b/src/api/assess/assessDept.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function departmentAssess(params) {
+ return request({
+ url: '/assess/departmentAccess/',
+ method: 'get',
+ params
+ })
+}
diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js
new file mode 100644
index 0000000..68f930b
--- /dev/null
+++ b/src/api/assess/assessDept.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function departmentAssess(params) {
+ return request({
+ url: '/assess/departmentAccess/',
+ method: 'get',
+ params
+ })
+}
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index b0d696f..4e9dcf1 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -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,11 +104,19 @@
}
},
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') {
diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js
new file mode 100644
index 0000000..68f930b
--- /dev/null
+++ b/src/api/assess/assessDept.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function departmentAssess(params) {
+ return request({
+ url: '/assess/departmentAccess/',
+ method: 'get',
+ params
+ })
+}
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index b0d696f..4e9dcf1 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -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,11 +104,19 @@
}
},
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') {
diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue
index d385f11..1d0c0ce 100644
--- a/src/views/deptAccess/deptAccessChart.vue
+++ b/src/views/deptAccess/deptAccessChart.vue
@@ -88,7 +88,7 @@
formatter: (params) => tooltip + '
' + params.name + ':' + params.data
},
- color: '#2a7bc4',
+ color: '#5ab1ef',
xAxis: {
data: this.x,
axisLabel: {
diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js
new file mode 100644
index 0000000..68f930b
--- /dev/null
+++ b/src/api/assess/assessDept.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function departmentAssess(params) {
+ return request({
+ url: '/assess/departmentAccess/',
+ method: 'get',
+ params
+ })
+}
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index b0d696f..4e9dcf1 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -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,11 +104,19 @@
}
},
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') {
diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue
index d385f11..1d0c0ce 100644
--- a/src/views/deptAccess/deptAccessChart.vue
+++ b/src/views/deptAccess/deptAccessChart.vue
@@ -88,7 +88,7 @@
formatter: (params) => tooltip + '
' + params.name + ':' + params.data
},
- color: '#2a7bc4',
+ color: '#5ab1ef',
xAxis: {
data: this.x,
axisLabel: {
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index 4122976..efa4263 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -31,7 +31,7 @@
tableColumns: [
{
text: '单位名称',
- value: 'deptName',
+ value: 'departName',
type: 'text'
},
{
@@ -42,7 +42,7 @@
},
{
text: '本期应处置数',
- value: 'CurrentCheckNum',
+ value: 'currentCheckNum',
width: 60,
type: 'button'
},
diff --git a/src/api/assess/assessDept.js b/src/api/assess/assessDept.js
new file mode 100644
index 0000000..68f930b
--- /dev/null
+++ b/src/api/assess/assessDept.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function departmentAssess(params) {
+ return request({
+ url: '/assess/departmentAccess/',
+ method: 'get',
+ params
+ })
+}
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index b0d696f..4e9dcf1 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -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,11 +104,19 @@
}
},
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') {
diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue
index d385f11..1d0c0ce 100644
--- a/src/views/deptAccess/deptAccessChart.vue
+++ b/src/views/deptAccess/deptAccessChart.vue
@@ -88,7 +88,7 @@
formatter: (params) => tooltip + '
' + params.name + ':' + params.data
},
- color: '#2a7bc4',
+ color: '#5ab1ef',
xAxis: {
data: this.x,
axisLabel: {
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index 4122976..efa4263 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -31,7 +31,7 @@
tableColumns: [
{
text: '单位名称',
- value: 'deptName',
+ value: 'departName',
type: 'text'
},
{
@@ -42,7 +42,7 @@
},
{
text: '本期应处置数',
- value: 'CurrentCheckNum',
+ value: 'currentCheckNum',
width: 60,
type: 'button'
},
diff --git a/src/views/otherComment/highFreq/highFreqChart.vue b/src/views/otherComment/highFreq/highFreqChart.vue
index dbb738c..e1c07ed 100644
--- a/src/views/otherComment/highFreq/highFreqChart.vue
+++ b/src/views/otherComment/highFreq/highFreqChart.vue
@@ -47,6 +47,13 @@
}
},
// 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..68f930b
--- /dev/null
+++ b/src/api/assess/assessDept.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function departmentAssess(params) {
+ return request({
+ url: '/assess/departmentAccess/',
+ method: 'get',
+ params
+ })
+}
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index b0d696f..4e9dcf1 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -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,11 +104,19 @@
}
},
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') {
diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue
index d385f11..1d0c0ce 100644
--- a/src/views/deptAccess/deptAccessChart.vue
+++ b/src/views/deptAccess/deptAccessChart.vue
@@ -88,7 +88,7 @@
formatter: (params) => tooltip + '
' + params.name + ':' + params.data
},
- color: '#2a7bc4',
+ color: '#5ab1ef',
xAxis: {
data: this.x,
axisLabel: {
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index 4122976..efa4263 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -31,7 +31,7 @@
tableColumns: [
{
text: '单位名称',
- value: 'deptName',
+ value: 'departName',
type: 'text'
},
{
@@ -42,7 +42,7 @@
},
{
text: '本期应处置数',
- value: 'CurrentCheckNum',
+ value: 'currentCheckNum',
width: 60,
type: 'button'
},
diff --git a/src/views/otherComment/highFreq/highFreqChart.vue b/src/views/otherComment/highFreq/highFreqChart.vue
index dbb738c..e1c07ed 100644
--- a/src/views/otherComment/highFreq/highFreqChart.vue
+++ b/src/views/otherComment/highFreq/highFreqChart.vue
@@ -47,6 +47,13 @@
}
},
// 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..9a90ccd 100644
--- a/src/views/otherComment/sourceStatis/sourceStatisChart.vue
+++ b/src/views/otherComment/sourceStatis/sourceStatisChart.vue
@@ -38,6 +38,13 @@
tooltip: {
show: true
},
+ color: [
+ '#19d4ae', '#5ab1ef', '#fa6e86',
+ '#ffb980', '#0067a6', '#c4b4e4',
+ '#d87a80', '#9cbbff', '#d9d0c7',
+ '#87a997', '#d49ea2', '#5b4947',
+ '#7ba3a8'
+ ],
series: [{
name: '问题来源',
type: 'pie',