From 60bb69f4cfc33cd0224e856afc2b00f6bc80e4d4 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Mon, 25 Sep 2023 14:24:51 +0800
Subject: [PATCH] 无人机控制区分
---
src/pages/page-web/projects/devices.vue | 75 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/src/pages/page-web/projects/devices.vue b/src/pages/page-web/projects/devices.vue
index b81ad9a..e22d6a7 100644
--- a/src/pages/page-web/projects/devices.vue
+++ b/src/pages/page-web/projects/devices.vue
@@ -47,11 +47,11 @@
<template #status="{ text }">
<span v-if="text" class="flex-row flex-align-center">
<span class="mr5" style="width: 12px; height: 12px; border-radius: 50%; background-color: green;" />
- <span>Online</span>
+ <span>在线</span>
</span>
<span class="flex-row flex-align-center" v-else>
<span class="mr5" style="width: 12px; height: 12px; border-radius: 50%; background-color: red;" />
- <span>Offline</span>
+ <span>离线</span>
</span>
</template>
<!-- 操作 -->
@@ -59,10 +59,10 @@
<div class="editable-row-operations">
<!-- 编辑态操作 -->
<div v-if="editableData[record.device_sn]">
- <a-tooltip title="Confirm changes">
+ <a-tooltip title="保存">
<span @click="save(record)" style="color: #28d445;"><CheckOutlined /></span>
</a-tooltip>
- <a-tooltip title="Modification canceled">
+ <a-tooltip title="取消">
<span @click="() => delete editableData[record.device_sn]" style="color: #e70102;"><CloseOutlined /></span>
</a-tooltip>
</div>
@@ -71,13 +71,13 @@
<a-tooltip v-if="current.indexOf(EDeviceTypeName.Dock) !== -1" title="设备日志">
<CloudServerOutlined @click="showDeviceLogUploadRecord(record)"/>
</a-tooltip>
- <a-tooltip v-if="current.indexOf(EDeviceTypeName.Dock) !== -1" title="Hms Info">
+ <a-tooltip v-if="current.indexOf(EDeviceTypeName.Dock) !== -1" title="Hms信息">
<FileSearchOutlined @click="showHms(record)"/>
</a-tooltip>
- <a-tooltip title="Edit">
+ <a-tooltip title="编辑">
<EditOutlined @click="edit(record)"/>
</a-tooltip>
- <a-tooltip title="Delete">
+ <a-tooltip title="删除">
<DeleteOutlined @click="() => { deleteTip = true, deleteSn = record.device_sn }"/>
</a-tooltip>
</div>
@@ -86,10 +86,10 @@
</a-table>
<a-modal v-model:visible="deleteTip" width="450px" :closable="false" centered :okButtonProps="{ danger: true }" @ok="unbind">
- <p class="pt10 pl20" style="height: 50px;">Delete device from workspace?</p>
+ <p class="pt10 pl20" style="height: 50px;">确定从项目中删除该设备吗?</p>
<template #title>
<div class="flex-row flex-justify-center">
- <span>Delete devices</span>
+ <span>确定</span>
</div>
</template>
</a-modal>
@@ -130,12 +130,12 @@
import DeviceLogUploadRecordDrawer from '/@/components/devices/device-log/DeviceLogUploadRecordDrawer.vue'
import DeviceHmsDrawer from '/@/components/devices/device-hms/DeviceHmsDrawer.vue'
import { message, notification } from 'ant-design-vue'
-
+import { useMyStore } from '/@/store'
interface DeviceData {
device: Device[]
}
-
-const loading = ref(true)
+const store = useMyStore()
+const loading = ref(false)
const deleteTip = ref<boolean>(false)
const deleteSn = ref<string>()
const columns: ColumnProps[] = [
@@ -243,7 +243,7 @@
}
type Pagination = TableState['pagination']
-const workspaceId: string = localStorage.getItem(ELocalStorageKey.WorkspaceId) || ''
+const workspaceId = computed(() => store.state.common.projectId)
const editableData: UnwrapRef<Record<string, Device>> = reactive({})
const current = ref([EDeviceTypeName.Aircraft])
@@ -257,7 +257,7 @@
selectedDevice,
onDeviceUpgrade,
onUpgradeDeviceOk
-} = useDeviceFirmwareUpgrade(workspaceId)
+} = useDeviceFirmwareUpgrade(workspaceId.value)
function onDeviceUpgradeWs (payload: DeviceCmdExecuteInfo) {
updateDevicesByWs(data.device, payload)
@@ -301,26 +301,29 @@
if (!closeLoading) {
loading.value = true
}
- // getBindingDevices(workspaceId, getPaginationBody(), domain).then(res => {
- // if (res.code !== 0) {
- // return
- // }
- // const resData: Device[] = res.data.list
- // expandRows.value = []
- // resData.forEach((val: any) => {
- // if (val.children) {
- // val.children = [val.children]
- // }
- // if (judgeCurrentType(EDeviceTypeName.Dock)) {
- // expandRows.value.push(val.device_sn)
- // }
- // })
- // data.device = resData
- // paginationProp.total = res.data.pagination.total
- // paginationProp.current = res.data.pagination.page
- // paginationProp.pageSize = res.data.pagination.page_size
- // loading.value = false
- // })
+ getBindingDevices(workspaceId.value, getPaginationBody(), domain).then(res => {
+ if (res.code !== 0) {
+ loading.value = false
+ return
+ }
+ const resData: Device[] = res.data.list
+ expandRows.value = []
+ resData.forEach((val: any) => {
+ if (val.children) {
+ val.children = [val.children]
+ }
+ if (judgeCurrentType(EDeviceTypeName.Dock)) {
+ expandRows.value.push(val.device_sn)
+ }
+ })
+ data.device = resData
+ paginationProp.total = res.data.pagination.total
+ paginationProp.current = res.data.pagination.page
+ paginationProp.pageSize = res.data.pagination.page_size
+ loading.value = false
+ }).catch(e => {
+ loading.value = false
+ })
}
function refreshData (page: Pagination) {
@@ -337,7 +340,7 @@
// 保存
function save (record: Device) {
delete editableData[record.device_sn]
- updateDevice({ nickname: record.nickname }, workspaceId, record.device_sn)
+ updateDevice({ nickname: record.nickname }, workspaceId.value, record.device_sn)
}
// 删除
@@ -378,7 +381,7 @@
}
onMounted(() => {
- // getDevices(current.value[0])
+ getDevices(current.value[0])
})
</script>
--
Gitblit v1.9.3