From b5b2bf6b45feb11de4dcc76021eccafb76ad5cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Thu, 24 Jul 2025 15:25:33 +0800 Subject: [PATCH] =?UTF-8?q?task=2044941=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/charts/bar/index.js | 48 +++++++++---------- .../capital/comps/left/bottom/1/index.html | 4 +- .../capital/comps/left/bottom/1/index.js | 5 +- .../capital/comps/left/middle/1/index.html | 4 +- .../capital/comps/left/middle/1/index.js | 9 ++-- .../capital/comps/right/top/1/index.html | 4 +- .../property/comps/left/bottom/4/index.js | 41 +++++++++++++++- src/views/property/comps/left/top/4/data.js | 2 +- .../property/comps/right/bottom/4/index.js | 2 +- src/views/property/comps/right/top/4/data.js | 18 +++---- src/views/property/index.html | 2 +- src/views/resources/index.html | 2 +- 12 files changed, 91 insertions(+), 50 deletions(-) diff --git a/src/components/charts/bar/index.js b/src/components/charts/bar/index.js index 9503652..c36b5ce 100644 --- a/src/components/charts/bar/index.js +++ b/src/components/charts/bar/index.js @@ -226,30 +226,30 @@ export default { data: data, zlevel: 11, }, - { - type: 'custom', - itemStyle: { - color: 'rgba(18, 40, 83, 0.4)' - }, - renderItem: function (params, api) { - //获取对应类目的axisTick中心点坐标 - var start = api.coord([api.value(0)]); - //通过坐标系的宽度和类目数，计算单个类目的背景 - var width = (params.coordSys.width / 7) * 0.6; - return { - type: 'rect', - shape: { - // 相对左上角坐标 - x: start[0] - width / 2, - y: params.coordSys.y, - width: width, - height: params.coordSys.height, - }, - style: api.style() - }; - }, - data: bgData - } + // { + // type: 'custom', + // itemStyle: { + // color: 'rgba(18, 40, 83, 0.4)' + // }, + // renderItem: function (params, api) { + // //获取对应类目的axisTick中心点坐标 + // var start = api.coord([api.value(0)]); + // //通过坐标系的宽度和类目数，计算单个类目的背景 + // var width = (params.coordSys.width / 7) * 0.6; + // return { + // type: 'rect', + // shape: { + // // 相对左上角坐标 + // x: start[0] - width / 2, + // y: params.coordSys.y, + // width: width, + // height: params.coordSys.height, + // }, + // style: api.style() + // }; + // }, + // data: bgData + // } ] }; this.chart.setOption(option); diff --git a/src/views/capital/comps/left/bottom/1/index.html b/src/views/capital/comps/left/bottom/1/index.html index 409b1f5..89ed506 100644 --- a/src/views/capital/comps/left/bottom/1/index.html +++ b/src/views/capital/comps/left/bottom/1/index.html @@ -10,7 +10,7 @@ element-loading-background="rgba(0, 0, 0, 0.1)"
- +
- \ No newline at end of file + diff --git a/src/views/capital/comps/left/bottom/1/index.js b/src/views/capital/comps/left/bottom/1/index.js index 8624c9c..a9351e5 100644 --- a/src/views/capital/comps/left/bottom/1/index.js +++ b/src/views/capital/comps/left/bottom/1/index.js @@ -16,7 +16,8 @@ export default { return { data: [], // 数据 isLoad: false, // 是否加载完成 - tabIndex: '1' + tabIndex: '1', + titleNum: 0 }; }, computed: { @@ -68,7 +69,7 @@ export default { analysisOfCapitalExpenditureType(this.deptId, this.year).then(res => { let data = res.data.list.map(item => { - + this.titleNum += item.value; return { name: item.name, value: item.value, diff --git a/src/views/capital/comps/left/middle/1/index.html b/src/views/capital/comps/left/middle/1/index.html index c2681e0..462f614 100644 --- a/src/views/capital/comps/left/middle/1/index.html +++ b/src/views/capital/comps/left/middle/1/index.html @@ -10,7 +10,7 @@ element-loading-background="rgba(0, 0, 0, 0.1)"
- +
- \ 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 6fbfc41..032a319 100644 --- a/src/views/capital/comps/left/middle/1/index.js +++ b/src/views/capital/comps/left/middle/1/index.js @@ -7,9 +7,9 @@ import { leftbottomcapitalgainstrend, leftbottomcapitalgainstype } from '../../. const map = { '经营收入': '万元', - '补助收入': '万吨', + '补助收入': '万元', '投资收益': '万元', - '其他收入': '万吨' + '其他收入': '万元' } export default { components: { @@ -22,7 +22,8 @@ export default { return { data: [], // 数据 isLoad: false, // 是否加载完成 - tabIndex: '1' + tabIndex: '1', + titleNum: 0 }; }, computed: { @@ -47,6 +48,7 @@ export default { getData () { if (this.year || this.deptId) { this.isLoad = false; + this.titleNum = 0; // 如果是趋势 if (this.tabIndex == 1) { leftbottomcapitalgainstrend( this.deptId, this.year).then(res => { @@ -63,6 +65,7 @@ export default { // 获取类型 leftbottomcapitalgainstype(this.deptId, this.year).then(res => { let data = res.data.list.map(item => { + this.titleNum += item.value; return { name: item.name, value: item.value, diff --git a/src/views/capital/comps/right/top/1/index.html b/src/views/capital/comps/right/top/1/index.html index c0ad1f9..7d5b8b6 100644 --- a/src/views/capital/comps/right/top/1/index.html +++ b/src/views/capital/comps/right/top/1/index.html @@ -1,4 +1,4 @@ - - \ No newline at end of file + diff --git a/src/views/property/comps/left/bottom/4/index.js b/src/views/property/comps/left/bottom/4/index.js index f334090..9803a9b 100644 --- a/src/views/property/comps/left/bottom/4/index.js +++ b/src/views/property/comps/left/bottom/4/index.js @@ -1,16 +1,53 @@ import Pannel from '@/components/pannel/index.vue'; import ScrollTable from '@/components/scroll-table/index.vue'; +import {mapGetters} from "vuex"; +import { listDebtOrganizations } 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 { - headers: ['组织名称', '负债总额', '资产总额', '负债率'], + headers: ['组织名称', '负债总额(万元)', '资产总额(万元)', '负债率'], data: [ - ['组织名称', '负债总额（万元）', '资产总额（万元）', '负债率'] + ['组织名称', '负债总额', '资产总额', '负债率'] ] }; + }, + methods: { + getData () { + if (this.year, this.deptId) { + this.isLoad = false; + listDebtOrganizations(this.deptId, this.year).then(res => { + let data = res.rows.map(item => { + return [item.name, item.fzze, item.zcze, item.zcfzl] + }) + this.data = data; + this.isLoad = true; + }) + } + }, + tabChange (info) { + this.tabIndex = info.id; + this.getData(); + } } }; diff --git a/src/views/property/comps/left/top/4/data.js b/src/views/property/comps/left/top/4/data.js index 9955929..62b7137 100644 --- a/src/views/property/comps/left/top/4/data.js +++ b/src/views/property/comps/left/top/4/data.js @@ -37,4 +37,4 @@ export default { } ] ] -} \ 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 5e796e4..a24a444 100644 --- a/src/views/property/comps/right/bottom/4/index.js +++ b/src/views/property/comps/right/bottom/4/index.js @@ -27,7 +27,7 @@ export default { data () { return { isLoad: false, - headers: ['组织名称', '负债总额', '资产总额', '负债率'], + headers: ['组织名称', '负债总额(万元)', '资产总额(万元)', '债务率'], data: [ ] }; diff --git a/src/views/property/comps/right/top/4/data.js b/src/views/property/comps/right/top/4/data.js index 9955929..b64a851 100644 --- a/src/views/property/comps/right/top/4/data.js +++ b/src/views/property/comps/right/top/4/data.js @@ -4,16 +4,16 @@ export default { { value: '29', unit: '个', - name: '资不抵债', - text: '资产负债率＞100%', + name: '资不抵债务', + text: '资产债务率＞100%', color: 'rgba(252, 91, 110, 1)', icon: require('./组 4669@2x.png') }, { value: '29', unit: '个', - name: '高负债率', - text: '60%＜资产负债率≤100%', + name: '高债务率', + text: '60%＜资产债务率≤100%', color: 'rgba(252, 133, 91, 1)', icon: require('./组 4669@2x(1).png') } @@ -22,19 +22,19 @@ export default { { value: '29', unit: '个', - name: '中负债率', + name: '中债务率', color: 'rgba(252, 231, 91, 1)', - text: '40%≤资产负债率≤60%', + text: '40%≤资产债务率≤60%', icon: require('./组 4669@2x(2).png') }, { value: '29', unit: '个', - name: '低负债率', + name: '低债务率', color: 'rgba(91, 252, 114, 1)', - text: '资产负债率＜40%', + text: '资产债务率＜40%', icon: require('./组 4669@2x(3).png') } ] ] -} \ No newline at end of file +} diff --git a/src/views/property/index.html b/src/views/property/index.html index d20ac89..db5c5e2 100644 --- a/src/views/property/index.html +++ b/src/views/property/index.html @@ -1,6 +1,6 @@
- +
diff --git a/src/views/resources/index.html b/src/views/resources/index.html index 636f5ce..895bb01 100644 --- a/src/views/resources/index.html +++ b/src/views/resources/index.html @@ -13,7 +13,7 @@
-
+