Browse Source

修复 获取数据为空的情况给予默认值

会飞的电脑 2 years ago
parent
commit
6fb0507474

+ 4 - 4
src/components/Address.vue

@@ -99,10 +99,10 @@ export default {
     async generatePageCount() {
       const rstCount = await this.addressModel.paginateCount()
       if (rstCount.state && rstCount.data > 0) {
-        console.log("当前 分页数据,index:" + this.table.pageNum +
-            "\t 每页数据:" + this.table.pageSize +
-            "\t总数据量:" +rstCount.data +
-        "\t因有分页:"+(rstCount.data/this.table.pageSize))
+        // console.log("当前 分页数据,index:" + this.table.pageNum +
+        //     "\t 每页数据:" + this.table.pageSize +
+        //     "\t总数据量:" +rstCount.data +
+        // "\t因有分页:"+(rstCount.data/this.table.pageSize))
         // this.table.pageLength = rstCount.data / this.table.pageSize
       }
     },

+ 2 - 1
src/components/Pending.vue

@@ -24,7 +24,8 @@ export default {
         block: process.env.NODE_ENV === 'development' ? '27133638' : '',
         hash: '',
         from: '',
-        to: ''
+        to: '',
+        isBrowser:'1',
       },
       transfer: {
         from: '',

+ 3 - 3
src/components/viewer/Chain/Table.vue

@@ -302,15 +302,15 @@ export default {
 
     remButClick() {
       jquery(".v-row-group__header td.text-start").unbind('click')
-      console.log("移除点击事件:remButClick")
+      // console.log("移除点击事件:remButClick")
     },
 
     IsJsonString(str) {
       try {
       var zzz=  JSON.parse(str);
-        console.log('是', str,zzz);
+        // console.log('是', str,zzz);
       } catch (e) {
-        console.log('否', str);
+        // console.log('否', str);
         return false;
       }
       return true;

+ 1 - 1
src/components/viewer/Chain/Top.vue

@@ -33,7 +33,7 @@ export default {
   methods: {
     async generateTableDataAgain() {
       await this.packQuery()
-      console.log("---占位事件")
+      // console.log("---占位事件")
     },
     addClick() {
       this.showVisible()

+ 22 - 22
src/components/viewer/Table.vue

@@ -276,7 +276,7 @@ export default {
   methods: {
     async deleteByHash(hash_code, item) {
       if (confirm('要删吗?\n' + hash_code)) {
-        console.log(JSON.stringify(item))
+        // console.log(JSON.stringify(item))
         this.$msgkit.warning('还没有做,别急啊')
         // const rst = await EthMev.deleteByHash(hash_code)
         //
@@ -347,19 +347,19 @@ export default {
 
 
     currentItems(val) {
-      console.log("currentItems:", val)
+      // console.log("currentItems:", val)
     },
     input(val) {
-      console.log("input:", val)
+      // console.log("input:", val)
     },
     itemSelected(val) {
-      console.log("itemSelected:", val)
+      // console.log("itemSelected:", val)
     },
     pageCount(val) {
-      console.log("pageCount:", val)
+      // console.log("pageCount:", val)
     },
     pagination(val) {
-      console.log("pagination:", val)
+      // console.log("pagination:", val)
       if (val.itemsLength === 0) {
         this.remButRegroupAll()
       } else {
@@ -367,59 +367,59 @@ export default {
       }
     },
     toggleSelectAll(val) {
-      console.log("toggleSelectAll:", val)
+      // console.log("toggleSelectAll:", val)
     },
     updateExpanded(val) {
-      console.log("updateExpanded:", val)
+      // console.log("updateExpanded:", val)
     },
     updateGroupBy(val) {
-      console.log("updateGroupBy:", val)
+      // console.log("updateGroupBy:", val)
     },
     updateGroupEesc(val) {
-      console.log("updateGroupEesc:", val)
+      // console.log("updateGroupEesc:", val)
     },
     updateItemsPerPage(val) {
-      console.log("updateItemsPerPage:", val)
+      // console.log("updateItemsPerPage:", val)
     },
 
     updateMultiSort(val) {
-      console.log("updateMultiSort:", val)
+      // console.log("updateMultiSort:", val)
     },
 
     updateMustSort(val) {
-      console.log("updateMustSort:", val)
+      // console.log("updateMustSort:", val)
     },
 
     updateOptions(val) {
-      console.log("updateOptions:", val)
+      // console.log("updateOptions:", val)
     },
 
     updatePage(val) {
-      console.log("updatePage:", val)
+      // console.log("updatePage:", val)
     },
     updateSortBy(val) {
-      console.log("updateSortBy:", val)
+      // console.log("updateSortBy:", val)
     },
     updateSortDesc(val) {
-      console.log("updateSortDesc:", val)
+      // console.log("updateSortDesc:", val)
     },
 
     itemExpanded(item, val) {
-      console.log("itemExpanded:", item, val)
+      // console.log("itemExpanded:", item, val)
     },
 
     toggle(val) {
-      console.log("toggle:", val)
+      // console.log("toggle:", val)
     },
     dblclickRow(event, value) {
-      console.log("dblclickRow:", event, value)
+      // console.log("dblclickRow:", event, value)
     },
 
 
     //赋予按钮第二个点击事件
     addButClick(explorer) {
       jquery("div.v-data-table__wrapper table tbody").on("click", ".v-row-group__header td.text-start", function (dom) {
-        console.log("当前访问:",this.tx,dom)
+        // console.log("当前访问:",this.tx,dom)
         //需要移除临时 并已经作废的标签
         var array_del = jquery("a.temporary_label")
         for (var d = 0; d < array_del.length; d++) {
@@ -451,7 +451,7 @@ export default {
     //添加跳转标签
     addButRegroup(explorer) {
       var array = jquery("div.v-data-table__wrapper table tbody .v-row-group__header td.text-start");
-      console.log(array)
+      // console.log(array)
       for (var i = 0; i < array.length; i++) {
         //思路:根据 jq 拿到对应的td 然后循环遍历  动态添加元素标签
         var td = array.eq(i)[0]

+ 1 - 1
src/components/viewer/address/Table.vue

@@ -193,7 +193,7 @@ export default {
 
     remButClick(){
       jquery(".v-row-group__header td.text-start").unbind('click')
-      console.log("移除点击事件:remButClick")
+      // console.log("移除点击事件:remButClick")
     },
   },
   async mounted() {

+ 1 - 1
src/components/viewer/address/Top.vue

@@ -33,7 +33,7 @@ export default {
   methods: {
     async generateTableDataAgain() {
       await this.packQuery()
-      console.log("---占位事件")
+      // console.log("---占位事件")
     },
     addClick() {
       this.showVisible()

+ 1 - 1
src/components/viewer/history/Table.vue

@@ -285,7 +285,7 @@ export default {
   methods: {
     async deleteByHash(hash_code, item) {
       if (confirm('要删吗?\n' + hash_code)) {
-        console.log(JSON.stringify(item))
+        // console.log(JSON.stringify(item))
         this.$msgkit.warning('还没有做,别急啊')
         // const rst = await EthMev.deleteByHash(hash_code)
         //

+ 2 - 1
src/components/viewer/pending/Table.vue

@@ -286,7 +286,7 @@ export default {
   methods: {
     async deleteByHash(hash_code, item) {
       if (confirm('要删吗?\n' + hash_code)) {
-        console.log(JSON.stringify(item))
+        // console.log(JSON.stringify(item))
         this.$msgkit.warning('还没有做,别急啊')
         // const rst = await EthMev.deleteByHash(hash_code)
         //
@@ -329,6 +329,7 @@ export default {
     },
     showTradeInfo(item) {
       this.transferDetailsDialog.data = item
+      // console.log("??",item)
       this.transferDetailsDialog.visible = true
     },
     async inputPageNum() {

+ 4 - 0
src/plugins/kit/HashKit.js

@@ -19,6 +19,10 @@ export default class HashKit {
   }
 
   static generateColorByHash(hash) {
+   if(hash === ''){
+    return '数据有误'
+   }
+
     const hashSub = hash.substring(2, 5)
     let color = '#history'
 

+ 17 - 11
src/plugins/model/TxModel.js

@@ -84,27 +84,29 @@ export default class TxModel {
             localRecord.hash = (remoteRecord.hash === null ? '' : remoteRecord.hash)
             localRecord.blockNumber = (remoteRecord.blockNumber === null ? 0 : remoteRecord.blockNumber)
             localRecord.comment = (remoteRecord.comment === null ? '' : remoteRecord.comment)
-            localRecord.from = (remoteRecord.fromAddress === null ? '' : remoteRecord.fromAddress)
-            localRecord.to = (remoteRecord.toAddress === null ? '' : remoteRecord.toAddress)
+            localRecord.from = (remoteRecord.fromAddress === undefined || remoteRecord.fromAddress === null ? '' : remoteRecord.fromAddress)
+            localRecord.to = (remoteRecord.toAddress === undefined || remoteRecord.toAddress === null ? '' : remoteRecord.toAddress)
             localRecord.gasPrice = TxModel.parseGasPrice((remoteRecord.gasPriceStr === null ? '' : remoteRecord.gasPriceStr))
             localRecord.timestamp = remoteRecord.timestamp === null ? 0 : remoteRecord.timestamp
             localRecord.transferList = (remoteRecord.transferList === null ? {} : remoteRecord.transferList)
-            localRecord.fromName = remoteRecord.fromName
-            localRecord.toName = remoteRecord.toName
+            localRecord.fromName = (remoteRecord.fromName === undefined || remoteRecord.fromName === null ? '' : remoteRecord.fromName)
+            localRecord.toName = (remoteRecord.toName === null || remoteRecord.toName === undefined ? '' : remoteRecord.toName)
             localRecord.status = (remoteRecord.status === null ? '' : parseInt(remoteRecord.status))
             localRecord.index = remoteRecord.transactionIndex === null ? '' : parseInt(remoteRecord.transactionIndex)
             localRecord.type = (remoteRecord.tradeType === null ? '' : remoteRecord.tradeType)
-            // if (isNaN(localRecord.type))
-            // if (localRecord.type === NaN || localRecord.type === null || localRecord.type === undefined)
-            //     localRecord.type = ''
-
 
             // transferList的format
             for (const transfer of localRecord.transferList) {
+                transfer.from = (transfer.from === undefined || transfer.from === null ? '' : transfer.from)
+                transfer.to = (transfer.to === undefined || transfer.to === null ? '' : transfer.to)
+                transfer.token = (transfer.token === undefined || transfer.token === null ? '' : transfer.token)
+                transfer.amountStr = (transfer.amountStr === undefined || transfer.amountStr === null ? '' : transfer.amountStr)
+
                 try {
-                    if (transfer.tokenDecimals !== undefined && transfer.tokenDecimals !== null) {
+                    if (transfer.tokenDecimals !== undefined
+                        && transfer.tokenDecimals !== null) {
                         transfer.amount = parseInt(transfer.amountStr) / (10 ** transfer.tokenDecimals)
-                    } else {
+                    } else if (transfer.amountStr !== '') {
                         transfer.amount = parseInt(transfer.amountStr)
                     }
                 } catch (e) {
@@ -112,6 +114,8 @@ export default class TxModel {
                 }
                 if (isNaN(transfer.amount))
                     transfer.amount = 0
+
+
             }
             localRecord.isMev = remoteRecord.isMev === true
             localRecord.isBot = remoteRecord.isBot === true
@@ -119,7 +123,7 @@ export default class TxModel {
 
             return localRecord
         } catch (e) {
-            console.log('数据解析出现异常:', e)
+            // console.log('数据解析出现异常:', e)
             return undefined
         }
     }
@@ -135,4 +139,6 @@ export default class TxModel {
             return gasPriceStr
         }
     }
+
+
 }