From dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 13 九月 2024 16:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/home.vue | 99 +++++++++++++++++++++++++++----------------------
1 files changed, 54 insertions(+), 45 deletions(-)
diff --git a/web/src/views/modules/home.vue b/web/src/views/modules/home.vue
index 9a5027f..1c0f252 100644
--- a/web/src/views/modules/home.vue
+++ b/web/src/views/modules/home.vue
@@ -1,53 +1,57 @@
<template>
<div class="fa-card-b">
- <span class="size">绯荤粺鐧诲綍娆℃暟:{{dataForm.loginNum}}</span>
- <span class="size">璇曢獙鏂规鍒跺畾娆℃暟:{{dataForm.planMakeNum}}</span>
- <el-table ref="taskTable" class="DataTable" :data="dataForm.taskReliabList" height="330px" border>
- <el-table-column label="浠诲姟鍙潬鎬ф暟鎹�" align="center">
- <el-table-column align="center" prop="name" label="鍚嶇О">
+ <div style="margin: 0 0 10px 0">
+ <span class="size">绯荤粺鐧诲綍娆℃暟:</span>
+ <span class="font">{{dataForm.loginNum}}</span>
+ <span class="size">璇曢獙鏂规鍒跺畾娆℃暟:</span>
+ <span class="font">{{dataForm.planMakeNum}}</span>
+ </div>
+ <el-table ref="taskTable" class="DataTable" :data="dataForm.taskReliabList" height="330px" border>
+ <el-table-column label="浠诲姟鍙潬鎬ф暟鎹�" align="center">
+ <el-table-column align="center" prop="name" label="鍚嶇О">
+ </el-table-column>
+ <el-table-column align="center" prop="taskNum" label="浠诲姟">
+ </el-table-column>
+ <el-table-column align="center" prop="operatConNum" label="鎬讳綋宸ュ喌">
+ </el-table-column>
+ <el-table-column align="center" prop="modelNum" label="妯″瀷">
+ </el-table-column>
+ <el-table-column align="center" prop="simulatNum" label="浠跨湡璇勪及(娆�)">
+ </el-table-column>
+ <el-table-column align="center" prop="testData" label="璇曢獙鏁版嵁(濂�)">
+ </el-table-column>
+ <el-table-column align="center" prop="assessNum" label="璇勫畾娆℃暟">
+ </el-table-column>
</el-table-column>
- <el-table-column align="center" prop="taskNum" label="浠诲姟">
- </el-table-column>
- <el-table-column align="center" prop="operatConNum" label="鎬讳綋宸ュ喌">
- </el-table-column>
- <el-table-column align="center" prop="modelNum" label="妯″瀷">
- </el-table-column>
- <el-table-column align="center" prop="simulatNum" label="浠跨湡璇勪及(娆�)">
- </el-table-column>
- <el-table-column align="center" prop="testData" label="璇曢獙鏁版嵁(濂�)">
- </el-table-column>
- <el-table-column align="center" prop="assessNum" label="璇勫畾娆℃暟">
- </el-table-column>
- </el-table-column>
- </el-table>
+ </el-table>
- <el-table ref="baseTable" class="DataTable" height="230px" :data="dataForm.baseReliabList" border
- v-adaptive="{bottomOffset:30}">
- <el-table-column label="鍩烘湰鍙潬鎬ф暟鎹�" align="center">
- <el-table-column align="center" prop="name" label="鍚嶇О">
+ <el-table ref="baseTable" class="DataTable" height="230px" :data="dataForm.baseReliabList" border
+ v-adaptive="{bottomOffset:30}">
+ <el-table-column label="鍩烘湰鍙潬鎬ф暟鎹�" align="center">
+ <el-table-column align="center" prop="name" label="鍚嶇О">
+ </el-table-column>
+ <el-table-column align="center" prop="xtNum" label="绯荤粺">
+ </el-table-column>
+ <el-table-column align="center" prop="sbNum" label="璁惧">
+ </el-table-column>
+ <el-table-column align="center" prop="mtbf" label="MTBF">
+ <template slot-scope="scope">
+ <span>{{keepNumber(scope.row.mtbf) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="mttr" label="MTTR">
+ <template slot-scope="scope">
+ <span>{{keepNumber(scope.row.mttr) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="availability" label="鍙敤搴�">
+ <template slot-scope="scope">
+ <span>{{keepNumber(scope.row.availability) }}</span>
+ </template>
+ </el-table-column>
</el-table-column>
- <el-table-column align="center" prop="xtNum" label="绯荤粺">
- </el-table-column>
- <el-table-column align="center" prop="sbNum" label="璁惧">
- </el-table-column>
- <el-table-column align="center" prop="mtbf" label="MTBF">
- <template slot-scope="scope">
- <span>{{keepNumber(scope.row.mtbf) }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" prop="mttr" label="MTTR">
- <template slot-scope="scope">
- <span>{{keepNumber(scope.row.mttr) }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" prop="availability" label="鍙敤搴�">
- <template slot-scope="scope">
- <span>{{keepNumber(scope.row.availability) }}</span>
- </template>
- </el-table-column>
- </el-table-column>
- </el-table>
- </div>
+ </el-table>
+ </div>
</template>
<script>
@@ -101,6 +105,11 @@
.size{
font-size: 20px;
margin: 10px;
+ color: #000000;
+ }
+ .font{
+ font-size: 20px;
+ margin: 10px;
color: #0aa0bf;
}
</style>
--
Gitblit v1.9.1