From 3f6e114b1d18b178df97c05a30fba11897273575 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Tue, 23 Jul 2024 09:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=94=B3=E6=8A=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E3=80=81=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=B0=8F=E7=B1=BB=E6=94=B9=E4=B8=BA=E6=A0=91=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- package.json | 2 +- src/assets/styles/index.scss | 22 +++ src/assets/styles/public.scss | 126 +++++++++++--- src/assets/styles/utils.scss | 20 +++ .../dataCloudMap/components/honorDialog.vue | 8 +- src/views/dataCloudMap/index.vue | 91 ++++++++-- src/views/home/index.vue | 160 ++---------------- .../enterpriseDirectory/index.vue | 58 +++++-- src/views/onlineDeclaration/records/index.vue | 2 + .../onlineDeclaration/template/index.vue | 53 +++++- src/views/workbench/index.vue | 120 +++---------- 12 files changed, 357 insertions(+), 307 deletions(-) create mode 100644 src/assets/styles/utils.scss diff --git a/.env.development b/.env.development index 321b6f9..1edba8c 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.108: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 = 'https://idp.sipac.gov.cn/api' diff --git a/package.json b/package.json index c6996e2..84ff274 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202407191025", + "version": "1.0.202407230851", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 5f937ef..851a0b2 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -201,6 +201,28 @@ div::-webkit-scrollbar { section::-webkit-scrollbar { display: none; } +// 荣誉情况弹窗样式 +.honor-dialog,.collectDialog-dialog,.headquarterEnterprise-dialog,.serviceIndustry-dialog { + section { + div::-webkit-scrollbar { + display: block; + } + .el-table::-webkit-scrollbar { + display: block; + width: 6px; + height: 6px; + } + + .el-table::-webkit-scrollbar-track { + background-color: #f1f1f1; + } + + .el-table::-webkit-scrollbar-thumb { + background-color: #c0c0c0; + border-radius: 3px; + } + } +} #detail_content_two { width: 100%; #reportId { diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 20e43f7..e00822a 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -1,3 +1,5 @@ +@import "@/assets/styles/utils.scss"; + // 面包屑样式 .my-L-breadcrumb { // height: 55px; @@ -1280,6 +1282,12 @@ } } } + // 企业端首页 + .home-index-main { + height: calc(100% - 55px); + padding: 10px; + box-sizing: border-box; + } } // 企业库==》项目清单的分页按钮 @@ -1362,6 +1370,7 @@ font-family: AlibabaPuHuiTiR; font-size: 14px; color: #999999; + line-height: 22px; // line-height: 31px; // margin-top: 5px; } @@ -1419,7 +1428,7 @@ .echarts-data-box { display: grid; grid-template-columns: 1fr 1fr 1fr; - margin-top: 10px; + margin: 15px 0 12px; .E-box-item { display: flex; .img-box { @@ -1474,7 +1483,9 @@ } #echarts { width: 100%; - height: calc(100% - 100px); + height: calc(100% - 110px); + // height: 30vh; + // height: 370px; } } // 行业纵深情况 @@ -1511,6 +1522,7 @@ font-family: AlibabaPuHuiTiR; font-size: 14px; color: #999999; + line-height: 22px; } } .rightBtn { @@ -1525,7 +1537,7 @@ } } section { - margin-top: 10px; + margin-top: 15px; // width: 100%; // height: calc(100% - 20px); // overflow-y: auto; @@ -1536,7 +1548,7 @@ .el-table { th { font-family: AlibabaPuHuiTiM; - font-weight: bold; + // font-weight: bold; font-size: 14px; color: #333333; .Table-header { @@ -1552,8 +1564,8 @@ } td { font-family: PingFang-SC, PingFang-SC; - font-weight: bold; - font-size: 16px; + // font-weight: bold; + font-size: 15px; color: #666666; border-bottom: none; } @@ -1562,7 +1574,7 @@ } .project-trace-table-number { font-family: DINCondensed, DINCondensed; - font-weight: bold; + // font-weight: bold; font-size: 20px; span { font-family: PingFang-SC-Heavy; @@ -1576,21 +1588,19 @@ } } } - // 企业情况 .dataCloudMap-main-right { height: 100%; display: flex; flex-direction: column; justify-content: space-between; + + // 企业情况 .dataCloudMap-right-top { height: 42%; background-color: #fff; border-radius: 10px; - padding: 10px 20px; + padding: 10px 20px 15px; .right-top-title { - // display: grid; - // grid-template-columns: 1fr 6fr; /* 自动列宽 */ - // align-items: end; /* 垂直对齐方式：底部对齐 */ display: flex; align-items: flex-end; /* 底部对齐 */ .L-title-left { @@ -1614,10 +1624,11 @@ font-family: AlibabaPuHuiTiR; font-size: 14px; color: #999999; + line-height: 22px; } } .dataCloudMap-enterprise { - margin: 10px 0; + margin-top: 15px; display: grid; grid-template-columns: 1fr 1fr 1fr 1fr; grid-column-gap: 10px; @@ -1707,15 +1718,34 @@ } } } + // 全屏模式下企业情况上方卡片样式 + .dataCloudMap-enterprise-fullscreen { + .el-card { + .el-card__header { + .clearfix { + font-size: 18px; + } + } + .el-card__body { + padding: 14px 20px 20px; + } + .card-items { + padding: 10px 10px ; + margin-bottom: 20px; + } + } + } .dataCloudMap-statistics { - margin-top: 20px; + margin-top: 15px; display: grid; grid-template-columns: 1fr 1fr 1fr 1fr; background: radial-gradient( 0% 0% at 0% 0%, #E8F3FC 0%, #F6F9FD 0%), #E8F3FC; padding: 10px 0; width: 100%; .statistics-title { - text-align: center; + display: flex; + align-items: center; + justify-content: center; border-right: 1px solid #C7DAEE; font-family: AlibabaPuHuiTiM; font-size: 18px; @@ -1806,10 +1836,13 @@ } // 荣誉情况 .dataCloudMap-right-middle { + width: 100%; height: 27%; background-color: #fff; border-radius: 10px; - padding: 10px 20px; + padding: 10px 20px 20px; + display: flex; + flex-direction: column; .honor-title { display: flex; align-items: center; @@ -1841,6 +1874,7 @@ font-family: AlibabaPuHuiTiR; font-size: 14px; color: #999999; + line-height: 22px; } } .rightBtn { @@ -1855,13 +1889,21 @@ } } .honor-data { - margin-top: 13px; + margin-top: 15px; display: grid; grid-template-columns: 1fr 1fr 1fr; grid-gap: 10px; + // flex: 1; + // display: flex; + // flex-wrap: wrap; + // justify-content: space-between; + // align-content: space-between; .honor-item { + // width: 32%; display: flex; padding: 20px; + // padding: vh(25) vw(30); + align-items: center; justify-content: space-between; background-color: #F6F9FD; .honor-item-left { @@ -1889,6 +1931,19 @@ } } } + // 全屏模式下样式 + .honor-item-fullscreen { + padding: 30px; + .honor-item-left { + font-size: 17px; + } + .honor-item-number { + font-size: 27px; + } + .honor-item-home { + font-size: 13px; + } + } } } // 项目追踪情况 @@ -1927,6 +1982,7 @@ font-family: AlibabaPuHuiTiR; font-size: 14px; color: #999999; + line-height: 22px; } } .rightBtn { @@ -1949,14 +2005,14 @@ margin-bottom: 25px; th { font-family: AlibabaPuHuiTiM; - font-weight: bold; + // font-weight: bold; font-size: 14px; color: #333333; } td { font-family: PingFang-SC, PingFang-SC; - font-weight: bold; - font-size: 16px; + // font-weight: bold; + font-size: 15px; color: #666666; border-bottom: none; } @@ -1965,7 +2021,7 @@ } .project-trace-table-number { font-family: DINCondensed, DINCondensed; - font-weight: bold; + // font-weight: bold; font-size: 20px; color: #FF844D; } @@ -1979,6 +2035,12 @@ .honor-dialog { .el-dialog__header { border-bottom: 1px solid #F0F0F0; + .el-dialog__title { + font-family: PingFang-SC-Heavy; + font-weight: 800; + font-size: 16px; + color: #000000; + } } section { .el-table--border { @@ -1998,6 +2060,10 @@ text-transform: none; cursor: pointer; } + .grey-number { + color: #666666; + text-decoration-line: none; + } .evenNumber-row { background-color: #F6F9FD; } @@ -2015,6 +2081,12 @@ } .el-dialog__header { border-bottom: 1px solid #F0F0F0; + .el-dialog__title { + font-family: PingFang-SC-Heavy; + font-weight: 800; + font-size: 16px; + color: #000000; + } } .headquarterEnterprise-box { .radio_btn { @@ -2100,6 +2172,12 @@ } .el-dialog__header { border-bottom: 1px solid #F0F0F0; + .el-dialog__title { + font-family: PingFang-SC-Heavy; + font-weight: 800; + font-size: 16px; + color: #000000; + } } .serviceIndustry-box { .radio_btn { @@ -2189,6 +2267,12 @@ } .el-dialog__header { border-bottom: 1px solid #F0F0F0; + .el-dialog__title { + font-family: PingFang-SC-Heavy; + font-weight: 800; + font-size: 16px; + color: #000000; + } } .collectDialog-box { .radio_btn { diff --git a/src/assets/styles/utils.scss b/src/assets/styles/utils.scss new file mode 100644 index 0000000..4fdc498 --- /dev/null +++ b/src/assets/styles/utils.scss @@ -0,0 +1,20 @@ +/** +解决大屏可视化适配问题 +设计稿：1920（宽度），1080（高度） +*/ + +// @function px2vw($px) { +// @return $px/1920*100vw; +// } + +// @function px2vh($px) { +// @return $px/1920*100vh; +// } + +@function vw($px) { + @return $px/1920*100vw; +} + +@function vh($px) { + @return $px/1080*100vh; +} \ No newline at end of file diff --git a/src/views/dataCloudMap/components/honorDialog.vue b/src/views/dataCloudMap/components/honorDialog.vue index 7ac9e9b..752f798 100644 --- a/src/views/dataCloudMap/components/honorDialog.vue +++ b/src/views/dataCloudMap/components/honorDialog.vue @@ -25,24 +25,24 @@ diff --git a/src/views/dataCloudMap/index.vue b/src/views/dataCloudMap/index.vue index ece1b4a..a526848 100644 --- a/src/views/dataCloudMap/index.vue +++ b/src/views/dataCloudMap/index.vue @@ -59,7 +59,7 @@ -
+
@@ -75,7 +75,7 @@
查看更多数据>>
- + diff --git a/src/views/onlineDeclaration/template/index.vue b/src/views/onlineDeclaration/template/index.vue index 0351302..3b8492f 100644 --- a/src/views/onlineDeclaration/template/index.vue +++ b/src/views/onlineDeclaration/template/index.vue @@ -19,15 +19,22 @@ /> --> - - + + + + -
{{ (item.status == 0 ? "待填报" : item.status == 8 ? "初审不通过" : item.status == 10 ? "初审退回修改" : item.status == 7 ? "复审不通过" : item.status == 9 ? "终审不通过" : item.status == 5 ? "终审通过" : "") }}
- -
{{ item.status == 0 ? "去填报" : item.status == 10 ? "去修改" : "去查看"}}
- -
暂无
@@ -124,14 +115,18 @@ +