From 54849757852f6ab40eb17afbd03d1d839b60a38d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 17:09:15 +0800
Subject: [PATCH] 重复定时和连续执行
---
src/pages/page-web/projects/devices.vue | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/pages/page-web/projects/devices.vue b/src/pages/page-web/projects/devices.vue
index 8139ea9..758ed5f 100644
--- a/src/pages/page-web/projects/devices.vue
+++ b/src/pages/page-web/projects/devices.vue
@@ -8,7 +8,6 @@
</a-menu-item>
</a-menu>
- <a-config-provider :locale="zhCN">
<div class="device-table-wrap table flex-display flex-column">
<a-table :columns="columns" :data-source="data.device" :pagination="paginationProp" @change="refreshData"
row-key="device_sn" :expandedRowKeys="expandRows"
@@ -116,10 +115,8 @@
:device="currentDevice">
</DeviceHmsDrawer>
</div>
- </a-config-provider>
</template>
<script lang="ts" setup>
-import zhCN from 'ant-design-vue/es/locale/zh_CN'
import { ColumnProps, TableState } from 'ant-design-vue/lib/table/interface'
import { h, onMounted, reactive, ref, UnwrapRef } from 'vue'
import { IPage } from '/@/api/http/type'
@@ -282,7 +279,7 @@
}
type Pagination = TableState['pagination']
-const workspaceId = computed(() => store.state.common.projectId)
+const workspaceId = computed(() => store.state.common.projectId || localStorage.getItem(ELocalStorageKey.WorkspaceId))
const editableData: UnwrapRef<Record<string, Device>> = reactive({})
const current = ref([EDeviceTypeName.Aircraft])
@@ -317,8 +314,8 @@
} else { // 终态：成功，失败，超时
if (status === DeviceCmdExecuteStatus.Failed || status === DeviceCmdExecuteStatus.Timeout) {
notification.error({
- message: `(${payload.sn}) Upgrade failed`,
- description: `Error Code: ${payload.result}`,
+ message: `(${payload.sn}) 升级失败`,
+ description: `错误码: ${payload.result}`,
duration: null
})
}
--
Gitblit v1.9.3