fix build-floor and locationflag showbugs

src/components/point/dynamicdata/delRelationDialog.vue

@@ -11,7 +11,9 @@
               <el-table-column label="设备标识" align="right" class-name="bgfff">
                 <el-table-column label="数据源" prop="Datasource" align="right" class-name="bgfff" show-overflow-tooltip></el-table-column>
                 <el-table-column label="位置标签" prop="LocationFlag" align="right" class-name="bgfff" show-overflow-tooltip>
-                  <template slot-scope="scope">{{ scope.row.LocationFlag.toString() }}</template>
+                  <template slot-scope="scope">
+                    <div class="tool-tip">{{scope.row.LocationFlag.toString()}}</div>
+                  </template>
                 </el-table-column>
                 <el-table-column label="设备标识" prop="EquipmentMark" align="right" class-name="bgf5" show-overflow-tooltip></el-table-column>
                 <el-table-column type="selection" class-name="bgf5"></el-table-column>
@@ -44,8 +46,8 @@
                 <el-table-column label="设备实例编码" prop="ObjectID" 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 :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''" placement="top">
+                      <div class="tool-tip">{{scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''}}</div>
                     </el-tooltip>
                   </template>
                 </el-table-column>
@@ -73,7 +75,7 @@ export default {
       loading: false, //loading状态
       dialogWidth: "20%", //弹窗宽度
       selection: [],
-      deleDisabled: false,
+      deleDisabled: true,
       deleParam: []
     };
   },

src/components/point/dynamicdata/equipRules.vue

@@ -46,17 +46,17 @@
         <el-table-column prop="LocationFlag" label="位置标签" min-width="200">
           <template slot-scope="scope">
             <el-tooltip :content="scope.row.LocationFlag.toString()" placement="top">
-              <span>{{scope.row.LocationFlag.toString()}}</span>
+              <div class="tool-tip">{{scope.row.LocationFlag.toString()}}</div>
             </el-tooltip>
           </template>
         </el-table-column>
         <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 label="实例所在建筑楼层" 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 :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''" placement="top">
+              <div class="tool-tip">{{scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''}}</div>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -141,7 +141,6 @@ export default {
     },
     //清除对应关系
     handleDelete(index, row) {
-      console.log('delete')
       this.$refs.del.showDialog(row);
     },
     //改变pagesize

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

@@ -49,7 +49,7 @@
               <el-table-column label="位置标签" align="right">
                 <template slot-scope="scope">
                   <el-tooltip :content="scope.row.LocationFlag.toString()" placement="top">
-                    <span>{{scope.row.LocationFlag.toString()}}</span>
+                    <div class="tool-tip">{{scope.row.LocationFlag.toString()}}</div>
                   </el-tooltip>
                 </template>
               </el-table-column>
@@ -106,8 +106,8 @@
               <el-table-column prop="SubTypeName" label="设备类型" show-overflow-tooltip></el-table-column>
               <el-table-column label="所在建筑楼层">
                 <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 :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''" placement="top">
+                    <div class="tool-tip">{{scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''}}</div>
                   </el-tooltip>
                 </template>
               </el-table-column>