Browse Source

edit:fix> 排查控制台报错

YaolongHan 4 years ago
parent
commit
0d00a26aad

+ 6 - 1
src/components/editview/leftToolBar/addItemModel.vue

@@ -442,7 +442,12 @@ export default {
       );
     });
     const domLeft = document.getElementById("left");
-    this.tableHeight = domLeft.offsetHeight - 140;
+    if (domLeft) {
+      this.tableHeight = domLeft.offsetHeight - 140;
+    }
+
+    // 调取设备接口
+    // this.queryEquip()
   },
 };
 </script>

+ 9 - 5
src/components/editview/leftToolBar/equipmentList.vue

@@ -1,6 +1,7 @@
 <!-- 设备列表 -->
 <template>
   <div class="equip-list">
+    <!-- 筛选 -->
     <div class="clp">
       <Input
         class="baseItemInput"
@@ -23,7 +24,6 @@
                 width="300"
                 @change="changeItem"
                 @confirm="changeItem"
-                v-model="abc"
               ></Cascader>
             </div>
             <div>
@@ -36,7 +36,6 @@
                 width="300"
                 @change="changeItem"
                 @confirm="changeItem"
-                v-model="abc"
               ></Cascader>
             </div>
             <el-button class="reset" type="text">重置</el-button>
@@ -48,6 +47,7 @@
         ></span>
       </Popover>
     </div>
+    <!-- 设备 list -->
     <div class="porfess" v-for="(items, index) in equipmentList" :key="index">
       <div @click="collapse(items)" class="porfess-title">
         <span>{{ items.porfess }}</span>
@@ -71,7 +71,7 @@
               <span>{{ item.equipType }}</span>
             </div>
             <el-collapse-transition>
-              <ul @mouseout="deletehover(b)" v-show="item.isShow">
+              <ul @mouseout="deletehover" v-show="item.isShow">
                 <li
                   @click="getEquipItem('lengganji.svg')"
                   v-for="(a, b) in item.children"
@@ -179,6 +179,7 @@ export default {
       ],
       equipmentList: [],
       hoverIndex: -1,
+      baseItemVal: "",
     };
   },
   methods: {
@@ -227,9 +228,12 @@ export default {
     collapse(item) {
       item.isShow = !item.isShow;
     },
+    //
+    changeItem() {},
+    pressEnter(){}
   },
   computed: {
-    ...mapState(["editCmd",]),
+    ...mapState(["editCmd"]),
     // equipmentList
   },
   mounted() {
@@ -344,7 +348,7 @@ li {
 
   .addbtn {
     width: 100%;
-    height: 40px;
+    height: 46px;
     position: absolute;
     bottom: 0;
     left: 0;

+ 1 - 1
src/components/editview/leftToolBar/legendList.vue

@@ -14,7 +14,7 @@
     <!-- 新增实例对象 -->
     <addItemModel
       @closeModel="showAddItemModel = false"
-      :showAddItemModel="true"
+      :showAddItemModel="showAddItemModel"
       :filtIdList="[]"
     ></addItemModel>
     <!-- :showAddItemModel="showAddItemModel" -->

+ 1 - 1
src/components/editview/rightPropertyBar/BaseEquipment.vue

@@ -29,7 +29,7 @@
               class="avatar-uploader"
               action="https://jsonplaceholder.typicode.com/posts/"
               :show-file-list="false"
-              :before-upload="beforeAvatarUpload"
+
             >
               <i class="el-icon-link"></i>
             </el-upload>