From 1fc339c8f71c81dfbd262f5fede143225580f1e0 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 15 Apr 2025 17:33:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue | 8 ++-
src/assets/images/home/homeLeft/inspection-reset.png | 0
src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue | 40 +++++++++++---------
src/assets/images/home/homeLeft/inspection-select.png | 0
src/assets/images/task/reset.png | 0
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue | 18 ++++++--
6 files changed, 40 insertions(+), 26 deletions(-)
diff --git "a/src/assets/images/home/homeLeft/in\342\200\214spection-select.png" "b/src/assets/images/home/homeLeft/in\342\200\214spection-select.png"
index 83290a0..a5e5dbe 100644
--- "a/src/assets/images/home/homeLeft/in\342\200\214spection-select.png"
+++ "b/src/assets/images/home/homeLeft/in\342\200\214spection-select.png"
Binary files differ
diff --git "a/src/assets/images/home/homeLeft/\342\200\214inspection-reset.png" "b/src/assets/images/home/homeLeft/\342\200\214inspection-reset.png"
index 5db6e1b..1ec388d 100644
--- "a/src/assets/images/home/homeLeft/\342\200\214inspection-reset.png"
+++ "b/src/assets/images/home/homeLeft/\342\200\214inspection-reset.png"
Binary files differ
diff --git a/src/assets/images/task/reset.png b/src/assets/images/task/reset.png
index 07cbd8e..7ba76fb 100644
--- a/src/assets/images/task/reset.png
+++ b/src/assets/images/task/reset.png
Binary files differ
diff --git a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
index 2e8deca..777af0c 100644
--- a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
+++ b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
@@ -54,8 +54,8 @@
/>
</el-form-item>
<el-form-item>
- <div class="reset" @click="handleReset"></div>
- <div class="searchs" @click="handleSearch"></div>
+ <div class="reset" @click="handleReset">重置</div>
+ <div class="searchs" @click="handleSearch">搜索</div>
</el-form-item>
</div>
</el-form>
@@ -86,8 +86,8 @@
? 'distributed'
: scope.row.status === 3
? 'finish '
- : scope.row.status === 4
- ? 'cancel '
+
+
: 'fail '
"
>
@@ -97,10 +97,9 @@
: scope.row.status === 2
? '执行中'
: scope.row.status === 3
- ? '完成'
- : scope.row.status === 4
- ? '取消'
- : '失败'
+ ? '已执行'
+
+ : '执行失败'
}}
</span>
</template>
@@ -112,11 +111,11 @@
<span>{{ scope.row.event_number ? scope.row.event_number : '/' }}</span>
</template>
</el-table-column>
- <el-table-column label="操作" width="80"><div class="ztzf-view ">查看</div></el-table-column>
+ <el-table-column label="操作" width="80"><div class="ztzf-view">查看</div></el-table-column>
</el-table>
</div>
<!-- 分页 -->
- <div style="display: flex;justify-content: center">
+ <div style="display: flex; justify-content: center">
<el-pagination
class="ztzf-pagination"
v-model:current-page="pageParams.current"
@@ -151,8 +150,8 @@
{ label: '待执行', value: 1 },
{ label: '执行中', value: 2 },
{ label: '已完成', value: 3 },
- { label: '已取消', value: 4 },
- { label: '执行失败', value: 5 },
+
+ { label: '执行失败', value: 4 },
]
// 设备页面参数
const devicePageParams = ref({
@@ -217,10 +216,12 @@
}
// 获取任务列表
const getJobList = () => {
+// 事件状态:0 =待处理，1=待分拨，2=待处理，3=处理中，4=已完成 5=已完结
jobList(taskDetailParams).then(res => {
if (res.data.code !== 0) return
taskDetailData.value = res.data.data.records
total.value = res.data.data.total
+
})
}
// 机巢列表数据
@@ -278,8 +279,6 @@
}
:deep() {
-
-
.el-form-item__label {
font-family: Segoe UI, Segoe UI;
font-weight: 400;
@@ -303,6 +302,10 @@
cursor: pointer;
background: url('/src/assets/images/home/homeLeft/inspection-reset.png') no-repeat center;
background-size: 100% 100%;
+ color: #fff;
+ font-weight: bold;
+ font-size: 14px;
+ text-align: center;
}
.searchs {
margin-left: 23px;
@@ -311,6 +314,10 @@
height: 32px;
background: url('/src/assets/images/home/homeLeft/inspection-select.png') no-repeat center;
background-size: 100% 100%;
+ color: #fff;
+ font-weight: bold;
+ font-size: 14px;
+ text-align: center;
}
.tabledata {
padding: 0 16px;
@@ -338,10 +345,7 @@
</style>
<style lang="scss">
.inspection-rask-details-dialog {
- width: 1270px;
+ width: 1270px;
height: 856px;
-
-
-
}
</style>
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
index e5eb341..587af5b 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
@@ -6,7 +6,7 @@
>件
</p>
</div>
- <div class="deviceevent-table ztzf-table">
+ <div class="deviceevent-table ztzf-table" >
<el-table :data="list" :row-class-name="tableRowClassName"
style="width: 100%;"
:row-style="{ height: '38px', fontSize: '14px', 'text-align': 'center' }"
@@ -40,10 +40,10 @@
<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,sizes, jumper"
+ layout="prev, pager, next, jumper"
:total="total"
@change="pageChange"
/>
@@ -79,6 +79,7 @@
const resData = res?.data?.data || {}
list.value = resData.records
total.value = resData.total
+
})
@@ -127,6 +128,7 @@
// 表格
.deviceevent-table {
padding: 0 17px;
+
}
// 分页
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
index 89a9c0d..4999956 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
@@ -2,8 +2,9 @@
<div class="devicejob-container">
<div class="machineTableDetailsTitle">
<p>
- 相关任务<span>{{ total }}</span
- >次
+ 相关任务
+ <span>{{ total }}</span>
+ 次
</p>
</div>
<div class="devicelob-table ztzf-table">
@@ -35,10 +36,10 @@
<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,sizes, jumper"
+ layout=" prev, pager, next, jumper"
:total="total"
@change="pageChange"
/>
@@ -120,8 +121,15 @@
// 表格
.devicelob-table {
padding: 0 17px;
+ // height: 280px;
+ // overflow: hidden;
+ // overflow-y: scroll !important;
}
-
+// :deep(::-webkit-scrollbar) {
+// width: 0;
+// display: none;
+// background: none !important;
+// }
// 分页
:deep(.el-pagination) {
--
Gitblit v1.9.3