From 03be8d94f81d948ab428711f1a7bf3fac7c447a2 Mon Sep 17 00:00:00 2001 From: harry Date: Thu, 12 Mar 2020 11:54:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=AE=9E=E8=AE=AD=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/paths/ShixunPathSearch.js | 4 +- public/react/src/modules/paths/btn-new.png | Bin 0 -> 2745 bytes public/react/src/modules/tpm/TPMIndex.css | 452 +++++++++++------- .../src/modules/tpm/shixuns/ShixunsIndex.js | 2 +- .../tpm/shixuns/shixun-keyword-list.scss | 4 + 5 files changed, 276 insertions(+), 186 deletions(-) create mode 100644 public/react/src/modules/paths/btn-new.png diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js index be1d3a33c..844215974 100644 --- a/public/react/src/modules/paths/ShixunPathSearch.js +++ b/public/react/src/modules/paths/ShixunPathSearch.js @@ -8,7 +8,7 @@ import Pagination from '@icedesign/base/lib/pagination'; import '@icedesign/base/lib/pagination/style.js'; import './ShixunPaths.css'; import KeywordList from '../tpm/shixuns/shixun-keyword-list'; -import btnUrl from '../tpm/shixuns/btn-new.png'; +import btnUrl from './btn-new.png'; class ShixunPathSearch extends Component { constructor(props) { @@ -252,7 +252,7 @@ class ShixunPathSearch extends Component { - + { diff --git a/public/react/src/modules/paths/btn-new.png b/public/react/src/modules/paths/btn-new.png new file mode 100644 index 0000000000000000000000000000000000000000..b900fa1f48d0f6dcb63e0f4a1c1d5c5394aa178c GIT binary patch literal 2745 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 literal 0 HcmV?d00001 diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css index 2ec090e7d..325b0fc54 100644 --- a/public/react/src/modules/tpm/TPMIndex.css +++ b/public/react/src/modules/tpm/TPMIndex.css @@ -4,48 +4,58 @@ } */ body { overflow: auto !important; - font-family: "Microsoft YaHei"; + font-family: "Microsoft YaHei"; } #root { - /* ie兼容性 */ - position: relative; - min-height: 100%; + /* ie兼容性 */ + position: relative; + min-height: 100%; } + body>.-task-title { - opacity: 1 !important; + opacity: 1 !important; } + /*�����Ŵ󾵵�����·Ŵ󾵵�λ��*/ #root .search-all { - width: 219px; + width: 219px; } /*Header START*/ .newHeader .logoimg { - margin-top: 16px; - float: left; - width: 97px; + margin-top: 16px; + float: left; + width: 97px; } + .head-right i { - font-size: 20px; - float: none !important; + font-size: 20px; + float: none !important; } -.headIcon, #header_keyword_search { - padding-top: 13px !important; + +.headIcon, +#header_keyword_search { + padding-top: 13px !important; } + .search-icon { - height: 30px !important; + height: 30px !important; } + .search-icon i { - font-size: 20px; + font-size: 20px; } + #header_keyword_search i { - color: #4cacff; + color: #4cacff; } -.ant-select-selection--multiple{ - padding-bottom: 0px!important; - padding-top:3px; + +.ant-select-selection--multiple { + padding-bottom: 0px !important; + padding-top: 3px; } + /* 先注释掉下面2个样式，这样写影响范围太广了，并不是所有的select都需要40px高 */ /* .ant-select-selection--single{ height:40px!important; @@ -53,247 +63,323 @@ body>.-task-title { .ant-select-selection__rendered{ line-height: 40px!important; } */ -.ant-select-selection--multiple .ant-select-selection__rendered>ul>li, .ant-select-selection--multiple>ul>li{ - height: 25px!important; - line-height: 23px!important; - margin-bottom:3px; - margin-top:0px; +.ant-select-selection--multiple .ant-select-selection__rendered>ul>li, +.ant-select-selection--multiple>ul>li { + height: 25px !important; + line-height: 23px !important; + margin-bottom: 3px; + margin-top: 0px; } + /*Main START*/ -.newContainer{ - background: #fafafa!important; +.newContainer { + background: #fafafa !important; } -.ant-modal-title{ - font-size: 16px; - font-weight: bold !important; - color: #333; +.ant-modal-title { + font-size: 16px; + font-weight: bold !important; + color: #333; } -.ant-modal-title{ - text-align: center; +.ant-modal-title { + text-align: center; } + /*.ant-modal{*/ - /*top:10rem !important;*/ +/*top:10rem !important;*/ /*}*/ @-moz-document url-prefix() { - .ant-radio-inner { - width: 17px !important; - height: 17px !important; - } + .ant-radio-inner { + width: 17px !important; + height: 17px !important; + } } + /* IE只能用padding，不能用上下居中 */ -.shixunDetail_top{ - display: block!important; - padding-top: 48px; -} -.totalScore{ - display: block!important; - padding-top: 40px; +.shixunDetail_top { + display: block !important; + padding-top: 48px; } -.head-nav ul#header-nav li{ - /*font-weight: 600;*/ + +.totalScore { + display: block !important; + padding-top: 40px; } + /*.newFooter{*/ - /*position: fixed !important;*/ +/*position: fixed !important;*/ /*}*/ -.edu-menu-panel .edu-menu-listnew:hover .careersiconfont{ - color: #000 !important; +.edu-menu-panel .edu-menu-listnew:hover .careersiconfont { + color: #000 !important; } .newHeader { - background: #24292D !important; - height: 60px !important; + background: #24292D !important; + height: 60px !important; } /*-------------------个人主页：右侧提示区域--------------------------*/ -.-task-sidebar{position:fixed;width:40px;height:180px;right:0;bottom:80px !important;z-index: 10;} -.-task-sidebar>div{height: 40px;line-height: 40px;box-sizing: border-box;width:40px;background:#4CACFF;color:#fff;font-size:20px;text-align:center;margin-bottom:5px;border-radius: 4px;} -.-task-sidebar>div i{ color:#fff;} -.-task-sidebar>div i:hover{color: #fff!important;} -.gotop{background-color: rgba(208,207,207,0.5)!important;padding: 0px!important;} -.-task-desc{background:#494949;width:90px;line-height: 36px;text-align: center; - position: absolute;color: #fff;font-size: 13px;z-index: 999999;opacity: 0;} -.-task-desc div{position: absolute;top:10px;right: -7px;height: 13px;} -.-task-desc div img{float: left} -.-task-sidebar .scan_ewm{ - position: absolute !important; - right: 45px !important; - bottom: 0px !important; - background-color: #494949 !important; - -webkit-box-sizing: border-box !important; - box-sizing: border-box !important; - font-size: 14px !important; - line-height: 16px !important; - display: none; - height: 213px !important; -} -.trangle_right{position: absolute;right: -5px;bottom: 15px;width: 0;height: 0px;border-top: 6px solid transparent;border-left: 5px solid #494949;border-bottom: 6px solid transparent} - -.HeaderSearch{ - margin-top: 18px; - margin-right: 20px; -} -.HeaderSearch .ant-input-search .ant-input{ - /*height:30px;*/ - background: #373e3f !important; - border: 1px solid #373e3f !important; - -} -.ant-input-search .ant-input-affix-wrapper{ - border:transparent; +.-task-sidebar { + position: fixed; + width: 40px; + height: 180px; + right: 0; + bottom: 20px !important; + z-index: 10; +} + +.-task-sidebar>div { + height: 40px; + line-height: 40px; + box-sizing: border-box; + width: 40px; + background: #4CACFF; + color: #fff; + font-size: 20px; + text-align: center; + margin-bottom: 5px; + border-radius: 4px; +} + +.-task-sidebar>div i { + color: #fff; +} + +.-task-sidebar>div i:hover { + color: #fff !important; +} + +.gotop { + background-color: rgba(208, 207, 207, 0.5) !important; + padding: 0px !important; +} + +.-task-desc { + background: #494949; + width: 90px; + line-height: 36px; + text-align: center; + position: absolute; + color: #fff; + font-size: 13px; + z-index: 999999; + opacity: 0; +} + +.-task-desc div { + position: absolute; + top: 10px; + right: -7px; + height: 13px; } + +.-task-desc div img { + float: left +} + +.-task-sidebar .scan_ewm { + position: absolute !important; + right: 45px !important; + bottom: 0px !important; + background-color: #494949 !important; + -webkit-box-sizing: border-box !important; + box-sizing: border-box !important; + font-size: 14px !important; + line-height: 16px !important; + display: none; + height: 213px !important; +} + +.trangle_right { + position: absolute; + right: -5px; + bottom: 15px; + width: 0; + height: 0px; + border-top: 6px solid transparent; + border-left: 5px solid #494949; + border-bottom: 6px solid transparent +} + +.HeaderSearch { + margin-top: 18px; + margin-right: 20px; +} + +.HeaderSearch .ant-input-search .ant-input { + /*height:30px;*/ + background: #373e3f !important; + border: 1px solid #373e3f !important; + +} + +.ant-input-search .ant-input-affix-wrapper { + border: transparent; +} + .ant-input-affix-wrapper:hover .ant-input:not(.ant-input-disabled) { - /* 比较奇怪的需求，先注释掉了，如果需要启用，麻烦增加class限制，别影响别的地方的使用 */ - /* border-color: transparent; */ + /* 比较奇怪的需求，先注释掉了，如果需要启用，麻烦增加class限制，别影响别的地方的使用 */ + /* border-color: transparent; */ } .ant-input:focus { - /*border-color: transparent;*/ - border-right-width: 1px !important; - outline: 0; - -webkit-box-shadow: 0 0 0 2px transparent; - box-shadow: 0 0 0 2px transparent; - border: 1px solid #d9d9d9; + /*border-color: transparent;*/ + border-right-width: 1px !important; + outline: 0; + -webkit-box-shadow: 0 0 0 2px transparent; + box-shadow: 0 0 0 2px transparent; + border: 1px solid #d9d9d9; } -.HeaderSearch .ant-input-search .ant-input::-webkit-input-placeholder{ - color: #999; - font-size: 14px; +.HeaderSearch .ant-input-search .ant-input::-webkit-input-placeholder { + color: #999; + font-size: 14px; } .HeaderSearch .ant-input-search .ant-input:-moz-placeholder { - color: #999; - font-size: 14px; + color: #999; + font-size: 14px; } -.HeaderSearch .ant-input-search .ant-input::-moz-placeholder{ - color: #999; - font-size: 14px; +.HeaderSearch .ant-input-search .ant-input::-moz-placeholder { + color: #999; + font-size: 14px; } -.HeaderSearch .ant-input-search .ant-input:-ms-input-placeholder{ - color: #999; - font-size: 14px; +.HeaderSearch .ant-input-search .ant-input:-ms-input-placeholder { + color: #999; + font-size: 14px; } .HeaderSearch .ant-input-search .ant-input-suffix .anticon-search { - color: #999; + color: #999; } -.HeaderSearch .ant-input-search .ant-input{ - color: #fff; +.HeaderSearch .ant-input-search .ant-input { + color: #fff; } -.HeaderSearch .ant-input-search .ant-input-suffix{ - background: transparent !important; +.HeaderSearch .ant-input-search .ant-input-suffix { + background: transparent !important; } -.roundedRectangles{ - position: absolute; - top: 10px; - right: -22px; +.roundedRectangles { + position: absolute; + top: 10px; + right: -22px; } -.HeaderSearch{ - width: 325px; - /*right: 20px;*/ +.HeaderSearch { + width: 325px; + /*right: 20px;*/ } -.HeaderSearch .ant-input-search{ - right: 20px; + +.HeaderSearch .ant-input-search { + right: 20px; } -.mainheighs{ - height: 100%; - display: block; + +.mainheighs { + height: 100%; + display: block; } -.ml18a{ - margin-left:18%; +.ml18a { + margin-left: 18%; } -.logoimg{ - float: left; - min-width: 40px; - height:40px; +.logoimg { + float: left; + min-width: 40px; + height: 40px; } -.headwith100b{ - width: 100%; +.headwith100b { + width: 100%; } -.wechatcenter{ - text-align: center; + +.wechatcenter { + text-align: center; } -.myrigthsiderbar{ - right: 9% !important; +.myrigthsiderbar { + right: 9% !important; } -.feedbackdivcolor{ - background: #33BD8C !important; - height: 49px !important; - line-height: 24px !important; +.feedbackdivcolor { + background: #33BD8C !important; + height: 49px !important; + line-height: 24px !important; } -.xiaoshou{ - cursor:pointer + +.xiaoshou { + cursor: pointer } -.questiontypes{ - width:37px; - height:17px; - font-size:12px; - color:rgba(51,51,51,1); - line-height:17px; - cursor:pointer; + +.questiontypes { + width: 37px; + height: 17px; + font-size: 12px; + color: rgba(51, 51, 51, 1); + line-height: 17px; + cursor: pointer; } -.questiontype{ - width: 100%; - font-size: 12px; - color: #333333; - line-height: 17px; - text-align: center; - padding: 11px; - cursor:pointer; + +.questiontype { + width: 100%; + font-size: 12px; + color: #333333; + line-height: 17px; + text-align: center; + padding: 11px; + cursor: pointer; } -.questiontypeheng{ - width:100%; - height:1px; - background: #EEEEEE; + +.questiontypeheng { + width: 100%; + height: 1px; + background: #EEEEEE; } -.mystask-sidebar{ - right: 181px !important; + +.mystask-sidebar { + right: 181px !important; } -.mystask-sidebars{ - right: 20px !important; + +.mystask-sidebars { + right: 20px !important; } -.shitikussmys{ - width:29px !important; - height:20px!important; - background:#FF6601 !important; - border-radius:10px !important; - position: absolute !important; - font-size:11px !important; - color:#ffffff !important; - line-height:20px !important; - top: -13px !important; - right: -10px !important; + +.shitikussmys { + width: 29px !important; + height: 20px !important; + background: #FF6601 !important; + border-radius: 10px !important; + position: absolute !important; + font-size: 11px !important; + color: #ffffff !important; + line-height: 20px !important; + top: -13px !important; + right: -10px !important; } -.maxnamewidth30{ - max-width: 30px; - overflow:hidden; - text-overflow:ellipsis; - white-space:nowrap; - cursor: default; -} -.mystask-sidebarss{ - right: 5px !important; +.maxnamewidth30 { + max-width: 30px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + cursor: default; } + +.mystask-sidebarss { + right: 5px !important; +} \ No newline at end of file diff --git a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js index c0fbb2c01..2613fc1c7 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js +++ b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js @@ -392,7 +392,7 @@ class ShixunsIndex extends Component { // console.log(this.state.updata) return ( -
+
{this.state.updata === undefined ? "" : } diff --git a/public/react/src/modules/tpm/shixuns/shixun-keyword-list.scss b/public/react/src/modules/tpm/shixuns/shixun-keyword-list.scss index c8a62bdd8..d74f54e03 100644 --- a/public/react/src/modules/tpm/shixuns/shixun-keyword-list.scss +++ b/public/react/src/modules/tpm/shixuns/shixun-keyword-list.scss @@ -1,3 +1,7 @@ +.shi-xun-index .search-keyword-container { + padding: 20px 0 15px 0; +} + .search-keyword-container { display: flex; flex-flow: row nowrap;