diff --git a/src/api/index.js b/src/api/index.js index 1974b87..46801a4 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -7,8 +7,8 @@ import qs from 'qs' // axios全局配置 axios.defaults.timeout = 10000 // 超时时间 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8' // 配置请求头 -// axios.defaults.baseURL = 'http://www.tougao.com/' -axios.defaults.baseURL = '/' +axios.defaults.baseURL = 'http://www.tougao.com/' +// axios.defaults.baseURL = '/' // 添加响应拦截器,统一处理服务器响应和异常 axios.interceptors.response.use( diff --git a/src/assets/img/orcid.png b/src/assets/img/orcid.png new file mode 100644 index 0000000..85dea9d Binary files /dev/null and b/src/assets/img/orcid.png differ diff --git a/src/assets/img/orcno.png b/src/assets/img/orcno.png new file mode 100644 index 0000000..4b457fa Binary files /dev/null and b/src/assets/img/orcno.png differ diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue index 445136c..fd30db8 100644 --- a/src/components/common/Header.vue +++ b/src/components/common/Header.vue @@ -7,7 +7,7 @@
@@ -25,28 +25,31 @@
- +
- + -
- +
+ + + +
+
+ + +
- {{username}} + {{ username }} - {{$t('system.loyout')}} + {{ $t('system.loyout') }}
@@ -62,26 +65,33 @@ export default { fullscreen: false, name: 'unknown user', message: 2, + hasorcie: false, + orcid: '', + orcidLink: + 'https://orcid.org/oauth/authorize?client_id=APP-PKF0BGRP6DWM6FUB&response_type=code&scope=/authenticate&redirect_uri=https://submission.tmrjournals.com/orcidLink', langArr: [ { value: 'zh', label: '中文' }, { value: 'en', label: 'English' } ] }; }, + created() { + this.initORCID(); + }, computed: { username() { let username = localStorage.getItem('ms_username'); return username ? username : this.name; }, - userrole(){ + userrole() { let userrole = localStorage.getItem('ms_userrole'); - if(userrole==1){ + if (userrole == 1) { return this.$t('total.author'); - }else if(userrole==2){ + } else if (userrole == 2) { return this.$t('total.editor'); - }else if(userrole=='admin'){ + } else if (userrole == 'admin') { return this.$t('total.admin'); - }else{ + } else { return this.$t('total.reviewers'); } } @@ -100,6 +110,18 @@ export default { this.collapse = !this.collapse; bus.$emit('collapse', this.collapse); }, + //判断orcid + initORCID() { + this.$api + .post('api/user/checkOrcid', { account: localStorage.getItem('ms_username') }) + .then((res) => { + this.hasorcie = res.userinfo.orcid == '' ? false : true; + this.orcid = res.userinfo.orcid; + }) + .catch((err) => { + console.log(err); + }); + }, // 全屏事件 handleFullScreen() { let element = document.documentElement; @@ -128,9 +150,15 @@ export default { this.fullscreen = !this.fullscreen; }, //切换语言 - chengelang(commond){ - localStorage.setItem('langs',commond); + chengelang(commond) { + localStorage.setItem('langs', commond); this.$router.go(0); + }, + skip_link() { + location.href = 'https://orcid.org/'+this.orcid; + }, + skip_check(){ + location.href = this.orcidLink; } }, mounted() { @@ -214,9 +242,8 @@ export default { } .user-avator img { display: block; - width: 40px; - height: 40px; - border-radius: 50%; + width: 20px; + height: 20px; } .el-dropdown-link { color: #fff; @@ -225,7 +252,7 @@ export default { .el-dropdown-menu__item { text-align: center; } -#colgreen{ +#colgreen { color: rgb(142, 150, 74); } diff --git a/src/components/common/common.vue b/src/components/common/common.vue index c4b2ba2..9ee107f 100644 --- a/src/components/common/common.vue +++ b/src/components/common/common.vue @@ -1,8 +1,8 @@ diff --git a/src/main.js b/src/main.js index c8c7cb1..00cfdb4 100644 --- a/src/main.js +++ b/src/main.js @@ -31,7 +31,7 @@ router.beforeEach((to, from, next) => { document.title = `${to.meta.title} | Traditional Medicine Research`; const role = localStorage.getItem('ms_username'); const userrole = localStorage.getItem('ms_userrole'); - if (!role && to.path!='/register'&&to.path!=='/submission'&&to.path!=='/img'&& to.path !=='/reviewer'&&to.path !=='/thanks' &&to.path !== '/login'&&to.path.search(/retrieve/i)<0 ) { + if (!role && to.path!='/register'&&to.path!=='/submission'&&to.path!=='/orcidLink'&&to.path!=='/img'&& to.path !=='/reviewer'&&to.path !=='/thanks' &&to.path !== '/login'&&to.path.search(/retrieve/i)<0 ) { next('/login'); // } else if (to.meta.permission) { // // 如果是管理员权限则可进入,这里只是简单的模拟管理员权限而已 diff --git a/src/router/index.js b/src/router/index.js index 46be3e9..c7d2930 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -216,6 +216,11 @@ export default new Router({ component:()=>import('../components/page/reviewer.vue'), meta:{title:'reviewer'} }, + { + path:'/orcidLink', + component:()=>import('../components/page/orcidLink.vue'), + meta:{title:'orcidLink'} + }, { path:'/thanks', component:()=>import('../components/page/thanks.vue'),