From 3c8ada71c2f06f4c43e25e16a9717dc96caa9f5a Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期三, 17 八月 2022 20:01:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/intellectInspect/intelligentLine/index.vue | 74 +++++++++---------------------------
1 files changed, 19 insertions(+), 55 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index 4c8f6e2..0c02976 100644
--- a/src/views/intellectInspect/intelligentLine/index.vue
+++ b/src/views/intellectInspect/intelligentLine/index.vue
@@ -105,8 +105,7 @@
socket: any;
socketData: string;
data: Array<any>;
- id: string;
- defaultImg: string
+ id: string
}
export default {
name: 'intelligentLine',
@@ -122,8 +121,7 @@
socketData: '',
socket: null,
data: [],
- id: '',
- defaultImg: new URL('../../../assets/default-img.jpg',import.meta.url).href
+ id: ''
});
onMounted(() => {
@@ -265,35 +263,23 @@
.picbox {
width: 100%;
- height: 200px;
+ height: 180px;
padding: 10px;
- margin-bottom: 20px;
+ margin-bottom: 40px;
box-sizing: border-box;
- .imgbox{
- width: 100%;
- height: 120px;
- position: relative;
- margin-bottom: 10px;
- border-radius: 4px;
- overflow: hidden;
- img {
- display: block;
- width: 100%;
- height: auto;
- position: absolute;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
- margin: auto;
- }
- }
+ img {
+ display: block;
+ width: 100%;
+ height: 100px;
+ margin-bottom: 8px;
+ border-radius: 4px;
+ }
p {
font-size: 14px;
white-space: nowrap;
color: rgba(255, 255, 255, 0.8);
- margin-bottom: 4px;
+ margin-top: 10px;
span {
color: #fff;
}
@@ -303,7 +289,7 @@
.item {
width: calc((100vw - 40px) / 6);
height: calc((100vh - 130px) / 5);
- padding: 0 40px 20px 50px;
+ padding: 0 20px 20px 50px;
position: relative;
box-sizing: border-box;
border-left: 1px solid #36fcfc;
@@ -478,24 +464,13 @@
padding: 10px;
margin-bottom: 40px;
box-sizing: border-box;
- .imgbox{
+
+ img {
+ display: block;
width: 100%;
height: 100px;
- position: relative;
margin-bottom: 6px;
border-radius: 4px;
- overflow: hidden;
- img {
- display: block;
- width: 100%;
- height: auto;
- position: absolute;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
- margin: auto;
- }
}
p {
font-size: 14px;
@@ -688,24 +663,13 @@
padding: 10px;
margin-bottom: 30px;
box-sizing: border-box;
- .imgbox{
+
+ img {
+ display: block;
width: 100%;
height: 80px;
- position: relative;
margin-bottom: 10px;
border-radius: 4px;
- overflow: hidden;
- img {
- display: block;
- width: 100%;
- height: auto;
- position: absolute;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
- margin: auto;
- }
}
p {
font-size: 12px;
--
Gitblit v1.9.2