From f18ff6df94830a0147f372f031fa94ab5402ead8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 三月 2024 15:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-face/index.vue | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/src/views/screen/components/screen-face/index.vue b/src/views/screen/components/screen-face/index.vue
index 0f4a90c..978f2a5 100644
--- a/src/views/screen/components/screen-face/index.vue
+++ b/src/views/screen/components/screen-face/index.vue
@@ -1,8 +1,7 @@
<template>
<div class="face-container">
- <div class="title-container">
- <span class="title">浜鸿劯鏁版嵁瓒嬪娍</span>
- </div>
+ <wrapper-title :title="'浜鸿劯鏁版嵁瓒嬪娍'"></wrapper-title>
+
<div class="face-content">
<div class="data-plane">
<dv-border-box-13 class="plane">
@@ -48,10 +47,14 @@
</template>
<script>
+import WrapperTitle from '../wrapper-title/index';
import * as echarts from 'echarts';
let lineChart = null;
export default {
name: 'ScreenFace',
+ components: {
+ WrapperTitle
+ },
data() {
return {
dataList: {
@@ -137,27 +140,6 @@
</script>
<style lang="scss" scoped>
-.title-container {
- background-image: url("../../../../assets/images/screen/title_bg.png");
- background-size: 231px 100%;
- background-repeat: no-repeat;
- height: 38px;
- width: 100%;
- position: relative;
- display: flex;
- align-items: center;
- margin-bottom: 10px;
-
- .title {
- margin-left: 20px;
- margin-top: -2px;
- color: #fff;
- letter-spacing: 2px;
- font-size: 20px;
- font-style: italic;
- }
-}
-
.face-content {
background: rgba(67, 102, 155, 0.3);
border: 1px solid rgba(47, 91, 157, 0.8);
--
Gitblit v1.8.0