From 6f1e2acc812b2f40359aabdb5d04648acfcdcef5 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期四, 24 四月 2025 08:40:11 +0800
Subject: [PATCH] 修改
---
src/views/firework/humiture/index.vue | 90 ++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 29 deletions(-)
diff --git a/src/views/firework/humiture/index.vue b/src/views/firework/humiture/index.vue
index 01a985c..c7b2088 100644
--- a/src/views/firework/humiture/index.vue
+++ b/src/views/firework/humiture/index.vue
@@ -16,37 +16,40 @@
@pagination="getListAll"
/>
</div>
- <!-- 卡片部分-->
- <el-scrollbar max-height="420px" style="padding-right: 10px;overflow-x: hidden;" v-if="state.dataList && state.dataList.length >0">
-<!-- <el-row :gutter="20" style="margin-top: 5px;margin-left: 5px">-->
-<!-- <el-col v-for="(item,index) in state.dataList" :key="index" :span="8">-->
- <div class="grid-container">
- <div v-for="(item,index) in state.dataList" :key="index" style="width: 365px;margin: 20px 30px">
- <el-card class="card-item " shadow="always">
- <div style="display: flex;flex-direction: column">
- <div style="font-size: 18px;font-weight: 700;margin-bottom: 25px">{{item.storeName}}—{{item.storeroomName}}—{{item.deviceName}}</div>
- <div style="display: flex;align-items: center;margin-bottom: 15px">
- <img src="@/assets/images/device.png" />
- <div style="display: flex;flex-direction: column">
- <div style="display: flex;justify-content: space-between;margin-bottom: 10px;align-items: center">
- <span>温度：{{item.temperatureValue}}℃</span>
- <el-button type="primary" plain style="margin-left: 15px" @click="openData('温度',item)">历史数据</el-button>
- </div>
- <div style="display: flex;justify-content: space-between;align-items: center">
- <span>湿度：{{item.humidityValue}}%RH</span>
- <el-button type="primary" plain style="margin-left: 15px" @click="openData('湿度',item)">历史数据</el-button>
+ <div style=" border: 1px solid #ebeef5;border-radius: 15px;margin-top: 20px">
+<!-- <span style="font-size: 18px;font-weight: 600;margin-left: 15px;margin-top: 10px"> 设备信息</span>-->
+ <el-scrollbar max-height="420px" style="padding-right: 10px;overflow-x: hidden;" v-if="state.dataList && state.dataList.length >0">
+ <div class="grid-container">
+ <div v-for="(item,index) in state.dataList" :key="index" style="width: 370px;margin: 20px 30px">
+ <el-card class="card-item " shadow="always">
+ <div style="display: flex;flex-direction: column">
+<!-- <div style="font-size: 18px;font-weight: 700;margin-bottom: 25px">{{item.storeName}}—{{item.storeroomName}}—{{item.deviceName}}</div>-->
+ <div class="truncate-text" :title="item.storeName+'—'+item.storeroomName+'—'+item.deviceName">
+ {{item.storeName}}—{{item.storeroomName}}—{{item.deviceName}}
+ </div>
+ <div style="display: flex;align-items: center;margin-bottom: 15px">
+ <img src="@/assets/images/device.png" />
+ <div style="display: flex;flex-direction: column">
+ <div style="display: flex;justify-content: space-between;margin-bottom: 10px;align-items: center">
+ <span>温度：{{item.temperatureValue}}℃</span>
+ <el-button type="primary" plain style="margin-left: 15px" @click="openData('温度',item)">历史数据</el-button>
+ </div>
+ <div style="display: flex;justify-content: space-between;align-items: center">
+ <span>湿度：{{item.humidityValue}}%RH</span>
+ <el-button type="primary" plain style="margin-left: 15px" @click="openData('湿度',item)">历史数据</el-button>
+ </div>
</div>
</div>
</div>
- </div>
- </el-card>
+ </el-card>
+ </div>
</div>
- </div>
+ </el-scrollbar>
+ <el-empty v-else description="暂无设备数据" ></el-empty>
+ </div>
+ <!-- 卡片部分-->
-<!-- </el-col>-->
-<!-- </el-row>-->
- </el-scrollbar>
- <el-empty v-else description="暂无设备数据" ></el-empty>
+
<d-dialog ref="dialogRef" @getList="getListAll"></d-dialog>
</div>
</template>
@@ -71,7 +74,8 @@
pageIndex: 1,
pageSize: 5,
filter: {
- companyCode : ''
+ companyCode : '',
+ deviceType: 1
}
},
total: 0,
@@ -130,8 +134,9 @@
grid-template-columns: repeat(auto-fill, minmax(385px, 1fr));
gap: 0px;
justify-content: start;
- padding: 15px;
- background: #f7f7f7;
+ //padding: 15px;
+ //background: #f7f7f7;
+
}
.title-font{
display:flex;
@@ -150,5 +155,32 @@
:deep(.el-scrollbar__wrap) {
overflow-x: hidden;
}
+ .truncate-text {
+ width: 350px;
+ font-size: 18px;
+ font-weight: 700;
+ margin-bottom: 25px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ /* 悬浮显示原生标题 */
+ cursor: pointer;
+ position: relative;
+ }
+ /* 高级悬浮样式优化 */
+ .truncate-text:hover::after {
+ content: attr(title);
+ position: absolute;
+ left: 0;
+ top: 100%;
+ background: rgba(0,0,0,0.8);
+ color: white;
+ padding: 6px 12px;
+ border-radius: 4px;
+ z-index: 999;
+ white-space: normal;
+ width: max-content;
+ max-width: 300px;
+ }
}
</style>
--
Gitblit v1.9.2