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/page/articleDetailEditor.vue b/src/components/page/articleDetailEditor.vue
index 58f6222..4118a82 100644
--- a/src/components/page/articleDetailEditor.vue
+++ b/src/components/page/articleDetailEditor.vue
@@ -2527,6 +2527,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();
diff --git a/src/components/page/autoPromotionLogs.vue b/src/components/page/autoPromotionLogs.vue
index e7e14b2..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') }}
-
+
-
-
-
-
-
+
-
-
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();
}
@@ -747,7 +721,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);
@@ -764,7 +738,7 @@ export default {
}
},
async fetchFactoryTasksForHeader() {
- if (!this.selectedJournalId || !this.config.initialized) {
+ if (!this.selectedJournalId) {
this.factoryTaskOptions = [];
return;
}