From 139b39fe1293eba6d21be9d854d2bcd966707fdb Mon Sep 17 00:00:00 2001 From: TiaStars Date: Thu, 29 Aug 2024 18:40:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- package.json | 2 +- src/assets/styles/publicPro.scss | 130 +++++++++++------- .../components/AFuwufazhanzonglan/index.vue | 6 +- .../components/capitalConditionTOP5/index.vue | 40 ++++-- src/views/workbenchPro/index.vue | 11 +- 6 files changed, 124 insertions(+), 69 deletions(-) diff --git a/.env.development b/.env.development index 710cf5d..1ffa280 100644 --- a/.env.development +++ b/.env.development @@ -5,9 +5,9 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -# VUE_APP_BASE_API = 'http://192.168.0.110:9040' +VUE_APP_BASE_API = 'http://192.168.0.110:9040' # 测试环境数据库 -VUE_APP_BASE_API = 'http://39.101.188.84:9040' +# VUE_APP_BASE_API = 'http://39.101.188.84:9040' # 脱敏三方测试用数据库 # VUE_APP_BASE_API = 'http://39.101.188.84:9031' # 正式环境数据库 diff --git a/package.json b/package.json index eb5935e..02979ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408291508", + "version": "1.0.202408291813", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/assets/styles/publicPro.scss b/src/assets/styles/publicPro.scss index aa9980a..c86b599 100644 --- a/src/assets/styles/publicPro.scss +++ b/src/assets/styles/publicPro.scss @@ -79,7 +79,7 @@ .home-main { width: 100%; padding: 10px; - height: calc(100% - 132px); + height: calc(100% - 91px); display: flex; flex-direction: column; @@ -253,7 +253,7 @@ } .service-left { - padding: 10px 20px; + padding: 10px; .home-mainPro-top, .home-mainPro-middle, @@ -263,60 +263,77 @@ .pro-left-box, .pro-right-box { - width: 50%; + height: 100%; padding: 10px; background-color: #F5F8FA; border-radius: 10px; + display: flex; + flex-direction: column; + } + .pro-left-box { + width: 55%; + } + .pro-right-box { + width: 45%; } } .home-mainPro-top { + height: 35%; .home-mainPro-top-box { width: 100%; - height: 28vh; + height: 100%; overflow: hidden; } // 服务发展 .AFuwufazhanzonglan-box { + flex: 1; .AFuwufazhanzonglan { width: 100%; height: 100%; - + display: grid; + grid-template-columns: 1fr; + grid-gap: 15px; + padding-top: 10px; .AFuwufazhanzonglan-listbox { width: 100%; - height: 45%; background: #FFFFFF; border-radius: 10px; - margin: 2% 0; + // margin: 2% 0; padding: 5px 5px; display: flex; align-items: center; .AFuwufazhanzonglan-niandu { - width: 3%; + width: 5%; writing-mode: vertical-rl; /* 竖直显示，文字从上到下 */ text-align: center; font-size: 12px; + font-family: PingFang-SC; + font-weight: bold; + color: #666666; + line-height: 20px; } .AFuwufazhanzonglan-neirongBox { width: 100%; display: flex; align-items: center; + justify-content: space-between; .AFuwufazhanzonglan-item { - width: 95%; + // width: 95%; display: flex; align-items: center; margin: 0 10px; - flex: 1; + // flex: 1; .AFuwufazhanzonglan-img-box { - width: 65px; - height: 65px; + width: 50px; + height: 50px; border-radius: 50%; background-size: cover; background-repeat: no-repeat; @@ -345,34 +362,43 @@ div:nth-child(1) { font-size: 20px; font-weight: bold; - + font-family: DINCondensed, DINCondensed; + font-weight: bold; + line-height: 30px; + margin-right: 5px; + color: #333333; span { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; font-size: 12px; - color: #737373; + line-height: 18px; + color: #666666; } } div:nth-child(2) { - font-size: 14px; - margin-bottom: 5px; - font-size: 14px; - max-width: 100px; - white-space: nowrap; - /* 不换行 */ - overflow: hidden; - /* 隐藏溢出的内容 */ - text-overflow: ellipsis; - /* 显示省略号 */ + // font-size: 14px; + // margin-bottom: 5px; + // font-size: 14px; + // max-width: 100px; + // white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + font-family: PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #666666; } div:nth-child(3) { - + font-family: PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #666666; } } } } - - } } } @@ -385,16 +411,16 @@ .home-mainPro-middle { margin: 10px 0; - + height: 40%; + // 企业获得资金拨付排名TOP5 .capitalConditionTOP5-box { - padding: 10px 0; - + flex: 1; section { margin-top: 10px; - // .el-table--border { - // border: 1px solid #dfe6ec; - // } + .el-table--border { + border: 1px solid #dfe6ec; + } .el-table { .project-trace-table-ranking { // padding: 1px 0px; @@ -408,22 +434,21 @@ color: #FFFFFF; } - .project-table-Info { - font-family: AlibabaPuHuiTiR; - font-weight: 500; + .project-trace-table-number { + font-weight: bold; font-size: 14px; - color: #1890FF; - // font-style: normal; - // text-decoration-line: underline; - // text-transform: none; - cursor: pointer; + text-align: center; + font-family: PingFang-SC; + color: #333333; } th { font-weight: bold; font-size: 14px; - color: #000; text-align: center; + font-family: PingFang-SC; + color: #333333; + padding: 0; .Table-header { // font-family: AlibabaPuHuiTiM; @@ -440,9 +465,11 @@ } td { - font-weight: 500; + font-weight: bold; font-size: 14px; - color: #666666; + text-align: center; + font-family: PingFang-SC; + color: #333333; } } } @@ -573,6 +600,7 @@ color: #383838; } + // 企业获得资金拨付排名TOP5右侧选择框 .left-box-select { flex: 1; display: flex; @@ -580,12 +608,22 @@ align-items: center; .el-select { - width: 100px; - + width: 130px; .el-input__inner { text-align: center; + height: 30px; + line-height: 30px; + border-color: #0086FF; + color: #0086FF; + } + .el-input--medium .el-input__icon { + line-height: 30px; + color: #0086FF; } } + .years-select { + margin-right: 10px; + } } } diff --git a/src/views/workbenchPro/components/AFuwufazhanzonglan/index.vue b/src/views/workbenchPro/components/AFuwufazhanzonglan/index.vue index 0d72391..1472e4b 100644 --- a/src/views/workbenchPro/components/AFuwufazhanzonglan/index.vue +++ b/src/views/workbenchPro/components/AFuwufazhanzonglan/index.vue @@ -1,9 +1,9 @@ - + + + + @@ -33,7 +37,7 @@ export default { return { loading:false, tableData:[], - tabHeader: 200, + tabHeader: null, } }, props:{ @@ -41,7 +45,7 @@ export default { type:Number, default:1, }, - yearsChange:{ + yearsValue:{ type:Number, default:1, }, @@ -49,17 +53,17 @@ export default { watch:{ typeValue:{ handler(newVAlue){ - console.log(newVAlue); + this.getList(); }, }, - yearsChange:{ + yearsValue:{ handler(newVAlue){ - console.log(newVAlue); + this.getList(); }, }, }, mounted() { - // this.cancalDebounce(); + this.cancalDebounce(); window.addEventListener('resize', this.cancalDebounce); this.getList(); }, @@ -67,7 +71,7 @@ export default { // 获取top5列表 getList(){ this.loading = true; - top5Fund().then(res=>{ + top5Fund({type:this.typeValue,yearsChange:this.yearsValue}).then(res=>{ let arr = []; let bgc = ['#EE462A','#FF8929','#ffbb00','#5CBC69','#00AEFF'] res.data.forEach((element,index) => { @@ -95,13 +99,23 @@ export default { }) } }, + formatDate(dateString,id) { + const year = dateString.slice(0, 4); + const month = dateString.slice(4, 6); + const day = dateString.slice(6, 8); + if(id == 1) { + return `${year}年${month}月${day}日`; + } else { + return `${year}-${month}-${day}`; + } + }, // 屏幕尺寸变化 cancalDebounce(){ - const element = document.getElementById('zhijinbofu-qingkaung'); // 通过元素的 ID 获取元素 - const header = document.getElementById('zhijinbofu-header-id'); // 通过元素的 ID 获取元素 + const element = document.getElementById('home-mainPro-middle-id'); // 通过元素的 ID 获取元素 + const header = document.getElementById('TOP-header-id'); // 通过元素的 ID 获取元素 const elementHeight = element.offsetHeight; const headerHeight = header.offsetHeight; - this.tabHeader = elementHeight - headerHeight - 35; + this.tabHeader = elementHeight - headerHeight - 30; } }, } diff --git a/src/views/workbenchPro/index.vue b/src/views/workbenchPro/index.vue index ae219e7..ff6287b 100644 --- a/src/views/workbenchPro/index.vue +++ b/src/views/workbenchPro/index.vue @@ -47,12 +47,12 @@
-
-
+
+
企业获得资金拨付排名TOP5
- + @@ -75,7 +75,7 @@
- +
@@ -83,6 +83,9 @@ 当年已申报完成的项目
+
+ +