From e27751fdccb5fdf61fe06e39f63ef5643e9c7c77 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Thu, 5 Sep 2024 10:36:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=91=E4=B8=89=E5=B9=B4=E8=B5=84=E9=87=91?= =?UTF-8?q?=E6=8B=A8=E4=BB=98=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/api/jin_ji_hu/zijinbiao/index.js | 8 + src/assets/styles/publicPro.scss | 2 +- .../components/BJinsannianzijin/index.vue | 141 ++++++++++++++---- src/views/workbenchPro/index.vue | 12 +- 5 files changed, 134 insertions(+), 33 deletions(-) diff --git a/.env.development b/.env.development index 1ffa280..eba5441 100644 --- a/.env.development +++ b/.env.development @@ -5,11 +5,11 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.110:9040' +# VUE_APP_BASE_API = 'http://192.168.0.108:9040' # 测试环境数据库 # VUE_APP_BASE_API = 'http://39.101.188.84:9040' # 脱敏三方测试用数据库 -# VUE_APP_BASE_API = 'http://39.101.188.84:9031' +VUE_APP_BASE_API = 'http://39.101.188.84:9031' # 正式环境数据库 # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' diff --git a/src/api/jin_ji_hu/zijinbiao/index.js b/src/api/jin_ji_hu/zijinbiao/index.js index 75875a9..61e9634 100644 --- a/src/api/jin_ji_hu/zijinbiao/index.js +++ b/src/api/jin_ji_hu/zijinbiao/index.js @@ -80,4 +80,12 @@ export function memorandum(){ url: "/jjh/chiefWork/memorandum" , method: "get", }) +} + +// 正式环境政务端工作台 --> 近三年资金拨付情况 +export function threeYearsFund(year){ + return request({ + url: "/jjh/chiefWork/threeYearsFund/" + year, + method: "get", + }) } \ No newline at end of file diff --git a/src/assets/styles/publicPro.scss b/src/assets/styles/publicPro.scss index ff22117..700e2e7 100644 --- a/src/assets/styles/publicPro.scss +++ b/src/assets/styles/publicPro.scss @@ -472,7 +472,7 @@ display: flex; .BJinsannianzijinchart-left, .zongbuzhuanxing-box{ - width: 75%; + width: 68%; height: 100%; } .BJinsannianzijinchart-right { diff --git a/src/views/workbenchPro/components/BJinsannianzijin/index.vue b/src/views/workbenchPro/components/BJinsannianzijin/index.vue index 4100f97..48f4d2d 100644 --- a/src/views/workbenchPro/components/BJinsannianzijin/index.vue +++ b/src/views/workbenchPro/components/BJinsannianzijin/index.vue @@ -12,15 +12,15 @@
资金预算 -
60 万元
+
{{ obj.fundBudget }} 万元
追加预算 -
40 万元
+
{{ obj.additionBudget }} 万元
-
拨付资金 80万元 (执行率 80% )
+
拨付资金 {{ obj.appropriationFund }}万元 (执行率 {{ obj.implementationRate }}% )
@@ -34,15 +34,15 @@
资金预算 -
60 万元
+
{{ objTwo.fundBudget }} 万元
追加预算 -
40 万元
+
{{ objTwo.additionBudget }} 万元
-
拨付资金 80万元 (执行率 80% )
+
拨付资金 {{ objTwo.appropriationFund }}万元 (执行率 {{ objTwo.implementationRate }}% )
@@ -50,7 +50,7 @@