diff --git a/src/components/pannel/index.html b/src/components/pannel/index.html index 3702176..c2eef36 100644 --- a/src/components/pannel/index.html +++ b/src/components/pannel/index.html @@ -7,7 +7,7 @@
-

{{title}}

+

{{title}}

diff --git a/src/components/pannel/index.js b/src/components/pannel/index.js index 450729e..0f0ec7b 100644 --- a/src/components/pannel/index.js +++ b/src/components/pannel/index.js @@ -47,6 +47,9 @@ export default { }; }, methods: { + titleClick () { + this.$emit('titleClick') + }, open () { this.isOpen = !this.isOpen } diff --git a/src/views/capital/api/index.js b/src/views/capital/api/index.js index b5a625a..3f443d5 100644 --- a/src/views/capital/api/index.js +++ b/src/views/capital/api/index.js @@ -170,4 +170,32 @@ export function rankingOfNonStandardFundTransactionsWarning (deptId, year, type) method: 'get', params: query }) +} + +// 资金一张图-预警分析-左中-资金往来敏感词预警分析 +export function analysisSensitiveWarningForFundTransactions (deptId, year, type) { + let query = { + deptId, + year, + type + } + return request({ + url: 'api/home/xixia/financeWarning/zjwlmgcyjfx', + method: 'get', + params: query + }) +} + +// 资金一张图-预警分析-右中-资金往来敏感词预警排名 +export function RankingSensitiveWordWarningFundTransactions (deptId, year, type) { + let query = { + deptId, + year, + type + } + return request({ + url: 'api/home/xixia/financeWarning/zjwlmgcyjpm', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/views/capital/comps/left/middle/1/index.js b/src/views/capital/comps/left/middle/1/index.js index eecf4ec..9451354 100644 --- a/src/views/capital/comps/left/middle/1/index.js +++ b/src/views/capital/comps/left/middle/1/index.js @@ -42,15 +42,10 @@ export default { immediate: true, // 立即执行 } }, - created () { - }, - mounted () { - }, methods: { // 获取数据 getData () { if (this.year || this.deptId) { - this.isLoad = false; // 如果是趋势 if (this.tabIndex == 1) { diff --git a/src/views/capital/comps/left/middle/2/index.html b/src/views/capital/comps/left/middle/2/index.html index cf3cd25..762a08c 100644 --- a/src/views/capital/comps/left/middle/2/index.html +++ b/src/views/capital/comps/left/middle/2/index.html @@ -1,11 +1,16 @@ - +
- +
\ No newline at end of file diff --git a/src/views/capital/comps/left/middle/2/index.js b/src/views/capital/comps/left/middle/2/index.js index 7f2b884..cf54035 100644 --- a/src/views/capital/comps/left/middle/2/index.js +++ b/src/views/capital/comps/left/middle/2/index.js @@ -1,6 +1,8 @@ import Pannel from '@/components/pannel/index.vue'; import Bar from '@/components/charts/bar/index.vue'; import PannelTabs from '@/components/pannel-tabs/index.vue'; +import { mapGetters } from 'vuex'; +import { analysisSensitiveWarningForFundTransactions } from '../../../../api/index.js'; export default { components: { PannelTabs, @@ -9,6 +11,8 @@ export default { }, data () { return { + isLoad: false, + tabIndex: '1', pannelTabsData: [ { id: '1', @@ -18,16 +22,46 @@ export default { id: '2', name: '收入' } - ] + ], + data: [] }; }, - created () { + computed: { + ...mapGetters(['year', 'deptId']) }, - mounted () { + watch: { + year: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + }, + deptId: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + } }, methods: { - tabChange () { + // 获取数据 + getData () { + if (this.year || this.deptId) { + this.isLoad = false; + analysisSensitiveWarningForFundTransactions(this.year, this.deptId).then(res => { + if (this.tabIndex == 1) { + this.data = res.data.zc + } else if (this.tabIndex == 2) { + this.data = res.data.sr + } + this.isLoad = true; + }) + } + }, + tabChange (info) { + this.tabIndex = info.id + this.getData() } } }; diff --git a/src/views/capital/comps/right/bottom/1/index.js b/src/views/capital/comps/right/bottom/1/index.js index a87661c..e78ee02 100644 --- a/src/views/capital/comps/right/bottom/1/index.js +++ b/src/views/capital/comps/right/bottom/1/index.js @@ -28,11 +28,6 @@ export default { return { isLoad: false }; - }, - created () { - }, - mounted () { - }, methods: { getData () { diff --git a/src/views/capital/comps/right/middle/2/index.html b/src/views/capital/comps/right/middle/2/index.html index 4264549..c86c4ad 100644 --- a/src/views/capital/comps/right/middle/2/index.html +++ b/src/views/capital/comps/right/middle/2/index.html @@ -1,11 +1,16 @@ - +
- +
\ No newline at end of file diff --git a/src/views/capital/comps/right/middle/2/index.js b/src/views/capital/comps/right/middle/2/index.js index 75f36de..e5d6057 100644 --- a/src/views/capital/comps/right/middle/2/index.js +++ b/src/views/capital/comps/right/middle/2/index.js @@ -1,6 +1,8 @@ import Pannel from '@/components/pannel/index.vue'; import ScrollTable from '@/components/scroll-table/index.vue'; import PannelTabs from '@/components/pannel-tabs/index.vue'; +import { mapGetters } from 'vuex'; +import { RankingSensitiveWordWarningFundTransactions } from '../../../../api/index.js'; export default { components: { PannelTabs, @@ -9,13 +11,17 @@ export default { }, data () { return { + type: 'zc', + isLoad: false, pannelTabsData: [ { id: '1', + type: 'zc', name: '支出' }, { id: '2', + type: 'sr', name: '收入' } ], @@ -23,13 +29,39 @@ export default { headers: ['部门名称', '支出金额', '排名'] }; }, - created () { + computed: { + ...mapGetters(['year', 'deptId']) }, - mounted () { + watch: { + year: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + }, + deptId: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + } }, methods: { + getData () { + if (this.year, this.deptId) { + this.isLoad = false; + RankingSensitiveWordWarningFundTransactions(this.deptId, this.year, this.type).then(res => { + let data = res.rows.map(item => { + return [item.name, item.value, item.index] + }) + this.data = data; + this.isLoad = true; + }) + } + }, tabChange (info) { - this.tabIndex = info.id + this.type = info.type + this.getData() } } }; diff --git a/src/views/property/api/index.js b/src/views/property/api/index.js index 8dd37f7..74f26a3 100644 --- a/src/views/property/api/index.js +++ b/src/views/property/api/index.js @@ -263,3 +263,68 @@ export function indicatorBelowAverage (deptId, year) { params: query }) } + +// 资产一张图-债务预警-左中-负债分布 +export function distributionOfLiabilities (deptId, year) { + let query = { + deptId, + year + } + return request({ + url: 'api/home/xixia/assetLiabilities/fzfb', + method: 'get', + params: query + }) +} + +// 资产一张图-债务预警-左下-负债组织清单 +export function listDebtOrganizations (deptId, year) { + let query = { + deptId, + year + } + return request({ + url: 'api/home/xixia/assetLiabilities/fzzzqd', + method: 'get', + params: query + }) +} + +//资产一张图-债务预警-右上-债务概况 +export function debtOverview2 (deptId, year) { + let query = { + deptId, + year + } + return request({ + url: 'api/home/xixia/assetLiabilities/zwgk', + method: 'get', + params: query + }) +} + +// 资产一张图-债务预警-左下-负债组织清单 +export function listDebtOrganizations2 (deptId, year) { + let query = { + deptId, + year + } + return request({ + url: 'api/home/xixia/assetLiabilities/zwzzqd', + method: 'get', + params: query + }) +} + +// 资产一张图-债务分析-左中-债务类别分析 +export function debtCategoryAnalysis (deptId, year) { + let query = { + deptId, + year + } + return request({ + url: 'api/home/xixia/assetAnalysis/zwlxfx', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/views/property/comps/left/bottom/1/index.js b/src/views/property/comps/left/bottom/1/index.js index 4b2fec9..70741a9 100644 --- a/src/views/property/comps/left/bottom/1/index.js +++ b/src/views/property/comps/left/bottom/1/index.js @@ -48,7 +48,6 @@ export default { if (this.year && this.deptId) { this.isLoad = false; analysisOfOperatingAssets(this.deptId, this.year).then(res => { - console.log(res, 999); if (this.tabIndex == 1) { this.data = res.data.jyx } else if (this.tabIndex == 2) { diff --git a/src/views/property/comps/left/bottom/3/index.html b/src/views/property/comps/left/bottom/3/index.html index 74f26c8..740cc1c 100644 --- a/src/views/property/comps/left/bottom/3/index.html +++ b/src/views/property/comps/left/bottom/3/index.html @@ -5,5 +5,5 @@ element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.1)" > - +
\ No newline at end of file diff --git a/src/views/property/comps/left/middle/2/index.js b/src/views/property/comps/left/middle/2/index.js index 552071d..8672d80 100644 --- a/src/views/property/comps/left/middle/2/index.js +++ b/src/views/property/comps/left/middle/2/index.js @@ -1,13 +1,48 @@ import Pannel from '@/components/pannel/index.vue'; import PieLegend from '@/components/charts/pie-legend/index.vue'; - +import { debtCategoryAnalysis } from '../../../../api/index.js'; +import { mapGetters } from 'vuex'; export default { components: { PieLegend, Pannel }, + computed: { + ...mapGetters(['year', 'deptId']) + }, + watch: { + year: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + }, + deptId: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + } + }, data () { return { + isLoad: false, + data: [] }; + }, + methods: { + getData () { + if (this.year, this.deptId) { + this.isLoad = false; + debtCategoryAnalysis(this.deptId, this.year).then(res => { + console.log('debtCategoryAnalysis', res); + let data = res.data.map(item => { + return [item.name, item.resourceSort, item.resourceType, item.deptName] + }) + this.data = data; + this.isLoad = true; + }) + } + } } }; diff --git a/src/views/property/comps/right/bottom/4/index.html b/src/views/property/comps/right/bottom/4/index.html index 77c80f7..c8b70cd 100644 --- a/src/views/property/comps/right/bottom/4/index.html +++ b/src/views/property/comps/right/bottom/4/index.html @@ -1,4 +1,9 @@ - - + + \ No newline at end of file diff --git a/src/views/property/comps/right/bottom/4/index.js b/src/views/property/comps/right/bottom/4/index.js index 329cf99..5e796e4 100644 --- a/src/views/property/comps/right/bottom/4/index.js +++ b/src/views/property/comps/right/bottom/4/index.js @@ -1,15 +1,34 @@ import Pannel from '@/components/pannel/index.vue'; import ScrollTable from '@/components/scroll-table/index.vue'; +import { mapGetters } from 'vuex'; +import { listDebtOrganizations2 } from '../../../../api/index.js'; export default { components: { ScrollTable, Pannel }, + computed: { + ...mapGetters(['year', 'deptId']) + }, + watch: { + year: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + }, + deptId: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + } + }, data () { return { + isLoad: false, headers: ['组织名称', '负债总额', '资产总额', '负债率'], data: [ - ['组织名称', '负债总额', '资产总额', '负债率'] ] }; }, @@ -18,5 +37,17 @@ export default { mounted () { }, methods: { + getData () { + if (this.year, this.deptId) { + this.isLoad = false; + listDebtOrganizations2(this.deptId, this.year).then(res => { + let data = res.rows.map(item => { + return [item.name, item.zwze, item.zcze, item.zczwl] + }) + this.data = data; + this.isLoad = true; + }) + } + }, } }; diff --git a/src/views/property/comps/right/middle/4/index.js b/src/views/property/comps/right/middle/4/index.js index c11e527..9e97e4d 100644 --- a/src/views/property/comps/right/middle/4/index.js +++ b/src/views/property/comps/right/middle/4/index.js @@ -1,5 +1,7 @@ import Pannel from '@/components/pannel/index.vue'; import BarSpecial from '@/components/charts/bar-special/index.vue'; +import { mapGetters } from 'vuex'; +import { distributionOfLiabilities } from '../../../../api/index.js'; export default { components: { BarSpecial, @@ -9,10 +11,31 @@ export default { return { }; }, - created () { + computed: { + ...mapGetters(['year', 'deptId']) }, - mounted () { + watch: { + year: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + }, + deptId: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + } }, methods: { + getData () { + if (this.year, this.deptId) { + this.isLoad = false; + distributionOfLiabilities(this.deptId, this.year).then(res => { + this.isLoad = true; + }) + } + }, } }; diff --git a/src/views/property/comps/right/top/4/index.js b/src/views/property/comps/right/top/4/index.js index c2071c5..747acf2 100644 --- a/src/views/property/comps/right/top/4/index.js +++ b/src/views/property/comps/right/top/4/index.js @@ -1,14 +1,50 @@ import Pannel from '@/components/pannel/index.vue'; import BlockIcon from '@/components/block-icon/index.vue'; import data from './data.js'; +import { debtOverview2 } from '../../../../api/index.js'; +import { mapGetters } from 'vuex'; export default { components: { BlockIcon, Pannel }, + computed: { + ...mapGetters(['year', 'deptId']) + }, + watch: { + year: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + }, + deptId: { + handler () { + this.getData(); + }, + immediate: true, // 立即执行 + } + }, data () { return { data }; + }, + methods: { + getData () { + this.isLoad = false // 是否加载完成 + if (this.year, this.deptId) { + debtOverview2(this.deptId, this.year).then(res => { + console.log(222, res); + this.data.topData[0][0].value = res.data.zbdzw + this.data.topData[0][1].value = res.data.gzwl + this.data.topData[1][0].value = res.data.zzwl + this.data.topData[1][1].value = res.data.dzwl + + this.isLoad = true // 是否加载完成 + }) + } + + } } }; diff --git a/src/views/property/main-gis/index.js b/src/views/property/main-gis/index.js index fc26ebb..c001860 100644 --- a/src/views/property/main-gis/index.js +++ b/src/views/property/main-gis/index.js @@ -597,7 +597,6 @@ export default { mapCenterLocation = [116.391458, 39.902377]; } gis = new GisUtils('map2') - console.log('=============='); gis.addTianDiTuLayer() gis.addAnnotationLayer() // 添加村边界 diff --git a/src/views/resources/comps/left/bottom/1/index.html b/src/views/resources/comps/left/bottom/1/index.html index 3adc81f..bece1b6 100644 --- a/src/views/resources/comps/left/bottom/1/index.html +++ b/src/views/resources/comps/left/bottom/1/index.html @@ -1,5 +1,6 @@