From 0f85a9c9f964e433aa0f2078819cdbda062ebbbf Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 19 Apr 2025 17:34:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/components/DeviceJobDetails/JobRelatedEvents.vue | 39 +++++++++++++++++++--------------------
.env | 4 ++++
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/.env b/.env
index ef69cd4..5128c3d 100644
--- a/.env
+++ b/.env
@@ -9,3 +9,7 @@
VITE_APP_TDT_TOKEN = c6eea7dad4fa1e2d1e32ec0e7c9735db
#cesium token
VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M
+
+# 环境路径
+VITE_APP_TICKET_BASE_URL=https://wrj.shuixiongit.com
+VITE_APP_TICKET_BACKUP_URL=https://aisky.org.cn
\ No newline at end of file
diff --git a/src/components/DeviceJobDetails/JobRelatedEvents.vue b/src/components/DeviceJobDetails/JobRelatedEvents.vue
index f2bd341..5384cec 100644
--- a/src/components/DeviceJobDetails/JobRelatedEvents.vue
+++ b/src/components/DeviceJobDetails/JobRelatedEvents.vue
@@ -2,7 +2,7 @@
<div class="machineTableDetailsTitle"><span>关联事件</span></div>
<div class="ztzf-table">
<el-table
- :row-class-name="tableRowClassName"
+ :row-class-name="tableRowClassName"
:data="list"
style="width: 100%"
:row-style="{ height: '38px', fontSize: '14px', 'text-align': 'center' }"
@@ -20,7 +20,6 @@
<div class="processing" v-if="scope.row.status === 3">处理中</div>
<div class="done" v-if="scope.row.status === 4">已完成</div>
<div class="ended" v-if="scope.row.status === 5">已完结</div>
-
</template>
</el-table-column>
<el-table-column label="操作" width="80">
@@ -31,7 +30,7 @@
</el-table>
</div>
<el-pagination
- class="ztzf-pagination"
+ class="ztzf-pagination"
background
:page-sizes="[10, 20, 30, 50]"
v-model:current-page="sizeParams.current"
@@ -58,15 +57,16 @@
const store = useStore()
const child_sn = computed(() => store.state.home.singleUavHome.child_sn)
const total = ref(10)
-
-const distribution = row => {
- ElMessage.warning('正在加急开发中...')
-}
const examine = row => {
- ElMessage.warning('正在加急开发中...')
+ 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 wayLineJodInfoId = inject('wayLineJodInfoId')
-
const getList = () => {
params.value.wayLineJodInfoId = wayLineJodInfoId.value
@@ -74,7 +74,6 @@
const resData = res?.data?.data || {}
list.value = resData.records
total.value = resData.total
-
})
}
@@ -111,23 +110,23 @@
}
// 待处理
-.pending{
-color: #FF7411;
+.pending {
+ color: #ff7411;
}
// 待审核
-.reviewed{
-color: #8CFEA7;
+.reviewed {
+ color: #8cfea7;
}
// 处理中
-.processing{
-color: #FFC398;
+.processing {
+ color: #ffc398;
}
// 已完成
-.done{
-color: #AFD9FB;
+.done {
+ color: #afd9fb;
}
// 已完结
-.ended{
-color: #11C4FF;
+.ended {
+ color: #11c4ff;
}
</style>
--
Gitblit v1.9.3