Merge remote-tracking branch 'origin/master'

罗广辉

2025-04-19 173daadbf8b6ceaa8ed0f463105cd7681b98b9cc

Merge remote-tracking branch 'origin/master'

 src/hooks/useTaskWayline/useTaskWayline.js

@@ -1,3 +1,13 @@
/*
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2025-04-19 14:24:34
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2025-04-19 15:23:57
 * @FilePath: \command-center-dashboard\src\hooks\useTaskWayline\useTaskWayline.js
 * @Description: 
 * 
 * Copyright (c) 2025 by shuishen, All Rights Reserved. 
 */
import lineImg from '@/assets/images/arrow-right-blue.png'
import rwqfdImg from '@/assets/images/signMachineNest/rwqfd.png'
import endPointImg from '@/assets/images/EndPointicon.png'
@@ -75,11 +85,19 @@
    }
  }, { immediate: true })

  onBeforeUnmount(() => {
  const removeEntitys = () => {
    const entitiesIDs = newViewer?.entities.values.map(i => i.id)

    entitiesIDs.forEach(item => {
      item.includes('drone-job-wayline-') && newViewer?.entities.removeById(item)
    })
  }

  onBeforeUnmount(() => {
    removeEntitys()
  })

  return {
    removeEntitys
  }
}

 src/views/Home/HomeRight/EventOverview.vue

@@ -144,7 +144,7 @@
const today = dayjs().format('YYYY-MM-DD')
const timeArr = ref([today, today])
const completionRateSeries = {
    name: '完成率',
    name: '完结率',
    type: 'line',
    itemStyle: {
        color: '#0CEBF7', // 设置颜色

 src/views/SignMachineNest/MachineLeft/InspectionRaskDetails.vue

@@ -160,12 +160,13 @@
                color: '#fff',
            },
            data: [
                { value: 0, name: '待审核', itemStyle: { color: '#1860EC' } },
                { value: 0, name: '待处理', itemStyle: { color: '#47D107' } },
                { value: 0, name: '已完成', itemStyle: { color: '#F29509' } },
                { value: 0, name: '待审核', itemStyle: { color: '#8CFEA7' } },
                { value: 0, name: '待处理', itemStyle: { color: '#FF7411' } },
                { value: 0, name: '处理中', itemStyle: { color: '#FFC398' } },
                { value: 0, name: '已完成', itemStyle: { color: '#AFD9FB' } },
                // { value: 0, name: '待分拨', itemStyle: { color: '#E9C81A' } },
                { value: 0, name: '处理中', itemStyle: { color: '#0FC1E8' } },
                { value: 0, name: '已完结', itemStyle: { color: '#FE577F' } },
				
                { value: 0, name: '已完结', itemStyle: { color: '#11C4FF' } },
            ],
        },
    ],