diff --git a/public/index.html b/public/index.html index f80aa61e..e44163f2 100644 --- a/public/index.html +++ b/public/index.html @@ -18,12 +18,14 @@ margin: 0px; padding: 0px; } + .chromeframe { margin: 0.2em 0; background: #ccc; color: #000; padding: 0.2em 0; } + #loader-wrapper { position: fixed; top: 0; @@ -32,6 +34,7 @@ height: 100%; z-index: 999999; } + #loader { display: block; position: relative; @@ -56,6 +59,7 @@ /* Chrome, Firefox 16+, IE 10+, Opera */ z-index: 1001; } + #loader:before { content: ""; position: absolute; @@ -78,6 +82,7 @@ animation: spin 3s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */ } + #loader:after { content: ""; position: absolute; @@ -100,6 +105,7 @@ animation: spin 1.5s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */ } + @-webkit-keyframes spin { 0% { -webkit-transform: rotate(0deg); @@ -118,6 +124,7 @@ /* Firefox 16+, IE 10+, Opera */ } } + @keyframes spin { 0% { -webkit-transform: rotate(0deg); @@ -136,6 +143,7 @@ /* Firefox 16+, IE 10+, Opera */ } } + #loader-wrapper .loader-section { position: fixed; top: 0; @@ -151,12 +159,15 @@ transform: translateX(0); /* Firefox 16+, IE 10+, Opera */ } + #loader-wrapper .loader-section.section-left { left: 0; } + #loader-wrapper .loader-section.section-right { right: 0; } + /* Loaded */ .loaded #loader-wrapper .loader-section.section-left { -webkit-transform: translateX(-100%); @@ -168,6 +179,7 @@ -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); } + .loaded #loader-wrapper .loader-section.section-right { -webkit-transform: translateX(100%); /* Chrome, Opera 15+, Safari 3.1+ */ @@ -178,11 +190,13 @@ -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); } + .loaded #loader { opacity: 0; -webkit-transition: all 0.3s ease-out; transition: all 0.3s ease-out; } + .loaded #loader-wrapper { visibility: hidden; -webkit-transform: translateY(-100%); @@ -194,13 +208,16 @@ -webkit-transition: all 0.3s 1s ease-out; transition: all 0.3s 1s ease-out; } + /* JavaScript Turned Off */ .no-js #loader-wrapper { display: none; } + .no-js h1 { color: #222222; } + #loader-wrapper .load_title { font-family: 'Open Sans'; color: #FFF; @@ -213,6 +230,7 @@ opacity: 1; line-height: 30px; } + #loader-wrapper .load_title span { font-weight: normal; font-style: italic; @@ -220,26 +238,37 @@ color: #FFF; opacity: 0.5; } + /* 滚动条优化 start */ - ::-webkit-scrollbar{ - width:8px; - height:8px; + ::-webkit-scrollbar { + width: 8px; + height: 8px; } - ::-webkit-scrollbar-track{ + + ::-webkit-scrollbar-track { background: #f6f6f6; - border-radius:2px; + border-radius: 2px; } - ::-webkit-scrollbar-thumb{ + + ::-webkit-scrollbar-thumb { background: #cdcdcd; - border-radius:2px; + border-radius: 2px; } - ::-webkit-scrollbar-thumb:hover{ + + ::-webkit-scrollbar-thumb:hover { background: #747474; } + ::-webkit-scrollbar-corner { background: #f6f6f6; } + /* 滚动条优化 end */ + + /*tooltip宽度调整*/ + .ant-tooltip { + max-width: 500px !important; + } diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js index 7bcca994..7391cd99 100644 --- a/src/api/documentToolApi.js +++ b/src/api/documentToolApi.js @@ -9,6 +9,8 @@ const changePermission = (params) => postAction('/split/sarFileSplitInfo/updateP const withdraw = (params) => postAction('/laws/DocumentTool/documentSplit/revocation', params) // 文档拆分-查看 const previewDocSplit = (params) => postAction('/laws/DocumentTool/documentSplit/queryView', params) +// 文档拆分-导入拆分结果 +const importSplitResult = (params) => postAction('/split/sarFileSplitItems/importSplitResult', params) // 文档拆分-拆分已入库文本-拆分 const addDocSplit = (params) => postAction('/split/sarFileSplitInfo/add', params) @@ -78,6 +80,7 @@ export { changePermission, withdraw, previewDocSplit, + importSplitResult, // 文档拆分-详情 getDocSplitTableHeader, diff --git a/src/permission.js b/src/permission.js index 90f284a9..1bdb5fef 100644 --- a/src/permission.js +++ b/src/permission.js @@ -14,7 +14,7 @@ whiteList.push(OAUTH2_LOGIN_PAGE_PATH) router.beforeEach(async (to, from, next) => { // 单点登录 - if (to.query.code) { + if (to.query.code && top.frames.length > 0) { const result = await getSSOUserInfo({ code: to.query.code }) const userInfo = result.userInfo Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) diff --git a/src/views/documentTool/documentComparison/ComparisonResults.vue b/src/views/documentTool/documentComparison/ComparisonResults.vue index 94f61328..79d53dfc 100644 --- a/src/views/documentTool/documentComparison/ComparisonResults.vue +++ b/src/views/documentTool/documentComparison/ComparisonResults.vue @@ -38,9 +38,9 @@ -