Merge branch 'refs/heads/fix/v1.0.0/lgh/历史任务详情优化' into test

张含笑

2025-04-21 58f72da6d6c2a15a4c86705c23f37c9b5c4b4b71

Merge branch 'refs/heads/fix/v1.0.0/lgh/历史任务详情优化' into test

# Conflicts:
#	src/components/DeviceJobDetails/JobRelatedEvents.vue
#	src/views/SignMachineNest/MachineRight/InspectionRaskList.vue

 src/components/DeviceJobDetails/JobRelatedEvents.vue

@@ -72,8 +72,6 @@
        const resData = res?.data?.data || {}
        list.value = resData.records
        total.value = resData.total
console.log('历史任务详情');

    })
}


 src/views/SignMachineNest/MachineLeft/MachineData.vue

@@ -33,7 +33,7 @@
  (newValue) => {
    if (!newValue) return;
    statisticsList.value = [
      { imgurl: rwcs, num: newValue.fly_count || 0, text: '任务次数(次)' },
      { imgurl: rwcs, num: newValue.task_num || 0, text: '任务次数(次)' },
      { imgurl: sjs, num: newValue.event_count || 0, text: '事件数(件)' },
      { imgurl: jscb, num: newValue.total_cost_saved || 0, text: '节省成本(万元)' },
      { imgurl: rwcg, num: newValue.achievement_count || 0, text: '任务成果(个)' },

 src/views/SignMachineNest/MachineRight/InspectionRaskList.vue

@@ -9,7 +9,7 @@
                    <div :class="tabIndex === 2 ? 'active' : ''" @click="tabClick(2)">历史任务</div>
                </div>
                <div class="search-box">
                    <el-input v-model="searchText" placeholder="请输入搜索内容" class="input-with-select">
                    <el-input v-model="searchText" placeholder="请输入关键字" class="input-with-select">
                        <template #append>
                            <el-button :icon="Search" @click="searchNickName" />
                        </template>

 src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue

@@ -35,7 +35,7 @@
                        <span>{{ scope.row.event_number ? scope.row.event_number : '/' }}</span>
                    </template>
                </el-table-column>
        <el-table-column prop="begin_time" label="任务时间" />
        <el-table-column prop="create_time" label="任务时间" />
        <el-table-column prop="creator_name" label="创建人" />
        <el-table-column label="操作" >
          <template #default="scope">
@@ -94,6 +94,8 @@
    if (res.data.code !== 0) return;
    jobListData.value = res.data.data.records;
    total.value = res.data.data.total;
    console.log('任务管理列表',jobListData.value);
    
  });
};
// 状态文字