diff --git a/src/api/index.js b/src/api/index.js index 487fb66..525753d 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -19,8 +19,8 @@ const service = axios.create({ // baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换 // baseURL: 'http://www.tougao.com/', //测试本地 记得切换 // baseURL: 'http://192.168.110.110/tougao/public/index.php/', - baseURL: '/api', //本地 - // baseURL: '/', //正式 + // baseURL: '/api', //本地 + baseURL: '/', //正式 }); diff --git a/src/components/common/Header2.vue b/src/components/common/Header2.vue index 43ca3f4..b406822 100644 --- a/src/components/common/Header2.vue +++ b/src/components/common/Header2.vue @@ -86,6 +86,7 @@ export default { props: ['home'], data() { return { + localUsername: localStorage.getItem('U_name') || 'unknown user', isProofreading: false, collapse: false, fullscreen: false, @@ -131,9 +132,10 @@ export default { } }, computed: { + username() { - let username = localStorage.getItem('U_name'); - return username ? username : this.name; + + return this.localUsername ? this.localUsername : this.name; }, onRoutes() { 0; @@ -153,6 +155,11 @@ export default { } }, methods: { + updateUsername() { + + this.localUsername = localStorage.getItem('U_name'); + + }, goHome() { this.$router.push('/'); }, @@ -272,10 +279,19 @@ export default { } }, mounted() { + if (this.$bus) { // 检查 $bus 是否存在，避免未定义错误 + this.$bus.$on('user-name-updated', this.updateUsername); + } if (document.body.clientWidth < 1000) { this.collapseChage(); } }, + beforeDestroy() { + // 步骤 C2: 销毁前移除监听器 + if (this.$bus) { + this.$bus.$off('user-name-updated', this.updateUsername); + } + }, watch: { $route: { handler: function (route) { diff --git a/src/components/common/common.vue b/src/components/common/common.vue index 4a59fb9..2038279 100644 --- a/src/components/common/common.vue +++ b/src/components/common/common.vue @@ -2,16 +2,16 @@ //记得切换 //正式 -// const mediaUrl = '/public/'; -// const baseUrl = '/'; +const mediaUrl = '/public/'; +const baseUrl = '/'; // const mediaUrl = 'https://submission.tmrjournals.com/public/'; // // const mediaUrl = 'http://zmzm.tougao.dev.com/public/'; // const baseUrl = '/api' -const mediaUrl = 'http://tougaotest.tmrjournals.com/public/'; -// const mediaUrl = 'http://zmzm.tougao.dev.com/public/'; -const baseUrl = '/api'; +// const mediaUrl = 'http://tougaotest.tmrjournals.com/public/'; +// // const mediaUrl = 'http://zmzm.tougao.dev.com/public/'; +// const baseUrl = '/api'; //本地(正式环境 ) diff --git a/src/components/page/GenerateCharts.vue b/src/components/page/GenerateCharts.vue index cface2c..2334e04 100644 --- a/src/components/page/GenerateCharts.vue +++ b/src/components/page/GenerateCharts.vue @@ -1875,11 +1875,12 @@ export default { }, handleAvatarError(res, file) {}, beforeAvatarUpload(file) { - // const isLt2M = file.size / 1024 / 1024 < 10; - // if (!isLt2M) { - // this.$message.error('Picture size cannot exceed 10M!'); - // } - // return isLt2M; + const isLt2M = file.size / 1024 / 1024 < 20; + if (!isLt2M) { + this.$message.error('Picture size cannot exceed 20M!'); + return false; + } + const isValidFormat = ['image/jpeg', 'image/png', 'image/tiff'].includes(file.type); if (!isValidFormat) { this.$message.error(this.$t('commonTable.uploadImageInfo')); diff --git a/src/components/page/PaperSubmitanalysis.vue b/src/components/page/PaperSubmitanalysis.vue index 9eea92a..4f1c467 100644 --- a/src/components/page/PaperSubmitanalysis.vue +++ b/src/components/page/PaperSubmitanalysis.vue @@ -124,7 +124,7 @@ export default { // formatter函数动态修改tooltip样式 formatter: function (params) { var that = this; - console.log('params at line 430:', params); + if (params) { var htmlStr = ''; // htmlStr += params[0].name.replace(/\-/g, '/') + '
'; //x轴的名称 @@ -324,7 +324,7 @@ export default { var otherInfo = optionJournalData.map((e) => { for (let i in e.value) { if (i == key) { - console.log('e at line 299:', e.value[i]); + return { key: e.key, value: e.value[i].split('/')[0] @@ -386,7 +386,7 @@ export default { var url = ''; if (type == 'month') { for (let i in this.monthData) { - console.log('i at line 386:', i); + timeData.push(i); } @@ -396,7 +396,7 @@ export default { }); } else if (type == 'year') { for (let i in this.yearData) { - console.log('i at line 386:', i); + timeData.push(i); } tableData = this.JournalYearData.map((e) => { diff --git a/src/components/page/PreIngestedEditor.vue b/src/components/page/PreIngestedEditor.vue index c13d796..ec88f84 100644 --- a/src/components/page/PreIngestedEditor.vue +++ b/src/components/page/PreIngestedEditor.vue @@ -7,6 +7,7 @@ {{ item.name }}

+ Manuscript unpaid @@ -89,6 +90,7 @@