From 013c4922a3296e95a54c1902c09b44d62a000eb2 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期三, 27 七月 2022 17:14:02 +0800
Subject: [PATCH] Merge branch 'shandong' of ssh://192.168.5.5:29418/web/saas-web into shandong
---
src/views/equipmentManagement/equipmentList/components/InfoCard.vue | 2 +-
src/views/personalCenter/components/InfoCard.vue | 2 +-
src/views/equipmentManagement/equipmentDetail/index.vue | 2 +-
src/main.ts | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main.ts b/src/main.ts
index 1bfbb8b..7f30d34 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,7 +8,7 @@
import numeral from 'numeral';
import preview from "vue-photo-preview";
import "vue-photo-preview/dist/skin.css";
- import * as VueWindow from "@hscmap/vue-window";
+// import * as VueWindow from "@hscmap/vue-window";
import VueAwesomeSwiper from "vue-awesome-swiper";
import ToggleButton from 'vue-js-toggle-button';
@@ -24,7 +24,7 @@
Vue.config.productionTip = false;
Vue.mixin(Mixin);
Vue.use(preview);
- Vue.use(VueWindow);
+// Vue.use(VueWindow);
Vue.use(VueAwesomeSwiper as any);
Vue.use(ToggleButton)
Vue.use(ImageShow)
diff --git a/src/views/equipmentManagement/equipmentDetail/index.vue b/src/views/equipmentManagement/equipmentDetail/index.vue
index 04b4a5d..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">
diff --git a/src/views/equipmentManagement/equipmentList/components/InfoCard.vue b/src/views/equipmentManagement/equipmentList/components/InfoCard.vue
index 785b95f..0e6582a 100644
--- a/src/views/equipmentManagement/equipmentList/components/InfoCard.vue
+++ b/src/views/equipmentManagement/equipmentList/components/InfoCard.vue
@@ -17,7 +17,7 @@
<div class="item">
<div class="label">璁惧绫诲瀷:</div>
- <div class="data">{{ node.devType }}</div>
+ <div class="data">{{ node.devDesc }}</div>
</div>
<div class="item">
diff --git a/src/views/personalCenter/components/InfoCard.vue b/src/views/personalCenter/components/InfoCard.vue
index 5ea0a14..317f6af 100644
--- a/src/views/personalCenter/components/InfoCard.vue
+++ b/src/views/personalCenter/components/InfoCard.vue
@@ -17,7 +17,7 @@
<div class="item">
<div class="label">璁惧绫诲瀷:</div>
- <div class="data">{{ node.devType }}</div>
+ <div class="data">{{ node.devDesc }}</div>
</div>
<div class="item">
--
Gitblit v1.8.0