From 9d5243e8e0f3cefca825b16906c5e51d1d3c35c5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 30 七月 2024 17:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/monitor/video/index.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/views/system/monitor/video/index.vue b/src/views/system/monitor/video/index.vue
index 09020f8..85db04d 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>
@@ -101,8 +101,8 @@
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -122,8 +122,8 @@
<el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" />
- <el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed/>
- <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/>
+ <el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed show-overflow-tooltip/>
+ <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180" show-overflow-tooltip/>
<el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180" v-if="columns[0].visible">
<template slot-scope="scope">
<div>{{"鐪佸巺"}}</div>
@@ -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%;
+ border-radius: 10px;
+ 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