From 083b65c625ddfd238b4d325f856ab3bf706f71a4 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 14 Apr 2025 15:26:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
index 62b17e1..e5eb341 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
@@ -18,28 +18,22 @@
</el-table-column>
<el-table-column prop="id" label="事件编号" />
<el-table-column prop="event_name" label="事件名称" />
- <el-table-column prop="event_name" label="所属单位 " />
- <el-table-column show-overflow-tooltip prop="media_type" label="事件内容" />
+ <el-table-column prop="create_user" label="所属单位 " />
+ <el-table-column show-overflow-tooltip prop="remark" label="事件内容" />
<el-table-column show-overflow-tooltip prop="ai_types" label="关联算法" />
<el-table-column prop="status" label="事件状态">
<template #default="scope">
- <el-tag v-if="scope.row.status === 0" type="info">待处理</el-tag>
- <el-tag v-if="scope.row.status === 1" type="success">待分拨</el-tag>
- <el-tag v-if="scope.row.status === 2" type="warning">待处理</el-tag>
- <el-tag v-if="scope.row.status === 3" type="success">处理中</el-tag>
- <el-tag v-if="scope.row.status === 4" type="success">已完成</el-tag>
- <el-tag v-if="scope.row.status === 5" type="success">已完结</el-tag>
+ <div class="pending" v-if="scope.row.status === 0">待处理</div>
+ <div class="reviewed" v-if="scope.row.status === 2">待审核</div>
+ <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">
<template #default="scope">
<div class="ztzf-view" @click="distribution(scope.row)">查看</div>
</template>
- <!-- <template #default="scope" >
- <el-button type="success" link @click="examine(scope.row)">审核</el-button>
- <el-button type="primary" link @click="distribution(scope.row)">查看</el-button>
- </template> -->
</el-table-column>
</el-table>
</div>
@@ -49,7 +43,7 @@
:page-sizes="[10, 20, 30, 50]"
v-model:current-page="sizeParams.current"
v-model:page-size="sizeParams.size"
- layout="prev, pager, next, jumper"
+ layout="prev, pager, next,sizes, jumper"
:total="total"
@change="pageChange"
/>
@@ -145,10 +139,24 @@
background: center center no-repeat none !important;
color: #8eb8ea !important;
}
-
-:deep(.el-tag){
-background: none !important;
-border:none !important
+// 待处理
+.pending{
+color: #FF7411;
}
-
+// 待审核
+.reviewed{
+color: #8CFEA7;
+}
+// 处理中
+.processing{
+color: #FFC398;
+}
+// 已完成
+.done{
+color: #AFD9FB;
+}
+// 已完结
+.ended{
+color: #11C4FF;
+}
</style>
--
Gitblit v1.9.3