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/MachineTableDetails.vue | 152 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 115 insertions(+), 37 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue
index 7f18489..884c8bc 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/MachineTableDetails.vue
@@ -1,18 +1,39 @@
<!-- 机巢列表详情 -->
<template>
<el-dialog
- modal-class="machineTableDetails"
+ class="machineTableDetails ztzf-dialog"
v-model="isShowDetails"
- title="机巢详情"
:width="pxToRem(1500)"
:close-on-click-modal="false"
:destroy-on-close="true"
>
- <el-divider content-position="left">详情</el-divider>
- <div class="infoBox">
- <div class="itemBox" v-for="item in infoList">
- <div class="itemTitle">{{ item.name }}:</div>
- <div class="itemValue">{{ item.value }}</div>
+ <template #header="{ titleId, titleClass }">
+ <div class="my-header">
+ <img src="/src/assets/images/home/homeLeft/inspection-union.png" alt="" />
+ <span :id="titleId" :class="titleClass">机巢详情</span>
+ </div>
+ </template>
+ <div class="machineTableDetailsblock">
+ <div class="machineTableDetailsTitle"><span>详情</span></div>
+ <div class="infoBox">
+ <div class="itemBox" v-for="(item, index) in infoList" :key="index">
+ <div class="itemTitle">{{ item.name }} :</div>
+ <div v-if="item.name == '任务成果'" class="missionOutcomes">
+ <span>{{item.value ? item.value :0}}</span>
+ 个
+ </div>
+ <div
+ v-if="item.name == '机巢状态'"
+ :class="{
+ active: item.value === 'WORKING',
+ freetime: item.value === 'LEISURE',
+ offine: item.value === 'OFFLINE',
+ }"
+ >
+ {{ item.value === 'OFFLINE' ? '离线中' : item.value === 'WORKING' ? '作业中' : '空闲中' }}
+ </div>
+ <div class="itemValue" v-else>{{ item.value }}</div>
+ </div>
</div>
</div>
<DeviceJob v-if="isShowDetails" />
@@ -23,63 +44,120 @@
<script setup>
import DeviceEvent from '@/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue'
import DeviceJob from '@/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue'
-import { pxToRem } from '@/utils/rem';
+import { pxToRem } from '@/utils/rem'
import { useStore } from 'vuex'
const isShowDetails = defineModel('show')
const infoList = ref([
- { name: '机巢名称', value: '',field:'nickname' },
- { name: '机巢所属地区', value: '',field:'device_area' },
- { name: '机巢状态', value: '',field:'status' },
- { name: '任务成功', value: '',field:'result_num' },
- { name: '机巢位置', value: '',field:'address' },
+ { name: '机巢名称', value: '', field: 'nickname' },
+ { name: '机巢所属地区', value: '', field: 'device_area' },
+ { name: '任务成果', value: '', field: 'result_num' },
+ { name: '机巢位置', value: '', field: 'address' },
+ { name: '机巢状态', value: '', field: 'status' },
])
-const store = useStore();
-const singleTotal = computed(() => store.state.home.singleTotal);
-watch(singleTotal, (val) => {
- if (val?.device_info){
+const store = useStore()
+const singleTotal = inject('singleTotal')
+watch(singleTotal, val => {
+ if (val?.device_info) {
infoList.value.forEach(item => {
item.value = val.device_info?.[item.field] || ''
})
}
})
-onMounted(() => {
-})
+onMounted(() => {})
</script>
<style lang="scss">
.machineTableDetails {
+
.el-pagination {
text-align: left;
- padding: 20px;
+ padding: 10px 20px 5px 10px;
+ }
+ .my-header {
+ display: inline-block;
+ vertical-align: middle;
+ margin-left: 12px;
}
}
</style>
<style lang="scss" scoped>
.infoBox {
- display: grid;
- grid-template-columns: repeat(3, 1fr);
- gap: 10px; // 列之间的间距
- padding: 10px;
-
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 10px;
+ font-size: 14px;
+ color: #ffffff;
.itemBox {
- background-color: #fff;
- border: 1px solid #ddd;
- border-radius: 4px;
- padding: 15px;
- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+ display: flex;
+ align-items: center;
+ .itemTitle {
+ margin-right: 5px;
+ }
}
- .itemTitle {
+ .flystatus {
+ width: 53px;
+ height: 27px;
+ background: #042c53;
+ border-radius: 0px 0px 0px 0px;
+ border: 1px solid #1b94ff;
+ }
+}
+
+// 详情
+.machineTableDetailsblock {
+ margin: 0 24px;
+}
+.machineTableDetailsTitle {
+ margin-bottom: 10px;
+ background: url('/src/assets/images/signMachineNest/machineRight/detailtitle.png') no-repeat center;
+ background-size: 100% 100%;
+ span {
+ display: inline-block;
+ margin-left: 30px;
+ font-size: 16px;
+ color: #ddf0ff;
+ line-height: 20px;
+ text-align: left;
+ margin-bottom: 8px;
+ }
+}
+.missionOutcomes {
+ span {
+ color: #ffa500;
+ font-size: 14px;
font-weight: bold;
- color: #333;
}
-
- .itemValue {
- margin-top: 5px;
- color: #666;
- }
+}
+// 离线中
+.offine {
+ width: 53px;
+ height: 27px;
+ background: #042c53;
+ border-radius: 0px 0px 0px 0px;
+ border: 1px solid #1b94ff;
+ text-align: center;
+ line-height: 27px;
+ font-size: 14px;
+ color: #1b94ff;
+}
+// 空闲中
+.freetime {
+ width: 53px;
+ height: 27px;
+ text-align: center;
+ line-height: 27px;
+ font-size: 14px;
+ color: #8effac;
+ background: rgba(142, 255, 172, 0.14);
+ border-radius: 0px 0px 0px 0px;
+ border: 1px solid #8effac;
+}
+.active {
+ color: #04f020;
}
</style>
--
Gitblit v1.9.3