From 2800fa4f32f3900509cb4d6eefaf2bfaf54efdd7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:29:09 +0800
Subject: [PATCH] fix: 天气显示
---
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue | 164 +++++++-----------------------------------------------
1 files changed, 23 insertions(+), 141 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
index e53a6e5..1a7fa6b 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
@@ -2,17 +2,18 @@
<div class="devicejob-container">
<div class="machineTableDetailsTitle">
<p>
- 相关任务<span>{{ total }}</span
- >次
+ 相关任务
+ <span>{{ total }}</span>
+ 次
</p>
</div>
- <div class="devicelob-table">
+ <div class="devicelob-table ztzf-table">
<el-table
:data="list"
:row-class-name="tableRowClassName"
style="width: 100%"
- :row-style="{ height: '38px', fontSize: '14px', 'text-align': 'center' }"
- :header-cell-style="{ 'text-align': 'center', height: '36px', fontSize: '14px' }"
+ :row-style="{ height: '35px', fontSize: '14px', 'text-align': 'center' }"
+ :header-cell-style="{ 'text-align': 'center', height: '30px', fontSize: '14px' }"
>
<el-table-column label="序号" type="index" width="60">
<template #default="{ $index }">
@@ -20,23 +21,22 @@
</template>
</el-table-column>
<el-table-column prop="id" label="任务编号" />
- <el-table-column prop="name" label="任务名称" />
- <el-table-column prop="industry_type_str" label="任务类型" />
- <el-table-column prop="ai_type_str" label="关联算法" />
- <el-table-column prop="event_number" label="事件工单" />
+ <el-table-column show-overflow-tooltip prop="name" label="任务名称" />
+ <el-table-column show-overflow-tooltip prop="industry_type_str" label="任务类型" />
+ <el-table-column show-overflow-tooltip prop="ai_type_str" label="关联算法" />
+ <el-table-column show-overflow-tooltip prop="event_number" label="事件工单" />
<el-table-column label="操作" width="80">
-
<template #default="scope">
- <div class="view" @click="viewJob(scope.row)">查看</div>
- <!-- <el-button type="warning" link @click="viewJob(scope.row)">查看</el-button> -->
+ <div class="ztzf-view" @click="viewJob(scope.row)">查看</div>
</template>
</el-table-column>
</el-table>
</div>
<el-pagination
+ class="ztzf-pagination"
background
- :page-sizes="[10, 20, 30, 50]"
+
v-model:current-page="sizeParams.current"
v-model:page-size="sizeParams.size"
layout=" prev, pager, next, jumper"
@@ -45,11 +45,15 @@
/>
</div>
- <DeviceJobDetails v-model:show="deviceJobDetailsShow" />
+ <DeviceJobDetails
+ v-if="deviceJobDetailsShow"
+ v-model:show="deviceJobDetailsShow"
+ :wayLineJodInfoId="wayLineJodInfoId"
+ />
</template>
<script setup>
import { useStore } from 'vuex'
-import DeviceJobDetails from './DeviceJobDetails/DeviceJobDetails.vue'
+import DeviceJobDetails from '@/components/DeviceJobDetails/DeviceJobDetails.vue'
import { getDeviceJobList } from '@/api/home/task'
const list = ref([])
@@ -65,7 +69,6 @@
const total = ref(0)
const deviceJobDetailsShow = ref(false)
const wayLineJodInfoId = ref(null)
-provide('wayLineJodInfoId', wayLineJodInfoId)
const viewJob = row => {
wayLineJodInfoId.value = row.id
deviceJobDetailsShow.value = true
@@ -96,55 +99,11 @@
getList()
})
</script>
-<style lang="scss">
-.devicejob-container {
- // 表格
- .el-table__inner-wrapper:before {
- height: 0 !important;
- }
- .el-table .warning-row {
- --el-table-tr-bg-color: rgba(22, 43, 74, 0.79);
- }
- .el-table .warning-row::after {
- position: absolute;
- content: '';
- left: 0;
- width: 100%;
- border-bottom: 1px solid;
-
- border-image: linear-gradient(
- 90deg,
- rgba(25, 162, 255, 0) 10%,
- rgba(20, 125, 202, 1) 50%,
- rgba(25, 162, 255, 0) 90%
- )
- 2 2 2 2;
- }
- .el-table .success-row {
- --el-table-tr-bg-color: #0b1d38;
- }
- .el-table .success-row::after {
- position: absolute;
- content: '';
- left: 0;
- width: 100%;
- border-bottom: 1px solid;
-
- border-image: linear-gradient(
- 90deg,
- rgba(25, 162, 255, 0) 10%,
- rgba(20, 125, 202, 1) 79%,
- rgba(25, 162, 255, 0) 90%
- )
- 2 2 2 2;
- }
-}
-</style>
<style scoped lang="scss">
// 标题
.machineTableDetailsTitle {
margin: 0 24px;
- // margin-bottom: 16px;
+ margin-bottom: 10px;
background: url('/src/assets/images/signMachineNest/machineRight/detailtitle.png') no-repeat center;
background-size: 100% 100%;
p {
@@ -165,94 +124,17 @@
// 表格
.devicelob-table {
padding: 0 17px;
+
}
-.el-table {
- color: #fff;
- --el-table-border-color: var(--el-border-color-lighter);
- --el-table-border: none !important;
- --el-table-text-color: #fff !important;
- --el-table-header-text-color: #fff !important;
- --el-table-row-hover-bg-color: none !important;
- --el-table-current-row-bg-color: none !important;
- --el-table-header-bg-color: none !important;
- --el-table-fixed-box-shadow: none !important;
- --el-table-bg-color: none !important;
- --el-table-tr-bg-color: none !important;
- --el-table-expanded-cell-bg-color: none !important;
- --el-table-fixed-left-column: inset 10px 0 10px -10px rgba(0, 0, 0, 0.15);
- --el-table-fixed-right-column: inset -10px 0 10px -10px rgba(0, 0, 0, 0.15);
-}
-.el-table__header {
- width: 0 !important;
-}
-.el-table__body {
- border-collapse: collapse;
-}
-:deep(.el-table .el-table__cell) {
- padding: 0 !important;
- text-align: center !important;
-}
-:deep(.el-table .el-table__cell) {
- padding: 0 !important;
-}
-:deep(.el-table thead) {
- border-bottom: 1px solid;
- border: 1px solid;
- border-image: linear-gradient(90deg, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1), rgba(255, 255, 255, 0)) 1 1;
- color: var(--el-table-header-text-color);
- background: #102441;
-}
+
+
// 分页
:deep(.el-pagination) {
display: flex;
justify-content: center;
-
}
:deep(.el-pagination button) {
background: center center no-repeat none !important;
color: #8eb8ea !important;
-}
-:deep(.el-pager li) {
- background: none !important;
- color: #8eb8ea !important;
-}
-:deep(.el-pager li.is-active) {
- background: #021022 !important;
- border-radius: 0px 0px 0px 0px;
- border: 1px solid #1479ef;
- color: #c7e1ff !important;
-}
-:deep(.el-pagination__goto) {
- color: #c7e1ff !important;
-}
-:deep(.el-pagination__classifier) {
- color: #c7e1ff !important;
-}
-:deep(.el-pager .el-input__wrapper) {
- background: #021022 !important;
- color: #c7e1ff !important;
- border: 1px solid #1479ef !important;
- z-index: 1;
-}
-:deep(.el-input__wrapper) {
- background: #021022 !important;
- box-shadow: none !important;
- border: 1px solid #178bff;
- color: #fff !important;
-}
-:deep(.el-input__inner) {
- color: #fff !important;
-}
-.view {
- width: 53px;
- height: 27px;
- background: #001f4e;
- border-radius: 0px 0px 0px 0px;
- border: 1px solid #51a8ff;
- font-size: 14px;
- color: #ffffff;
- text-align: center;
- line-height: 27px;
- cursor: pointer;
}
</style>
--
Gitblit v1.9.3