From e58526cc3a60a8f5c0c22c0cc6fe31bd2f7dd9b2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 14 九月 2024 17:33:16 +0800
Subject: [PATCH] 运行监控展示数据重构

---
 src/views/system/monitor/car/index.vue |  115 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 82 insertions(+), 33 deletions(-)

diff --git a/src/views/system/monitor/car/index.vue b/src/views/system/monitor/car/index.vue
index 87f7c22..c48f3ee 100644
--- a/src/views/system/monitor/car/index.vue
+++ b/src/views/system/monitor/car/index.vue
@@ -87,11 +87,10 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-form>
 
-
-
     <el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
       <el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed show-overflow-tooltip/>
       <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/>
+      <el-table-column label="ip" align="center" prop="ip" width="180"/>
       <el-table-column label="鏍囩" align="center" width="180" v-if="columns[0].visible">
         <template slot-scope="scope">
           <div>{{ scope.row.provinceTag == 0 ? "鐪佸巺" : "甯傚眬" }}</div>
@@ -104,13 +103,32 @@
       </template>
       </el-table-column>
       <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="error" width="180" v-if="columns[3].visible" />
-      <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="mongoCreateTime" width="180" v-if="columns[4].visible"/>
-      <el-table-column label="绠$悊鍗曚綅" align="center" prop="unitName" width="180" v-if="columns[5].visible"/>
-      <el-table-column label="褰撴棩鎶撴媿閲�" align="center" prop="dataCount" width="180" v-if="columns[6].visible"/>
-      <el-table-column label="鏃堕挓鍑嗙‘鐜�" align="center" prop="clockPercent" 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" prop="unitName" width="180" v-if="columns[4].visible"/>
+      <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="mongoCreateTime" width="180" v-if="columns[5].visible"/>
+      <el-table-column label="涓�鏈轰竴妗g姸鎬�" align="center" prop="monitorQualify" width="180" v-if="columns[6].visible">
+        <template slot-scope="scope">
+          <div>{{ scope.row.monitorQualify ? "姝e父" : "寮傚父" }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="鏄惁涓烘湭娉ㄥ唽璁惧" align="center" prop="newMonitor" width="180" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <div>{{ scope.row.newMonitor ? "鏄�" : "鍚�" }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="鎶撴媿鏁版嵁閲忕洃娴�" align="center" prop="snapResult" width="180" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <div v-if="scope.row.snapResult === 1">姝e父</div>
+          <div v-else-if="scope.row.snapResult === 2">鏃犳暟鎹�</div>
+          <div v-else-if="scope.row.snapResult === 4">鏁版嵁閲忓皯</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="褰撴棩鎶撴媿閲�" align="center" prop="snapCount" width="180" v-if="columns[9].visible"/>
+      <el-table-column label="鏃堕挓鍑嗙‘鐜�" align="center" prop="clockPercent" width="180" v-if="columns[10].visible"/>
+      <el-table-column label="涓婁紶鍙婃椂鐜�" align="center" prop="uploadPercent" width="180" v-if="columns[11].visible"/>
+      <el-table-column label="涓昏灞炴�т竴鑷寸巼" align="center" prop="importantConPercent" width="180" v-if="columns[12].visible"/>
+      <el-table-column label="鍏ㄩ噺灞炴�т竴鑷寸巼" align="center" prop="majorConPercent" width="180" v-if="columns[13].visible"/>
+      <el-table-column label="澶у浘鍙敤鐜�" align="center" prop="bigUsefulPercent" width="180" v-if="columns[14].visible"/>
+      <el-table-column label="url鍙敤鐜�" align="center" prop="urlPercent" width="180" v-if="columns[15].visible"/>
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"  fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -132,38 +150,60 @@
     />
 
     <!-- 璁惧璧勪骇璇︽儏 -->
-    <el-dialog title="鎿嶄綔鏃ュ織璇︾粏" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog title="杞﹁締鐩戞帶璇︽儏" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" label-width="150px" size="mini">
         <el-row>
+          <el-form-item label="璁惧鍚嶇О锛�">{{ form.name }}</el-form-item>
           <el-col :span="12">
             <el-form-item label="璁惧缂栫爜锛�">{{ form.serialNumber }}</el-form-item>
-            <el-form-item label="璁惧鍚嶇О锛�">{{ form.name }} </el-form-item>
-            <el-form-item label="鍦板尯锛�">{{ form.area }} </el-form-item>
-            <el-form-item label="涓婃姤閮ㄩ棬锛�">{{ form.deptName }} </el-form-item>
+            <el-form-item label="鏍囩锛�">{{ form.provinceTag == 0 ? '鐪佸巺' : '甯傚眬' }}</el-form-item>
             <el-form-item label="璁惧鐘舵�侊細">
-              <div v-if="form.onState === 1">鍙敤</div>
-              <div v-else-if="form.onState === 2">涓嶅彲鐢�</div>
+              <div v-if="form.onState === 0">寮傚父</div>
+              <div v-else-if="form.onState === 1">姝e父</div>
             </el-form-item>
-
+            <el-form-item label="绠$悊鍗曚綅锛�">{{ form.unitName }}</el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="鍦板潃锛�">{{ form.address }}</el-form-item>
+          <el-col :span="12">
+            <el-form-item label="ip锛�">{{ form.ip }}</el-form-item>
+            <el-form-item label="鍦板尯锛�">{{ form.area }}</el-form-item>
             <el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟锛�">
-              <div v-if="form.defaultOrder === 1">鏄�</div>
-              <div v-else-if="form.defaultOrder === 2">鍚�</div>
+              {{ form.error }}
             </el-form-item>
+            <el-form-item label="杩愮淮鏃堕棿锛�">{{ form.startTime + '鑷�' + form.endTime }}</el-form-item>
           </el-col>
+        </el-row>
+        <!-- 杩愯鏁版嵁鐨勫垎闅旂寮�濮嬫柊鐨勮 -->
+        <el-row>
           <el-col :span="24">
-            <el-form-item label="瀹夎鏃堕棿锛�">{{ form.installedTime }}</el-form-item>
+            <el-divider content-position="left">杩愯鏁版嵁</el-divider>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="24">
-            <el-form-item label="绠$悊鍗曚綅锛�">{{ form.managementUnit }}</el-form-item>
+            <el-form-item label="鏁版嵁鏃堕棿锛�">{{ form.mongoCreateTime }}</el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="杩囪溅鏁版嵁閲忥細">{{ form.a }}</el-form-item>
+          <el-col :span="12">
+            <el-form-item label="涓�鏈轰竴妗g姸鎬侊細">
+              {{ form.monitorQualify ? '姝e父' : '寮傚父' }}
+            </el-form-item>
+            <el-form-item label="鎶撴媿鏁版嵁閲忕洃娴嬶細">
+              <div v-if="form.snapResult === 1">姝e父</div>
+              <div v-else-if="form.snapResult === 2">鏃犳暟鎹�</div>
+              <div v-else-if="form.snapResult === 4">鏁版嵁閲忓皯</div>
+            </el-form-item>
+            <el-form-item label="鏃堕挓鍑嗙‘鐜囷細">{{ form.clockPercent }}</el-form-item>
+            <el-form-item label="涓昏灞炴�т竴鑷寸巼锛�">{{ form.importantConPercent }}</el-form-item>
+            <el-form-item label="澶у浘鍙敤鐜囷細">{{ form.bigUsefulPercent }}</el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="鎸佺画鏃犳暟鎹ぉ鏁帮細">{{ form.a }}</el-form-item>
+
+          <el-col :span="12">
+            <el-form-item label="鏄惁涓烘湭娉ㄥ唽璁惧锛�">
+              {{ form.newMonitor ? '鏄�' : '鍚�' }}
+            </el-form-item>
+            <el-form-item label="褰撴棩鎶撴媿閲忥細">{{ form.snapCount }}</el-form-item>
+            <el-form-item label="涓婁紶鍙婃椂鐜囷細">{{ form.uploadPercent }}</el-form-item>
+            <el-form-item label="鍏ㄩ噺灞炴�т竴鑷寸巼锛�">{{ form.majorConPercent }}</el-form-item>
+            <el-form-item label="url鍙敤鐜囷細">{{ form.urlPercent }}</el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -171,6 +211,7 @@
         <el-button @click="open = false">鍏� 闂�</el-button>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
@@ -189,13 +230,18 @@
         { key: 1, label: `鍖哄煙`, visible: true },
         { key: 2, label: `璁惧鐘舵�乣, visible: true },
         { 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: 8, label: `澶у浘鍙敤鐜嘸, visible: true },
-        { key: 9, label: `涓昏灞炴�т竴鑷寸巼`, visible: true },
-        { key: 10, label: `閲嶈灞炴�т竴鑷寸巼`, visible: true },
+        { key: 4, label: `绠$悊鍗曚綅`, visible: true },
+        { key: 5, label: `鏁版嵁鏃堕棿`, visible: false },
+        { key: 6, label: `涓�鏈轰竴妗g姸鎬乣, visible: false },
+        { key: 7, label: `鏄惁涓烘湭娉ㄥ唽璁惧`, visible: false },
+        { key: 8, label: `鎶撴媿鏁版嵁閲忕洃娴媊, visible: false },
+        { key: 9, label: `褰撴棩鎶撴媿閲廯, visible: false },
+        { key: 10, label: `鏃堕挓鍑嗙‘鐜嘸, visible: false },
+        { key: 11, label: `涓婁紶鍙婃椂鐜嘸, visible: false },
+        { key: 12, label: `涓昏灞炴�т竴鑷寸巼`, visible: false },
+        { key: 13, label: `鍏ㄩ噺灞炴�т竴鑷寸巼`, visible: false },
+        { key: 14, label: `鍥剧墖璁块棶寮傚父閲廯, visible: false },
+        { key: 15, label: `澶у浘涓嶅彲鐢ㄩ噺`, visible: false }
       ],
       count: {
         totalPosts: 0,
@@ -406,6 +452,9 @@
 .tabInactive:hover {
   background-color: #edf2f6;
 }
+
+
+
 .box-card {
   background-color: #ffffff;
   width: 100%;

--
Gitblit v1.8.0