From ce59cac766bd4f0fb70555bff1c08875181e03bf Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:14:42 +0800
Subject: [PATCH] 处理冲突
---
src/views/system/monitor/video/index.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/views/system/monitor/video/index.vue b/src/views/system/monitor/video/index.vue
index 030708c..b90d25c 100644
--- a/src/views/system/monitor/video/index.vue
+++ b/src/views/system/monitor/video/index.vue
@@ -3,13 +3,13 @@
<div class="app-container">
<el-card class="box-card" >
- <el-row type="flex" align="middle" justify="space-between">
- <el-col :xl="8" :lg="8" :md="10" :sm="8" :xs="6">
- <div class="icon-container" style="background-color: #5599F7">
+ <el-row type="flex" align="middle" justify="space-between" style="width: 100%;">
+ <el-col :span="4">
+ <div class="icon-container" style="background-color: #1890FF">
<i class="el-icon-video-camera"></i>
</div>
</el-col>
- <el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
+ <el-col :span="20">
<div class="dashboard">
<div class="dashboard-item">
<h3 style="color: #5C9BF8">{{ count.totalPosts }}</h3>
@@ -434,17 +434,17 @@
<style lang="scss" scoped>
.box-card {
- background-color: #F5F9FE;
+ background-color: hsl(0, 0%, 100%);
width: 100%;
margin-bottom: 20px;
- height: 120px
+ height: 120px;
}
.icon-container {
display: flex;
justify-content: center;
align-items: center;
border-radius: 20px;
- width: 20%;
+ width: 130px;
height: 80px;
margin-left: 5%;
}
@@ -455,9 +455,10 @@
.dashboard {
display: flex;
- gap: 10%;
+ gap: 5%;
align-items: center;
- margin-left: -50%;
+ justify-content: space-between;
+ margin-right: 20px;
}
.dashboard-item {
--
Gitblit v1.8.0