diff --git a/.env.development b/.env.development index b2cda0a..c6cec0b 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.118:9040' +VUE_APP_BASE_API = 'http://192.168.0.109: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 6aaaff8..c02b8e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408021554", + "version": "1.0.202408051113", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 3aaca27..5d6abda 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -1496,7 +1496,7 @@ .main-right { padding: 10px 20px; - + height: 100%; .right-header { display: flex; justify-content: space-between; @@ -1533,7 +1533,8 @@ } .right-main { - height: 121px; + // height: 121px; + height: calc(100% - 55px); overflow-y: scroll; .main-items { display: flex; @@ -3692,13 +3693,6 @@ font-weight: 500; font-size: 14px; } - .red { - color: #FD5F5F; - } - .green { - color: #4EB997; - } - th { font-weight: bold; font-size: 14px; @@ -3993,6 +3987,149 @@ } } +// 政务端工作台智能提醒弹框 +.zhinengtixing-dialog { + .el-dialog__body { + padding: 20px; + } + + .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 { + margin: 10px 0; + } + + .serviceIndustry-form { + + .el-button--primary.is-active, + .el-button--primary:active { + background: oklab(0.7 -0.3 -0.4); + border-color: #1890FF; + color: #FFFEFE; + } + + .el-button--primary { + background: #1890FF; + border-color: #1890FF; + color: #FFFEFE; + } + + .el-button--primary:focus, + .el-button--primary:hover { + background: oklab(0.7 -0.3 -0.4); + border-color: #1890FF; + color: #FFFEFE; + } + + .el-button--default:hover, + .el-button--primary:hover { + background-color: oklab(0.65 -0.06 -0.18); + border-color: #1890FF; + color: #FFFEFE; + } + + .el-button--default { + border-color: #1890FF; + color: #000000; + } + } + + section { + .el-table::before { + height: 100%; + width: 1px; + } + .el-table { + border-left: none; + .project-trace-table-number { + font-family: PingFang-SC-Medium; + font-weight: 500; + font-size: 14px; + color: #134EE6; + font-style: normal; + text-decoration-line: underline; + text-transform: none; + cursor: pointer; + } + .project-trace-table-type { + font-weight: 500; + font-size: 14px; + } + .red { + color: #FD5F5F; + } + .green { + color: #4EB997; + } + + th { + font-weight: bold; + font-size: 14px; + color: #000; + text-align: center; + } + + td { + font-weight: 500; + font-size: 14px; + color: #666666; + } + + .evenNumber-row-childred { + background-color: #E8F3FC; + } + + .evenNumber-row { + background-color: #F6F9FD; + } + } + .dataMap-work-table { + .workDialog-btns { + display: flex; + justify-content: center; + align-items: center; + .project-trace-table-number { + margin-right: 5px; + } + } + td { + border-bottom: 1px solid #D9D9D9; + } + } + + .my-pagination-container { + margin-top: 10px; + + .el-pagination.is-background .el-pager li:not(.is-disabled).active { + + background-color: #1890FF; + /*进行修改选中项背景和字体 */ + + color: #fff; + } + + .el-pagination { + + .btn-prev, + .btn-next { + padding: 0px 20px; + } + } + } + } + } +} + #echarts { width: 100%; height: calc(100% - 110px); @@ -4154,7 +4291,7 @@ font-family: AlibabaPuHuiTiR; padding: 0; font-size: 14px; - color: #1890FF; + // color: #1890FF; font-style: normal; text-decoration-line: underline; text-transform: none; diff --git a/src/views/ServiceAndDevelopment/index.vue b/src/views/ServiceAndDevelopment/index.vue index 1ff1ccb..bc416aa 100644 --- a/src/views/ServiceAndDevelopment/index.vue +++ b/src/views/ServiceAndDevelopment/index.vue @@ -59,7 +59,7 @@ diff --git a/src/views/abnormalRemind/index.vue b/src/views/abnormalRemind/index.vue index 52cf8f2..0dba480 100644 --- a/src/views/abnormalRemind/index.vue +++ b/src/views/abnormalRemind/index.vue @@ -19,6 +19,12 @@ + + + \ No newline at end of file diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue index 8c8234a..ded7743 100644 --- a/src/views/workbench/index.vue +++ b/src/views/workbench/index.vue @@ -24,7 +24,7 @@
- + +
@@ -117,7 +117,7 @@
- +
@@ -141,8 +141,8 @@
- - +