dedsudiyu hace 2 años
padre
commit
8360bc1adb

+ 3 - 0
src/views/comprehensive/laboratoryManagement/building/buildingDetails.vue

@@ -1599,6 +1599,9 @@
             flex:1;
             font-size:16px;
             color:#333;
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
           }
           div{
             cursor: pointer;

+ 8 - 6
src/views/comprehensive/laboratoryManagement/building/newIndex.vue

@@ -216,7 +216,7 @@
               <el-form-item label="关键字" prop="searchValue" style="margin-right:20px;margin-bottom:20px;">
                 <el-input
                   v-model="queryParams.searchValue"
-                  placeholder="请输入关键字"
+                  placeholder="房间号/房间名称"
                   clearable
                   size="small"
                 />
@@ -777,6 +777,13 @@
           this.$set(this, 'pageType', type)
         } else if (type == 2) {
           this.$set(this, 'propsData', item)
+          if(item.name){
+            this.$set(this.propsData, 'buildName', item.buildName)
+            this.$set(this.propsData, 'floorName', item.name)
+          }else{
+            this.$set(this.propsData, 'buildName', this.ldName)
+            this.$set(this.propsData, 'floorName', this.lcName)
+          }
           this.$set(this, 'pageType', type)
         }else if(type == 3){
           this.$set(this, 'pageType', 1)
@@ -908,11 +915,6 @@
         } else {
           this.$set(this, 'floorZkType', 3)
         }
-        console.log('self.buildingList',self.buildingList)
-        console.log('self.buildingList.length',self.buildingList.length)
-        console.log('numOne',numOne)
-        console.log('numTwo',numTwo)
-        console.log('floorZkFor',this.floorZkType)
       },
       //拖拽抓取时触发
       dragstartPlay(event) {