From 504ee9df635f910b7f00685a21b734f0a4282e61 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期六, 17 四月 2021 21:34:41 +0800
Subject: [PATCH] 固废弹框修改
---
src/components/BaseNav/WasteSolid/PublicTabs.vue | 105 ++++++++++++--------------
src/components/BaseNav/PublicVideo.vue | 90 ++++++++++------------
src/components/BaseNav/WasteSolid/PublicTable.vue | 35 +++-----
3 files changed, 105 insertions(+), 125 deletions(-)
diff --git a/src/components/BaseNav/PublicVideo.vue b/src/components/BaseNav/PublicVideo.vue
index f87c2bb..9a6be4f 100644
--- a/src/components/BaseNav/PublicVideo.vue
+++ b/src/components/BaseNav/PublicVideo.vue
@@ -1,17 +1,14 @@
<template>
- <div class="win">
- <!-- 鍥涗釜瑙掔殑杈规鏁堟灉 -->
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
- <div class="main">
- <!-- <div class="main-video">-->
+ <div class="public-video">
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <div class="video-content">
<video controls>
<source src="movie.mp4" type="video/mp4">
<source src="movie.ogg" type="video/ogg">
</video>
- <!-- </div>-->
</div>
</div>
</template>
@@ -23,58 +20,55 @@
</script>
<style scoped lang="less">
-.win {
+
+.public-video {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
- //height: 2rem;
-}
+ .video-content {
+ border: 1px solid #396d83;
+ width: 2.5rem;
+ height: 2.5rem;
-.main {
- border: 1px solid #396d83;
- width: 2.5rem;
- height: 2.5rem;
- video {
- width: 100%;
- height: 100%;
- outline: none;
+ video {
+ width: 100%;
+ height: 100%;
+ outline: none;
+ }
}
}
-.border_corner {
- z-index: 999;
+.public-video span {
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
+}
+
+.public-video span:nth-child(1) {
position: absolute;
- width: 14px;
- height: 14px;
- background: rgba(0, 0, 0, 0);
- border: 1px solid #47d5ea;
+ left: -1px;
+ top: -1px;
+ border-width: 1px 0 0 1px;
}
-.border_corner_left_top {
- top: 0;
- left: 0;
- border-right: none;
- border-bottom: none;
+.public-video span:nth-child(2) {
+ position: absolute;
+ right: -1px;
+ top: -1px;
+ border-width: 1px 1px 0 0;
}
-.border_corner_right_top {
- top: 0;
- right: 0;
- border-left: none;
- border-bottom: none;
+.public-video span:nth-child(3) {
+ position: absolute;
+ right: -1px;
+ bottom: -1px;
+ border-width: 0 1px 1px 0;
}
-.border_corner_left_bottom {
- bottom: 0;
- left: 0;
- border-right: none;
- border-top: none;
-}
-
-.border_corner_right_bottom {
- bottom: 0;
- right: 0;
- border-left: none;
- border-top: none;
+.public-video span:nth-child(4) {
+ position: absolute;
+ left: -1px;
+ bottom: -1px;
+ border-width: 0 0 1px 1px;
}
</style>
diff --git a/src/components/BaseNav/WasteSolid/PublicTable.vue b/src/components/BaseNav/WasteSolid/PublicTable.vue
index 3bc0315..51b8427 100644
--- a/src/components/BaseNav/WasteSolid/PublicTable.vue
+++ b/src/components/BaseNav/WasteSolid/PublicTable.vue
@@ -5,7 +5,7 @@
<span></span>
<span></span>
<div class="main-table">
- <el-table :data="listData" style="width: 100%" height="325px" :row-class-name="tableRowClassName">
+ <el-table :data="listData" style="width: 100%" height="200px" :row-class-name="tableRowClassName">
<el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
:label="item.label" :show-overflow-tooltip="true"></el-table-column>
</el-table>
@@ -56,7 +56,7 @@
},
mounted () {
this.$nextTick(() => {
- this.listData.push({}, {}, {}, {}, {}, {})
+ // this.listData.push(this.listData2, {}, {}, {}, {}, {})
})
},
methods: {
@@ -66,7 +66,6 @@
}
const result = await mapApi.getSolidWasteDetail(StoragePlaceId)
this.listData = result.Result.DataInfo[0]
- console.log(this.listData)
},
// 闅旇棰滆壊璁剧疆
tableRowClassName ({
@@ -85,9 +84,6 @@
</script>
<style lang="less" scoped>
-.main-table {
- border: 1px #02a6b5 solid;
-}
/deep/ .el-table td {
border-bottom: none !important;
@@ -98,8 +94,8 @@
}
/deep/ .el-table td {
- height: 45px !important;
- line-height: 45px !important;
+ height: 30px !important;
+ line-height: 30px !important;
}
/deep/ .el-table tbody tr:hover > td {
@@ -109,16 +105,22 @@
.slotChildTable {
position: relative;
background: rgba(33, 41, 69, 0.9);
- //border: 1px solid red;
+
+ .main-table {
+ border: 1px #396d83 solid;
+ }
+}
+
+.slotChildTable span {
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
}
.slotChildTable span:nth-child(1) {
position: absolute;
left: -1px;
top: -1px;
- padding: 10px;
- border-style: solid;
- border-color: #02a6b5;
border-width: 1px 0 0 1px;
}
@@ -126,9 +128,6 @@
position: absolute;
right: -1px;
top: -1px;
- padding: 10px;
- border-style: solid;
- border-color: #02a6b5;
border-width: 1px 1px 0 0;
}
@@ -136,9 +135,6 @@
position: absolute;
right: -1px;
bottom: -1px;
- padding: 10px;
- border-style: solid;
- border-color: #02a6b5;
border-width: 0 1px 1px 0;
}
@@ -146,9 +142,6 @@
position: absolute;
left: -1px;
bottom: -1px;
- padding: 10px;
- border-style: solid;
- border-color: #02a6b5;
border-width: 0 0 1px 1px;
}
diff --git a/src/components/BaseNav/WasteSolid/PublicTabs.vue b/src/components/BaseNav/WasteSolid/PublicTabs.vue
index c940a49..fa42c5d 100644
--- a/src/components/BaseNav/WasteSolid/PublicTabs.vue
+++ b/src/components/BaseNav/WasteSolid/PublicTabs.vue
@@ -1,22 +1,18 @@
<template>
- <div class="win">
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
- <div class="main">
- <div class="main-matter">
- <div>
- <ul v-for="(item,index) in setSolidWaste" :key="index">
- <li>鍦烘墍鍚嶇О:{{ item.StoragePlaceName }}</li>
- <li>璐瓨鑳藉姏:{{ item.StoragePlaceName }}</li>
- <li>鍓╀綑璐瓨鑳藉姏:{{ item.StorageQty }}</li>
- <li>鍗犲湴闈㈢Н(銕�):{{ item.SurplusFloorArea }}</li>
- <li>鏈�杩戣串瀛樻棩鏈�:{{ item.DesignFloorArea }}</li>
- <li class="lastli"></li>
- </ul>
- </div>
- </div>
+ <div class="slotChildTabs">
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <div class="tabs-content">
+ <ul v-for="(item,index) in setSolidWaste" :key="index">
+ <li>鍦烘墍鍚嶇О:{{ item.StoragePlaceName }}</li>
+ <li>璐瓨鑳藉姏:{{ item.StoragePlaceName }}</li>
+ <li>鍓╀綑璐瓨鑳藉姏:{{ item.StorageQty }}</li>
+ <li>鍗犲湴闈㈢Н(銕�):{{ item.SurplusFloorArea }}</li>
+ <li>鏈�杩戣串瀛樻棩鏈�:{{ item.DesignFloorArea }}</li>
+ <li class="lastli"></li>
+ </ul>
</div>
</div>
</template>
@@ -50,33 +46,27 @@
<style scoped lang="less">
-.win {
+.slotChildTabs {
position: relative;
- margin-bottom: 0.04rem;
+ margin-bottom: 0.1rem;
background-color: @background-color;
-}
-.main {
-
- .main-matter {
+ .tabs-content {
font-size: 0.06rem;
font-weight: normal;
padding: 0.04rem 0;
border: 1px solid #396d83;
ul {
- //width: 100%;
- //height: 100%;
display: flex;
align-items: center;
justify-content: space-around;
flex-wrap: wrap;
- margin-bottom: -0.04rem;
li {
margin-bottom: 0.04rem;
text-align: center;
- min-width: 31%;
+ min-width: 30%;
background-color: #243a55;
color: #00d0f9;
border-radius: 0.02rem;
@@ -92,40 +82,43 @@
}
}
-.border_corner {
- z-index: 999;
+.slotChildTabs span:nth-child(1) {
position: absolute;
- width: 10px;
- height: 10px;
- background: rgba(0, 0, 0, 0);
- border: 1px solid #47d5ea;
+ left: -1px;
+ top: -1px;
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
+ border-width: 1px 0 0 1px;
}
-.border_corner_left_top {
- top: 0;
- left: 0;
- border-right: none;
- border-bottom: none;
+.slotChildTabs span:nth-child(2) {
+ position: absolute;
+ right: -1px;
+ top: -1px;
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
+ border-width: 1px 1px 0 0;
}
-.border_corner_right_top {
- top: 0;
- right: 0;
- border-left: none;
- border-bottom: none;
+.slotChildTabs span:nth-child(3) {
+ position: absolute;
+ right: -1px;
+ bottom: -1px;
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
+ border-width: 0 1px 1px 0;
}
-.border_corner_left_bottom {
- bottom: 0;
- left: 0;
- border-right: none;
- border-top: none;
-}
-
-.border_corner_right_bottom {
- bottom: 0;
- right: 0;
- border-left: none;
- border-top: none;
+.slotChildTabs span:nth-child(4) {
+ position: absolute;
+ left: -1px;
+ bottom: -1px;
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
+ border-width: 0 0 1px 1px;
}
</style>
--
Gitblit v1.8.0