From 9a7d9b9b6058a0a601cb1e8c9ba4565ce2d3c985 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 30 三月 2021 11:26:57 +0800
Subject: [PATCH] 废气公共样式 废气公共样式
---
src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue | 67 +++++++++++++++-
src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue | 20 +++--
src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue | 88 +++++++++++++++------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 11 ++
4 files changed, 144 insertions(+), 42 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
index d6e3909..9084a18 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
@@ -1,5 +1,17 @@
<template>
- <div id="echarts" style="width:300px;height:222px" ref="main"></div>
+ <!-- 妗� -->
+ <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-echarts">
+ <div id="echarts" style="width:100%;height:100%" ref="main"></div>
+ </div>
+ </div>
+ </div>
</template>
<script>
@@ -16,9 +28,9 @@
tooltip: {
trigger: 'axis'
},
- legend: {
- data: ['閭欢钀ラ攢', '鑱旂洘骞垮憡', '瑙嗛骞垮憡', '鐩存帴璁块棶', '鎼滅储寮曟搸']
- },
+ // legend: {
+ // data: ['閭欢钀ラ攢', '鑱旂洘骞垮憡', '瑙嗛骞垮憡', '鐩存帴璁块棶', '鎼滅储寮曟搸']
+ // },
grid: {
left: '3%',
right: '4%',
@@ -103,5 +115,50 @@
</script>
<style scoped lang="less">
-
+.win {
+ width: 100%;
+ height: 100%;
+ position: relative;
+ //display: inline-block;
+ background-color: rgba(33, 41, 69,0.9);
+}
+.border_corner{
+ z-index: 2500;
+ position: absolute;
+ width: 10px;
+ height: 10px;
+ background: rgba(0,0,0,0);
+ border: 1.5px solid #47d5ea;
+}
+.border_corner_left_top{
+ top: 0;
+ left: 0;
+ border-right: none;
+ border-bottom: none;
+}
+.border_corner_right_top{
+ top: 0;
+ right: 0;
+ border-left: none;
+ border-bottom: none;
+}
+.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;
+}
+.main {
+ width: 100%;
+ height: 100%;
+ .main-echarts{
+ border: 1px solid #396d83;
+ }
+}
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue
index 6db1047..e05f59f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue
@@ -7,16 +7,18 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="12">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col>
- <el-col :span="12">鐢熶骇鍗曚綅:{{ displayContent.DeptSname }}</el-col>
- <el-col :span="12">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.EmissTypeName }}</el-col>
- </el-row>
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="12">鎺掓斁鍘诲悜:{{ displayContent.EmissTypeDirectName }}</el-col>
- <el-col :span="12">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col>
- <el-col :span="12">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col>
- </el-row>
+ <div class="main-matter">
+ <el-row type="flex" class="row-bg row-item-one" justify="space-around">
+ <el-col :span="12">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col>
+ <el-col :span="12">鐢熶骇鍗曚綅:{{ displayContent.DeptSname }}</el-col>
+ <el-col :span="12">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.EmissTypeName }}</el-col>
+ </el-row>
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="12">鎺掓斁鍘诲悜:{{ displayContent.EmissTypeDirectName }}</el-col>
+ <el-col :span="12">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col>
+ <el-col :span="12">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col>
+ </el-row>
+ </div>
</div>
</div>
</template>
@@ -35,20 +37,48 @@
.win {
position: relative;
- display: inline-block;
- //border: 1px solid #396d83;
+ //display: inline-block;
+ margin-bottom: 13px;
+ background-color: rgba(33, 41, 69,0.9);
}
.main {
width: 100%;
height: 100%;
+ .main-matter{
+ font-size: 13px;
+ padding: 9px 7px;
+ font-weight: normal;
+ border: 1px solid #396d83;
+ .row-item-one{
+ margin-bottom: 7px;
+ }
+ .el-row {
+ width: 100%;
+ color: #00d0f9;
+ display: flex;
+ font-size: 12px!important;
+ .el-col{
+ flex: 1;
+ width: 100%;
+ background-color: #243a55;;
+ text-align: center;
+ line-height: 28px;
+ margin-left: 6px;
+ border-radius: 4px;
+ &:nth-child(1){
+ margin-left:0;
+ }
+ }
+ }
+ }
}
.border_corner{
z-index: 2500;
position: absolute;
- width: 14px;
- height: 14px;
+ width: 10px;
+ height: 10px;
background: rgba(0,0,0,0);
- border: 2px solid #47d5ea;
+ border: 1.5px solid #47d5ea;
}
.border_corner_left_top{
top: 0;
@@ -67,7 +97,6 @@
left: 0;
border-right: none;
border-top: none;
- border-bottom-left-radius: 4px;
}
.border_corner_right_bottom{
bottom: 0;
@@ -75,15 +104,20 @@
border-left: none;
border-top: none;
}
-.el-row {
- width: 100%;
- color: #00d0f9;
- .el-col{
- width: 180px;
- height: 28px;
- background-color: #243a55;;
- text-align: center;
- line-height: 28px;
- }
-}
+//.el-row {
+// width: 100%;
+// color: #00d0f9;
+// .el-col{
+// width: 180px;
+// height: 28px;
+// background-color: #243a55;;
+// text-align: center;
+// line-height: 28px;
+// margin-left: 6px;
+// border-radius: 4px;
+// &:nth-child(1){
+// margin-left:0;
+// }
+// }
+//}
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
index eb83145..fc152ab 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
@@ -1,12 +1,12 @@
<template>
- <div class="win">
+ <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>
+ <div class="main-video">
<video width="100%" height="100%" controls>
<source src="movie.mp4" type="video/mp4">
<source src="movie.ogg" type="video/ogg">
@@ -22,17 +22,22 @@
}
</script>
-<style scoped>
+<style scoped lang="less">
.win {
- width: 100%;
+ /*width: 100%;*/
/*height: 100%;*/
position: relative;
- display: inline-block;
-//border: 1px solid #396d83;
+ //display: inline-block;
+ background-color: rgba(33, 41, 69,0.9);
+/*//border: 1px solid #396d83;*/
}
.main {
width: 100%;
height: 100%;
+ .main-video {
+ padding: 7px;
+ border: 1px solid #396d83;
+ }
}
.border_corner{
z-index: 2500;
@@ -40,7 +45,7 @@
width: 14px;
height: 14px;
background: rgba(0,0,0,0);
- border: 2px solid #47d5ea;
+ border: 1.5px solid #47d5ea;
}
.border_corner_left_top{
top: 0;
@@ -59,7 +64,6 @@
left: 0;
border-right: none;
border-top: none;
- border-bottom-left-radius: 4px;
}
.border_corner_right_bottom{
bottom: 0;
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 152f458..b5f3750 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
<template>
- <div class="public-bounced" v-draw v-show="flag">
+ <div class="public-bounced" style="width: auto" v-draw v-show="flag">
<div class="public-bounced-title">
<span>{{ displayContent.Name }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
@@ -56,7 +56,8 @@
position: fixed;
top: 50%;
left: 50%;
- background-color: #002432;
+ //transform: translate(-50%, -50%);
+ background-color: #0f1432;
border: 1px #9fc5c8 solid;
.public-bounced-title {
@@ -65,6 +66,7 @@
align-items: center;
justify-content: space-between;
padding: 5px 0;
+ background-color: #002433;
span {
color: #f4f7ff;
@@ -83,11 +85,16 @@
display: flex;
align-items: center;
justify-content: space-around;
+ padding: 12px;
.public-bounced-content-left {
+ //flex: 1;
+ flex-direction: column;
+ margin-right: 13px;
}
.public-bounced-content-right {
+ //flex: 1;
}
}
--
Gitblit v1.8.0