Merge remote-tracking branch 'origin/master'

张含笑

2025-04-17 04cd5b43197a8831c1e1637acf96bacb7a7116fa

 src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue

@@ -59,13 +59,13 @@
  <!-- 添加任务 -->
  <AddTask v-model:show="isShowAddTask" @refresh="searchClick"/>
  <!-- 当前任务详情 -->
  <CurrentTaskDetails v-if="isShowCurrentTaskDetails"  v-model:show="isShowCurrentTaskDetails" :rowData="rowData"/>
  <CurrentTaskDetails v-if="isShowCurrentTaskDetails"  v-model:show="isShowCurrentTaskDetails" :id="rowData.id"/>
</template>

<script setup>
import SearchBox from '../SearchBox.vue';
import AddTask from './AddTask.vue';
import CurrentTaskDetails from './CurrentTaskDetails/CurrentTaskDetails.vue';
import CurrentTaskDetails from '@/components/CurrentTaskDetails/CurrentTaskDetails.vue';
import { jobList } from '@/api/home/task';
import { ElMessage } from 'element-plus'

@@ -105,7 +105,7 @@
      if (row.status === 2 || row.status === 1){
         rowData.value = row? row : {};
         isShowCurrentTaskDetails.value = true;
      }else{
      } else{
         ElMessage.warning('todo 跳历史任务详情')
      }
   }else{