From af9656f9814dfb0a3839e9fd122de774fa51d965 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 10 Sep 2025 11:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v6.0/6.0.1' into feature/v6.0/6.0.1
---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 10 ++++++++--
src/views/job/components/TaskTop/TaskIndustry.vue | 2 +-
src/views/device/components/devicePerShare.vue | 44 ++++++++++++++++++++++----------------------
3 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/src/views/device/components/devicePerShare.vue b/src/views/device/components/devicePerShare.vue
index 2ee9ac6..ad47899 100644
--- a/src/views/device/components/devicePerShare.vue
+++ b/src/views/device/components/devicePerShare.vue
@@ -89,28 +89,28 @@
},
],
},
- {
- label: '授权功能',
- prop: 'devicePerMenuId',
- labelWidth: 130,
- type: 'tree',
- dicUrl: '/blade-system/manage/api/v1/devicePerMenu/selectDeviceList',
- props: {
- label: 'name',
- value: 'id',
- },
- multiple: true,
- dataType: 'string',
- span: 24,
- row: true,
- rules: [
- {
- required: true,
- message: '请输入授权功能',
- trigger: 'blur',
- },
- ],
- },
+ // {
+ // label: '授权功能',
+ // prop: 'devicePerMenuId',
+ // labelWidth: 130,
+ // type: 'tree',
+ // dicUrl: '/blade-system/manage/api/v1/devicePerMenu/selectDeviceList',
+ // props: {
+ // label: 'name',
+ // value: 'id',
+ // },
+ // multiple: true,
+ // dataType: 'string',
+ // span: 24,
+ // row: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: '请输入授权功能',
+ // trigger: 'blur',
+ // },
+ // ],
+ // },
{
label: '授权时间',
prop: 'createTime',
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index d7941d3..22363fa 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -169,9 +169,15 @@
const jobId = ref('')
const handleDetail = row => {
if (!row.device_sns.length) return ElMessage.warning('没有device_sns')
- if (row.device_sns.length !== 1) return ElMessage.success('即将跳转到集群调度')
+ // if (row.device_sns.length !== 1) return ElMessage.success('即将跳转到集群调度')
rowData.value = row ? row : {}
-jobId.value = rowData.value?.job_id
+ if (row.device_sns.length > 1 && (row.status === 2 || row.status === 1)) {
+ const adminUrl = `${import.meta.env.VITE_APP_AREA_NAME}/command-center-dashboard/#/clusterScheduling`
+ const targetPath = `taskNo=${encodeURIComponent(rowData.value.job_info_num)}`
+ window.open(`${adminUrl}?${targetPath}`, '_blank')
+ return
+ }
+ jobId.value = rowData.value?.job_id
if (row.status === 2 || row.status === 1) {
// isShowCurrentTaskDetails.value = true
// 跳转大屏当前任务详情
diff --git a/src/views/job/components/TaskTop/TaskIndustry.vue b/src/views/job/components/TaskTop/TaskIndustry.vue
index 9d06862..63d496d 100644
--- a/src/views/job/components/TaskTop/TaskIndustry.vue
+++ b/src/views/job/components/TaskTop/TaskIndustry.vue
@@ -1,7 +1,7 @@
<!-- 任务算法统计 -->
<template>
<div class="task-industry">
- <div class="title">机巢事件前五数量占比</div>
+ <div class="title">机巢事件数量占比</div>
<div class="chart" ref="chartRef"></div>
</div>
</template>
--
Gitblit v1.9.3