Merge branch 'feature/v6.0/6.0.1' into test

罗广辉

2025-09-10 e07cf823152afcd2590081283f97ade1cba81470

Merge branch 'feature/v6.0/6.0.1' into test

# Conflicts:
#	src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue

 src/api/home/aggregation.js

@@ -8,19 +8,11 @@
    })
}

export const getDeviceRegion = params => {
export const getDeviceRegion = data => {
    return request({
        url: '/drone-device-core/manage/api/v1/devices/getDeviceRegion',
        method: 'get',
        params,
    })
}

export const getDeviceRegionByPost = data => {
    return request({
        url: '/drone-device-core/manage/api/v1/devices/getDeviceRegion',
        method: 'post',
        data,
    method: 'post',
    data:{ hidden_flag:0, ...data },
    })
}


 src/api/job/task.js

@@ -190,11 +190,11 @@
    })
}

export const getDeviceRegion = params => {
export const getDeviceRegion = data => {
    return request({
        url: '/drone-device-core/manage/api/v1/devices/getDeviceRegion',
        method: 'get',
        params,
        method: 'post',
        data:{ hidden_flag:0, ...data },
    })
}

@@ -255,4 +255,4 @@
        method: 'post',
        data: data,
    })
}
}

 src/views/device/components/devicePerShare.vue

@@ -89,28 +89,28 @@
              },
            ],
          },
          {
            label: '授权功能',
            prop: 'devicePerMenuId',
            labelWidth: 130,
            type: 'tree',
            dicUrl: '/blade-system/manage/api/v1/devicePerMenu/selectDeviceList',
            props: {
              label: 'name',
              value: 'id',
            },
            multiple: true,
            dataType: 'string',
            span: 24,
            row: true,
            rules: [
              {
                required: true,
                message: '请输入授权功能',
                trigger: 'blur',
              },
            ],
          },
          // {
          //   label: '授权功能',
          //   prop: 'devicePerMenuId',
          //   labelWidth: 130,
          //   type: 'tree',
          //   dicUrl: '/blade-system/manage/api/v1/devicePerMenu/selectDeviceList',
          //   props: {
          //     label: 'name',
          //     value: 'id',
          //   },
          //   multiple: true,
          //   dataType: 'string',
          //   span: 24,
          //   row: true,
          //   rules: [
          //     {
          //       required: true,
          //       message: '请输入授权功能',
          //       trigger: 'blur',
          //     },
          //   ],
          // },
          {
            label: '授权时间',
            prop: 'createTime',

 src/views/job/components/TaskTop/TaskIndustry.vue

@@ -1,7 +1,7 @@
<!-- 任务算法统计 -->
<template>
    <div class="task-industry">
        <div class="title">机巢事件前五数量占比</div>
        <div class="title">机巢事件数量占比</div>
        <div class="chart" ref="chartRef"></div>
    </div>
</template>