From a6842851a844e63a8766d63c5410a8e2f27a7d45 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 20 八月 2024 11:56:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/data-detail/index.vue | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue
index a4783ca..fd1f243 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -2,22 +2,22 @@
<div class="app-container">
<el-card class="box-card">
<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; margin-right: 50px">
- <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;margin-bottom: 20px;font-size: 20px">{{ data.value }}</div>
- <div>{{data.label}}</div>
+ <div v-for="card in cardList" style="display: flex;flex-direction: row; margin-right: 50px">
+ <div>
+ <div class="icon-container">
+ <i :class="card.icon"></i>
</div>
</div>
-<!-- <el-col :span="1">-->
-<!-- <div class="dashboard-item">-->
-<!-- <div style="width: 1px;height: 55px;border: 1px solid #D7EBFA;margin: 20px;"></div>-->
-<!-- </div>-->
-<!-- </el-col>-->
+ <div v-for="data in card.dataList" class="dashboard-item">
+ <div style="color: #5C9BF8;margin-bottom: 20px;font-size: 20px">{{ data.value }}</div>
+ <div>{{ data.label }}</div>
+ </div>
+ </div>
+ <!-- <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>
@@ -57,10 +57,7 @@
</el-row>
<el-table v-loading="loading" :data="platformList" @selection-change="handleSelectionChange">
- <template v-for="(item, index) in tableHead">
- <el-table-column :key="item.name" :prop="item.prop" :label="item.label">
- </el-table-column>
- </template>
+ <el-table-column :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -165,8 +162,6 @@
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]
@@ -190,7 +185,7 @@
getList(url) {
this.loading = true;
dataCenter(url, this.queryParams).then(response => {
- this.platformList = response.rows;
+ this.platformList = response.data;
this.total = response.total;
this.loading = false;
});
@@ -219,7 +214,7 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
- this.getList();
+ this.getList(this.$route.query.url);
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
--
Gitblit v1.8.0