diff --git a/config/proxy.ts b/config/proxy.ts index 53474f3..0b4439c 100644 --- a/config/proxy.ts +++ b/config/proxy.ts @@ -6,8 +6,8 @@ export default { // pathRewrite: { '^': '' }, // }, '/api': { - // target: 'http://10.242.37.148:18022',//连接天宫的ng - target: 'http://10.0.0.10:18013',//连接天宫的ng + target: 'http://10.0.0.125:18012',//测试环境 + // target: 'http://10.0.0.14:18013',//连接天宫的ng changeOrigin: true, pathRewrite: { '^/api': '' }, }, diff --git a/src/components/FileUpload/FileUpload.less b/src/components/FileUpload/FileUpload.less index 413983a..fda0c82 100644 --- a/src/components/FileUpload/FileUpload.less +++ b/src/components/FileUpload/FileUpload.less @@ -1,6 +1,6 @@ .file-upload-wrapper { .ant-upload-list { - margin-top: 8px; + // margin-top: 8px; } .ant-upload-list-item-name { @@ -10,7 +10,7 @@ } .ant-upload-select { - margin-bottom: 8px; + // margin-bottom: 8px; } .file-upload-tip { diff --git a/src/components/FileUpload/FileUpload.tsx b/src/components/FileUpload/FileUpload.tsx index 3f29c1a..2cf13ec 100644 --- a/src/components/FileUpload/FileUpload.tsx +++ b/src/components/FileUpload/FileUpload.tsx @@ -203,7 +203,7 @@ const FileUpload: React.FC = ({ } return ( - ); diff --git a/src/pages/announce/announce.less b/src/pages/announce/announce.less index 27b29fe..a7f4e15 100644 --- a/src/pages/announce/announce.less +++ b/src/pages/announce/announce.less @@ -60,9 +60,9 @@ } } -/* 覆盖antd样式 */ -:global { - .ant-radio-button-wrapper { +/* 覆盖antd样式 - 仅在announceContainer内生效 */ +.announceContainer { + :global(.ant-radio-button-wrapper) { margin-right: 5px; margin-bottom: 8px; border-radius: 0; @@ -73,15 +73,15 @@ padding: 0 10px; } - .ant-radio-button-wrapper:first-child { + :global(.ant-radio-button-wrapper:first-child) { border-radius: 0; } - .ant-radio-button-wrapper:last-child { + :global(.ant-radio-button-wrapper:last-child) { border-radius: 0; } - .ant-radio-button-wrapper-checked { + :global(.ant-radio-button-wrapper-checked) { background-color: rgb(0, 79, 142); border-color: rgb(0, 79, 142); color: #fff; @@ -92,7 +92,7 @@ } } - .ant-btn-primary { + :global(.ant-btn-primary) { background-color: rgb(0, 79, 142); border-color: rgb(0, 79, 142); border-radius: 0; @@ -102,24 +102,24 @@ } } - .ant-select-selector { + :global(.ant-select-selector) { border-radius: 0 !important; } - .ant-input { + :global(.ant-input) { border-radius: 0; } - .ant-input-affix-wrapper { + :global(.ant-input-affix-wrapper) { border-radius: 0; } - .ant-list-pagination { + :global(.ant-list-pagination) { margin-top: 20px; text-align: center; } - .ant-pagination-item { + :global(.ant-pagination-item) { border-radius: 0; &-active { @@ -131,17 +131,17 @@ } } - .ant-pagination-item-link { + :global(.ant-pagination-item-link) { border-radius: 0; } - .ant-pagination-options { - .ant-select-selector { + :global(.ant-pagination-options) { + :global(.ant-select-selector) { border-radius: 0; } } - .ant-tag { + :global(.ant-tag) { margin-right: 0; border-radius: 2px; } diff --git a/src/pages/announce/announce.tsx b/src/pages/announce/announce.tsx index 90f51ad..4bf484a 100644 --- a/src/pages/announce/announce.tsx +++ b/src/pages/announce/announce.tsx @@ -187,7 +187,7 @@ const AnnouncePage: React.FC = () => { }; return ( -
+
{/* 公告搜索 */}