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 2c1b8aa..2782af0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408301742", + "version": "1.0.202409031604", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/assets/styles/publicPro.scss b/src/assets/styles/publicPro.scss index b5f654f..ff22117 100644 --- a/src/assets/styles/publicPro.scss +++ b/src/assets/styles/publicPro.scss @@ -264,12 +264,14 @@ .service-left { padding: 10px; + height: 100%; + overflow: hidden; display: flex; flex-direction: column; - .home-mainPro-top, - .home-mainPro-middle, - .home-mainPro-bottom { + .home-mainPro-top { + height: 32%; + // height: 250px; display: flex; align-items: center; @@ -288,12 +290,6 @@ .pro-right-box { width: 45%; } - } - - - .home-mainPro-top { - // height: 32%; - height: 250px; .home-mainPro-top-box { width: 100%; height: 100%; @@ -534,14 +530,32 @@ .home-mainPro-middle { margin: 10px 0; - // height: 45%; - flex: 2; + height: 40%; + display: flex; + align-items: center; + // overflow: hidden; + + .pro-left-box, + .pro-right-box { + 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%; + } + // flex: 2; // 企业获得资金拨付排名TOP5 .capitalConditionTOP5-box,.wancheng-project { flex: 1; section { margin-top: 10px; - .el-table--border { border: 1px solid #dfe6ec; } @@ -605,8 +619,26 @@ } .home-mainPro-bottom { - // height: 25.5%; - flex: 1.3; + height: 25.5%; + // flex: 1.3; + display: flex; + align-items: center; + + .pro-left-box, + .pro-right-box { + 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%; + } .wancheng-project { flex: 1; section { @@ -681,6 +713,7 @@ } } } + } @@ -826,6 +859,13 @@ color: #0086FF; } } + .el-radio-group { + .el-radio-button { + .el-radio-button__inner { + padding: 5px 15px; + } + } + } .years-select { margin-right: 10px; } diff --git a/src/views/homeTwo/index.vue b/src/views/homeTwo/index.vue index d13afab..2e90b97 100644 --- a/src/views/homeTwo/index.vue +++ b/src/views/homeTwo/index.vue @@ -10,7 +10,7 @@
- 企业荣誉资质(5个) + 企业荣誉资质
@@ -34,7 +34,7 @@
- 关联项目进展(3个) + 关联项目进展
diff --git a/src/views/workbenchPro/components/capitalConditionTOP5/index.vue b/src/views/workbenchPro/components/capitalConditionTOP5/index.vue index f89d1ff..38f4a2c 100644 --- a/src/views/workbenchPro/components/capitalConditionTOP5/index.vue +++ b/src/views/workbenchPro/components/capitalConditionTOP5/index.vue @@ -1,7 +1,7 @@