diff --git a/src/api/trials.js b/src/api/trials.js index 709d4441..7699db50 100644 --- a/src/api/trials.js +++ b/src/api/trials.js @@ -4482,4 +4482,36 @@ export function getDoctorUserTrialReadingStat(data) { method: 'post', data, }) +} +// 设置项目链接过期时间 +export function setTrialLinkExpirationTime(data) { + return request({ + url: `/TrialConfig/setTrialLinkExpirationTime`, + method: 'post', + data, + }) +} +// 获取项目链接过期时间 +export function getTrialLinkExpirationTime(data) { + return request({ + url: `/TrialConfig/getTrialLinkExpirationTime`, + method: 'post', + data, + }) +} +// 获取项目链接时间是否过期 +export function getLinkLinkExpirationTime(data) { + return request({ + url: `/TrialConfig/getLinkLinkExpirationTime`, + method: 'post', + data, + }) +} +// 获取项目链接code是否有效 +export function getLinkVerificationCodeIsEffective(data) { + return request({ + url: `/TrialConfig/getLinkVerificationCodeIsEffective`, + method: 'post', + data, + }) } \ No newline at end of file diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue index f8955262..eb7346a6 100644 --- a/src/components/TrialsTab/index.vue +++ b/src/components/TrialsTab/index.vue @@ -56,7 +56,8 @@ export default { TrialConfig: {}, TrialStatusStr: null, trialId: null, - IsAdditionalAssessment: false + IsAdditionalAssessment: false, + isReload: false } }, computed: { @@ -71,7 +72,11 @@ export default { if (~url.indexOf('?')) { query = url.split('?')[1] } - zzSessionStorage.setItem('lastWorkbench', `${v.path}${query ? '?' : ''}${query}`) + if (!this.isReload) { + zzSessionStorage.setItem('lastWorkbench', `${v.path}${query ? '?' : ''}${query}`) + } else { + this.isReload = false + } var firstGoIn = this.trialsRouter.children.find(v => { return v.name === 'TrialsPanel' }).children[0] if (this.trialsTab === '/trials/trials-panel') { var targetPath = firstGoIn.path @@ -96,6 +101,9 @@ export default { } }, mounted() { + this.$EventBus.$on("reload", () => { + this.isReload = true + }) var query = `` var url = window.location.href if (~url.indexOf('?')) { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 2d89a113..bf9ab81a 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -2,11 +2,7 @@ - + @@ -192,12 +184,14 @@ export default { flex-direction: row; justify-content: space-between; } + .navbar { height: 50px; overflow: hidden; // position: relative; background: #fff; box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08); + .hamburger-container { line-height: 46px; height: 100%; @@ -219,6 +213,7 @@ export default { // float: right; height: 100%; line-height: 65px; + // position: relative; &:focus { outline: none; @@ -245,6 +240,7 @@ export default { .avatar-container { display: inline-block; margin-right: 200px; + .user-avatar { margin-top: 5px; width: 40px; @@ -252,16 +248,19 @@ export default { border-radius: 10px; } } + .dropdown-container { // margin-left: 30px; // position: absolute; // right: 20px; // top: 0px; cursor: pointer; + .el-icon-caret-bottom { font-size: 12px; } } + .el-dropdown-link { color: #999c9e; cursor: pointer; diff --git a/src/views/research/login.vue b/src/views/research/login.vue index 6c2352af..4f5a81f0 100644 --- a/src/views/research/login.vue +++ b/src/views/research/login.vue @@ -1,6 +1,7 @@