From b985ea176bf805730a1d914dd906388b562a314d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 30 七月 2024 16:46:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/data-detail/index.vue | 89 +++++++++++++++++++++-----------------------
1 files changed, 42 insertions(+), 47 deletions(-)
diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue
index e48a562..b2d4cc6 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -1,48 +1,23 @@
<template>
<div class="app-container">
<el-card class="box-card">
- <el-row type="flex" align="middle" justify="space-between">
- <el-col :span="2">
- <div class="icon-container">
- <i class="el-icon-wind-power"></i>
- </div>
- </el-col>
- <el-col :span="2">
- <div>
- <div class="dashboard-item">
- <h3 style="color: #5C9BF8">{{ totalKiosks }}</h3>
- <p>鍗″彛鎬绘暟</p>
+ <el-row style="display: flex; flex-direction: row; align-items: center" justify="space-between">
+ <div v-for="card in cardList" style="display: flex;flex-direction: row; ">
+ <div>
+ <div class="icon-container">
+ <i :class="card.icon"></i>
+ </div>
+ </div>
+ <div v-for="data in card.dataList" class="dashboard-item">
+ <div style="color: #5C9BF8">{{ data.value }}</div>
+ <div>{{data.label}}</div>
</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="1">-->
+<!-- <div class="dashboard-item">-->
+<!-- <div style="width: 1px;height: 55px;border: 1px solid #D7EBFA;margin: 20px;"></div>-->
+<!-- </div>-->
+<!-- </el-col>-->
<el-col :span="8"></el-col>
</el-row>
</el-card>
@@ -120,8 +95,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
</div>
</el-dialog>
</div>
@@ -177,7 +152,8 @@
{ required: true, message: "鍗″彛缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
],
},
- tableHead: []
+ tableHead: [],
+ cardList: []
};
},
beforeRouteEnter(to, from, next) {
@@ -185,9 +161,23 @@
next();
},
created() {
- if (this.$route.query.type === '1') this.tableHead = videoData[this.$route.query.index].columns;
- if (this.$route.query.type === '2') this.tableHead = carData[this.$route.query.index].columns;
- if (this.$route.query.type === '3') this.tableHead = faceData[this.$route.query.index].columns;
+ if (this.$route.query.type === '1') {
+ let data = videoData.table.filter(item => item.index === this.$route.query.index)[0]
+ this.tableHead = data.columns;
+ this.cardList = data.card;
+ console.log(data, "aaa")
+ console.log(this.cardList, "ddd")
+ };
+ if (this.$route.query.type === '2') {
+ let data = carData.table.filter(item => item.index === this.$route.query.index)[0]
+ this.tableHead = data.columns;
+ this.cardList = data.card;
+ }
+ if (this.$route.query.type === '3') {
+ let data = faceData.table.filter(item => item.index === this.$route.query.index)[0]
+ this.tableHead = data.columns;
+ this.cardList = data.card;
+ }
if (this.$route.query.type === '4') this.tableHead = equipment[this.$route.query.index].columns;
this.getList();
},
@@ -303,9 +293,10 @@
.icon-container {
display: flex;
+ flex-direction: row;
justify-content: center;
align-items: center;
- border-radius: 20px;
+ border-radius: 10px;
width: 20%;
height: 80px;
margin-left: 5%;
@@ -321,6 +312,10 @@
}
.dashboard-item {
- text-align: center;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ width: 200px;
}
</style>
--
Gitblit v1.8.0