From 5808f76456ca0d40de5074f132b73a5a488e3e13 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 09 Dec 2025 09:12:03 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/job/components/JobRelatedEvents.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/views/job/components/JobRelatedEvents.vue b/src/views/job/components/JobRelatedEvents.vue
index 2dd0b4a..6f977ca 100644
--- a/src/views/job/components/JobRelatedEvents.vue
+++ b/src/views/job/components/JobRelatedEvents.vue
@@ -1,6 +1,7 @@
<template>
<div class="JobRelatedEvents">
<div class="machineTableDetailsTitle">
+ <img src="/src/assets/images/task/sign.svg" alt="">
<p>
关联事件
<span>{{ total }}</span>
@@ -105,7 +106,7 @@
const loading = ref(false)
const list = ref()
const params = ref({
- way_line_jod_info_id: null,
+ way_line_job_info_id: null,
event_name: '',
ai_types: [], // 算法类型
start_date: null,
@@ -132,11 +133,11 @@
},
});
}
-const wayLineJodInfoId = inject('wayLineJodInfoId')
+const wayLineJobInfoId = inject('wayLineJobInfoId')
const getList = () => {
- if (!wayLineJodInfoId.value) return
- params.value.way_line_jod_info_id = wayLineJodInfoId.value
+ if (!wayLineJobInfoId.value) return
+ params.value.way_line_job_info_id = wayLineJobInfoId.value
params.value.batchNo = props.batchNo
loading.value = true
getDeviceEventList(params.value, sizeParams.value).then(res => {
@@ -194,11 +195,15 @@
.JobRelatedEvents {
.machineTableDetailsTitle {
margin-bottom: 16px;
- background: url('/src/assets/images/task/detailtitle.png') no-repeat center;
+ // background: url('/src/assets/images/task/detailtitle.png') no-repeat center;
+ border-bottom: 2px solid #e4e7ed;
background-size: 100% 100%;
+ img{
+ width: 15px;
+ height: 15px;}
p {
display: inline-block;
- margin-left: 30px;
+ margin-left: 10px;
font-size: 16px;
color: #363636;
line-height: 20px;
@@ -263,7 +268,7 @@
display: flex;
justify-content: space-between;
font-size: 14px;
-
+
.btn {
width: 80px;
height: 32px;
@@ -272,7 +277,7 @@
display: flex;
justify-content: center;
align-items: center;
-
+
img {
width: 14px;
height: 14px;
--
Gitblit v1.9.3