From 1dd5b0dfca62428c513122b4b7a9d1c2a8e856a8 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 18 Sep 2025 10:23:13 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.1' into feature/v6.0/6.0.2
---
src/api/job/task.js | 8 ++--
src/views/device/components/devicePerShare.vue | 44 +++++++++++-----------
src/api/home/aggregation.js | 14 +-----
3 files changed, 29 insertions(+), 37 deletions(-)
diff --git a/src/api/home/aggregation.js b/src/api/home/aggregation.js
index 148707f..b31f892 100644
--- a/src/api/home/aggregation.js
+++ b/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 },
})
}
diff --git a/src/api/job/task.js b/src/api/job/task.js
index f6a28a1..6eeeb84 100644
--- a/src/api/job/task.js
+++ b/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,
})
-}
\ No newline at end of file
+}
diff --git a/src/views/device/components/devicePerShare.vue b/src/views/device/components/devicePerShare.vue
index 2ee9ac6..ad47899 100644
--- a/src/views/device/components/devicePerShare.vue
+++ b/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',
--
Gitblit v1.9.3