From 996ba897101bbc959e035983c44d0bd4c5559fbb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 20 三月 2024 17:03:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/vehicle-data-monitor/index.vue | 107 +++++++++++++++++++----------------------------------
1 files changed, 38 insertions(+), 69 deletions(-)
diff --git a/src/views/system/vehicle-data-monitor/index.vue b/src/views/system/vehicle-data-monitor/index.vue
index 44cac60..75bddb3 100644
--- a/src/views/system/vehicle-data-monitor/index.vue
+++ b/src/views/system/vehicle-data-monitor/index.vue
@@ -1,79 +1,51 @@
<template>
<div class="app-container">
- <!-- <div class="top">
- <el-row type="flex" justify="space-between" style="width: 60%;">
- <el-col :span="6">
- <el-card class="card">
- <i style="font-size: 40px;padding: 15px;" class="el-icon-wind-power"></i>
- </el-card>
- </el-col>
-
- <el-col :span="6" class="mod">
- <div class="number">{{ totalKiosks }}</div>
- <div>鍗″彛鎬绘暟</div>
- </el-col>
-
- <el-col :span="6" class="mod">
- <div class="numberTwo">{{ uniqueKiosks }}</div>
- <div>涓嶅敮涓�鍗″彛鏁�</div>
- </el-col>
-
- <div style="width: 1px;height: 60px;border: 1px solid #D7EBFA;margin: 40px;"></div>
-
-
- <el-col :span="6">
- <el-card class="card">
- <i style="font-size: 40px;padding: 15px;" class="el-icon-truck"></i>
- </el-card>
- </el-col>
- <el-col :span="6" class="mod">
- <div class="number">{{ totalCarData }}</div>
- <div>杩囪溅鏁版嵁鎬婚噺</div>
- </el-col>
-
- <el-col :span="6" class="mod">
- <div class="numberTwo">{{ uniqueCarData }}</div>
- <div>涓嶅敮涓�鏁版嵁閲�</div>
- </el-col>
- </el-row>
-
- </div> -->
-
-
<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;font-size: 50px;color: #FFF;">
+ <el-col :span="2">
+ <div class="icon-container">
<i class="el-icon-wind-power"></i>
</div>
</el-col>
- <el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
- <div class="dashboard">
+ <el-col :span="2">
+ <div>
<div class="dashboard-item">
<h3 style="color: #5C9BF8">{{ totalKiosks }}</h3>
<p>鍗″彛鎬绘暟</p>
</div>
- <div class="dashboard-item">
- <h3>{{ uniqueKiosks }}</h3>
- <p>涓嶅敮涓�鍗″彛鏁�</p>
- </div>
- <div class="dashboard-item">
- <div style="width: 1px;height: 55px;border: 1px solid #D7EBFA;"></div>
- </div>
- <div class="dashboard-item">
- <h3 style="color: #5C9BF8">{{ totalCarData }}</h3>
- <p>杩囪溅鏁版嵁鎬婚噺</p>
- </div>
- <div class="dashboard-item">
- <h3>{{ uniqueCarData }}</h3>
- <p>涓嶅敮涓�鏁版嵁閲�</p>
- </div>
</div>
</el-col>
+ <el-col :span="2">
+ <div class="dashboard-item">
+ <h3>{{ uniqueKiosks }}</h3>
+ <p>涓嶅敮涓�鍗″彛鏁�</p>
+ </div>
+ </el-col>
+ <el-col :span="1">
+ <div class="dashboard-item">
+ <div style="width: 1px;height: 55px;border: 1px solid #D7EBFA;margin: 20px;"></div>
+ </div>
+ </el-col>
+ <el-col :span="2">
+ <div class="icon-container">
+ <i class="el-icon-truck"></i>
+ </div>
+ </el-col>
+ <el-col :span="2">
+ <div class="dashboard-item">
+ <h3 style="color: #5C9BF8">{{ totalCarData }}</h3>
+ <p>杩囪溅鏁版嵁鎬婚噺</p>
+ </div>
+ </el-col>
+ <el-col :span="2">
+ <div class="dashboard-item">
+ <h3>{{ uniqueCarData }}</h3>
+ <p>涓嶅敮涓�鏁版嵁閲�</p>
+ </div>
+ </el-col>
+ <el-col :span="8"></el-col>
</el-row>
</el-card>
-
-
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="鍗″彛缂栧彿" prop="bayonetNumber">
@@ -165,7 +137,7 @@
return {
totalKiosks: 1157,
uniqueKiosks: 580,
- totalCarData: 77422,
+ totalCarData: 1477422,
uniqueCarData: 431163,
// 閬僵灞�
loading: true,
@@ -327,18 +299,15 @@
width: 20%;
height: 80px;
margin-left: 5%;
+ background-color: #5599F7;
+ font-size: 50px;
+ color: #FFF;
+ width: 85px;
}
.el-icon-refresh-left {
font-size: 50px;
color: #FFFFFF;
-}
-
-.dashboard {
- display: flex;
- gap: 10%;
- align-items: center;
- margin-left: -50%;
}
.dashboard-item {
--
Gitblit v1.8.0