From 1ef360a14efab8a1defa1dfdc13bb5af64a9d621 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Mon, 18 Sep 2023 17:02:51 +0800
Subject: [PATCH] 飞行指令打开

---
 src/pages/page-web/projects/devices.vue |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/pages/page-web/projects/devices.vue b/src/pages/page-web/projects/devices.vue
index dcf71f8..cbc676f 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>
@@ -135,7 +135,7 @@
   device: Device[]
 }
 
-const loading = ref(true)
+const loading = ref(false)
 const deleteTip = ref<boolean>(false)
 const deleteSn = ref<string>()
 const columns: ColumnProps[] = [
@@ -303,6 +303,7 @@
   }
   getBindingDevices(workspaceId, getPaginationBody(), domain).then(res => {
     if (res.code !== 0) {
+      loading.value = false
       return
     }
     const resData: Device[] = res.data.list
@@ -320,6 +321,8 @@
     paginationProp.current = res.data.pagination.page
     paginationProp.pageSize = res.data.pagination.page_size
     loading.value = false
+  }).catch(e => {
+    loading.value = false
   })
 }
 

--
Gitblit v1.9.3