From abe3a86c15105f215992d78bcaaf9b51efa1d565 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:22:41 +0800
Subject: [PATCH] 解决冲突
---
src/views/equipmentManagement/equipmentDetail/index.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/views/equipmentManagement/equipmentDetail/index.vue b/src/views/equipmentManagement/equipmentDetail/index.vue
index 18f3c04..d272bd0 100644
--- a/src/views/equipmentManagement/equipmentDetail/index.vue
+++ b/src/views/equipmentManagement/equipmentDetail/index.vue
@@ -203,7 +203,7 @@
<div class="item">
<div class="label">璁惧绫诲瀷</div>
- <div class="data">{{ detailData.devType }}</div>
+ <div class="data">{{ detailData.devDesc }}</div>
</div>
<div class="item">
@@ -220,7 +220,8 @@
<div class="hardWare_row">
<div class="item">
<div class="label">web鐗堟湰</div>
- <div class="data">{{ detailData.webVersion }}</div>
+ <!-- <div class="data">{{ detailData.webVersion }}</div> -->
+ <div class="data">2.0.0</div>
</div>
<div class="item">
@@ -395,8 +396,13 @@
//鑾峰彇绠楁硶鎵�鍗犺祫婧�
async showProcesses() {
const res = await showProcesses({ userId: this.userId, nodeId: this.id });
- console.log(res.data);
this.deviceProcesses = res.data;
+ if (!this.deviceProcesses.algos) {
+ this.deviceProcesses.algos = [];
+ }
+ if (!this.deviceProcesses.apps) {
+ this.deviceProcesses.apps = [];
+ }
},
//鑾峰彇璁惧鏃堕棿鎴�
async getTime() {
--
Gitblit v1.8.0