diff --git a/public/static/pdf/web/viewer.css b/public/static/pdf/web/viewer.css index 97b55cdc5..accde2053 100644 --- a/public/static/pdf/web/viewer.css +++ b/public/static/pdf/web/viewer.css @@ -522,19 +522,19 @@ html[dir='rtl'] #viewerContainer { height: 32px; background-color: #424242; /* fallback */ background-image: url(images/texture.png), - linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95)); + linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95)); } html[dir='ltr'] #toolbarSidebar { box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25), - inset 0 -1px 0 hsla(0,0%,100%,.05), - 0 1px 0 hsla(0,0%,0%,.15), - 0 0 1px hsla(0,0%,0%,.1); + inset 0 -1px 0 hsla(0,0%,100%,.05), + 0 1px 0 hsla(0,0%,0%,.15), + 0 0 1px hsla(0,0%,0%,.1); } html[dir='rtl'] #toolbarSidebar { box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.25), - inset 0 1px 0 hsla(0,0%,100%,.05), - 0 1px 0 hsla(0,0%,0%,.15), - 0 0 1px hsla(0,0%,0%,.1); + inset 0 1px 0 hsla(0,0%,100%,.05), + 0 1px 0 hsla(0,0%,0%,.15), + 0 0 1px hsla(0,0%,0%,.1); } #toolbarContainer, .findbar, .secondaryToolbar { @@ -542,21 +542,21 @@ html[dir='rtl'] #toolbarSidebar { height: 32px; background-color: #474747; /* fallback */ background-image: url(images/texture.png), - linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95)); + linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95)); } html[dir='ltr'] #toolbarContainer, .findbar, .secondaryToolbar { box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08), - inset 0 1px 1px hsla(0,0%,0%,.15), - inset 0 -1px 0 hsla(0,0%,100%,.05), - 0 1px 0 hsla(0,0%,0%,.15), - 0 1px 1px hsla(0,0%,0%,.1); + inset 0 1px 1px hsla(0,0%,0%,.15), + inset 0 -1px 0 hsla(0,0%,100%,.05), + 0 1px 0 hsla(0,0%,0%,.15), + 0 1px 1px hsla(0,0%,0%,.1); } html[dir='rtl'] #toolbarContainer, .findbar, .secondaryToolbar { box-shadow: inset -1px 0 0 hsla(0,0%,100%,.08), - inset 0 1px 1px hsla(0,0%,0%,.15), - inset 0 -1px 0 hsla(0,0%,100%,.05), - 0 1px 0 hsla(0,0%,0%,.15), - 0 1px 1px hsla(0,0%,0%,.1); + inset 0 1px 1px hsla(0,0%,0%,.15), + inset 0 -1px 0 hsla(0,0%,100%,.05), + 0 1px 0 hsla(0,0%,0%,.15), + 0 1px 1px hsla(0,0%,0%,.1); } #toolbarViewer { @@ -607,9 +607,9 @@ html[dir='rtl'] #toolbarContainer, .findbar, .secondaryToolbar { width: calc(100% + 150px); background: repeating-linear-gradient(135deg, - #bbb 0, #999 5px, - #999 45px, #ddd 55px, - #ddd 95px, #bbb 100px); + #bbb 0, #999 5px, + #999 45px, #ddd 55px, + #ddd 95px, #bbb 100px); -webkit-animation: progressIndeterminate 950ms linear infinite; animation: progressIndeterminate 950ms linear infinite; @@ -850,8 +850,8 @@ html[dir='rtl'] .splitToolbarButton > .toolbarButton { border: 1px solid hsla(0,0%,0%,.35); border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42); box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, - 0 0 1px hsla(0,0%,100%,.15) inset, - 0 1px 0 hsla(0,0%,100%,.05); + 0 0 1px hsla(0,0%,100%,.15) inset, + 0 1px 0 hsla(0,0%,100%,.05); -webkit-transition-property: background-color, border-color, box-shadow; -webkit-transition-duration: 150ms; -webkit-transition-timing-function: ease; @@ -869,8 +869,8 @@ html[dir='rtl'] .splitToolbarButton > .toolbarButton { .toolbarButton.textButton:focus { background-color: hsla(0,0%,0%,.2); box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, - 0 0 1px hsla(0,0%,100%,.15) inset, - 0 0 1px hsla(0,0%,0%,.05); + 0 0 1px hsla(0,0%,100%,.15) inset, + 0 0 1px hsla(0,0%,0%,.05); z-index: 199; } .splitToolbarButton > .toolbarButton { @@ -969,8 +969,8 @@ html[dir='rtl'] .dropdownToolbarButton { border: 1px solid hsla(0,0%,0%,.35); border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42); box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, - 0 0 1px hsla(0,0%,100%,.15) inset, - 0 1px 0 hsla(0,0%,100%,.05); + 0 0 1px hsla(0,0%,100%,.15) inset, + 0 1px 0 hsla(0,0%,100%,.05); } .toolbarButton:hover:active, @@ -981,8 +981,8 @@ html[dir='rtl'] .dropdownToolbarButton { background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0)); border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.4) hsla(0,0%,0%,.45); box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset, - 0 0 1px hsla(0,0%,0%,.2) inset, - 0 1px 0 hsla(0,0%,100%,.05); + 0 0 1px hsla(0,0%,0%,.2) inset, + 0 1px 0 hsla(0,0%,100%,.05); -webkit-transition-property: background-color, border-color, box-shadow; -webkit-transition-duration: 10ms; -webkit-transition-timing-function: linear; @@ -998,8 +998,8 @@ html[dir='rtl'] .dropdownToolbarButton { background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0)); border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.45) hsla(0,0%,0%,.5); box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset, - 0 0 1px hsla(0,0%,0%,.2) inset, - 0 1px 0 hsla(0,0%,100%,.05); + 0 0 1px hsla(0,0%,0%,.2) inset, + 0 1px 0 hsla(0,0%,100%,.05); -webkit-transition-property: background-color, border-color, box-shadow; -webkit-transition-duration: 10ms; -webkit-transition-timing-function: linear; @@ -1014,8 +1014,8 @@ html[dir='rtl'] .dropdownToolbarButton { background-color: hsla(0,0%,0%,.4); border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.5) hsla(0,0%,0%,.55); box-shadow: 0 1px 1px hsla(0,0%,0%,.2) inset, - 0 0 1px hsla(0,0%,0%,.3) inset, - 0 1px 0 hsla(0,0%,100%,.05); + 0 0 1px hsla(0,0%,0%,.3) inset, + 0 1px 0 hsla(0,0%,100%,.05); } .dropdownToolbarButton { @@ -1329,7 +1329,7 @@ html[dir='rtl'] .verticalToolbarSeparator { border: 1px solid hsla(0,0%,0%,.35); border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42); box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset, - 0 1px 0 hsla(0,0%,100%,.05); + 0 1px 0 hsla(0,0%,100%,.05); color: hsl(0,0%,95%); font-size: 12px; line-height: 14px; @@ -1359,8 +1359,8 @@ html[dir='rtl'] .verticalToolbarSeparator { .toolbarField.pageNumber::-webkit-inner-spin-button, .toolbarField.pageNumber::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; + -webkit-appearance: none; + margin: 0; } .toolbarField:hover { @@ -1441,8 +1441,8 @@ a:focus > .thumbnail > .thumbnailSelectionRing, background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0)); background-clip: padding-box; box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, - 0 0 1px hsla(0,0%,100%,.2) inset, - 0 0 1px hsla(0,0%,0%,.2); + 0 0 1px hsla(0,0%,100%,.2) inset, + 0 0 1px hsla(0,0%,0%,.2); color: hsla(0,0%,100%,.9); } @@ -1456,8 +1456,8 @@ a:focus > .thumbnail > .thumbnailSelectionRing, background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0)); background-clip: padding-box; box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, - 0 0 1px hsla(0,0%,100%,.1) inset, - 0 0 1px hsla(0,0%,0%,.2); + 0 0 1px hsla(0,0%,100%,.1) inset, + 0 0 1px hsla(0,0%,0%,.2); color: hsla(0,0%,100%,1); } @@ -1572,8 +1572,8 @@ html[dir='rtl'] .outlineItemToggler::before { background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0)); background-clip: padding-box; box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, - 0 0 1px hsla(0,0%,100%,.2) inset, - 0 0 1px hsla(0,0%,0%,.2); + 0 0 1px hsla(0,0%,100%,.2) inset, + 0 0 1px hsla(0,0%,0%,.2); border-radius: 2px; color: hsla(0,0%,100%,.9); } @@ -1583,8 +1583,8 @@ html[dir='rtl'] .outlineItemToggler::before { background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0)); background-clip: padding-box; box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, - 0 0 1px hsla(0,0%,100%,.1) inset, - 0 0 1px hsla(0,0%,0%,.2); + 0 0 1px hsla(0,0%,100%,.1) inset, + 0 0 1px hsla(0,0%,0%,.2); color: hsla(0,0%,100%,1); } @@ -1665,12 +1665,12 @@ html[dir='rtl'] .outlineItemToggler::before { line-height: 14px; background-color: #474747; /* fallback */ background-image: url(images/texture.png), - linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95)); + linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95)); box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08), - inset 0 1px 1px hsla(0,0%,0%,.15), - inset 0 -1px 0 hsla(0,0%,100%,.05), - 0 1px 0 hsla(0,0%,0%,.15), - 0 1px 1px hsla(0,0%,0%,.1); + inset 0 1px 1px hsla(0,0%,0%,.15), + inset 0 -1px 0 hsla(0,0%,100%,.05), + 0 1px 0 hsla(0,0%,0%,.15), + 0 1px 1px hsla(0,0%,0%,.1); border: 1px solid hsla(0,0%,0%,.5); border-radius: 4px; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); @@ -1763,9 +1763,9 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * { width: 300px; } #PDFBug .controls { - background:#EEEEEE; - border-bottom: 1px solid #666666; - padding: 3px; + background:#EEEEEE; + border-bottom: 1px solid #666666; + padding: 3px; } #PDFBug .panels { bottom: 0; @@ -1792,7 +1792,7 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * { white-space: pre; } #PDFBug .stats .title { - font-weight: bold; + font-weight: bold; } #PDFBug table { font-size: 10px; @@ -1831,8 +1831,8 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * { .grab-to-pan-grab { cursor: url("images/grab.cur"), move !important; - cursor: -webkit-grab !important; - cursor: -moz-grab !important; + /*cursor: -webkit-grab !important;*/ + /*cursor: -moz-grab !important;*/ cursor: grab !important; } .grab-to-pan-grab *:not(input):not(textarea):not(button):not(select):not(:link) { @@ -1841,8 +1841,8 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * { .grab-to-pan-grab:active, .grab-to-pan-grabbing { cursor: url("images/grabbing.cur"), move !important; - cursor: -webkit-grabbing !important; - cursor: -moz-grabbing !important; + /*cursor: -webkit-grabbing !important;*/ + /*cursor: -moz-grabbing !important;*/ cursor: grabbing !important; position: fixed; diff --git a/public/static/pdf/web/viewer.html b/public/static/pdf/web/viewer.html index 9f174fb4f..320221196 100644 --- a/public/static/pdf/web/viewer.html +++ b/public/static/pdf/web/viewer.html @@ -61,7 +61,7 @@ See https://github.com/adobe-type-tools/cmap-resources /* left: 50%;*/ /* transform: translate(-50%, -50%);*/ /* border: 1px solid #e5e5e5;*/ - /* border-radius: 8px;*/ + /* 8px;*/ /* background: #e5e5e5;*/ /* z-index: 999;*/ /*}*/ @@ -83,7 +83,7 @@ See https://github.com/adobe-type-tools/cmap-resources /* background-color: #3391CE;*/ /* border: #3391CE;*/ /* color: #ffffff;*/ - /* border-radius: 3px;*/ + /* 3px;*/ /* cursor: pointer;*/ /*}*/ /*.note-float{*/ @@ -136,7 +136,7 @@ See https://github.com/adobe-type-tools/cmap-resources /* left: 50%;*/ /* transform: translate(-50%, -50%);*/ /* border: 1px solid #e5e5e5;*/ - /* border-radius: 8px;*/ + /* 8px;*/ /* background: #e5e5e5;*/ /* z-index: 999;*/ /*}*/ diff --git a/public/static/ueditor/ADT/attachment/attachment.css b/public/static/ueditor/ADT/attachment/attachment.css index 548b4284d..e1ff867cc 100644 --- a/public/static/ueditor/ADT/attachment/attachment.css +++ b/public/static/ueditor/ADT/attachment/attachment.css @@ -96,7 +96,7 @@ #upload .placeholder .webuploader-pick { font-size: 18px; background: #00b7ee; - border-radius: 3px; + 3px; line-height: 44px; padding: 0 30px; *width: 120px; @@ -198,7 +198,7 @@ overflow: hidden; z-index: 50; margin: 0; - border-radius: 0; + 0; background: none; -webkit-box-shadow: 0 0 0; } @@ -317,7 +317,7 @@ height: 113px; background: url(./images/image.png) no-repeat center 12px; border: 1px solid #eeeeee; - border-radius: 0; + 0; } #upload .filelist li.filePickerBlock div.webuploader-pick { width: 100%; @@ -447,7 +447,7 @@ color: #565656; padding: 0 18px; display: inline-block; - border-radius: 3px; + 3px; margin-left: 10px; cursor: pointer; font-size: 14px; @@ -678,4 +678,4 @@ i.file-preview.file-type-bmp, i.file-preview.file-type-png, i.file-preview.file-type-psd{ background-position: -140px center; -} \ No newline at end of file +} diff --git a/public/static/ueditor/ADT/background/background.css b/public/static/ueditor/ADT/background/background.css index 5c41fe9a4..882701c1f 100644 --- a/public/static/ueditor/ADT/background/background.css +++ b/public/static/ueditor/ADT/background/background.css @@ -19,7 +19,7 @@ input,label{vertical-align:middle} .wrapcolor{height: 19px;} div.color{float: left;margin: 0;} -#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;border-radius: 3px;box-shadow: 2px 2px 5px #D3D6DA;margin: 0;float: left;} +#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;3px;box-shadow: 2px 2px 5px #D3D6DA;margin: 0;float: left;} div.alignment,#custom{margin-left: 23px;margin-left: 28px\9;} #custom input{height: 15px;min-height: 15px;width:20px;} #repeatType{width:100px;} @@ -91,4 +91,4 @@ div.alignment,#custom{margin-left: 23px;margin-left: 28px\9;} height: 107px; border: 3px solid #1094fa; background-position: 72px 72px; -} \ No newline at end of file +} diff --git a/public/static/ueditor/ADT/charts/charts.css b/public/static/ueditor/ADT/charts/charts.css index ac3c76458..45adc7caa 100644 --- a/public/static/ueditor/ADT/charts/charts.css +++ b/public/static/ueditor/ADT/charts/charts.css @@ -144,9 +144,9 @@ html, body { margin-right: 30px; text-decoration: none; color: black; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; + -webkit-2px; + -moz-2px; + 2px; } .button-container a:HOVER { @@ -162,4 +162,4 @@ html, body { height: 100px; line-height: 100px; text-align: center; -} \ No newline at end of file +} diff --git a/public/static/ueditor/ADT/image/image.css b/public/static/ueditor/ADT/image/image.css index 52c2295ef..b3cbdb5b2 100644 --- a/public/static/ueditor/ADT/image/image.css +++ b/public/static/ueditor/ADT/image/image.css @@ -143,7 +143,7 @@ background-color: #fff; background-image: none; border: 1px solid #ccc; - border-radius: 4px; + 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; @@ -251,7 +251,7 @@ #upload .placeholder .webuploader-pick { font-size: 18px; background: #00b7ee; - border-radius: 3px; + 3px; line-height: 44px; padding: 0 30px; *width: 120px; @@ -354,7 +354,7 @@ overflow: hidden; z-index: 50; margin: 0; - border-radius: 0; + 0; background: none; -webkit-box-shadow: 0 0 0; } @@ -464,7 +464,7 @@ height: 113px; background: url(./images/image.png) no-repeat center 12px; border: 1px solid #eeeeee; - border-radius: 0; + 0; } #upload .filelist li.filePickerBlock div.webuploader-pick { width: 100%; @@ -594,7 +594,7 @@ color: #565656; padding: 0 18px; display: inline-block; - border-radius: 3px; + 3px; margin-left: 10px; cursor: pointer; font-size: 14px; @@ -723,7 +723,7 @@ background-color: #fff; background-image: none; border: 1px solid #ccc; - border-radius: 4px; + 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; @@ -753,7 +753,7 @@ padding:0; line-height: 28px; border: 1px solid #d7d7d7; - border-radius: 0; + 0; vertical-align: top; margin-left: 5px; float: left; @@ -774,7 +774,7 @@ border: 1px solid transparent; white-space: nowrap; font-size: 14px; - border-radius: 4px; + 4px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -891,4 +891,4 @@ } #search .searchList .clearFloat{ clear: both; -} \ No newline at end of file +} diff --git a/public/static/ueditor/ADT/music/music.css b/public/static/ueditor/ADT/music/music.css index 8fb7a94c3..77e417241 100644 --- a/public/static/ueditor/ADT/music/music.css +++ b/public/static/ueditor/ADT/music/music.css @@ -3,7 +3,7 @@ .searchBar{height:30px;padding:7px 0 3px;text-align:center;} .searchBtn{font-size:13px;height:24px;} -.resultBar{width:460px;margin:5px auto;border: 1px solid #CCC;border-radius: 5px;box-shadow: 2px 2px 5px #D3D6DA;overflow: hidden;} +.resultBar{width:460px;margin:5px auto;border: 1px solid #CCC;5px;box-shadow: 2px 2px 5px #D3D6DA;overflow: hidden;} .listPanel{overflow: hidden;} .panelon{display:block;} @@ -27,4 +27,4 @@ .m-trying{float:left;width:20px;height:20px;background:url('http://static.tieba.baidu.com/tb/editor/images/stop_music.gif') no-repeat ;} .loading{width:95px;height:7px;font-size:7px;margin:60px auto;background:url(http://static.tieba.baidu.com/tb/editor/images/loading.gif) no-repeat} -.empty{width:300px;height:40px;padding:2px;margin:50px auto;line-height:40px; color:#006699;text-align:center;} \ No newline at end of file +.empty{width:300px;height:40px;padding:2px;margin:50px auto;line-height:40px; color:#006699;text-align:center;} diff --git a/public/static/ueditor/ADT/scrawl/scrawl.css b/public/static/ueditor/ADT/scrawl/scrawl.css index b18430dc5..2cf5b4271 100644 --- a/public/static/ueditor/ADT/scrawl/scrawl.css +++ b/public/static/ueditor/ADT/scrawl/scrawl.css @@ -5,7 +5,7 @@ table{width:100%;} table td{padding:2px 4px;vertical-align: middle;} a{text-decoration: none;} em{font-style: normal;} -.border_style1{border: 1px solid #ccc;border-radius: 5px;box-shadow:2px 2px 5px #d3d6da;} +.border_style1{border: 1px solid #ccc;5px;box-shadow:2px 2px 5px #d3d6da;} /*module */ .main{margin: 8px;overflow: hidden;} @@ -19,7 +19,7 @@ em{font-style: normal;} .drawToolbar{float:right;width:110px;height:300px;overflow: hidden;} .colorBar{margin-top:10px;font-size: 12px;text-align: center;} -.colorBar a{display:block;width: 10px;height: 10px;border:1px solid #1006F1;border-radius: 3px; box-shadow:2px 2px 5px #d3d6da;opacity: 0.3} +.colorBar a{display:block;width: 10px;height: 10px;border:1px solid #1006F1;3px; box-shadow:2px 2px 5px #d3d6da;opacity: 0.3} .sectionBar{margin-top:15px;font-size: 12px;text-align: center;} .sectionBar a{display:inline-block;width:10px;height:12px;color: #888;text-indent: -999px;opacity: 0.3} .size1{background: url('images/size.png') 1px center no-repeat ;} diff --git a/public/static/ueditor/ADT/template/template.css b/public/static/ueditor/ADT/template/template.css index 6c1608dfc..dbbab2d9b 100644 --- a/public/static/ueditor/ADT/template/template.css +++ b/public/static/ueditor/ADT/template/template.css @@ -10,9 +10,9 @@ .bottom{height:320px;width:100%;margin: 0 auto;} .transparent{ background: url("images/bg.gif") repeat;} .bottom table tr td{border:1px dashed #ccc;} -#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;border-radius: 3px;box-shadow: 2px 2px 5px #D3D6DA;} -.border_style1{padding:2px;border: 1px solid #ccc;border-radius: 5px;box-shadow:2px 2px 5px #d3d6da;} +#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;3px;box-shadow: 2px 2px 5px #D3D6DA;} +.border_style1{padding:2px;border: 1px solid #ccc;5px;box-shadow:2px 2px 5px #d3d6da;} p{margin: 5px 0} table{clear:both;margin-bottom:10px;border-collapse:collapse;word-break:break-all;} li{clear:both} -ol{padding-left:40px; } \ No newline at end of file +ol{padding-left:40px; } diff --git a/public/static/ueditor/ADT/video/video.css b/public/static/ueditor/ADT/video/video.css index 5870e7a15..4f797744e 100644 --- a/public/static/ueditor/ADT/video/video.css +++ b/public/static/ueditor/ADT/video/video.css @@ -148,7 +148,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color: #upload .placeholder .webuploader-pick { font-size: 18px; background: #00b7ee; - border-radius: 3px; + 3px; line-height: 44px; padding: 0 30px; *width: 120px; @@ -250,7 +250,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color: overflow: hidden; z-index: 50; margin: 0; - border-radius: 0; + 0; background: none; -webkit-box-shadow: 0 0 0; } @@ -369,7 +369,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color: height: 113px; background: url(./images/image.png) no-repeat center 12px; border: 1px solid #eeeeee; - border-radius: 0; + 0; } #upload .filelist li.filePickerBlock div.webuploader-pick { width: 100%; @@ -499,7 +499,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color: color: #565656; padding: 0 18px; display: inline-block; - border-radius: 3px; + 3px; margin-left: 10px; cursor: pointer; font-size: 14px; @@ -632,4 +632,4 @@ i.file-preview.file-type-bmp, i.file-preview.file-type-png, i.file-preview.file-type-psd{ background-position: -140px center; -} \ No newline at end of file +} diff --git a/public/static/ueditor/themes/default/css/ueditor.css b/public/static/ueditor/themes/default/css/ueditor.css index 64400d35c..a1c60d209 100644 --- a/public/static/ueditor/themes/default/css/ueditor.css +++ b/public/static/ueditor/themes/default/css/ueditor.css @@ -137,9 +137,6 @@ div.edui-box { background-color: white; position: relative; overflow: visible; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; } .edui-editor div{ width:auto; @@ -165,9 +162,6 @@ div.edui-box { background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; /*border: 1px solid #d4d4d4;*/ - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); *zoom: 1; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); @@ -431,7 +425,7 @@ div.edui-box { .edui-default .edui-toolbar .edui-combox-body .edui-arrow { background: url(../images/icons.png) -741px 0; - _background: url(../images/icons.gif) -741px 0; + /*_background: url(../images/icons.gif) -741px 0;*/ height: 20px; width: 9px; } @@ -439,9 +433,6 @@ div.edui-box { .edui-default .edui-toolbar .edui-combox .edui-combox-body { border: 1px solid #CCC; background-color: white; - border-radius: 2px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; } .edui-default .edui-toolbar .edui-combox-body .edui-splitborder { @@ -505,9 +496,6 @@ div.edui-box { background-color: #ffe69f; padding: 0; border: 1px solid #dcac6c; - border-radius: 2px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; } .edui-default .edui-toolbar .edui-button .edui-state-active .edui-button-wrap { @@ -946,7 +934,7 @@ div.edui-box { .edui-default .edui-toolbar .edui-splitbutton-body .edui-arrow, .edui-default .edui-toolbar .edui-menubutton-body .edui-arrow { background: url(../images/icons.png) -741px 0; - _background: url(../images/icons.gif) -741px 0; + /*_background: url(../images/icons.gif) -741px 0;*/ height: 20px; width: 9px; } @@ -1048,9 +1036,6 @@ div.edui-box { border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -webkit-box-shadow: 0 3px 4px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 3px 4px rgba(0, 0, 0, 0.2); box-shadow: 0 3px 4px rgba(0, 0, 0, 0.2); @@ -1120,7 +1105,6 @@ div.edui-box { position: relative; } .edui-default .edui-message-body{ - border-radius: 3px; padding: 8px 15px 8px 8px; color: #c09853; background-color: #fcf8e3; @@ -1209,9 +1193,6 @@ div.edui-box { border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -1826,7 +1807,6 @@ div.edui-box { height: 50px; background-color: #fff; border: 1px solid #ccc; - border-radius: 5px; } /*粘贴弹出菜单*/ diff --git a/public/static/ueditor/third-party/codemirror/codemirror.css b/public/static/ueditor/third-party/codemirror/codemirror.css index 461ae195a..1f5d4303a 100644 --- a/public/static/ueditor/third-party/codemirror/codemirror.css +++ b/public/static/ueditor/third-party/codemirror/codemirror.css @@ -30,10 +30,10 @@ } .CodeMirror pre { - -moz-border-radius: 0; - -webkit-border-radius: 0; - -o-border-radius: 0; - border-radius: 0; + -moz-0; + -webkit-0; + -o-0; + 0; border-width: 0; margin: 0; padding: 0; background: transparent; font-family: inherit; font-size: inherit; diff --git a/public/static/ueditor/third-party/video-js/video-js.css b/public/static/ueditor/third-party/video-js/video-js.css index 2e8c332c4..57843d49b 100644 --- a/public/static/ueditor/third-party/video-js/video-js.css +++ b/public/static/ueditor/third-party/video-js/video-js.css @@ -380,9 +380,9 @@ easily in the skin designer. http://designer.videojs.com/ background-color: rgba(7, 20, 30, 0.7); border: 0.1em solid #3b4249; /* border-radius */ - -webkit-border-radius: 0.8em; - -moz-border-radius: 0.8em; - border-radius: 0.8em; + -webkit-0.8em; + -moz-0.8em; + 0.8em; /* box-shadow */ -webkit-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25); -moz-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25); diff --git a/public/static/ueditor/third-party/webuploader/webuploader.css b/public/static/ueditor/third-party/webuploader/webuploader.css index 12f451f80..e2e4f92af 100644 --- a/public/static/ueditor/third-party/webuploader/webuploader.css +++ b/public/static/ueditor/third-party/webuploader/webuploader.css @@ -14,7 +14,7 @@ padding: 10px 15px; color: #fff; text-align: center; - border-radius: 3px; + 3px; overflow: hidden; } .webuploader-pick-hover { diff --git a/src/assets/styles/common.less b/src/assets/styles/common.less index 2a2e385be..74d7a5d70 100644 --- a/src/assets/styles/common.less +++ b/src/assets/styles/common.less @@ -62,7 +62,6 @@ .back { width: 30px; height: 30px; - border-radius: 50%; background: #1E89FF; display: inline-block; line-height: 35px; @@ -247,7 +246,6 @@ align-items: center; .el-input__inner{ height: inherit; - border-radius: 70px; background: #EEF8FA; font-size: 16px; padding: 0 25px 0 50px; @@ -300,7 +298,6 @@ font-size: 20px; text-align: center; background: rgba(248,181,81,1); - border-radius: 70px; &::before{ content: ''; position: absolute; @@ -308,7 +305,6 @@ left: 0; width: 100%; height: 100%; - border-radius: 70px; background: rgba(255,255,255,.25); display: none; } diff --git a/src/assets/styles/dialog.less b/src/assets/styles/dialog.less index 7d2302a8b..6239c87cf 100644 --- a/src/assets/styles/dialog.less +++ b/src/assets/styles/dialog.less @@ -1,7 +1,6 @@ /*dialog公共样式*/ .v-class{ .el-dialog{ - border-radius: 6px; .el-dialog__header{ width: 100%; font-size: 14px; diff --git a/src/assets/styles/navMenu.less b/src/assets/styles/navMenu.less index 439c32b40..54bbdd1f9 100644 --- a/src/assets/styles/navMenu.less +++ b/src/assets/styles/navMenu.less @@ -66,7 +66,6 @@ } .nav-menu-popper { .el-menu { - border-radius: 15px; li { &:hover { background: rgba(255, 255, 255, 0.1) !important; diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index b1807034a..f1c2d4da7 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -159,7 +159,7 @@ // height: 32px !important; // line-height: 32px !important; // width: 170px; -// border-radius: 0 4px 4px 0; +// 0 4px 4px 0; // font-size: 12px; // color: #515a6e; // font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; @@ -196,7 +196,7 @@ // height: 32px !important; // line-height: 32px !important; // width: 180px; -// border-radius: 4px; +// 4px; // font-size: 12px; // color: #515a6e; // font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; @@ -229,7 +229,7 @@ // font-size: 14px; // width: 224px; // .el-input__inner{ -// border-radius: 0 4px 4px 0; +// 0 4px 4px 0; // font-size: 12px; // color: #515a6e; // font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; diff --git a/src/assets/styles/process.less b/src/assets/styles/process.less index a373a7738..1caa274ac 100644 --- a/src/assets/styles/process.less +++ b/src/assets/styles/process.less @@ -2,7 +2,6 @@ .prc-content-border { border: 1px dashed #ddd; padding: 20px; - border-radius: 10px; background: #fdfdfd; .form-item-disabled { .el-form-item__label, .el-form-item__content .el-input .el-input__inner, diff --git a/src/assets/styles/scroll.less b/src/assets/styles/scroll.less index b8a3158e2..96695f989 100644 --- a/src/assets/styles/scroll.less +++ b/src/assets/styles/scroll.less @@ -6,7 +6,6 @@ ::-webkit-scrollbar-track, ::-webkit-scrollbar-thumb { - border-radius: 999px; border: 5px solid transparent; } //凹槽颜色 @@ -26,4 +25,4 @@ position: absolute; top: 0; left: 0; -} \ No newline at end of file +} diff --git a/src/assets/styles/searchInput.less b/src/assets/styles/searchInput.less index ae80378ef..fb08f9960 100644 --- a/src/assets/styles/searchInput.less +++ b/src/assets/styles/searchInput.less @@ -40,7 +40,7 @@ // .search-input-box{ // margin-top: 1px; // border: 1px solid #DCDFE6; -// border-radius: 0 4px 4px 0; +// 0 4px 4px 0; // .v-select-selection{ // & > div{ // .v-select-placeholder{ diff --git a/src/assets/styles/shangqi-iconfont-replace/demo.css b/src/assets/styles/shangqi-iconfont-replace/demo.css index a67054a0a..704b99534 100644 --- a/src/assets/styles/shangqi-iconfont-replace/demo.css +++ b/src/assets/styles/shangqi-iconfont-replace/demo.css @@ -252,7 +252,6 @@ margin: 0 3px; padding: 0 5px; background: #eee; - border-radius: 3px; } .markdown strong, @@ -461,7 +460,6 @@ pre[class*="language-"] { /* Inline code */ :not(pre)>code[class*="language-"] { padding: .1em; - border-radius: .3em; white-space: normal; } diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue index a88355aa6..aca492186 100644 --- a/src/components/CustomFormComponents/InputForAllStandards.vue +++ b/src/components/CustomFormComponents/InputForAllStandards.vue @@ -125,7 +125,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> diff --git a/src/components/CustomFormComponents/InputForPolicy.vue b/src/components/CustomFormComponents/InputForPolicy.vue index cf05bc9c7..81bb272f3 100644 --- a/src/components/CustomFormComponents/InputForPolicy.vue +++ b/src/components/CustomFormComponents/InputForPolicy.vue @@ -123,7 +123,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> diff --git a/src/components/CustomFormComponents/InputForRecord.vue b/src/components/CustomFormComponents/InputForRecord.vue index aec5bbb63..a27f48721 100644 --- a/src/components/CustomFormComponents/InputForRecord.vue +++ b/src/components/CustomFormComponents/InputForRecord.vue @@ -119,7 +119,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> diff --git a/src/components/CustomFormComponents/InputForStandAndForeign.vue b/src/components/CustomFormComponents/InputForStandAndForeign.vue index b4c6fc1e2..8950b94b6 100644 --- a/src/components/CustomFormComponents/InputForStandAndForeign.vue +++ b/src/components/CustomFormComponents/InputForStandAndForeign.vue @@ -122,7 +122,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 62b6fb9ef..32ba8c67e 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -120,7 +120,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue index dad369eeb..371e65e3d 100644 --- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue +++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue @@ -138,7 +138,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index e504835ca..fd4ea14c7 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -126,7 +126,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> diff --git a/src/components/CustomFormComponents/ProjectRelatedPersonnel.vue b/src/components/CustomFormComponents/ProjectRelatedPersonnel.vue index cec3c60ea..47500f4bd 100644 --- a/src/components/CustomFormComponents/ProjectRelatedPersonnel.vue +++ b/src/components/CustomFormComponents/ProjectRelatedPersonnel.vue @@ -18,8 +18,8 @@ > diff --git a/src/components/ProjectRelatedPersonnel/index.vue b/src/components/ProjectRelatedPersonnel/index.vue index f5ca6eb49..d355f5076 100644 --- a/src/components/ProjectRelatedPersonnel/index.vue +++ b/src/components/ProjectRelatedPersonnel/index.vue @@ -57,7 +57,7 @@ diff --git a/src/components/ProjectRelatedPersonnel/index2.vue b/src/components/ProjectRelatedPersonnel/index2.vue index 168f59a79..2db5d6b2a 100644 --- a/src/components/ProjectRelatedPersonnel/index2.vue +++ b/src/components/ProjectRelatedPersonnel/index2.vue @@ -79,7 +79,7 @@ - + @@ -497,7 +497,6 @@ export default { } .inp{ width: 230px; - border-radius: 50px; margin-left: 5px; } /deep/.el-input--suffix .el-input__inner { diff --git a/src/components/PutQuestionButton/index.vue b/src/components/PutQuestionButton/index.vue index 70b540df1..3dc145f0d 100644 --- a/src/components/PutQuestionButton/index.vue +++ b/src/components/PutQuestionButton/index.vue @@ -35,7 +35,7 @@ @@ -228,7 +228,6 @@ export default { height: 30px; line-height: 30px; font-size: 14px; - border-radius: 15px; color: #07C160; border: 1px solid #07C160; background: rgba(1, 193, 96, 0.1); diff --git a/src/components/advancedQuery/index.vue b/src/components/advancedQuery/index.vue index e184d1bd8..eee804871 100644 --- a/src/components/advancedQuery/index.vue +++ b/src/components/advancedQuery/index.vue @@ -190,7 +190,7 @@
高级检索 - 重置 + 重置
@@ -382,7 +382,7 @@
查询 - 重置 + 重置
@@ -421,7 +421,7 @@ diff --git a/src/components/generationNumber/index.vue b/src/components/generationNumber/index.vue index 80955c1fc..16e933212 100644 --- a/src/components/generationNumber/index.vue +++ b/src/components/generationNumber/index.vue @@ -72,8 +72,8 @@ diff --git a/src/components/hasNoData/index.vue b/src/components/hasNoData/index.vue index 1ef758a03..6abe270a0 100644 --- a/src/components/hasNoData/index.vue +++ b/src/components/hasNoData/index.vue @@ -43,7 +43,6 @@ export default { display: -ms-flex; justify-content: center; align-items: center; - border-radius: 50%; font-size: 50px; flex-flow: column; color: #AAA; diff --git a/src/components/lawsTree/index.vue b/src/components/lawsTree/index.vue index dcf64b3ac..4d528bfab 100644 --- a/src/components/lawsTree/index.vue +++ b/src/components/lawsTree/index.vue @@ -1492,7 +1492,6 @@ export default { line-height: 1.5; padding: 4px 28px 4px 7px; font-size: 12px; - border-radius: 4px; color: #515a6e; background-color: #fff; background-image: none; diff --git a/src/components/lawsTree/index2.vue b/src/components/lawsTree/index2.vue index 94b792417..5d8b4983a 100644 --- a/src/components/lawsTree/index2.vue +++ b/src/components/lawsTree/index2.vue @@ -1380,7 +1380,6 @@ export default { .input-wrapper{ padding: 10px 5px 0 5px; .empty { - border-radius: 50px; } input{ display: inline-block; @@ -1389,7 +1388,6 @@ export default { line-height: 1.5; padding: 4px 28px 4px 7px; font-size: 12px; - border-radius: 4px; color: #515a6e; background-color: #fff; background-image: none; diff --git a/src/components/loading/index.vue b/src/components/loading/index.vue index d160a6b86..fbe1b2286 100644 --- a/src/components/loading/index.vue +++ b/src/components/loading/index.vue @@ -64,7 +64,6 @@ export default { width: 100%; height: 100%; background-color: rgba(255, 255, 255, 0.9); - border-radius: 8px; user-select: none; .loading-content{ position: absolute; diff --git a/src/components/panel/PanelHeader.vue b/src/components/panel/PanelHeader.vue index 4af60afaf..882569e88 100644 --- a/src/components/panel/PanelHeader.vue +++ b/src/components/panel/PanelHeader.vue @@ -98,14 +98,12 @@ export default { } .test-1::-webkit-scrollbar-thumb { /*滚动条里面小方块*/ - border-radius: 10px; box-shadow : inset 0 0 5px rgba(0, 0, 0, 0.2); background : #cecece; } .test-1::-webkit-scrollbar-track { /*滚动条里面轨道*/ box-shadow : inset 0 0 5px rgba(0, 0, 0, 0.2); - border-radius: 10px; background : #ededed; } diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue index 986611300..75ee3b1e2 100644 --- a/src/pages/config/pages/attributeCustom/components/buss.vue +++ b/src/pages/config/pages/attributeCustom/components/buss.vue @@ -2,8 +2,8 @@ 数据获取中 @@ -378,7 +378,7 @@ @pageChange="typeProjectTablePageChange" @pageSizeChange="typeProjectTablePageSizeChange"> 数据获取中 diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step1.vue index c924e68c6..23172e1e5 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbba/step1.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbba/step1.vue @@ -336,7 +336,7 @@ icon="el-icon-check" :loading="loadUser" @click="typeProjectOk">确定 - 取消 + 取消 @@ -376,7 +376,7 @@ - + diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step2.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step2.vue index 788e2813d..30d752a70 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbba/step2.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbba/step2.vue @@ -275,8 +275,8 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step3.vue index 17415cfd3..936a44e4f 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbba/step3.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbba/step3.vue @@ -313,7 +313,7 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step4.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step4.vue index 6ca120c5b..6bd6033c7 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbba/step4.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbba/step4.vue @@ -365,7 +365,7 @@ @@ -396,7 +396,7 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step5.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step5.vue index 7a2536fa1..bb67d7322 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbba/step5.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbba/step5.vue @@ -327,8 +327,8 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step6.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step6.vue index c73dfdfae..3e0cbf7ad 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbba/step6.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbba/step6.vue @@ -327,8 +327,8 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step7.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step7.vue index 51e3f5fb3..47410e240 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbba/step7.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbba/step7.vue @@ -335,8 +335,8 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step8.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step8.vue index 256f84e55..0f0a1c7ec 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbba/step8.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbba/step8.vue @@ -304,7 +304,7 @@ @@ -328,7 +328,7 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbfs/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbfs/step1.vue index 9f91f1b3e..9ca9b9d1b 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbfs/step1.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbfs/step1.vue @@ -276,7 +276,7 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step1.vue index df265392c..7990e0fb8 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbfz/step1.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step1.vue @@ -1003,7 +1003,6 @@ export default { font-size: 14px; color: #409EFF; border: 1px solid #409EFF; - border-radius: 15px; background: rgba(64, 158, 255, 0.1); font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; } diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step2.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step2.vue index 3ab381db5..d3d55cae3 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbfz/step2.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step2.vue @@ -526,7 +526,6 @@ export default { font-size: 14px; color: #409EFF; border: 1px solid #409EFF; - border-radius: 15px; background: rgba(64, 158, 255, 0.1); font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; } diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step3.vue index 495a7f530..d6a7dd472 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbfz/step3.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step3.vue @@ -520,7 +520,6 @@ export default { font-size: 14px; color: #409EFF; border: 1px solid #409EFF; - border-radius: 15px; background: rgba(64, 158, 255, 0.1); font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; } diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step4.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step4.vue index bc622acc7..b0ab3d684 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbfz/step4.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step4.vue @@ -440,7 +440,6 @@ export default { font-size: 14px; color: #409EFF; border: 1px solid #409EFF; - border-radius: 15px; background: rgba(64, 158, 255, 0.1); font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; } diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step5.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step5.vue index 5aba63a03..f5ef56e3a 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbfz/step5.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step5.vue @@ -496,7 +496,6 @@ export default { font-size: 14px; color: #409EFF; border: 1px solid #409EFF; - border-radius: 15px; background: rgba(64, 158, 255, 0.1); font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; } diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step6.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step6.vue index d0148297c..30d1e0547 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbfz/step6.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step6.vue @@ -442,7 +442,6 @@ export default { font-size: 14px; color: #409EFF; border: 1px solid #409EFF; - border-radius: 15px; background: rgba(64, 158, 255, 0.1); font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; } diff --git a/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue b/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue index b1aef7d00..b49efae40 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue @@ -380,8 +380,8 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue index d1a4f4316..7acee19bd 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue @@ -382,8 +382,8 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxd/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbzxd/step1.vue index 1c10d0ea7..9b73c8064 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbzxd/step1.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbzxd/step1.vue @@ -1768,7 +1768,6 @@ export default { font-size: 14px; color: #409EFF; border: 1px solid #409EFF; - border-radius: 15px; background: rgba(64, 158, 255, 0.1); font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; } diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxdpg/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbzxdpg/step3.vue index 845a37cd4..68a4d1853 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbzxdpg/step3.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbzxdpg/step3.vue @@ -372,7 +372,7 @@ @@ -462,7 +462,7 @@ 数据获取中 diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step1.vue index c882f1437..cf12ed2f8 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step1.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step1.vue @@ -371,7 +371,7 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step2.vue b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step2.vue index a6df860b1..7a8066f41 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step2.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step2.vue @@ -739,7 +739,6 @@ export default { .prc-content-border { border: 1px dashed #ddd; padding: 20px; - border-radius: 10px; background: #fefefe; } } diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step3.vue index 0632f79d0..d58db5104 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step3.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step3.vue @@ -685,7 +685,6 @@ export default { .prc-content-border { border: 1px dashed #ddd; padding: 20px; - border-radius: 10px; background: #fefefe; } } diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step4.vue b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step4.vue index e4bc36ee5..8c709f82e 100644 --- a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step4.vue +++ b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step4.vue @@ -388,7 +388,7 @@ 数据获取中 @@ -1310,7 +1310,6 @@ export default { .prc-content-border { border: 1px dashed #ddd; padding: 20px; - border-radius: 10px; background: #fefefe; } } diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/components/reject.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/components/reject.vue index 036e1020c..05c29ebbf 100644 --- a/src/pages/processCenter/pages/createProcess/components/ruKu/components/reject.vue +++ b/src/pages/processCenter/pages/createProcess/components/ruKu/components/reject.vue @@ -17,7 +17,7 @@ maxlength="1000" :placeholder="placeholder"> - 取 消 + 取 消 确 定 @@ -102,4 +102,4 @@ export default { align-items: center; justify-content: flex-end; } - \ No newline at end of file + diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/step1.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/step1.vue index 6a41227cf..c4368e702 100644 --- a/src/pages/processCenter/pages/createProcess/components/ruKu/step1.vue +++ b/src/pages/processCenter/pages/createProcess/components/ruKu/step1.vue @@ -993,7 +993,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/step2.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/step2.vue index 807780a24..d74a850f0 100644 --- a/src/pages/processCenter/pages/createProcess/components/ruKu/step2.vue +++ b/src/pages/processCenter/pages/createProcess/components/ruKu/step2.vue @@ -2337,7 +2337,6 @@ export default { } .myBox { border: 1px solid #ccc; - border-radius: 4px; .mycheck { margin-right: 10px; } diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/step3.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/step3.vue index 43df27d2c..a1ebf2a90 100644 --- a/src/pages/processCenter/pages/createProcess/components/ruKu/step3.vue +++ b/src/pages/processCenter/pages/createProcess/components/ruKu/step3.vue @@ -265,17 +265,17 @@ :on-remove="(res, file, fileList) => handleRemoveFile(item, res, file, fileList)" :on-success="(res, file, fileList) => handleUploadSuccess(item, res, file, fileList)" ref="importFileAboutStand"> - 点击上传 + 点击上传
- 提交 - + 退回 @@ -485,10 +485,10 @@
- 提交 - + 退回 @@ -3547,8 +3547,6 @@ export default { .myBox { border: 1px solid #ccc; - border-radius: 4px; - .mycheck { margin-right: 10px; } diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/step4.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/step4.vue index 95079bbe3..2f36673f6 100644 --- a/src/pages/processCenter/pages/createProcess/components/ruKu/step4.vue +++ b/src/pages/processCenter/pages/createProcess/components/ruKu/step4.vue @@ -235,7 +235,7 @@ disabled ref="importFileAboutStand" :on-preview="handlePreviewFile"> - 点击上传 + 点击上传
@@ -250,7 +250,7 @@ class="common-button-default" icon="el-icon-close" @click="submitProcess(item, false)">驳回 - + - 点击上传 + 点击上传 @@ -414,7 +414,7 @@
驳回 - + 通过
@@ -2674,7 +2674,6 @@ export default { } .myBox { border: 1px solid #ccc; - border-radius: 4px; .mycheck { margin-right: 10px; } diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/step5.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/step5.vue index 754cfbad8..97c1e0eaa 100644 --- a/src/pages/processCenter/pages/createProcess/components/ruKu/step5.vue +++ b/src/pages/processCenter/pages/createProcess/components/ruKu/step5.vue @@ -232,7 +232,7 @@ disabled ref="importFileAboutStand" :on-preview="handlePreviewFile"> - 点击上传 + 点击上传 @@ -247,7 +247,7 @@ class="common-button-default" icon="el-icon-close" @click="submitProcess(item, false)">驳回
- + - 点击上传 + 点击上传 @@ -412,7 +412,7 @@
驳回 - + 通过
@@ -2780,7 +2780,6 @@ export default { } .myBox { border: 1px solid #ccc; - border-radius: 4px; .mycheck { margin-right: 10px; } @@ -3018,9 +3017,6 @@ export default { } } /deep/ .search-item { - .el-input__inner { - border-radius: 4px !important; - } .el-input__icon { line-height: 30px; } diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step1.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step1.vue index 107a7c38c..6a548dbc0 100644 --- a/src/pages/processCenter/pages/createProcess/components/xmpg/step1.vue +++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step1.vue @@ -464,7 +464,7 @@ @@ -585,7 +585,7 @@ @@ -2260,7 +2260,6 @@ export default { border: 1px solid #e5e5e5; /deep/.el-input__inner{ margin: 5px 0; - border-radius: 15px; } /deep/.table-row-background{ background: #ecf7ff; diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step3-validate-copy.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step3-validate-copy.vue index ba741c030..e6304bad3 100644 --- a/src/pages/processCenter/pages/createProcess/components/xmpg/step3-validate-copy.vue +++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step3-validate-copy.vue @@ -259,7 +259,7 @@ :on-success="uploadBackSuccess" :before-upload="beforeUpload" > - + 点击上传 @@ -271,7 +271,7 @@ v-if="approvalHistory.length" >
- 提交 + 提交
@@ -390,7 +390,7 @@ :on-success="uploadBackSuccess" :before-upload="beforeUpload" > - + 点击上传 @@ -403,9 +403,9 @@ v-if="approvalHistory.length" >
- - - 提交 + + + 提交
@@ -540,7 +540,7 @@ @@ -1322,7 +1322,6 @@ export default { .myBox { margin-bottom: 10px; border: 1px solid #ccc; - border-radius: 4px; &:last-child { margin-bottom: 0; } @@ -1394,7 +1393,7 @@ export default { margin-bottom: 25px; } /deep/.el-textarea__inner { - //border-radius: 15px; + //15px; } /deep/.el-input__inner { width: 140px; @@ -1455,9 +1454,6 @@ export default { align-items: center; display: flex; } - /deep/.el-input__inner{ - border-radius: 0; - } } } } @@ -1475,4 +1471,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step3.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step3.vue index d932aa9a0..f8af7345d 100644 --- a/src/pages/processCenter/pages/createProcess/components/xmpg/step3.vue +++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step3.vue @@ -233,7 +233,7 @@ :on-success="uploadBackSuccess" :before-upload="beforeUpload" > - + 点击上传 @@ -246,9 +246,9 @@ v-if="approvalHistory.length" >
- 取消 - 保存 - 提交 + 取消 + 保存 + 提交
@@ -370,7 +370,7 @@ :on-success="uploadBackSuccess" :before-upload="beforeUpload" > - + 点击上传 @@ -383,9 +383,9 @@ v-if="approvalHistory.length" >
- 取消 - 保存 - 提交 + 取消 + 保存 + 提交
@@ -521,7 +521,7 @@ @@ -1448,7 +1448,6 @@ export default { .myBox { //margin-bottom: 10px; border: 1px solid #ccc; - border-radius: 4px; .mycheck { margin-right: 10px; } @@ -1516,7 +1515,7 @@ export default { margin-bottom: 25px; } /deep/.el-textarea__inner { - //border-radius: 15px; + //15px; } /deep/.el-input__inner { width: 140px; @@ -1578,7 +1577,6 @@ export default { display: flex; } /deep/.el-input__inner{ - border-radius: 0; } } } diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step4.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step4.vue index c788fbc33..122ea10ee 100644 --- a/src/pages/processCenter/pages/createProcess/components/xmpg/step4.vue +++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step4.vue @@ -388,8 +388,8 @@ - 取消 - 确定 + 取消 + 确定
diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step5.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step5.vue index 283e4f057..32bae3817 100644 --- a/src/pages/processCenter/pages/createProcess/components/xmpg/step5.vue +++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step5.vue @@ -401,8 +401,8 @@ - 取消 - 确定 + 取消 + 确定 diff --git a/src/pages/processCenter/pages/createProcess/components/zcjspg/step1-1.vue b/src/pages/processCenter/pages/createProcess/components/zcjspg/step1-1.vue index 4820be1b1..2dd00acb8 100644 --- a/src/pages/processCenter/pages/createProcess/components/zcjspg/step1-1.vue +++ b/src/pages/processCenter/pages/createProcess/components/zcjspg/step1-1.vue @@ -258,7 +258,7 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/zcjspg/step1.vue b/src/pages/processCenter/pages/createProcess/components/zcjspg/step1.vue index eba7f9c9e..3965d156b 100644 --- a/src/pages/processCenter/pages/createProcess/components/zcjspg/step1.vue +++ b/src/pages/processCenter/pages/createProcess/components/zcjspg/step1.vue @@ -247,7 +247,7 @@ diff --git a/src/pages/processCenter/pages/createProcess/components/zcjspg/step2.vue b/src/pages/processCenter/pages/createProcess/components/zcjspg/step2.vue index f176bd496..e5aac9fc5 100644 --- a/src/pages/processCenter/pages/createProcess/components/zcjspg/step2.vue +++ b/src/pages/processCenter/pages/createProcess/components/zcjspg/step2.vue @@ -949,9 +949,6 @@ export default { .feedback { padding: 18px 15px 20px 0; - /deep/ .el-textarea__inner { - border-radius: 5px !important; - } /deep/ .el-form-item { margin-bottom: 0; } diff --git a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step1.vue b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step1.vue index 44089b167..91e062219 100644 --- a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step1.vue +++ b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step1.vue @@ -1942,7 +1942,6 @@ export default { font-size: 14px; color: #409EFF; border: 1px solid #409EFF; - border-radius: 15px; background: rgba(64, 158, 255, 0.1); font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; } diff --git a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step2.vue b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step2.vue index 24d494d39..f2aacf718 100644 --- a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step2.vue +++ b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step2.vue @@ -803,9 +803,6 @@ export default { .feedback { padding: 18px 15px 20px 0; - /deep/ .el-textarea__inner { - border-radius: 5px !important; - } /deep/ .el-form-item { margin-bottom: 0; } diff --git a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step3.vue b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step3.vue index e1437e958..9f66de205 100644 --- a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step3.vue +++ b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step3.vue @@ -1038,7 +1038,6 @@ export default { .feedback { padding: 18px 15px 20px 0; /deep/ .el-textarea__inner { - border-radius: 5px !important; } /deep/ .el-form-item { margin-bottom: 0; diff --git a/src/pages/processCenter/pages/createProcess/components/zg/step1.vue b/src/pages/processCenter/pages/createProcess/components/zg/step1.vue index 757d1d0f4..0684660f4 100644 --- a/src/pages/processCenter/pages/createProcess/components/zg/step1.vue +++ b/src/pages/processCenter/pages/createProcess/components/zg/step1.vue @@ -241,7 +241,7 @@ @@ -791,7 +791,6 @@ export default { .typebox { .typeitem { border: 1px solid #f4f4f4; - border-radius: 5px; padding: 10px 10px 0; margin: 10px 0; display: flex; diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index bdabc39ae..408a5d666 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -255,7 +255,6 @@ export default { margin-bottom: 10px; text-align: center; border: 1px dashed #ddd; - border-radius: 3px; background: #fdfdfd; font-size: 18px; font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif; diff --git a/src/pages/processCenter/pages/newProcess/index_new.vue b/src/pages/processCenter/pages/newProcess/index_new.vue index 1ccd03ed4..2931b971b 100644 --- a/src/pages/processCenter/pages/newProcess/index_new.vue +++ b/src/pages/processCenter/pages/newProcess/index_new.vue @@ -348,7 +348,6 @@ export default { margin-bottom: 10px; text-align: center; border: 1px dashed #ddd; - border-radius: 3px; background: #fdfdfd; font-size: 18px; font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif; diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 0245f1c65..53d4ca8cb 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -128,8 +128,8 @@ diff --git a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle.vue b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle.vue index fe2672ba8..6ef498a90 100644 --- a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle.vue +++ b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle.vue @@ -178,18 +178,18 @@ - + {{ form.file.length > 0 ? '查看已上传文件': '上传文件' }}
- 取消 - 退回 - 保存 - - 提交 + 取消 + 退回 + 保存 + + 提交
@@ -307,18 +307,18 @@ - + {{ form.file.length > 0 ? '查看已上传文件': '上传文件' }}
- 取消 - 退回 - 保存 - - 提交 + 取消 + 退回 + 保存 + + 提交
@@ -366,8 +366,8 @@
{{ ItemText }}
- 取 消 - 确 定 + 取 消 + 确 定
@@ -389,7 +389,6 @@ - 点击上传 + 点击上传 @@ -1627,7 +1626,6 @@ export default { .block-input { /deep/ .el-input__inner { width: 100% !important; - border-radius: 0; } } .myFileButton { @@ -1636,7 +1634,6 @@ export default { display: flex; align-items: center; justify-content: center; - border-radius: 0; } .file-box{ padding: 0 10px; @@ -1718,7 +1715,6 @@ export default { overflow: auto; .myBox { border: 1px solid #ccc; - border-radius: 4px; .mycheck { margin-right: 10px; } @@ -1795,7 +1791,6 @@ export default { } /deep/.el-input__inner { width: 240px; - border-radius: 0; } } .myBoxItemH { diff --git a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue index aa552a461..c69319b4d 100644 --- a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue +++ b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue @@ -243,7 +243,7 @@ @@ -280,7 +280,7 @@ @@ -303,7 +303,7 @@ @@ -317,8 +317,8 @@
- 取 消 - 确 定 + 取 消 + 确 定
@@ -332,8 +332,8 @@
- 取 消 - 确 定 + 取 消 + 确 定
@@ -2115,7 +2115,6 @@ } /deep/.el-input__inner { margin: 5px 0; - border-radius: 15px; } } .myfoot { diff --git a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue index beb526471..dc850eeba 100644 --- a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue +++ b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue @@ -83,7 +83,7 @@
- +
@@ -190,8 +190,8 @@
- 不同意 - 同意 + 不同意 + 同意
@@ -223,7 +223,7 @@
- +
@@ -330,8 +330,8 @@
- 不同意 - 同意 + 不同意 + 同意
@@ -365,8 +365,8 @@
{{ ItemText }}
- 取 消 - 确 定 + 取 消 + 确 定
@@ -529,16 +529,16 @@ moreFileClick () { // 点击文本附件、车型项目更多事件 this.isFileDrawer = true }, - handlePreview (item) { // 点击跳转标准详情 - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.resId, - pageType: item.resType - } - }) - window.open(routeUrl.href, '_blank') - }, + // handlePreview (item) { // 点击跳转标准详情 + // let routeUrl = this.$router.resolve({ + // name: 'OtherStandardDetails', + // params: { + // id: item.resId, + // pageType: item.resType + // } + // }) + // window.open(routeUrl.href, '_blank') + // }, parentSubmit (item, type) { const next =() => { let json = {...item} @@ -695,7 +695,6 @@ .block-input { /deep/ .el-input__inner { width: 100% !important; - border-radius: 0; } } .see-drawer-val { @@ -785,7 +784,6 @@ flex-direction: column; .myBox { border: 1px solid #ccc; - border-radius: 4px; .mycheck { margin-right: 10px; } @@ -862,7 +860,6 @@ } /deep/.el-input__inner { width: 240px; - border-radius: 0; } } .myBoxItemH { diff --git a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle3.vue b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle3.vue index 4099a8fe7..3265167df 100644 --- a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle3.vue +++ b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle3.vue @@ -81,8 +81,8 @@
- - + +
@@ -218,7 +218,7 @@
- +
@@ -359,8 +359,8 @@
{{ ItemText }}
- 取 消 - 确 定 + 取 消 + 确 定
@@ -448,16 +448,16 @@ }) }, // 点击查看 - handlePreview (item) { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.resId, - pageType: item.resType - } - }) - window.open(routeUrl.href, '_blank') - }, + // handlePreview (item) { + // let routeUrl = this.$router.resolve({ + // name: 'OtherStandardDetails', + // params: { + // id: item.resId, + // pageType: item.resType + // } + // }) + // window.open(routeUrl.href, '_blank') + // }, seeitems (indexs, index, items, item) { this.List[index].itemsList[indexs].seeopen = !this.List[index].itemsList[indexs].seeopen if (this.List[index].itemsList[indexs].seeopen === true) { @@ -590,7 +590,6 @@ .block-input { /deep/ .el-input__inner { width: 100% !important; - border-radius: 0; } } .see-drawer-val { @@ -680,7 +679,6 @@ flex-direction: column; .myBox { border: 1px solid #ccc; - border-radius: 4px; .mycheck { margin-right: 10px; } @@ -750,7 +748,6 @@ } /deep/.el-input__inner { width: 240px; - border-radius: 0; } } .myBoxItemH { diff --git a/src/pages/processCenter/pages/processDetail/pages/processDetailDetails/index.vue b/src/pages/processCenter/pages/processDetail/pages/processDetailDetails/index.vue index 6a3066afb..f8f4e63e0 100644 --- a/src/pages/processCenter/pages/processDetail/pages/processDetailDetails/index.vue +++ b/src/pages/processCenter/pages/processDetail/pages/processDetailDetails/index.vue @@ -486,7 +486,6 @@ export default { padding: 5px; cursor: pointer; font-size: 16px; - border-radius: 9px; margin-bottom: 10px; position: relative; &:hover{ diff --git a/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details11.vue b/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details11.vue index 29ad28036..68dc2e33d 100644 --- a/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details11.vue +++ b/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details11.vue @@ -220,7 +220,6 @@ export default { &:hover{ cursor: pointer; background: rgba(255,255,255,.25); - border-radius: 2px; } } } diff --git a/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details12.vue b/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details12.vue index 87b80ae2d..2d4643bea 100644 --- a/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details12.vue +++ b/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details12.vue @@ -218,7 +218,6 @@ export default { &:hover{ cursor: pointer; background: rgba(255,255,255,.25); - border-radius: 2px; } } } diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index de3fb9093..cf9862856 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -355,7 +355,6 @@ export default { width: 12px; height: 12px; margin-right: 8px; - border-radius: 50%; //background: #e8eaec; position: relative; top: 1px; diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 1f5f91ce7..380d1c7e8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -375,7 +375,6 @@ export default { width: 12px; height: 12px; margin-right: 8px; - border-radius: 50%; //background: #e8eaec; position: relative; top: 1px; diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue index 53cd22da4..cea6349ab 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue @@ -339,7 +339,6 @@ export default { width: 12px; height: 12px; margin-right: 8px; - border-radius: 50%; //background: #e8eaec; position: relative; top: 1px; diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index dcf796c48..698f9ee7f 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1197,7 +1197,6 @@ export default { width: 12px; height: 12px; margin-right: 8px; - border-radius: 50%; //background: #e8eaec; position: relative; top: 1px; diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 01810b668..a0286af9d 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -522,7 +522,6 @@ export default { width: 12px; height: 12px; margin-right: 8px; - border-radius: 50%; //background: #e8eaec; position: relative; top: 1px; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index f96306210..f320f259d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -53,7 +53,7 @@ :on-success="uploadBackSuccess" :before-upload="beforeUpload" > - + 点击上传 @@ -769,8 +769,8 @@ @@ -779,7 +779,7 @@ - 取消 + 取消 提交 @@ -1047,7 +1047,7 @@ @@ -1338,8 +1338,8 @@ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 9a12b5a4d..f026f1024 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -674,7 +674,7 @@ - 取消 + 取消 提交 @@ -697,7 +697,7 @@ @@ -715,8 +715,8 @@ {{$t('m.dataAcquisition')}} @@ -1687,7 +1687,6 @@ export default { height: 30px; line-height: 30px; font-size: 14px; - border-radius: 15px; padding: 0 10px; font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index df0e005d4..7703cd0be 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -246,7 +246,7 @@ - 取消 + 取消 提交 @@ -514,8 +514,8 @@ @@ -674,7 +674,7 @@ @pageChange="pageChangeItems" @pageSizeChange="pageSizeChangeItems"> @@ -799,7 +799,7 @@ @click="saveConfigStand" :loading="isSubmit" >提交 - 取消 + 取消 @@ -824,7 +824,7 @@ @@ -842,7 +842,7 @@ diff --git a/src/pages/regulatoryRepository/dyInformation/index.vue b/src/pages/regulatoryRepository/dyInformation/index.vue index 24b921c09..378d27d2e 100644 --- a/src/pages/regulatoryRepository/dyInformation/index.vue +++ b/src/pages/regulatoryRepository/dyInformation/index.vue @@ -50,7 +50,7 @@ @click="querySearchWords" >查询 - 清空 + 清空 @@ -309,7 +309,6 @@ export default { position: relative; height: 100%; border: 1px solid #ddd; - border-radius: 5px; overflow-x: auto; .substance { position: relative; diff --git a/src/pages/regulatoryRepository/dynamicInformation/index.vue b/src/pages/regulatoryRepository/dynamicInformation/index.vue index c2719d9d3..9f7ca7d14 100644 --- a/src/pages/regulatoryRepository/dynamicInformation/index.vue +++ b/src/pages/regulatoryRepository/dynamicInformation/index.vue @@ -52,7 +52,7 @@ @click="getSearch" >查询 - 清空 + 清空 @@ -549,7 +549,6 @@ export default { position: relative; height: 100%; border: 1px solid #ddd; - border-radius: 5px; overflow-x: auto; .substance { position: relative; diff --git a/src/pages/regulatoryRepository/dynamicInformation/indexMore.vue b/src/pages/regulatoryRepository/dynamicInformation/indexMore.vue index 8c962cfbb..596c2d4a4 100644 --- a/src/pages/regulatoryRepository/dynamicInformation/indexMore.vue +++ b/src/pages/regulatoryRepository/dynamicInformation/indexMore.vue @@ -55,7 +55,7 @@ @click="querySearchWords" >查询 - 清空 + 清空 @@ -342,7 +342,6 @@ export default { position: relative; height: 100%; border: 1px solid #ddd; - border-radius: 5px; overflow-x: auto; .substance { position: relative; diff --git a/src/pages/regulatoryRepository/dynamicInformation/pages/QueryDynamicInformation.vue b/src/pages/regulatoryRepository/dynamicInformation/pages/QueryDynamicInformation.vue index be71d717a..a04adaa71 100644 --- a/src/pages/regulatoryRepository/dynamicInformation/pages/QueryDynamicInformation.vue +++ b/src/pages/regulatoryRepository/dynamicInformation/pages/QueryDynamicInformation.vue @@ -50,7 +50,7 @@ @click="querySearchWords" >查询 - 清空 + 清空 @@ -307,7 +307,6 @@ export default { position: relative; height: 100%; border: 1px solid #ddd; - border-radius: 5px; overflow-x: auto; .substance { position: relative; diff --git a/src/pages/regulatoryRepository/dynamicInformation/pages/components/DomesticDynamics.vue b/src/pages/regulatoryRepository/dynamicInformation/pages/components/DomesticDynamics.vue index 913aabd68..7ae4c289d 100644 --- a/src/pages/regulatoryRepository/dynamicInformation/pages/components/DomesticDynamics.vue +++ b/src/pages/regulatoryRepository/dynamicInformation/pages/components/DomesticDynamics.vue @@ -114,7 +114,6 @@ font-style: italic; width: 20px; height: 20px; - border-radius: 50%; font-size: 12px; .flex(); justify-content: center; diff --git a/src/pages/regulatoryRepository/dynamicInformation/pages/components/InternationalDynamics.vue b/src/pages/regulatoryRepository/dynamicInformation/pages/components/InternationalDynamics.vue index aeba10ee2..66be4c244 100644 --- a/src/pages/regulatoryRepository/dynamicInformation/pages/components/InternationalDynamics.vue +++ b/src/pages/regulatoryRepository/dynamicInformation/pages/components/InternationalDynamics.vue @@ -85,7 +85,6 @@ font-style: italic; width: 20px; height: 20px; - border-radius: 50%; font-size: 12px; .flex(); justify-content: center; diff --git a/src/pages/regulatoryRepository/dynamicInformation/pages/components/pages/informationCenterPages/InformationNotice.vue b/src/pages/regulatoryRepository/dynamicInformation/pages/components/pages/informationCenterPages/InformationNotice.vue index 2cfd89394..015ebbcac 100644 --- a/src/pages/regulatoryRepository/dynamicInformation/pages/components/pages/informationCenterPages/InformationNotice.vue +++ b/src/pages/regulatoryRepository/dynamicInformation/pages/components/pages/informationCenterPages/InformationNotice.vue @@ -191,7 +191,6 @@ export default { font-style: italic; width: 20px; height: 20px; - border-radius: 50%; font-size: 12px; .flex(); justify-content: center; diff --git a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue index 781839803..1c139371c 100644 --- a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue +++ b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue @@ -1465,7 +1465,7 @@ - 取消 + 取消 提交 @@ -1537,7 +1537,7 @@ @@ -741,7 +741,7 @@ @click="saveConfigStand" :loading="isSubmit" >提交 - 取消 + 取消 @@ -767,7 +767,7 @@ @@ -778,8 +778,8 @@ >

该节点下有记录,是否删除?

- 取消 - 确定 + 取消 + 确定
@@ -790,7 +790,7 @@ - 取消 + 取消 提交 @@ -809,7 +809,7 @@ diff --git a/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue b/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue index c17ac9c1f..465d26143 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue @@ -404,8 +404,8 @@ @@ -447,7 +447,7 @@ - 取消 + 取消 提交 diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index b948e0c0e..378319852 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -260,7 +260,7 @@

该节点下有记录,是否删除?

- {{$t('m.cancel')}} + {{$t('m.cancel')}} {{$t('m.sure')}}
@@ -312,7 +312,7 @@ @@ -524,8 +524,8 @@ @@ -556,7 +556,7 @@ - 取消 + 取消 提交 @@ -778,7 +778,7 @@ @click="saveConfigLawsInfo" :loading="isSubmit" >{{$t('m.submit')}} - {{$t('m.cancel')}} + {{$t('m.cancel')}} @@ -867,7 +867,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 79c1f522c..40f8760f3 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -246,7 +246,7 @@ - 取消 + 取消 提交 @@ -499,8 +499,8 @@ @@ -694,7 +694,7 @@ @pageChange="pageChangeItems" @pageSizeChange="pageSizeChangeItems"> @@ -813,7 +813,7 @@ @@ -845,7 +845,7 @@ :loading="isSubmit" @click="newMenu" >提交 - 取消 + 取消 @@ -871,7 +871,7 @@ diff --git a/src/pages/regulatoryRepository/information/index2.vue b/src/pages/regulatoryRepository/information/index2.vue index afec2042b..be98873dd 100644 --- a/src/pages/regulatoryRepository/information/index2.vue +++ b/src/pages/regulatoryRepository/information/index2.vue @@ -95,8 +95,8 @@ - 取 消 - 确 定 + 取 消 + 确 定 @@ -137,7 +137,7 @@ @@ -549,7 +549,6 @@ export default { height: 30px; line-height: 30px; font-size: 14px; - border-radius: 15px; padding: 0 10px; font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; & > i{ @@ -702,7 +701,6 @@ export default { height: 30px; line-height: 30px; font-size: 14px; - border-radius: 15px; color: #07C160; border: 1px solid #07C160; background: rgba(1, 193, 96, 0.1); diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 760f9d2e6..cfd4354df 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -1016,8 +1016,8 @@ @@ -1127,8 +1127,8 @@ 正在获取中…… @@ -1136,8 +1136,8 @@
- 导出 - 取消 + 导出 + 取消
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index b6221fd07..4a5a1993b 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -1005,8 +1005,8 @@ @pageSizeChange="copyPageSizeChange"> 数据获取中 @@ -1136,8 +1136,8 @@ 数据获取中 @@ -1590,8 +1590,8 @@ @@ -1605,16 +1605,16 @@
- 导出 - 取消 + 导出 + 取消
@@ -1877,7 +1877,7 @@ @@ -1895,8 +1895,8 @@ @@ -1986,8 +1986,8 @@ @@ -3732,7 +3732,6 @@ export default { margin: 0 auto; width: 20px; height: 20px; - border-radius: 50px; } .iconClass{ width: 18px; @@ -3828,7 +3827,6 @@ export default { /deep/.el-step__icon{ width: 18px; height: 18px; - border-radius: 50%; font-size: 12px; } /deep/.el-step__title{ @@ -3851,7 +3849,6 @@ export default { height: 30px; line-height: 30px; font-size: 14px; - border-radius: 15px; padding: 0 10px; font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; } diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index f46673c4d..f269f02f8 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -49,7 +49,7 @@ - + @@ -244,8 +244,8 @@ @pageSizeChange="pageProStateSizeChange"> - - + + @@ -261,9 +261,9 @@ 数据处理中 @@ -384,8 +384,8 @@ @pageSizeChange="pageProStateSizeChange2"> - - + + 数据处理中 diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 5e25285a1..302b3c32d 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -49,7 +49,7 @@ - + @@ -243,8 +243,8 @@ @pageSizeChange="pageProStateSizeChange"> - - + + @@ -260,9 +260,9 @@ 数据处理中 @@ -383,8 +383,8 @@ @pageSizeChange="pageProStateSizeChange2"> - - + + 数据处理中 diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index fc8586e4e..73243f3ad 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -647,8 +647,8 @@ @@ -1010,8 +1010,8 @@ @@ -1095,7 +1095,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index e2c25d5c9..dafa34498 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -252,7 +252,7 @@ @@ -2514,7 +2514,6 @@ export default { height: 20px; line-height: 20px; padding: 0 5px; - border-radius: 6px; color: #fff; background: #3391CE; } @@ -2635,7 +2634,6 @@ export default { .ivu-input{ width: 100%; height: 100%; - border-radius: 0; border: none; .flex(); align-items: center; @@ -2657,7 +2655,7 @@ export default { margin-top: 15px; //background-color: hsla(0,0%,100%,.9); - //border-radius: 20px; + //20px; padding: 10px; .condition-btn{ width: 75px; @@ -2709,7 +2707,6 @@ export default { span{ /*padding: 3px 7px;*/ padding: 0 0 0 3px; - border-radius: 2px; transition: all .3s ease; .un-select(); &:hover{ @@ -2720,7 +2717,6 @@ export default { padding: 3px 7px 3px 7px; background: @baseColor; color: #FFF; - border-radius: 4px; & span { font { color: #fff !important; @@ -2946,7 +2942,6 @@ export default { //padding: 9px 0 10px 10px; input.el-input__inner{ font-size: 16px; - border-radius: 24px 0 0 24px; font-family: PingFang-SC-Medium; color: #666; } @@ -2954,7 +2949,6 @@ export default { .search-btn-box { width: 55px; height: 48px; - border-radius: 0 24px 24px 0; background-color: #fff; display: flex; justify-content: center; @@ -2972,7 +2966,6 @@ export default { } .el-input__inner { height: 48px; - border-radius: 0; border: none; padding: 0 34px; } diff --git a/src/pages/skillReq/SkillReqAdd/searchForm.vue b/src/pages/skillReq/SkillReqAdd/searchForm.vue index 6e9eae9ee..406aa120b 100644 --- a/src/pages/skillReq/SkillReqAdd/searchForm.vue +++ b/src/pages/skillReq/SkillReqAdd/searchForm.vue @@ -671,7 +671,6 @@ export default { span { margin-right: 15px; padding: 0px 7px; - border-radius: 2px; transition: all 0.3s ease; user-select: none; margin-bottom: 5px; diff --git a/src/pages/skillReq/SkillReqSee/searchForm.vue b/src/pages/skillReq/SkillReqSee/searchForm.vue index 9c1d4aee7..b600b14ce 100644 --- a/src/pages/skillReq/SkillReqSee/searchForm.vue +++ b/src/pages/skillReq/SkillReqSee/searchForm.vue @@ -404,7 +404,7 @@ export default { span { margin-right: 15px; padding: 0px 7px; - border-radius: 2px; + 2px; transition: all 0.3s ease; user-select: none; margin-bottom: 5px; diff --git a/src/pages/standardComparisonLibrary/index.vue b/src/pages/standardComparisonLibrary/index.vue index d72eecf05..92f630b90 100644 --- a/src/pages/standardComparisonLibrary/index.vue +++ b/src/pages/standardComparisonLibrary/index.vue @@ -216,7 +216,7 @@ @@ -301,8 +301,8 @@ @@ -315,8 +315,8 @@
- 取 消 - 保 存 + 取 消 + 保 存
diff --git a/src/pages/standardComparisonLibrary/view.vue b/src/pages/standardComparisonLibrary/view.vue index b8999c797..b07519b8a 100644 --- a/src/pages/standardComparisonLibrary/view.vue +++ b/src/pages/standardComparisonLibrary/view.vue @@ -306,8 +306,8 @@ @@ -340,8 +340,8 @@ @close="selectStandardDrawerVisible = false" /> @@ -379,8 +379,8 @@ @@ -433,8 +433,8 @@
点击或拖拽上传文件
- 取 消 - 保 存 + 取 消 + 保 存
@@ -459,8 +459,8 @@
点击或拖拽导入文件
- 取 消 - 导 入 + 取 消 + 导 入