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/monitor/car/index.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/views/system/monitor/car/index.vue b/src/views/system/monitor/car/index.vue
index 62d07cf..d9a3556 100644
--- a/src/views/system/monitor/car/index.vue
+++ b/src/views/system/monitor/car/index.vue
@@ -109,8 +109,11 @@
</el-table-column>
<el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180" v-if="columns[4].visible"/>
<el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180" v-if="columns[5].visible"/>
- <el-table-column label="杩囪溅鏁版嵁閲�" align="center" prop="a" width="180" v-if="columns[6].visible"/>
- <el-table-column label="鎸佺画鏃犳暟鎹ぉ鏁�" align="center" prop="a" width="180" v-if="columns[7].visible"/>
+ <el-table-column label="褰撴棩鎶撴媿閲�" align="center" prop="dataCount" width="180" v-if="columns[6].visible"/>
+ <el-table-column label="鏃堕挓鍑嗙‘鐜�" align="center" prop="a" width="180" v-if="columns[7].visible"/>
+ <el-table-column label="澶у浘鍙敤鐜�" align="center" prop="bigUsefulPercent" width="180" v-if="columns[8].visible"/>
+ <el-table-column label="涓昏灞炴�т竴鑷寸巼" align="center" prop="majorConPercent" width="180" v-if="columns[9].visible"/>
+ <el-table-column label="閲嶈灞炴�т竴鑷寸巼" align="center" prop="importantConPercent" width="180" v-if="columns[10].visible"/>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
@@ -190,8 +193,11 @@
{ key: 3, label: `鏄惁鐢熸垚寮傚父宸ュ崟`, visible: true },
{ key: 4, label: `鏁版嵁鏃堕棿`, visible: true },
{ key: 5, label: `绠＄悊鍗曚綅`, visible: true },
- { key: 6, label: `杩囪溅鏁版嵁閲廯, visible: true },
- { key: 7, label: `鎸佺画鏃犳暟鎹ぉ鏁癭, visible: true },
+ { key: 6, label: `褰撴棩鎶撴媿閲廯, visible: true },
+ { key: 7, label: `鏃堕挓鍑嗙‘鐜嘸, visible: true },
+ { key: 8, label: `澶у浘鍙敤鐜嘸, visible: true },
+ { key: 9, label: `涓昏灞炴�т竴鑷寸巼`, visible: true },
+ { key: 10, label: `閲嶈灞炴�т竴鑷寸巼`, visible: true },
],
count: {
totalPosts: 0,
--
Gitblit v1.8.0