From 18ba6b7aed78d1fc639b0b7702f9cb5bdf66e12c Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sun, 20 Apr 2025 16:28:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/components/DeviceJobDetails/JobRelatedEvents.vue | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/components/DeviceJobDetails/JobRelatedEvents.vue b/src/components/DeviceJobDetails/JobRelatedEvents.vue
index 93e6713..980e4c3 100644
--- a/src/components/DeviceJobDetails/JobRelatedEvents.vue
+++ b/src/components/DeviceJobDetails/JobRelatedEvents.vue
@@ -59,23 +59,20 @@
const total = ref(10)
const examine = row => {
const orderNumber = row.event_num
- const primaryUrl = `${import.meta.env.VITE_APP_TICKET_BASE_URL}/manage/tickets/ticket?orderNumber=${orderNumber}`
- const backupUrl = `${import.meta.env.VITE_APP_TICKET_BACKUP_URL}/manage/tickets/ticket?orderNumber=${orderNumber}`
- const win = window.open(primaryUrl, '_blank')
- if (!win || win.closed) {
- window.open(backupUrl, '_blank')
- }
+ const adminUrl = import.meta.env.VITE_APP_ADMIN_URL
+ const targetPath = `/tickets/ticket?orderNumber=${orderNumber}`;
+ window.open(`${adminUrl}?redirect=${encodeURIComponent(targetPath)}`, '_blank');
}
const wayLineJodInfoId = inject('wayLineJodInfoId')
const getList = () => {
params.value.way_line_jod_info_id = wayLineJodInfoId.value
-
+
getDeviceEventList(params.value, sizeParams.value).then(res => {
const resData = res?.data?.data || {}
list.value = resData.records
total.value = resData.total
-
+
})
}
--
Gitblit v1.9.3