From a12c0c68ea94848ec80e1e95e37e6b5117c001a6 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期三, 20 三月 2024 09:20:51 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/screen/components/screen-detection/index.vue | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/src/views/screen/components/screen-detection/index.vue b/src/views/screen/components/screen-detection/index.vue
index 714358d..714f076 100644
--- a/src/views/screen/components/screen-detection/index.vue
+++ b/src/views/screen/components/screen-detection/index.vue
@@ -1,8 +1,7 @@
<template>
<div class="detection-container">
- <div class="title-container">
- <span class="title">杩愯鐩戞帶鏁版嵁</span>
- </div>
+ <wrapper-title :title="'杩愯鐩戞帶鏁版嵁'"></wrapper-title>
+
<div class="detection-content">
<div class="water-item">
<dv-water-level-pond :config="config1" style="width:100px;height:100px" />
@@ -29,7 +28,11 @@
</template>
<script>
+import WrapperTitle from '../wrapper-title/index';
export default {
+ components: {
+ WrapperTitle
+ },
data() {
return {
config1: {
@@ -58,26 +61,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;
- }
-}
.detection-content {
width: 100%;
@@ -90,7 +73,7 @@
}
.water-item {
- font-size: 18px;
+ font-size: 16px;
color: #fff;
.water-text {
@@ -102,7 +85,7 @@
}
.water-label {
- font-size: 24px;
+ font-size: 20px;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0