Browse Source

fix 'null' bug and pagetotal

haojianlong 5 years ago
parent
commit
0bb51c24c6

+ 8 - 4
src/components/point/dynamicdata/historyDialog.vue

@@ -54,8 +54,12 @@
           <el-table-column label="所在建筑楼层">
             <template slot-scope="scope">
               <div v-for="t in scope.row.rightList" :key="t.id">
-                <el-tooltip :content="t.BuildLocalName&&t.FloorLocalName?t.BuildLocalName+'-'+t.FloorLocalName:''" placement="top">
-                  <div>{{t.BuildLocalName&&t.FloorLocalName?t.BuildLocalName+'-'+t.FloorLocalName:''}}</div>
+                <el-tooltip
+                  :content="t.BuildLocalName&&t.FloorLocalName&&t.BuildLocalName!='null'&&t.FloorLocalName!='null'?t.BuildLocalName+'-'+t.FloorLocalName:''"
+                  placement="top">
+                  <div>
+                    {{t.BuildLocalName&&t.FloorLocalName&&t.BuildLocalName!='null'&&t.FloorLocalName!='null'?t.BuildLocalName+'-'+t.FloorLocalName:''}}
+                  </div>
                 </el-tooltip>
               </div>
             </template>
@@ -63,8 +67,8 @@
           <el-table-column label="所在业务空间">
             <template slot-scope="scope">
               <div v-for="t in scope.row.rightList" :key="t.id">
-                <el-tooltip :content="t.RoomLocalName" placement="top">
-                  <div>{{t.RoomLocalName}}</div>
+                <el-tooltip :content="t.RoomLocalName&&t.RoomLocalName!='null'?t.RoomLocalName:''" placement="top">
+                  <div>{{t.RoomLocalName&&t.RoomLocalName!='null'?t.RoomLocalName:''}}</div>
                 </el-tooltip>
               </div>
             </template>

+ 2 - 2
src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -368,7 +368,7 @@ export default {
       }
       this.lTableLoading = true;
       dynamicPendingPoint(param, res => {
-        this.lPage.total = res.Total;
+        this.lPage.total = res.PageSize < 50 ? res.pageSize : res.Total;
         if (this.lPage.pageNumber == 1) {
           this.LtableData = res.Content;
         } else {
@@ -411,7 +411,7 @@ export default {
       }
       this.rTableLoading = true;
       dynamicPendingobjs(param, res => {
-        this.rPage.total = res.Total;
+        this.rPage.total = res.PageSize < 50 ? res.pageSize : res.Total;
         if (this.rPage.pageNumber == 1) {
           this.RtableData = res.Content;
         } else {