diff --git a/src/views/dataBoard/overview/components/Bmysxxq.vue b/src/views/dataBoard/overview/components/Bmysxxq.vue index 1eef8e436..98a7ca574 100644 --- a/src/views/dataBoard/overview/components/Bmysxxq.vue +++ b/src/views/dataBoard/overview/components/Bmysxxq.vue @@ -206,9 +206,6 @@ export default { handleDispatch() { this.$refs.ResourceScheduling.open() }, - handleSupervision() { - this.$refs.supervision.open() - }, async getDictOptions() { this.$http .post("/sys/dict/data/dictlist", { diff --git a/src/views/dataBoard/overview/components/EventDetail.vue b/src/views/dataBoard/overview/components/EventDetail.vue index 7412c5aab..39e5536fe 100644 --- a/src/views/dataBoard/overview/components/EventDetail.vue +++ b/src/views/dataBoard/overview/components/EventDetail.vue @@ -233,6 +233,10 @@ export default { type: Boolean, default: false, }, + is12345: { + type: Boolean, + default: true + } }, data() { @@ -276,7 +280,7 @@ export default { this.$refs.ResourceScheduling.open() }, handleSupervision() { - this.$refs.supervision.open() + this.$refs.supervision.open(this.item,this.id, 'event') }, openImg(src) { window.open(src); @@ -288,8 +292,15 @@ export default { getDetailsData(id) { this.loading = true; + console.log(this.is12345) + let url + if(this.is12345) { + url = "/governance/icEvent/detail" + } else { + url = "/governance/icEventOld/detail" + } this.$http - .post("/governance/icEventOld/detail", {icEventId: id}) + .post(url, {icEventId: id}) .then((res) => { const {code, data, msg} = res.data; if (code === 0) { @@ -303,8 +314,14 @@ export default { }, getProcessData(id) { + let url + if(this.is12345) { + url = "/governance/icEvent/process" + } else { + url = "/governance/icEventOld/process" + } this.$http - .post("/governance/icEventOld/process", {icEventId: id}) + .post(url, {icEventId: id}) .then((res) => { const {code, data, msg} = res.data; if (code === 0) { diff --git a/src/views/dataBoard/overview/components/MapDialog/DifficultyCharts.vue b/src/views/dataBoard/overview/components/MapDialog/DifficultyCharts.vue index 8a7d04c9f..4a5f82e7d 100644 --- a/src/views/dataBoard/overview/components/MapDialog/DifficultyCharts.vue +++ b/src/views/dataBoard/overview/components/MapDialog/DifficultyCharts.vue @@ -24,7 +24,10 @@ export default { return {} }, mounted() { - this.$http.get('/governance/icEventOld/statisticsByCategory?agencyId=' + this.currentLevelData.orgId+'&type=2').then(({data: {data}}) => { + this.$http.post('/governance/icEventOld/statisticsByCategory?agencyId=' + this.currentLevelData.orgId+'&type=2',{ + agencyId:this.currentLevelData.orgId, + type: 2 + }).then(({data: {data}}) => { this.initCharts(data ? data : []) }) }, @@ -34,12 +37,12 @@ export default { this.myChart = echarts.init(div); let chartData = data.map((item) => { return { - name: item.name, - count: item.value, + categoryName: item.categoryName, + total: item.total, }; }) - let xData = chartData.map(item => item.name); - let yData = chartData.map(item => item.value) + let xData = chartData.map(item => item.categoryName); + let yData = chartData.map(item => item.total) let color = [[ { offset: 0, @@ -82,7 +85,7 @@ export default { { "type": "slider", "start": 0, - "end": parseInt((5 / xData.length) * 10) / 10 * 100, + "end": parseInt((10 / xData.length) * 10) / 10 * 100, "height": 10, "bottom": 0, "showDetail": false, diff --git a/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue b/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue index c29f5cae8..64adcd8f7 100644 --- a/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue +++ b/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue @@ -33,6 +33,7 @@ :showDialog="showDialog" @close="showDialog = false" @ok="getList" + :is12345="false" /> diff --git a/src/views/dataBoard/overview/components/ResourceInfo.vue b/src/views/dataBoard/overview/components/ResourceInfo.vue index cf6d5f32f..6f591151f 100644 --- a/src/views/dataBoard/overview/components/ResourceInfo.vue +++ b/src/views/dataBoard/overview/components/ResourceInfo.vue @@ -1,48 +1,123 @@