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/recovery/index.vue |   66 +++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/src/views/system/monitor/recovery/index.vue b/src/views/system/monitor/recovery/index.vue
index 48112d3..fcd5a92 100644
--- a/src/views/system/monitor/recovery/index.vue
+++ b/src/views/system/monitor/recovery/index.vue
@@ -86,6 +86,7 @@
     <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="180px"/>
+      <el-table-column label="ip" align="center" prop="ip" width="180"/>
       <el-table-column label="璁惧绫诲瀷" align="center" prop="cameraFunType" width="180px">
         <template slot-scope="scope">
           {{ translateCameraFunType(scope.row.cameraFunType) }}
@@ -103,10 +104,14 @@
         </template>
       </el-table-column>
       <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="error" width="180px" v-if="columns[3].visible"/>
-      <el-table-column label="寮傚父鍘熷洜" align="center" prop="reason" width="180px" v-if="columns[4].visible"/>
-      <el-table-column label="寮傚父鎭㈠鏃堕棿" align="center" prop="recoveryTime" width="180px" v-if="columns[5].visible">
+      <el-table-column label="寮傚父鎭㈠鏃堕棿" align="center" prop="recoveryTime" width="180px" v-if="columns[4].visible">
       </el-table-column>
-      <el-table-column label="绠$悊鍗曚綅" align="center" prop="unitName" width="180px" v-if="columns[6].visible"/>
+      <el-table-column label="绠$悊鍗曚綅" align="center" prop="unitName" width="180px" v-if="columns[5].visible"/>
+      <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo" width="180px" v-if="columns[6].visible"/>
+      <el-table-column label="鑱旂郴浜�" align="center" prop="unitContact" width="180px" v-if="columns[7].visible"/>
+      <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="unitContactPhone" width="180px" v-if="columns[8].visible"/>
+      <el-table-column label="杩愮淮浜哄憳鍚嶇О" align="center" prop="ywPeopleName" width="180px" v-if="columns[9].visible"/>
+      <el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" width="180px" v-if="columns[10].visible"/>
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -129,33 +134,52 @@
     />
 
     <!-- 璁惧璧勪骇璇︽儏 -->
-    <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.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.reason }}</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.installedTime }}</el-form-item>
+            <el-form-item label="宸ュ崟缂栧彿锛�">{{ form.workOrderNo }}</el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="绠$悊鍗曚綅锛�">{{ form.managementUnit }}</el-form-item>
+          <el-col :span="12">
+            <el-form-item label="鑱旂郴浜猴細">
+              {{ form.unitContact }}
+            </el-form-item>
+            <el-form-item label="杩愮淮浜哄憳鍚嶇О锛�">
+              {{  form.ywPeopleName }}
+            </el-form-item>
+            <el-form-item label="鏁呴殰绫诲瀷锛�">{{ form.errorType }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鑱旂郴鐢佃瘽锛�">
+              {{ form.unitContactPhone }}
+            </el-form-item>
+            <el-form-item label="寮傚父鎭㈠鏃堕棿锛�">{{ form.recoveryTime }}</el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -189,9 +213,13 @@
         {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: 4, label: `寮傚父鎭㈠鏃堕棿`, visible: true},
+        {key: 5, label: `绠$悊鍗曚綅`, visible: true},
+        {key: 6, label: `宸ュ崟缂栧彿`, visible: false},
+        {key: 7, label: `鑱旂郴浜篳, visible: false},
+        {key: 8, label: `鑱旂郴鐢佃瘽`, visible: false},
+        {key: 9, label: `杩愮淮浜哄憳鍚嶇О`, visible: false},
+        {key: 10, label: `鏁呴殰绫诲瀷`, visible: false},
       ],
       count: {
         totalPosts: 0,

--
Gitblit v1.8.0