diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue index 05dc76e..0026cdb 100644 --- a/src/views/assessRules/deptStatistics.vue +++ b/src/views/assessRules/deptStatistics.vue @@ -136,7 +136,7 @@ this.fetchData(projectId) }, fetchData(projectId) { - debugger + // debugger getStatistics(projectId).then(response => { var cols = response.data.nameList if (cols) { diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue index 05dc76e..0026cdb 100644 --- a/src/views/assessRules/deptStatistics.vue +++ b/src/views/assessRules/deptStatistics.vue @@ -136,7 +136,7 @@ this.fetchData(projectId) }, fetchData(projectId) { - debugger + // debugger getStatistics(projectId).then(response => { var cols = response.data.nameList if (cols) { diff --git a/src/views/assessRules/editDeptRule.vue b/src/views/assessRules/editDeptRule.vue index a0098fe..5358ac8 100644 --- a/src/views/assessRules/editDeptRule.vue +++ b/src/views/assessRules/editDeptRule.vue @@ -120,7 +120,7 @@ this.dialogFormVisible = dialogFormVisible // this.resetForm() getDeptRuleDetail(row.id).then(response => { - debugger + // debugger const detail = response.data console.log(detail) if (detail) { diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue index 05dc76e..0026cdb 100644 --- a/src/views/assessRules/deptStatistics.vue +++ b/src/views/assessRules/deptStatistics.vue @@ -136,7 +136,7 @@ this.fetchData(projectId) }, fetchData(projectId) { - debugger + // debugger getStatistics(projectId).then(response => { var cols = response.data.nameList if (cols) { diff --git a/src/views/assessRules/editDeptRule.vue b/src/views/assessRules/editDeptRule.vue index a0098fe..5358ac8 100644 --- a/src/views/assessRules/editDeptRule.vue +++ b/src/views/assessRules/editDeptRule.vue @@ -120,7 +120,7 @@ this.dialogFormVisible = dialogFormVisible // this.resetForm() getDeptRuleDetail(row.id).then(response => { - debugger + // debugger const detail = response.data console.log(detail) if (detail) { diff --git a/src/views/assessRules/listDeptRules.vue b/src/views/assessRules/listDeptRules.vue index c18c4ad..6d49e37 100644 --- a/src/views/assessRules/listDeptRules.vue +++ b/src/views/assessRules/listDeptRules.vue @@ -14,8 +14,8 @@ :value="item.id"/> - - + + { this.subDeptList = response.data + if(!this.subDeptList.length) { // 下属部门无数据不展示 + this.showSubDept = false + } else { + this.showSubDept = true + } }) } }, diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue index 05dc76e..0026cdb 100644 --- a/src/views/assessRules/deptStatistics.vue +++ b/src/views/assessRules/deptStatistics.vue @@ -136,7 +136,7 @@ this.fetchData(projectId) }, fetchData(projectId) { - debugger + // debugger getStatistics(projectId).then(response => { var cols = response.data.nameList if (cols) { diff --git a/src/views/assessRules/editDeptRule.vue b/src/views/assessRules/editDeptRule.vue index a0098fe..5358ac8 100644 --- a/src/views/assessRules/editDeptRule.vue +++ b/src/views/assessRules/editDeptRule.vue @@ -120,7 +120,7 @@ this.dialogFormVisible = dialogFormVisible // this.resetForm() getDeptRuleDetail(row.id).then(response => { - debugger + // debugger const detail = response.data console.log(detail) if (detail) { diff --git a/src/views/assessRules/listDeptRules.vue b/src/views/assessRules/listDeptRules.vue index c18c4ad..6d49e37 100644 --- a/src/views/assessRules/listDeptRules.vue +++ b/src/views/assessRules/listDeptRules.vue @@ -14,8 +14,8 @@ :value="item.id"/> - - + + { this.subDeptList = response.data + if(!this.subDeptList.length) { // 下属部门无数据不展示 + this.showSubDept = false + } else { + this.showSubDept = true + } }) } }, diff --git a/src/views/assessRules/listOverview.vue b/src/views/assessRules/listOverview.vue index c25acc8..1d2fbd8 100644 --- a/src/views/assessRules/listOverview.vue +++ b/src/views/assessRules/listOverview.vue @@ -124,7 +124,7 @@ } }, mounted() { - debugger + // debugger this.fetchDeptList() this.fetchData(false) }, diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue index 05dc76e..0026cdb 100644 --- a/src/views/assessRules/deptStatistics.vue +++ b/src/views/assessRules/deptStatistics.vue @@ -136,7 +136,7 @@ this.fetchData(projectId) }, fetchData(projectId) { - debugger + // debugger getStatistics(projectId).then(response => { var cols = response.data.nameList if (cols) { diff --git a/src/views/assessRules/editDeptRule.vue b/src/views/assessRules/editDeptRule.vue index a0098fe..5358ac8 100644 --- a/src/views/assessRules/editDeptRule.vue +++ b/src/views/assessRules/editDeptRule.vue @@ -120,7 +120,7 @@ this.dialogFormVisible = dialogFormVisible // this.resetForm() getDeptRuleDetail(row.id).then(response => { - debugger + // debugger const detail = response.data console.log(detail) if (detail) { diff --git a/src/views/assessRules/listDeptRules.vue b/src/views/assessRules/listDeptRules.vue index c18c4ad..6d49e37 100644 --- a/src/views/assessRules/listDeptRules.vue +++ b/src/views/assessRules/listDeptRules.vue @@ -14,8 +14,8 @@ :value="item.id"/> - - + + { this.subDeptList = response.data + if(!this.subDeptList.length) { // 下属部门无数据不展示 + this.showSubDept = false + } else { + this.showSubDept = true + } }) } }, diff --git a/src/views/assessRules/listOverview.vue b/src/views/assessRules/listOverview.vue index c25acc8..1d2fbd8 100644 --- a/src/views/assessRules/listOverview.vue +++ b/src/views/assessRules/listOverview.vue @@ -124,7 +124,7 @@ } }, mounted() { - debugger + // debugger this.fetchDeptList() this.fetchData(false) }, diff --git a/src/views/assessRules/listPermWeight.vue b/src/views/assessRules/listPermWeight.vue index 644bc08..35ad174 100644 --- a/src/views/assessRules/listPermWeight.vue +++ b/src/views/assessRules/listPermWeight.vue @@ -136,7 +136,7 @@ }, // 获取开挖配置数据 fetchData(isNowPage = true) { - debugger + // debugger this.listLoading = true if (!isNowPage) { // 是否显示当前页，否则跳转第一页 this.listQuery.offset = 1 diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue index 05dc76e..0026cdb 100644 --- a/src/views/assessRules/deptStatistics.vue +++ b/src/views/assessRules/deptStatistics.vue @@ -136,7 +136,7 @@ this.fetchData(projectId) }, fetchData(projectId) { - debugger + // debugger getStatistics(projectId).then(response => { var cols = response.data.nameList if (cols) { diff --git a/src/views/assessRules/editDeptRule.vue b/src/views/assessRules/editDeptRule.vue index a0098fe..5358ac8 100644 --- a/src/views/assessRules/editDeptRule.vue +++ b/src/views/assessRules/editDeptRule.vue @@ -120,7 +120,7 @@ this.dialogFormVisible = dialogFormVisible // this.resetForm() getDeptRuleDetail(row.id).then(response => { - debugger + // debugger const detail = response.data console.log(detail) if (detail) { diff --git a/src/views/assessRules/listDeptRules.vue b/src/views/assessRules/listDeptRules.vue index c18c4ad..6d49e37 100644 --- a/src/views/assessRules/listDeptRules.vue +++ b/src/views/assessRules/listDeptRules.vue @@ -14,8 +14,8 @@ :value="item.id"/> - - + + { this.subDeptList = response.data + if(!this.subDeptList.length) { // 下属部门无数据不展示 + this.showSubDept = false + } else { + this.showSubDept = true + } }) } }, diff --git a/src/views/assessRules/listOverview.vue b/src/views/assessRules/listOverview.vue index c25acc8..1d2fbd8 100644 --- a/src/views/assessRules/listOverview.vue +++ b/src/views/assessRules/listOverview.vue @@ -124,7 +124,7 @@ } }, mounted() { - debugger + // debugger this.fetchDeptList() this.fetchData(false) }, diff --git a/src/views/assessRules/listPermWeight.vue b/src/views/assessRules/listPermWeight.vue index 644bc08..35ad174 100644 --- a/src/views/assessRules/listPermWeight.vue +++ b/src/views/assessRules/listPermWeight.vue @@ -136,7 +136,7 @@ }, // 获取开挖配置数据 fetchData(isNowPage = true) { - debugger + // debugger this.listLoading = true if (!isNowPage) { // 是否显示当前页，否则跳转第一页 this.listQuery.offset = 1 diff --git a/src/views/assessRules/permManage.vue b/src/views/assessRules/permManage.vue index b605144..fe91cc7 100644 --- a/src/views/assessRules/permManage.vue +++ b/src/views/assessRules/permManage.vue @@ -36,7 +36,7 @@ methods: { // 处理Tab点击事件，每次点击更新数据 handleClick(tab, event) { - debugger + // debugger if (tab.name === 'permWeight') { this.$refs.listPermWeight.fetchData() } else if (tab.name === 'targetNum') { diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue index 05dc76e..0026cdb 100644 --- a/src/views/assessRules/deptStatistics.vue +++ b/src/views/assessRules/deptStatistics.vue @@ -136,7 +136,7 @@ this.fetchData(projectId) }, fetchData(projectId) { - debugger + // debugger getStatistics(projectId).then(response => { var cols = response.data.nameList if (cols) { diff --git a/src/views/assessRules/editDeptRule.vue b/src/views/assessRules/editDeptRule.vue index a0098fe..5358ac8 100644 --- a/src/views/assessRules/editDeptRule.vue +++ b/src/views/assessRules/editDeptRule.vue @@ -120,7 +120,7 @@ this.dialogFormVisible = dialogFormVisible // this.resetForm() getDeptRuleDetail(row.id).then(response => { - debugger + // debugger const detail = response.data console.log(detail) if (detail) { diff --git a/src/views/assessRules/listDeptRules.vue b/src/views/assessRules/listDeptRules.vue index c18c4ad..6d49e37 100644 --- a/src/views/assessRules/listDeptRules.vue +++ b/src/views/assessRules/listDeptRules.vue @@ -14,8 +14,8 @@ :value="item.id"/> - - + + { this.subDeptList = response.data + if(!this.subDeptList.length) { // 下属部门无数据不展示 + this.showSubDept = false + } else { + this.showSubDept = true + } }) } }, diff --git a/src/views/assessRules/listOverview.vue b/src/views/assessRules/listOverview.vue index c25acc8..1d2fbd8 100644 --- a/src/views/assessRules/listOverview.vue +++ b/src/views/assessRules/listOverview.vue @@ -124,7 +124,7 @@ } }, mounted() { - debugger + // debugger this.fetchDeptList() this.fetchData(false) }, diff --git a/src/views/assessRules/listPermWeight.vue b/src/views/assessRules/listPermWeight.vue index 644bc08..35ad174 100644 --- a/src/views/assessRules/listPermWeight.vue +++ b/src/views/assessRules/listPermWeight.vue @@ -136,7 +136,7 @@ }, // 获取开挖配置数据 fetchData(isNowPage = true) { - debugger + // debugger this.listLoading = true if (!isNowPage) { // 是否显示当前页，否则跳转第一页 this.listQuery.offset = 1 diff --git a/src/views/assessRules/permManage.vue b/src/views/assessRules/permManage.vue index b605144..fe91cc7 100644 --- a/src/views/assessRules/permManage.vue +++ b/src/views/assessRules/permManage.vue @@ -36,7 +36,7 @@ methods: { // 处理Tab点击事件，每次点击更新数据 handleClick(tab, event) { - debugger + // debugger if (tab.name === 'permWeight') { this.$refs.listPermWeight.fetchData() } else if (tab.name === 'targetNum') { diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 4447f72..b447d89 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -19,15 +19,15 @@ return { dataGroup: [ { - title: '考核规则管理', + title: '考核规则列表', context: '', icon: 'app-config', color: '#40c9c6', - path: '/permManage', - permission: '/permManage' + path: '/deptRules', + permission: '/deptRules' }, { - title: '考核问效结果', + title: '部门考核结果', context: '', icon: 'chart-bar', color: '#36a3f7', @@ -35,7 +35,7 @@ permission: '/deptResult' }, { - title: '指标态势分析', + title: '异常指标告警', context: '', icon: 'statics', color: '#ffb980', diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue index 05dc76e..0026cdb 100644 --- a/src/views/assessRules/deptStatistics.vue +++ b/src/views/assessRules/deptStatistics.vue @@ -136,7 +136,7 @@ this.fetchData(projectId) }, fetchData(projectId) { - debugger + // debugger getStatistics(projectId).then(response => { var cols = response.data.nameList if (cols) { diff --git a/src/views/assessRules/editDeptRule.vue b/src/views/assessRules/editDeptRule.vue index a0098fe..5358ac8 100644 --- a/src/views/assessRules/editDeptRule.vue +++ b/src/views/assessRules/editDeptRule.vue @@ -120,7 +120,7 @@ this.dialogFormVisible = dialogFormVisible // this.resetForm() getDeptRuleDetail(row.id).then(response => { - debugger + // debugger const detail = response.data console.log(detail) if (detail) { diff --git a/src/views/assessRules/listDeptRules.vue b/src/views/assessRules/listDeptRules.vue index c18c4ad..6d49e37 100644 --- a/src/views/assessRules/listDeptRules.vue +++ b/src/views/assessRules/listDeptRules.vue @@ -14,8 +14,8 @@ :value="item.id"/> - - + + { this.subDeptList = response.data + if(!this.subDeptList.length) { // 下属部门无数据不展示 + this.showSubDept = false + } else { + this.showSubDept = true + } }) } }, diff --git a/src/views/assessRules/listOverview.vue b/src/views/assessRules/listOverview.vue index c25acc8..1d2fbd8 100644 --- a/src/views/assessRules/listOverview.vue +++ b/src/views/assessRules/listOverview.vue @@ -124,7 +124,7 @@ } }, mounted() { - debugger + // debugger this.fetchDeptList() this.fetchData(false) }, diff --git a/src/views/assessRules/listPermWeight.vue b/src/views/assessRules/listPermWeight.vue index 644bc08..35ad174 100644 --- a/src/views/assessRules/listPermWeight.vue +++ b/src/views/assessRules/listPermWeight.vue @@ -136,7 +136,7 @@ }, // 获取开挖配置数据 fetchData(isNowPage = true) { - debugger + // debugger this.listLoading = true if (!isNowPage) { // 是否显示当前页，否则跳转第一页 this.listQuery.offset = 1 diff --git a/src/views/assessRules/permManage.vue b/src/views/assessRules/permManage.vue index b605144..fe91cc7 100644 --- a/src/views/assessRules/permManage.vue +++ b/src/views/assessRules/permManage.vue @@ -36,7 +36,7 @@ methods: { // 处理Tab点击事件，每次点击更新数据 handleClick(tab, event) { - debugger + // debugger if (tab.name === 'permWeight') { this.$refs.listPermWeight.fetchData() } else if (tab.name === 'targetNum') { diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 4447f72..b447d89 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -19,15 +19,15 @@ return { dataGroup: [ { - title: '考核规则管理', + title: '考核规则列表', context: '', icon: 'app-config', color: '#40c9c6', - path: '/permManage', - permission: '/permManage' + path: '/deptRules', + permission: '/deptRules' }, { - title: '考核问效结果', + title: '部门考核结果', context: '', icon: 'chart-bar', color: '#36a3f7', @@ -35,7 +35,7 @@ permission: '/deptResult' }, { - title: '指标态势分析', + title: '异常指标告警', context: '', icon: 'statics', color: '#ffb980', diff --git a/src/views/indexStatus/alarmIndex.vue b/src/views/indexStatus/alarmIndex.vue index b032390..3abb796 100644 --- a/src/views/indexStatus/alarmIndex.vue +++ b/src/views/indexStatus/alarmIndex.vue @@ -4,7 +4,7 @@ - + - + - + { - debugger + // debugger var data = response.data for (var i = 0; i < data.dataList.length; i++) { data.dataList[i].value2 = data.dataList[i].value @@ -211,28 +214,43 @@ this.listQuery.deptId = this.deptList[0].id } if (this.listQuery.deptId) { + // 获取下属部门 getDeptList(this.listQuery.deptId).then(response => { + console.log('下属部门', response.data.length) this.subDeptList = response.data - if (!this.hasQuery) { - this.listQuery.subDeptId = response.data[0].id - } - const query = { - deptid: this.listQuery.subDeptId - } - getMenuByDepartment(query).then(response => { - this.menuList = response.data + if (!response.data.length) { // 没有下属部门 + this.showSubDeptId = false // 不显示下属部门 + } else { // 有指标名称 + this.showSubDeptId = true // 显示下属部门 if (!this.hasQuery) { - this.listQuery.indexMenuId = response.data[0].id + this.listQuery.subDeptId = response.data[0].id } - this.menuName = response.data[0].indexMenu - }) + const query = { + deptid: this.listQuery.subDeptId + } + // 获取指标名称 + getMenuByDepartment(query).then(response => { + // console.log('指标名称', response.data.length) + if (!response.data.length) { // 没有指标名称 + this.showIndexMenuId = false // 不显示指标名称 + } else { // 有指标名称 + this.showIndexMenuId = true // 显示指标名称 + this.menuList = response.data + if (!this.hasQuery) { + this.listQuery.indexMenuId = response.data[0].id + } + this.menuName = response.data[0].indexMenu + } + }) + } }) } }) }, + // 部门改变 changeDept() { - this.listQuery.subDeptId = '' - this.listQuery.indexMenuId = '' + this.listQuery.subDeptId = '' // 下属部门 + this.listQuery.indexMenuId = '' // 指标名称 // 清除验证 this.$nextTick(() => { this.$refs['dataForm'].clearValidate() @@ -241,6 +259,12 @@ getDeptList(this.listQuery.deptId).then(response => { this.subDeptList = response.data // this.listQuery.subDeptId = response.data[0].id + console.log('下属部门', response.data.length) + if (!response.data.length) { // 没有下属部门 + this.showSubDeptId = false // 不显示下属部门 + } else { // 有指标名称 + this.showSubDeptId = true // 显示下属部门 + } }) } }, @@ -254,9 +278,14 @@ deptid: this.listQuery.subDeptId } getMenuByDepartment(query).then(response => { - this.menuList = response.data - this.listQuery.indexMenuId = response.data[0].id - this.menuName = response.data[0].indexMenu + if (!response.data.length) { // 没有指标名称 + this.showIndexMenuId = false // 不显示指标名称 + } else { // 有指标名称 + this.showIndexMenuId = true // 显示指标名称 + this.menuList = response.data + this.listQuery.indexMenuId = response.data[0].id + this.menuName = response.data[0].indexMenu + } }) } } diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue index 05dc76e..0026cdb 100644 --- a/src/views/assessRules/deptStatistics.vue +++ b/src/views/assessRules/deptStatistics.vue @@ -136,7 +136,7 @@ this.fetchData(projectId) }, fetchData(projectId) { - debugger + // debugger getStatistics(projectId).then(response => { var cols = response.data.nameList if (cols) { diff --git a/src/views/assessRules/editDeptRule.vue b/src/views/assessRules/editDeptRule.vue index a0098fe..5358ac8 100644 --- a/src/views/assessRules/editDeptRule.vue +++ b/src/views/assessRules/editDeptRule.vue @@ -120,7 +120,7 @@ this.dialogFormVisible = dialogFormVisible // this.resetForm() getDeptRuleDetail(row.id).then(response => { - debugger + // debugger const detail = response.data console.log(detail) if (detail) { diff --git a/src/views/assessRules/listDeptRules.vue b/src/views/assessRules/listDeptRules.vue index c18c4ad..6d49e37 100644 --- a/src/views/assessRules/listDeptRules.vue +++ b/src/views/assessRules/listDeptRules.vue @@ -14,8 +14,8 @@ :value="item.id"/> - - + + { this.subDeptList = response.data + if(!this.subDeptList.length) { // 下属部门无数据不展示 + this.showSubDept = false + } else { + this.showSubDept = true + } }) } }, diff --git a/src/views/assessRules/listOverview.vue b/src/views/assessRules/listOverview.vue index c25acc8..1d2fbd8 100644 --- a/src/views/assessRules/listOverview.vue +++ b/src/views/assessRules/listOverview.vue @@ -124,7 +124,7 @@ } }, mounted() { - debugger + // debugger this.fetchDeptList() this.fetchData(false) }, diff --git a/src/views/assessRules/listPermWeight.vue b/src/views/assessRules/listPermWeight.vue index 644bc08..35ad174 100644 --- a/src/views/assessRules/listPermWeight.vue +++ b/src/views/assessRules/listPermWeight.vue @@ -136,7 +136,7 @@ }, // 获取开挖配置数据 fetchData(isNowPage = true) { - debugger + // debugger this.listLoading = true if (!isNowPage) { // 是否显示当前页，否则跳转第一页 this.listQuery.offset = 1 diff --git a/src/views/assessRules/permManage.vue b/src/views/assessRules/permManage.vue index b605144..fe91cc7 100644 --- a/src/views/assessRules/permManage.vue +++ b/src/views/assessRules/permManage.vue @@ -36,7 +36,7 @@ methods: { // 处理Tab点击事件，每次点击更新数据 handleClick(tab, event) { - debugger + // debugger if (tab.name === 'permWeight') { this.$refs.listPermWeight.fetchData() } else if (tab.name === 'targetNum') { diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 4447f72..b447d89 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -19,15 +19,15 @@ return { dataGroup: [ { - title: '考核规则管理', + title: '考核规则列表', context: '', icon: 'app-config', color: '#40c9c6', - path: '/permManage', - permission: '/permManage' + path: '/deptRules', + permission: '/deptRules' }, { - title: '考核问效结果', + title: '部门考核结果', context: '', icon: 'chart-bar', color: '#36a3f7', @@ -35,7 +35,7 @@ permission: '/deptResult' }, { - title: '指标态势分析', + title: '异常指标告警', context: '', icon: 'statics', color: '#ffb980', diff --git a/src/views/indexStatus/alarmIndex.vue b/src/views/indexStatus/alarmIndex.vue index b032390..3abb796 100644 --- a/src/views/indexStatus/alarmIndex.vue +++ b/src/views/indexStatus/alarmIndex.vue @@ -4,7 +4,7 @@ - + - + - + { - debugger + // debugger var data = response.data for (var i = 0; i < data.dataList.length; i++) { data.dataList[i].value2 = data.dataList[i].value @@ -211,28 +214,43 @@ this.listQuery.deptId = this.deptList[0].id } if (this.listQuery.deptId) { + // 获取下属部门 getDeptList(this.listQuery.deptId).then(response => { + console.log('下属部门', response.data.length) this.subDeptList = response.data - if (!this.hasQuery) { - this.listQuery.subDeptId = response.data[0].id - } - const query = { - deptid: this.listQuery.subDeptId - } - getMenuByDepartment(query).then(response => { - this.menuList = response.data + if (!response.data.length) { // 没有下属部门 + this.showSubDeptId = false // 不显示下属部门 + } else { // 有指标名称 + this.showSubDeptId = true // 显示下属部门 if (!this.hasQuery) { - this.listQuery.indexMenuId = response.data[0].id + this.listQuery.subDeptId = response.data[0].id } - this.menuName = response.data[0].indexMenu - }) + const query = { + deptid: this.listQuery.subDeptId + } + // 获取指标名称 + getMenuByDepartment(query).then(response => { + // console.log('指标名称', response.data.length) + if (!response.data.length) { // 没有指标名称 + this.showIndexMenuId = false // 不显示指标名称 + } else { // 有指标名称 + this.showIndexMenuId = true // 显示指标名称 + this.menuList = response.data + if (!this.hasQuery) { + this.listQuery.indexMenuId = response.data[0].id + } + this.menuName = response.data[0].indexMenu + } + }) + } }) } }) }, + // 部门改变 changeDept() { - this.listQuery.subDeptId = '' - this.listQuery.indexMenuId = '' + this.listQuery.subDeptId = '' // 下属部门 + this.listQuery.indexMenuId = '' // 指标名称 // 清除验证 this.$nextTick(() => { this.$refs['dataForm'].clearValidate() @@ -241,6 +259,12 @@ getDeptList(this.listQuery.deptId).then(response => { this.subDeptList = response.data // this.listQuery.subDeptId = response.data[0].id + console.log('下属部门', response.data.length) + if (!response.data.length) { // 没有下属部门 + this.showSubDeptId = false // 不显示下属部门 + } else { // 有指标名称 + this.showSubDeptId = true // 显示下属部门 + } }) } }, @@ -254,9 +278,14 @@ deptid: this.listQuery.subDeptId } getMenuByDepartment(query).then(response => { - this.menuList = response.data - this.listQuery.indexMenuId = response.data[0].id - this.menuName = response.data[0].indexMenu + if (!response.data.length) { // 没有指标名称 + this.showIndexMenuId = false // 不显示指标名称 + } else { // 有指标名称 + this.showIndexMenuId = true // 显示指标名称 + this.menuList = response.data + this.listQuery.indexMenuId = response.data[0].id + this.menuName = response.data[0].indexMenu + } }) } } diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue index edd5818..0c39394 100644 --- a/src/views/layout/components/AppHeader.vue +++ b/src/views/layout/components/AppHeader.vue @@ -52,7 +52,7 @@ this.$store.dispatch('ToggleSideBar') }, logout() { - debugger + // debugger this.$store.dispatch('LogOut').then(() => { // location.reload() // 为了重新实例化vue-router对象 避免bug // location // 为了重新实例化vue-router对象 避免bug diff --git a/config/dev.env.js b/config/dev.env.js index a176c11..c8a486f 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -11,7 +11,8 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' - BASE_API: '"http://111.198.10.15:11408"' + BASE_API: '"http://111.198.10.15:11407"' + // BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index 6be2384..2d35f60 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,6 +5,7 @@ // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.23:8084/callcenter/api"' // BASE_API: '"http://139.198.16.38:20007"' + // BASE_API: '"http://111.198.10.15:11407"' BASE_API: '"http://111.198.10.15:11408"' // BASE_API: '"http://192.168.8.201:8083"' } diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 28253ef..04a01ab 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -142,7 +142,7 @@ } else { this.fmap.setBgLayer(bgLayer) } - debugger + // debugger // 非查看事件位置点详情 if (detail) { // 查看位置点详情 diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue index d89a499..b561b7b 100644 --- a/src/components/wangeditor/wangeditor.vue +++ b/src/components/wangeditor/wangeditor.vue @@ -62,7 +62,7 @@ var that = this that.editor = new E(that.$refs.editorElem) // 创建富文本实例 that.editor.customConfig.debug = true - debugger + // debugger that.editor.customConfig.onchange = html => { that.editorContent = html console.log('onchange') diff --git a/src/views/assessResult/components/deptStatistics.vue b/src/views/assessResult/components/deptStatistics.vue index 23ff616..53f88e5 100644 --- a/src/views/assessResult/components/deptStatistics.vue +++ b/src/views/assessResult/components/deptStatistics.vue @@ -5,7 +5,7 @@ - + { - debugger + // debugger this.deptList = response.data console.log(response.data) this.listQuery.deptId = this.deptList[0].id @@ -190,7 +190,7 @@ // box.innerHTML = '' }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue index 9e86323..10d999b 100644 --- a/src/views/assessResult/components/indexStatistics.vue +++ b/src/views/assessResult/components/indexStatistics.vue @@ -5,7 +5,7 @@ - + { - this.deptList = response.data - this.listQuery.deptId = this.deptList[0].id - this.listQuery.indexType = this.typeList[0].name - this.deptName = this.deptList[0].simplename - this.fetchData() + if (response.data.length) { + this.deptList = response.data + this.deptName = this.deptList[0].simplename + this.listQuery.indexType = this.typeList[0].name + this.listQuery.deptId = this.deptList[0].id + this.fetchData() + } }) }, changeDept() { @@ -179,12 +181,17 @@ // this.fetchData() }, changeChart() { - debugger + // debugger if (this.buttonName === '饼图展示') { console.log(this.buttonName) this.buttonName = '柱状图展示' this.chartType = 'pie' - this.chartDataPie.rows = this.chartData.rows + this.chartDataPie.rows = this.chartData.rows.map(item => { + return { + ...item, + text: item.text + '月' + } + }) console.log('this.chartData.rows:::' + this.chartData.rows) } else if (this.buttonName === '柱状图展示') { console.log(this.buttonName) diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue index 3407ef3..3adf422 100644 --- a/src/views/assessResult/components/listDeptResult.vue +++ b/src/views/assessResult/components/listDeptResult.vue @@ -54,7 +54,8 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + + @@ -62,10 +63,11 @@ import { getDeptResultList, getDeptList, batchExport } from '@/api/assessResult' import resultDetail from '@/views/assessResult/components/resultDetail' import { getDayTime } from '@/utils/dateutils' +import listDeptResultDetail from '@/views/assessResult/components/listDeptResultDetail' export default { name: 'ListDeptResult', - components: { resultDetail }, + components: { resultDetail, listDeptResultDetail }, data() { return { listQuery: { @@ -76,6 +78,8 @@ sort: 'score', order: 'desc' }, // 筛选条件 + isShowListDeptResultDetail: false, // 是否显示详情对话框 + showListDeptResultDetailData: {}, // 详情对话框数据 columns: [ { text: '部门', @@ -185,7 +189,9 @@ detail(row) { // this.$router.push({ path: '/resultDetail', query: { checkId: row.id }}) this.dialogFormVisible = true - this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + // this.$refs.resultdetail.initDialog(this.dialogFormVisible, row) + this.isShowListDeptResultDetail = true + this.$refs.listDeptResultDetailRef.initDialog(this.dialogFormVisible, row) }, // 批量导出 batchExport() { diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue new file mode 100644 index 0000000..b8612c9 --- /dev/null +++ b/src/views/assessResult/components/listDeptResultDetail.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue index 05dc76e..0026cdb 100644 --- a/src/views/assessRules/deptStatistics.vue +++ b/src/views/assessRules/deptStatistics.vue @@ -136,7 +136,7 @@ this.fetchData(projectId) }, fetchData(projectId) { - debugger + // debugger getStatistics(projectId).then(response => { var cols = response.data.nameList if (cols) { diff --git a/src/views/assessRules/editDeptRule.vue b/src/views/assessRules/editDeptRule.vue index a0098fe..5358ac8 100644 --- a/src/views/assessRules/editDeptRule.vue +++ b/src/views/assessRules/editDeptRule.vue @@ -120,7 +120,7 @@ this.dialogFormVisible = dialogFormVisible // this.resetForm() getDeptRuleDetail(row.id).then(response => { - debugger + // debugger const detail = response.data console.log(detail) if (detail) { diff --git a/src/views/assessRules/listDeptRules.vue b/src/views/assessRules/listDeptRules.vue index c18c4ad..6d49e37 100644 --- a/src/views/assessRules/listDeptRules.vue +++ b/src/views/assessRules/listDeptRules.vue @@ -14,8 +14,8 @@ :value="item.id"/> - - + + { this.subDeptList = response.data + if(!this.subDeptList.length) { // 下属部门无数据不展示 + this.showSubDept = false + } else { + this.showSubDept = true + } }) } }, diff --git a/src/views/assessRules/listOverview.vue b/src/views/assessRules/listOverview.vue index c25acc8..1d2fbd8 100644 --- a/src/views/assessRules/listOverview.vue +++ b/src/views/assessRules/listOverview.vue @@ -124,7 +124,7 @@ } }, mounted() { - debugger + // debugger this.fetchDeptList() this.fetchData(false) }, diff --git a/src/views/assessRules/listPermWeight.vue b/src/views/assessRules/listPermWeight.vue index 644bc08..35ad174 100644 --- a/src/views/assessRules/listPermWeight.vue +++ b/src/views/assessRules/listPermWeight.vue @@ -136,7 +136,7 @@ }, // 获取开挖配置数据 fetchData(isNowPage = true) { - debugger + // debugger this.listLoading = true if (!isNowPage) { // 是否显示当前页，否则跳转第一页 this.listQuery.offset = 1 diff --git a/src/views/assessRules/permManage.vue b/src/views/assessRules/permManage.vue index b605144..fe91cc7 100644 --- a/src/views/assessRules/permManage.vue +++ b/src/views/assessRules/permManage.vue @@ -36,7 +36,7 @@ methods: { // 处理Tab点击事件，每次点击更新数据 handleClick(tab, event) { - debugger + // debugger if (tab.name === 'permWeight') { this.$refs.listPermWeight.fetchData() } else if (tab.name === 'targetNum') { diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 4447f72..b447d89 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -19,15 +19,15 @@ return { dataGroup: [ { - title: '考核规则管理', + title: '考核规则列表', context: '', icon: 'app-config', color: '#40c9c6', - path: '/permManage', - permission: '/permManage' + path: '/deptRules', + permission: '/deptRules' }, { - title: '考核问效结果', + title: '部门考核结果', context: '', icon: 'chart-bar', color: '#36a3f7', @@ -35,7 +35,7 @@ permission: '/deptResult' }, { - title: '指标态势分析', + title: '异常指标告警', context: '', icon: 'statics', color: '#ffb980', diff --git a/src/views/indexStatus/alarmIndex.vue b/src/views/indexStatus/alarmIndex.vue index b032390..3abb796 100644 --- a/src/views/indexStatus/alarmIndex.vue +++ b/src/views/indexStatus/alarmIndex.vue @@ -4,7 +4,7 @@ - + - + - + { - debugger + // debugger var data = response.data for (var i = 0; i < data.dataList.length; i++) { data.dataList[i].value2 = data.dataList[i].value @@ -211,28 +214,43 @@ this.listQuery.deptId = this.deptList[0].id } if (this.listQuery.deptId) { + // 获取下属部门 getDeptList(this.listQuery.deptId).then(response => { + console.log('下属部门', response.data.length) this.subDeptList = response.data - if (!this.hasQuery) { - this.listQuery.subDeptId = response.data[0].id - } - const query = { - deptid: this.listQuery.subDeptId - } - getMenuByDepartment(query).then(response => { - this.menuList = response.data + if (!response.data.length) { // 没有下属部门 + this.showSubDeptId = false // 不显示下属部门 + } else { // 有指标名称 + this.showSubDeptId = true // 显示下属部门 if (!this.hasQuery) { - this.listQuery.indexMenuId = response.data[0].id + this.listQuery.subDeptId = response.data[0].id } - this.menuName = response.data[0].indexMenu - }) + const query = { + deptid: this.listQuery.subDeptId + } + // 获取指标名称 + getMenuByDepartment(query).then(response => { + // console.log('指标名称', response.data.length) + if (!response.data.length) { // 没有指标名称 + this.showIndexMenuId = false // 不显示指标名称 + } else { // 有指标名称 + this.showIndexMenuId = true // 显示指标名称 + this.menuList = response.data + if (!this.hasQuery) { + this.listQuery.indexMenuId = response.data[0].id + } + this.menuName = response.data[0].indexMenu + } + }) + } }) } }) }, + // 部门改变 changeDept() { - this.listQuery.subDeptId = '' - this.listQuery.indexMenuId = '' + this.listQuery.subDeptId = '' // 下属部门 + this.listQuery.indexMenuId = '' // 指标名称 // 清除验证 this.$nextTick(() => { this.$refs['dataForm'].clearValidate() @@ -241,6 +259,12 @@ getDeptList(this.listQuery.deptId).then(response => { this.subDeptList = response.data // this.listQuery.subDeptId = response.data[0].id + console.log('下属部门', response.data.length) + if (!response.data.length) { // 没有下属部门 + this.showSubDeptId = false // 不显示下属部门 + } else { // 有指标名称 + this.showSubDeptId = true // 显示下属部门 + } }) } }, @@ -254,9 +278,14 @@ deptid: this.listQuery.subDeptId } getMenuByDepartment(query).then(response => { - this.menuList = response.data - this.listQuery.indexMenuId = response.data[0].id - this.menuName = response.data[0].indexMenu + if (!response.data.length) { // 没有指标名称 + this.showIndexMenuId = false // 不显示指标名称 + } else { // 有指标名称 + this.showIndexMenuId = true // 显示指标名称 + this.menuList = response.data + this.listQuery.indexMenuId = response.data[0].id + this.menuName = response.data[0].indexMenu + } }) } } diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue index edd5818..0c39394 100644 --- a/src/views/layout/components/AppHeader.vue +++ b/src/views/layout/components/AppHeader.vue @@ -52,7 +52,7 @@ this.$store.dispatch('ToggleSideBar') }, logout() { - debugger + // debugger this.$store.dispatch('LogOut').then(() => { // location.reload() // 为了重新实例化vue-router对象 避免bug // location // 为了重新实例化vue-router对象 避免bug diff --git a/src/views/statistic/caseStatistic/caseTypeStatistic.vue b/src/views/statistic/caseStatistic/caseTypeStatistic.vue index 2262387..ef4fbf5 100644 --- a/src/views/statistic/caseStatistic/caseTypeStatistic.vue +++ b/src/views/statistic/caseStatistic/caseTypeStatistic.vue @@ -74,7 +74,7 @@ // { area: '新区管理处', data: [{ caseNum: 12, eorc: '咨询' }, { caseNum: 12, eorc: '建议' }, { caseNum: 12, eorc: '求助' }, { caseNum: 12, eorc: '投诉' }, { caseNum: 12, eorc: '感谢' }, { caseNum: 12, eorc: '其他' }] } // ] // } - debugger + // debugger const columns = [ { text: '区域',