From 74a6c4b74b209b2b6e714f5d71d714bbfa3267ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com> Date: Thu, 14 May 2026 11:29:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/page/articleDetailEditor.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/page/articleDetailEditor.vue b/src/components/page/articleDetailEditor.vue index 965be5d..386334b 100644 --- a/src/components/page/articleDetailEditor.vue +++ b/src/components/page/articleDetailEditor.vue @@ -2462,6 +2462,7 @@ export default { background: 'rgba(0, 0, 0, 0.7)' }); this.$api.post('api/Article/changeRepetition', this.repeform).then((res) => { + this.repebox = false; load.close(); this.$message.success('success'); this.initarticle(); From 77c0fac34d795b4ee1d3f9063eeea4bdb803e347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com> Date: Thu, 14 May 2026 13:11:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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: '/', //正式 }); From 463100f6696b42eec9593807d0704e681a5cb348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com> Date: Mon, 18 May 2026 09:27:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E4=B8=8B=E6=8B=89=E6=A1=86=20=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/page/autoPromotionLogs.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/page/autoPromotionLogs.vue b/src/components/page/autoPromotionLogs.vue index e7e14b2..c523790 100644 --- a/src/components/page/autoPromotionLogs.vue +++ b/src/components/page/autoPromotionLogs.vue @@ -747,7 +747,7 @@ export default { }, /** 下拉仅展示「类型 - 创建日期」，运行状态单独用 el-tag */ buildFactoryHeaderOptionMainLabel(task, pidFallback) { - console.log("🚀 ~ buildFactoryHeaderOptionMainLabel ~ task:", task); + const typePart = this.getFactoryHeaderTaskTypeLabel(task) || String(pidFallback || '').trim() || '—'; const expertTypePart = this.mapFactoryExpertTypeLabel(task.expert_type); From d4784339fd8e72a3924cef963b2ecd30818370ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com> Date: Mon, 18 May 2026 11:46:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/page/autoPromotionLogs.vue | 98 +++++++++-------------- 1 file changed, 36 insertions(+), 62 deletions(-) diff --git a/src/components/page/autoPromotionLogs.vue b/src/components/page/autoPromotionLogs.vue index c523790..19f5b41 100644 --- a/src/components/page/autoPromotionLogs.vue +++ b/src/components/page/autoPromotionLogs.vue @@ -17,7 +17,7 @@ {{ $t('autoPromotion.journal') }} : {{ currentJournalName }} - {{ config.initialized ? $t('autoPromotionLogs.editConfig') : $t('autoPromotionLogs.startConfig') }} + {{ $t('autoPromotionLogs.editConfig') }} -
+
- - - - -
+
@@ -270,30 +246,6 @@
- - import CkeditorMail from '@/components/page/components/email/CkeditorMail.vue'; import TemplateSelectorDialog from '@/components/page/components/email/TemplateSelectorDialog.vue'; -import AutoPromotionWizard from '@/components/page/components/autoPromotion/AutoPromotionWizard.vue'; import PromotionFactoryTaskDialog from '@/components/page/components/autoPromotion/PromotionFactoryTaskDialog.vue'; import PromotionDetailDrawer from '@/components/page/components/autoPromotion/PromotionDetailDrawer.vue'; // 这里假设你已经定义了 API 地址 @@ -373,8 +324,8 @@ const API = { }; export default { - name: 'autoPromotion', - components: { TemplateSelectorDialog, AutoPromotionWizard, PromotionFactoryTaskDialog, CkeditorMail, PromotionDetailDrawer }, + name: 'autoPromotionLogs', + components: { TemplateSelectorDialog, PromotionFactoryTaskDialog, CkeditorMail, PromotionDetailDrawer }, data() { return { handleRefreshList: [], @@ -482,12 +433,17 @@ export default { } }, watch: { + '$route.query.journal_id'(val) { + const s = String(val != null ? val : '').trim(); + if (s === String(this.selectedJournalId || '').trim()) return; + this.initPage(); + }, '$route.query.promotion_factory_id'(val) { const s = String(val != null ? val : '').trim(); if (s === String(this.headerPromotionFactoryId || '').trim()) return; this.headerPromotionFactoryId = s; this.routePromotionFactoryId = s; - if (this.config.initialized && this.selectedJournalId) { + if (this.selectedJournalId) { this.query.pageIndex = 1; this.fetchList(); } @@ -496,6 +452,28 @@ export default { created() { this.initPage(); }, + activated() { + const routeJid = String((this.$route.query && this.$route.query.journal_id) || '').trim(); + const curJid = String(this.selectedJournalId || '').trim(); + if (routeJid && routeJid !== curJid) { + this.initPage(); + return; + } + const routePid = String( + (this.$route.query && this.$route.query.promotion_factory_id) || + (this.$route.query && this.$route.query.taskId) || + '' + ).trim(); + const curPid = String(this.headerPromotionFactoryId || '').trim(); + if (routePid && routePid !== curPid) { + this.headerPromotionFactoryId = routePid; + this.routePromotionFactoryId = routePid; + if (this.selectedJournalId) { + this.query.pageIndex = 1; + this.fetchList(); + } + } + }, methods: { mapFactoryTaskTypeLabel(type) { const t = String(type || ''); @@ -635,10 +613,6 @@ export default { try { await this.fetchJournalDetail(); if (this.selectedJournalId) { - this.loadPromotionFields(this.selectedJournalId); - } - if (this.config.initialized) { - await this.fetchTemplates(); await this.fetchFactoryTasksForHeader(); await this.fetchList(); } @@ -764,7 +738,7 @@ export default { } }, async fetchFactoryTasksForHeader() { - if (!this.selectedJournalId || !this.config.initialized) { + if (!this.selectedJournalId) { this.factoryTaskOptions = []; return; }