From ce5f99695c577ea0fa86595ea5aba64f13969dfb Mon Sep 17 00:00:00 2001 From: TiaStars Date: Wed, 7 Aug 2024 13:05:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BA=91=E5=9B=BE=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=B8=A6=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=8A=B6=E6=80=81=EF=BC=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=82=B9=E5=87=BB=E4=B8=80=E7=9B=B4=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- package.json | 2 +- src/views/onlineDeclaration/template/index.vue | 4 ++-- src/views/project/index.vue | 4 ++++ .../workbench/components/capitalCondition/index.vue | 4 ++-- .../components/capitalConditionTOP5/index.vue | 4 ++-- .../workbench/components/emphasisProject/index.vue | 4 ++-- src/views/workbench/index.vue | 12 ++++++------ 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.env.development b/.env.development index 2773117..d6ca00d 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.111:9040' -# VUE_APP_BASE_API = 'http://39.101.188.84:9040' +# VUE_APP_BASE_API = 'http://192.168.0.111:9040' +VUE_APP_BASE_API = 'http://39.101.188.84:9040' # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' # 路由懒加载 diff --git a/package.json b/package.json index 0182266..523f38f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408061928", + "version": "1.0.202408070944", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/views/onlineDeclaration/template/index.vue b/src/views/onlineDeclaration/template/index.vue index 4720ccb..dd993ad 100644 --- a/src/views/onlineDeclaration/template/index.vue +++ b/src/views/onlineDeclaration/template/index.vue @@ -145,7 +145,7 @@ --> - + - + diff --git a/src/views/project/index.vue b/src/views/project/index.vue index 4120ba4..f95ce57 100644 --- a/src/views/project/index.vue +++ b/src/views/project/index.vue @@ -285,6 +285,8 @@ export default { }) resolve(nodes) }) + } else { + resolve(node) } } }, @@ -356,11 +358,13 @@ export default { this.formInline.projectBigType = arr[0]; this.formInline.projectMiddleType = arr[1] ? arr[1] : null; this.formInline.projectSmallType = arr[2] ? arr[2] : null; + this.formInline.status = '5' this.pagination = { ...this.pagination,...this.formInline }; this.formInline.projectClassify = arr; } if(this.$route.params.projectYear) { this.formInline.projectYear = this.$route.params.projectYear ? this.$route.params.projectYear + '' : ''; + this.formInline.status = '5' this.pagination = { ...this.pagination,...this.formInline }; } // if(this.$route.params.projectName) { diff --git a/src/views/workbench/components/capitalCondition/index.vue b/src/views/workbench/components/capitalCondition/index.vue index c094c9f..6c5f59e 100644 --- a/src/views/workbench/components/capitalCondition/index.vue +++ b/src/views/workbench/components/capitalCondition/index.vue @@ -64,8 +64,8 @@ export default { methods:{ // 屏幕尺寸变化 cancalDebounce(){ - const element = document.getElementById('analyse-middle-box-id'); // 通过元素的 ID 获取元素 - const header = document.getElementById('box-header-id'); // 通过元素的 ID 获取元素 + const element = document.getElementById('zhijinyindao-qingkuang'); // 通过元素的 ID 获取元素 + const header = document.getElementById('zhijinyindao-header-id'); // 通过元素的 ID 获取元素 const elementHeight = element.offsetHeight; const headerHeight = header.offsetHeight; this.tabHeader = elementHeight - headerHeight - 35; diff --git a/src/views/workbench/components/capitalConditionTOP5/index.vue b/src/views/workbench/components/capitalConditionTOP5/index.vue index d54dceb..e144934 100644 --- a/src/views/workbench/components/capitalConditionTOP5/index.vue +++ b/src/views/workbench/components/capitalConditionTOP5/index.vue @@ -73,8 +73,8 @@ export default { methods:{ // 屏幕尺寸变化 cancalDebounce(){ - const element = document.getElementById('analyse-middle-box-id'); // 通过元素的 ID 获取元素 - const header = document.getElementById('box-header-id'); // 通过元素的 ID 获取元素 + const element = document.getElementById('zhijinbofu-qingkaung'); // 通过元素的 ID 获取元素 + const header = document.getElementById('zhijinbofu-header-id'); // 通过元素的 ID 获取元素 const elementHeight = element.offsetHeight; const headerHeight = header.offsetHeight; this.tabHeader = elementHeight - headerHeight - 35; diff --git a/src/views/workbench/components/emphasisProject/index.vue b/src/views/workbench/components/emphasisProject/index.vue index d2043f2..c71b1a0 100644 --- a/src/views/workbench/components/emphasisProject/index.vue +++ b/src/views/workbench/components/emphasisProject/index.vue @@ -66,8 +66,8 @@ export default { methods:{ // 屏幕尺寸变化 cancalDebounce(){ - const element = document.getElementById('analyse-middle-box-id'); // 通过元素的 ID 获取元素 - const header = document.getElementById('box-header-id'); // 通过元素的 ID 获取元素 + const element = document.getElementById('zhongdian-xiangmu'); // 通过元素的 ID 获取元素 + const header = document.getElementById('zhongdian-header-id'); // 通过元素的 ID 获取元素 const elementHeight = element.offsetHeight; const headerHeight = header.offsetHeight; this.tabHeader = elementHeight - headerHeight - 30; diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue index 7aaf2fa..2bd0129 100644 --- a/src/views/workbench/index.vue +++ b/src/views/workbench/index.vue @@ -161,8 +161,8 @@ - -
+ +
重点及特色项目
@@ -188,8 +188,8 @@
- -
+ +
资金引导情况分析
@@ -197,8 +197,8 @@
- -
+ +
拨付资金企业申请情况TOP5