From 33f0cfcd94eb8b40ba010939e0cfc387fc430add Mon Sep 17 00:00:00 2001 From: TiaStars Date: Thu, 29 Aug 2024 14:24:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- package.json | 2 +- src/api/jin_ji_hu/zijinbiao/index.js | 9 + src/assets/styles/index.scss | 1 + src/assets/styles/publicPro.scss | 447 ++++++++++++++++++ src/layout/components/AppMain.vue | 2 +- src/layout/components/FixedHeader/index.vue | 2 +- src/views/home/index.vue | 28 +- src/views/homeTwo/index.vue | 408 ++++++++++++++++ src/views/infoMaintain/index.vue | 2 +- src/views/policyDocument/index.vue | 2 +- .../components/capitalConditionTOP5/index.vue | 111 +++++ src/views/workbenchPro/index.vue | 433 +++++++++++++++++ 13 files changed, 1440 insertions(+), 11 deletions(-) create mode 100644 src/assets/styles/publicPro.scss create mode 100644 src/views/homeTwo/index.vue create mode 100644 src/views/workbenchPro/components/capitalConditionTOP5/index.vue create mode 100644 src/views/workbenchPro/index.vue diff --git a/.env.development b/.env.development index 231ebb7..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.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 = '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 12e52a2..623f996 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408270918", + "version": "1.0.202408290906", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/api/jin_ji_hu/zijinbiao/index.js b/src/api/jin_ji_hu/zijinbiao/index.js index aa0e080..b3870e2 100644 --- a/src/api/jin_ji_hu/zijinbiao/index.js +++ b/src/api/jin_ji_hu/zijinbiao/index.js @@ -39,4 +39,13 @@ export function fundStatistics() { url: "/jjh/jProjectFund/fundStatistics" , method: "get", }) +} + +// 正式环境政务端工作台 --> 企业获得资金拨付排名TOP5 +export function top5Fund(params){ + return request({ + url: "/jjh/chiefWork/top5Fund" , + method: "get", + params + }) } \ No newline at end of file diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index fb87c70..f022af5 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -6,6 +6,7 @@ @import "./btn.scss"; @import "./buttonType.scss"; @import "./public.scss"; +@import "./publicPro.scss"; @import "./font.css"; body { diff --git a/src/assets/styles/publicPro.scss b/src/assets/styles/publicPro.scss new file mode 100644 index 0000000..365b770 --- /dev/null +++ b/src/assets/styles/publicPro.scss @@ -0,0 +1,447 @@ +// 正式环境政务端工作台样式 +.workbench-box-pro { + height: 100%; + width: 100%; + + header { + background: url("../images/workbench.png"); + background-size: 100% 100%; + padding: 20px 0; + display: flex; + align-items: center; + + .workbench-serch { + padding-left: 200px; + + .workbench-title { + display: flex; + margin-bottom: 5px; + + .title-item { + cursor: pointer; + padding: 10px 60px 10px 40px; + border-top-right-radius: 30% 100%; + margin-right: 15px; + background: #FFFFFF; + box-shadow: 2px 0 3px 0px #ccc; + } + + .checked-item { + background: #409EFF; + color: #fff; + } + } + + .workbench-btn { + height: 45px; + + .el-autocomplete { + width: 800px; + height: 100%; + } + + .el-input { + width: 100%; + height: 100%; + + input { + height: 100%; + } + + .el-input-group__append { + width: 80px; + text-align: center; + cursor: pointer; + // background: radial-gradient( farthest-side at 40px 40px, #1B84D2 20%, #30CEF5 100%); + background: linear-gradient(to right, #1B84D2, #30CEF5); + // font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 16px; + color: #FFFFFF; + } + } + } + } + } + + // 工作台 + .home-main { + width: 100%; + padding: 10px; + height: calc(100% - 132px); + display: flex; + flex-direction: column; + .main-row { + height: 100%; + box-sizing: border-box; + display: flex; + background-color: #f6f7f9; + + .work-main-left { + background-color: #fff; + border-radius: 10px; + margin-right: 10px; + height: 100%; + + .main-left { + padding: 10px 20px; + height: 100%; + + .left-header { + margin-bottom: 10px; + display: flex; + align-items: flex-end; + justify-content: space-between; + + .left-header-titleS { + display: flex; + align-items: center; + + .dataCloudMap-birght { + width: 6px; + height: 18px; + background: #0086FF; + box-shadow: 3px 0 3px 0px #0086FF; + border-radius: 5px 5px 5px 5px; + } + + .left-header-title { + font-family: AlibabaPuHuiTiB; + margin: 0 10px; + font-weight: bold; + font-size: 18px; + color: #333333; + } + } + + .el-button { + font-family: PingFang-SC-Medium; + font-weight: 500; + font-size: 14px; + color: #0086FF; + } + } + + .left-main { + height: calc(100% - 55px); + overflow-y: auto; + + .el-card { + background-color: #F5F8FA; + border: none; + margin-bottom: 10px; + .el-card__body { + padding: 10px 20px; + } + } + + .el-card-border { + border: 1px solid rgba(245, 95, 95, 0.4); // #FD5F5F + } + + .warn-main { + display: flex; + justify-content: space-between; + + .warn-main-left { + display: flex; + flex: 1; + + .warn-main-img { + padding-top: 3px; + + img { + width: 20px; + height: 20px; + margin-right: 10px; + } + } + + .warn-main-content { + flex: 1; + .content-title,.content-title-type { + font-weight: bold; + font-size: 15px; + color: #333333; + } + .content-title-type { + margin-top: 5px; + } + .content-middle { + font-weight: bold; + font-size: 15px; + color: #333333; + margin: 10px 0; + } + .tixing-duanxin { + display: flex; + align-items: center; + } + .content-time { + font-weight: 500; + font-size: 14px; + color: #737373; + } + .content-time-two { + margin-left: 10px; + } + } + } + + .different-left { + .warn-main-content { + display: flex; + flex-direction: column; + justify-content: space-between; + } + } + + .warn-main-right { + padding-right: 10px; + display: flex; + flex-direction: column; + justify-content: space-between; + + .warn-main-right-chakan { + display: flex; + align-items: center; + justify-content: center; + background: rgba(19, 78, 230, 0.1); + padding: 5px 15px; + cursor: pointer; + border-radius: 50px; + font-weight: 500; + font-size: 14px; + color: #134EE6; + margin-bottom: 10px; + } + + .warn-main-right-status { + padding: 0px 15px; + font-weight: 500; + font-size: 14px; + color: #4EB997; + } + + .status-unread { + color: #FD5F5F; + } + } + } + } + } + } + + .service-left { + padding: 10px 20px; + .home-mainPro-top,.home-mainPro-middle,.home-mainPro-bottom { + display: flex; + align-items: center; + .pro-left-box, .pro-right-box { + width: 50%; + padding: 10px; + background-color: #F5F8FA; + border-radius: 10px; + } + } + .home-mainPro-top { + + } + .home-mainPro-middle { + margin: 10px 0; + .capitalConditionTOP5-box { + padding: 10px 0; + section { + margin-top: 10px; + // .el-table--border { + // border: 1px solid #dfe6ec; + // } + .el-table { + .project-trace-table-ranking { + // padding: 1px 0px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 5px; + font-weight: normal; + font-size: 12px; + font-family: ArialB; + color: #FFFFFF; + } + .project-table-Info { + font-family: AlibabaPuHuiTiR; + font-weight: 500; + font-size: 14px; + color: #1890FF; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; + cursor: pointer; + } + th { + font-weight: bold; + font-size: 14px; + color: #000; + text-align: center; + .Table-header { + // font-family: AlibabaPuHuiTiM; + font-size: 14px; + color: #333333; + } + .Table-unit { + font-family: AlibabaPuHuiTiR; + font-size: 12px; + font-weight: 400; + color: #333333; + } + } + td { + font-weight: 500; + font-size: 14px; + color: #666666; + } + } + } + } + } + } + + .work-main-right { + background-color: #fff; + border-radius: 10px; + height: 100%; + + .main-right { + padding: 10px 20px; + height: 100%; + .right-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 15px; + + .right-header-box { + display: flex; + align-items: center; + + .dataCloudMap-birght { + width: 6px; + height: 18px; + background: #0086FF; + box-shadow: 3px 0 3px 0px #0086FF; + border-radius: 5px 5px 5px 5px; + } + + .right-header-title { + font-family: AlibabaPuHuiTiB; + margin: 0 10px; + font-weight: bold; + font-size: 18px; + color: #333333; + } + } + + .el-button { + font-family: PingFang-SC-Medium; + font-weight: 500; + font-size: 14px; + color: #0086FF; + } + } + + .right-main { + height: calc(100% - 55px); + overflow-y: scroll; + .main-items { + display: flex; + align-items: center; + padding: 10px 30px; + background: #F5F8FA; + border: 1px solid #D9D9D9; + border-bottom: none; + text-align: center; + + &:last-child { + border-bottom: 1px solid #D9D9D9; + } + + div { + width: 40%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + // font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #666666; + } + + .last_child_item { + width: 20%; + // font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #1890FF; + // text-decoration: underline; + cursor: pointer; + } + + .tab-red { + color: #C51717; + } + } + + .main-item { + background-color: #fff; + } + } + } + } + } + + .main-two-row { + height: 100%; + flex-direction: column; + // align-content: space-between; + justify-content: space-between; + } + + .box-header { + display: flex; + align-items: center; + .garden { + width: 10px; + height: 10px; + border-radius: 50%; + background-color: #0086FF; + margin-right: 10px; + } + .box-header-title { + font-family: AlibabaPuHuiTiB; + font-size: 16px; + color: #383838; + } + .left-box-select { + flex: 1; + display: flex; + justify-content: flex-end; + align-items: center; + .el-select { + width: 100px; + .el-input__inner { + text-align: center; + } + } + } + } + + } + + // 企业端首页 + .home-index-main { + height: calc(100% - 55px); + padding: 10px; + box-sizing: border-box; + } +} \ No newline at end of file diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index e73a475..fbe55ae 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -19,7 +19,7 @@ export default { $route: { handler(route) { // console.log(route,"route"); - if((route.path == "/workbench" && this.userType == "01") || route.path == "/dataCloudMap") { + if((route.path == "/workbench" && this.userType == "01") || route.path == "/dataCloudMap" || route.path == "/workbenchPro") { this.breadcrumb = true; } else if(route.path == "/workbench" && this.userType == "02") { this.breadcrumbTwo = true; diff --git a/src/layout/components/FixedHeader/index.vue b/src/layout/components/FixedHeader/index.vue index 9af9b97..7b8fe55 100644 --- a/src/layout/components/FixedHeader/index.vue +++ b/src/layout/components/FixedHeader/index.vue @@ -60,7 +60,7 @@ export default { $route: { handler(route) { // console.log(route,"route"); - if(route.path == "/workbench" || route.path == "/dataCloudMap") { + if(route.path == "/workbench" || route.path == "/dataCloudMap" || route.path == "/workbenchPro") { this.breadcrumbShow = false; } else { this.breadcrumbShow = true; diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 3fcd123..e4a3eee 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -28,7 +28,7 @@
拨付时间： - {{ parseTime(item.appropriationTime, '{y}-{m}-{d}') }} + {{ item.appropriationTime ? formatDate(item.appropriationTime,2) : '' }}
拨付金额(元): @@ -56,7 +56,7 @@
申报时间： - {{ parseTime(item.createTime, '{y}-{m}-{d}') }} + {{ formatYear(item.createTime) }}
@@ -87,7 +87,7 @@ @@ -110,7 +110,7 @@
申报时间： - {{ parseTime(item.createTime, '{y}-{m}-{d}') }} + {{ formatYear(item.createTime) }}
@@ -393,6 +393,26 @@ export default { }) } }, + formatYear(time){ + const year = time.slice(0, 4); + let date = new Date(); + const currentYear = date.getFullYear(); //获取完整的年份(4位) + if(Number(year) < Number(currentYear)) { + return year; + } else { + return this.parseTime(time, '{y}-{m}-{d}') + } + }, + 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('task-box'); // 通过元素的 ID 获取元素 diff --git a/src/views/homeTwo/index.vue b/src/views/homeTwo/index.vue new file mode 100644 index 0000000..d13afab --- /dev/null +++ b/src/views/homeTwo/index.vue @@ -0,0 +1,408 @@ + + + diff --git a/src/views/infoMaintain/index.vue b/src/views/infoMaintain/index.vue index 510e0c0..83d4528 100644 --- a/src/views/infoMaintain/index.vue +++ b/src/views/infoMaintain/index.vue @@ -37,7 +37,7 @@
- + diff --git a/src/views/policyDocument/index.vue b/src/views/policyDocument/index.vue index 6b2b65a..818a671 100644 --- a/src/views/policyDocument/index.vue +++ b/src/views/policyDocument/index.vue @@ -4,7 +4,7 @@