Merge remote-tracking branch 'origin/prod' into prod

罗广辉

2025-09-19 a33c84e74a97d7f9761169602593ab6595d6b4d4

Merge remote-tracking branch 'origin/prod' into prod

# Conflicts:
#	src/views/tickets/ticket.vue

 src/views/tickets/ticket.vue

@@ -1236,9 +1236,9 @@
        if (tab) {
      const isTabValid = this.filteredTabs.some(t => t.name === tab);
      if (isTabValid) {
        this.activeTab = tab; 
        this.handleTabChangeAfterJump(); 
        isTabProcessed = true; 
        this.activeTab = tab;
        this.handleTabChangeAfterJump();
        isTabProcessed = true;
        const find = this.$store.state.tags.bsTagList.find(i => i.path === '/tickets/ticket');
          find && (find.query = {});
      }
@@ -1356,7 +1356,8 @@
          // 修改这里：使用 types 数组查找对应的 label
          value:
            this.types.find(t => t.value === this.currentDetail.type)?.label ||
            this.currentDetail.type 
            this.currentDetail.type

        },
        { label: '关联任务', value: this.currentDetail.job_name || '/' },
        { label: '任务发起人', value: this.currentDetail.creator },
@@ -1366,7 +1367,8 @@
          label: '关联算法',
          value:
            this.algorithms.find(t => t.value === this.currentDetail.aiType)?.label ||
            this.currentDetail.aiType 
            this.currentDetail.aiType

        },
        { label: '发起单位', value: this.currentDetail.department },
        { label: '发起任务时间', value: this.currentDetail.startTime },
@@ -2053,10 +2055,10 @@
handleTabChangeAfterJump() {
    const isReview = this.findObject(this.option.column, 'isReview');
    isReview.hide = !['all', 'completed', 'myTickets'].includes(this.activeTab);
    this.handleReset(); 
    this.page.currentPage = 1; 
    this.fetchTableData(); 
    this.fetchTabCounts(); 
    this.handleReset();
    this.page.currentPage = 1;
    this.fetchTableData();
    this.fetchTabCounts();
  },
    handleSearch() {
      this.page.currentPage = 1;