add buildname and fix delete relation error

src/components/point/dynamicdata/delRelationDialog.vue

@@ -20,9 +20,9 @@
           </el-col>
           <el-col :span="6">
             <div class="singleDir pl-10 font-default">设备实例</div>
-            <div class="pl-10 font-default">{{rtableData[0].EquipLocalName}}</div>
-            <div class="pl-10 font-default">{{rtableData[0].BuildLocalName}}-{{rtableData[0].FloorLocalName}}</div>
-            <div class="pl-10 font-default">{{rtableData[0].RoomLocalName}}</div>
+            <div class="pl-10 font-default">{{rtableData[0]?rtableData[0].EquipLocalName:'--'}}</div>
+            <div class="pl-10 font-default">{{rtableData[0]?rtableData[0].BuildLocalName:'--'}}-{{rtableData[0]?rtableData[0].FloorLocalName:'--'}}</div>
+            <div class="pl-10 font-default">{{rtableData[0]?rtableData[0].RoomLocalName:'--'}}</div>
           </el-col>
         </el-row>
       </div>
@@ -31,9 +31,9 @@
         <el-row class="bgf5">
           <el-col :span="6">
             <div class="singleDir pr-10 font-default tr">设备标识</div>
-            <div class="pr-10 font-default tr">{{ltableData[0].EquipmentMark}}</div>
-            <div class="pr-10 font-default tr">{{ltableData[0].LocationFlag.toString()}}</div>
-            <div class="pr-10 font-default tr">{{ltableData[0].Datasource}}</div>
+            <div class="pr-10 font-default tr">{{ltableData[0]?ltableData[0].EquipmentMark:'--'}}</div>
+            <div class="pr-10 font-default tr">{{ltableData[0]?ltableData[0].LocationFlag.toString():'--'}}</div>
+            <div class="pr-10 font-default tr">{{ltableData[0]?ltableData[0].Datasource:'--'}}</div>
           </el-col>
           <el-col :span="18">
             <el-table :data="rtableData" style="width: 100%;max-height:400px;" height="calc(100% - 160px)" @selection-change="changeSelection"
@@ -42,7 +42,13 @@
                 <el-table-column type="selection" class-name="bgf5"></el-table-column>
                 <el-table-column label="设备实例名称" prop="EquipLocalName" class-name="bgf5" show-overflow-tooltip></el-table-column>
                 <el-table-column label="设备实例编码" prop="ObjectID" class-name="bgfff" show-overflow-tooltip></el-table-column>
-                <el-table-column label="所在建筑楼层" prop="FloorLocalName" class-name="bgfff" show-overflow-tooltip> </el-table-column>
+                <el-table-column label="所在建筑楼层" class-name="bgfff">
+                  <template slot-scope="scope">
+                    <el-tooltip :content="scope.row.BuildLocalName+'-'+scope.row.FloorLocalName" placement="top">
+                      <div class="tool-tip">{{scope.row.BuildLocalName}}-{{scope.row.FloorLocalName}}</div>
+                    </el-tooltip>
+                  </template>
+                </el-table-column>
                 <el-table-column label="所在业务空间" prop="RoomLocalName" class-name="bgfff" show-overflow-tooltip></el-table-column>
               </el-table-column>
             </el-table>
@@ -74,8 +80,8 @@ export default {
   methods: {
     //弹窗显示
     showDialog(row) {
-      this.loading = true;
       this.dialogVisible = true;
+      this.loading = true;
       //需先用对象请求接口返回所需对象
       this.getDynamicQueryPrompt(row)
     },
@@ -196,5 +202,10 @@ export default {
   .tr {
     text-align: right;
   }
+  .tool-tip{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }
 </style>

src/components/point/dynamicdata/equipRules.vue

@@ -53,7 +53,13 @@
         <el-table-column prop="Datasource" label="数据源" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="SubTypeName" label="数字字典设备类型" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="EquipLocalName" label="对应的设备实例" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
-        <el-table-column prop="FloorLocalName" label="实例所在建筑楼层" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="FloorLocalName" label="实例所在建筑楼层" show-overflow-tooltip min-width="100">
+          <template slot-scope="scope">
+            <el-tooltip :content="scope.row.BuildLocalName+'-'+scope.row.FloorLocalName" placement="top">
+              <div class="tool-tip">{{scope.row.BuildLocalName}}-{{scope.row.FloorLocalName}}</div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column prop="RoomLocalName" label="实例所在业务空间" show-overflow-tooltip min-width="200"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
@@ -135,6 +141,7 @@ export default {
     },
     //清除对应关系
     handleDelete(index, row) {
+      console.log('delete')
       this.$refs.del.showDialog(row);
     },
     //改变pagesize
@@ -241,6 +248,11 @@ export default {
     .td-bl {
       border-left: 1px solid #ebeef5;
     }
+    .tool-tip{
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
   }
   .fr {
     padding-top: 10px;

src/components/point/dynamicdata/historyDialog.vue

@@ -55,7 +55,7 @@
             <template slot-scope="scope">
               <div v-for="t in scope.row.rightList" :key="t.id">
                 <el-tooltip :content="t.FloorLocalName" placement="top">
-                  <div>{{t.FloorLocalName}}</div>
+                  <div>{{t.BuildLocalName}}-{{t.FloorLocalName}}</div>
                 </el-tooltip>
               </div>
             </template>

src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -107,7 +107,7 @@
               <el-table-column label="所在建筑楼层">
                 <template slot-scope="scope">
                   <el-tooltip :content="scope.row.BuildLocalName+'-'+scope.row.FloorLocalName" placement="top">
-                    <span>{{scope.row.BuildLocalName}}-{{scope.row.FloorLocalName}}</span>
+                    <div class="tool-tip">{{scope.row.BuildLocalName}}-{{scope.row.FloorLocalName}}</div>
                   </el-tooltip>
                 </template>
               </el-table-column>
@@ -644,6 +644,11 @@ export default {
           text-align: right;
         }
       }
+      .tool-tip {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
   }
   .fr {