1

data-ui/src/views/data/digitalagriculture/LivestockInfo/index.vue

@@ -104,10 +104,10 @@ export default {
         this.AgriculturalMachineryInfoList = response.rows;
         //查询到的数据去除逗号
         this.AgriculturalMachineryInfoList.forEach(item => {
-          item.designMaintainCount = item.designMaintainCount.replace(/,/g, '');
-          item.designOfftakeCount = item.designOfftakeCount.replace(/,/g, '');
-          item.realityMaintainCount = item.realityMaintainCount.replace(/,/g, '');
-          item.realityOfftakeCount = item.realityOfftakeCount.replace(/,/g, '');
+          item.designMaintainCount = item.designMaintainCount==null?item.designMaintainCount:item.designMaintainCount.replace(/,/g, '');
+          item.designOfftakeCount = item.designOfftakeCount==null?item.designOfftakeCount:item.designOfftakeCount.replace(/,/g, '');
+          item.realityMaintainCount = item.realityMaintainCount==null?item.realityMaintainCount:item.realityMaintainCount.replace(/,/g, '');
+          item.realityOfftakeCount = item.realityOfftakeCount==null?item.realityOfftakeCount:item.realityOfftakeCount.replace(/,/g, '');
         });
         this.loading = false;
       });

data-ui/src/views/data/digitalagriculture/animalhusbandry_info/index.vue

@@ -123,10 +123,10 @@ import {
         listAnimalHusbandryInfo(this.queryParams).then(response => {
           this.AgriculturalMachineryInfoList = response.rows;
           this.AgriculturalMachineryInfoList.forEach(item => {
-            item.designMaintainCount = item.designMaintainCount.replace(/,/g, '');
-            item.designOfftakeCount = item.designOfftakeCount.replace(/,/g, '');
-            item.realityMaintainCount = item.realityMaintainCount.replace(/,/g, '');
-            item.realityOfftakeCount = item.realityOfftakeCount.replace(/,/g, '');
+            item.designMaintainCount = item.designMaintainCount==null?item.designMaintainCount: item.designMaintainCount.replace(/,/g, '');
+            item.designOfftakeCount = item.designOfftakeCount == null?item.designOfftakeCount : item.designOfftakeCount.replace(/,/g, '');
+            item.realityMaintainCount = item.realityMaintainCount == null?item.realityMaintainCount : item.realityMaintainCount.replace(/,/g, '');
+            item.realityOfftakeCount = item.realityOfftakeCount == null? item.realityOfftakeCount: item.realityOfftakeCount.replace(/,/g, '');
           });
           this.loading = false;
         });