ZZJ
2022-07-27 013c4922a3296e95a54c1902c09b44d62a000eb2
Merge branch 'shandong' of ssh://192.168.5.5:29418/web/saas-web into shandong
4个文件已修改
10 ■■■■ 已修改文件
src/main.ts 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/equipmentDetail/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/equipmentList/components/InfoCard.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personalCenter/components/InfoCard.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)
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">
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">
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">