fix time bug and fix null text

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

@@ -70,7 +70,7 @@
                   <el-checkbox v-model="t.checked"></el-checkbox>
                   <span>{{t.Proximity}}%</span>
                 </p>
-                <p>{{t.EquipmentMark}}</p>
+                <p>{{t.EquipmentMark&&t.EquipmentMark!='null'?t.EquipmentMark:''}}</p>
                 <p>{{t.LocationFlag.toString()}}</p>
                 <!-- <p>{{t.address}}</p> -->
               </div>
@@ -106,8 +106,10 @@
               <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?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 :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>
@@ -127,9 +129,10 @@
                   <span>{{t.Proximity}}%</span>
                 </p>
                 <p>{{t.EquipLocalName}}</p>
-                <p>{{t.BuildLocalName}}-{{t.FloorLocalName}}</p>
-                <p>{{t.RoomLocalName}}</p>
-                <p>{{t.InstallLocation}}</p>
+                <p>{{BuildLocalName&&BuildLocalName!='null'?t.BuildLocalName:''}}-{{t.FloorLocalName&&t.FloorLocalName!='null'?t.FloorLocalName:''}}
+                </p>
+                <p>{{t.RoomLocalName&&t.RoomLocalName!='null'?t.RoomLocalName:''}}</p>
+                <p>{{t.InstallLocation&&t.InstallLocation!='null'?t.InstallLocation:''}}</p>
               </div>
             </div>
           </transition>

src/views/point/dynamicdata/index.vue

@@ -91,7 +91,7 @@ export default {
           if (res.Content.length) {
             for (let i = 0; i < res.Content.length; i++) {
               if (res.Content[i].Type == "最后一次执行时间") {
-                this.lastUpdateTime = res.Content[i].Content;
+                this.lastUpdateTime = res.Content[i].Content.substr(0,res.Content[i].Content.lastIndexOf('.'));
                 this.tipsType = 1;
               }
               if (res.Content[i].Type == "原始点位增删") {