فهرست منبع

History模块格式化部分基本完成

skyfffire 3 سال پیش
والد
کامیت
bd33024e7a
3فایلهای تغییر یافته به همراه44 افزوده شده و 19 حذف شده
  1. 20 17
      src/components/viewer/Table.vue
  2. 15 0
      src/components/viewer/table/BooleanViewer.vue
  3. 9 2
      src/plugins/model/Tx.js

+ 20 - 17
src/components/viewer/Table.vue

@@ -27,7 +27,7 @@
             <v-row>
               <v-col cols="5">
                 <v-btn icon elevation="0" color="red" large @click="deleteByHash(item.hash)">
-                  <v-icon large>mdi-delete-forever-outline</v-icon>
+                  <v-icon>mdi-delete-forever-outline</v-icon>
                 </v-btn>
               </v-col>
             </v-row>
@@ -88,20 +88,23 @@
           </div>
         </template>
         <template v-slot:item.isMev="{ item }">
-          {{ item.isMev }}
+          <BooleanViewer :value="item.isMev"></BooleanViewer>
         </template>
         <template v-slot:item.isBot="{ item }">
-          {{ item.isBot }}
+          <BooleanViewer :value="item.isBot"></BooleanViewer>
         </template>
         <template v-slot:item.maybeBot="{ item }">
-          {{ item.maybeBot }}
+          <BooleanViewer :value="item.maybeBot"></BooleanViewer>
         </template>
-        <template v-slot:item.pending="{ item }">
-          <div v-if="item.pending !== undefined">
-            {{ item.pending }}
+        <template v-slot:item.timestamp="{ item }">
+          {{ formatTimeBySixBitTimestamp(item.timestamp) }}
+        </template>
+        <template v-slot:item.comment="{ item }">
+          <div v-if="item.comment">
+            <span class="memo-span">{{ item.comment }}</span>
           </div>
           <div v-else>
-            [pending]
+            [comment]
           </div>
         </template>
         <!--tradeInfo-->
@@ -118,14 +121,6 @@
             <TradeInfo :item="item"></TradeInfo>
           </div>
         </template>
-        <template v-slot:item.comment="{ item }">
-          <div v-if="item.comment">
-            <span class="memo-span">{{ item.comment }}</span>
-          </div>
-          <div v-else>
-            [comment]
-          </div>
-        </template>
       </v-data-table>
 
       <!-- 底部分页 -->
@@ -163,17 +158,20 @@
 
 <script>
 import TradeInfo from '@/components/viewer/table/TradeInfoDetails'
+import BooleanViewer from '@/components/viewer/table/BooleanViewer'
 import HashKit from '@/plugins/kit/HashKit'
 import HttpKit from '@/plugins/kit/HttpKit'
+import TimeKit from '@/plugins/kit/TimeKit'
 
 export default {
   name: 'Table',
-  components: {TradeInfo},
+  components: {BooleanViewer, TradeInfo},
   props: ['query', 'page', 'table'],
   inject: ['generateTableData'],
   data: () => ({
     hashKit: HashKit,
     httpKit: HttpKit,
+    timeKit: TimeKit,
     dialog: {
       data: [],
       visible: false
@@ -183,6 +181,7 @@ export default {
   methods: {
     async deleteByHash(hash_code) {
       if (confirm('要删吗?\n' + hash_code)) {
+        this.$msgkit.warning('还没有做,别急啊')
         // const rst = await EthMev.deleteByHash(hash_code)
         //
         // if (rst.data.state) {
@@ -206,6 +205,10 @@ export default {
     async generateTableDataAgain() {
       this.tempPage = this.table.pageNum
       await this.generateTableData()
+    },
+    formatTimeBySixBitTimestamp(sixBitTimestamp) {
+      let lastThreeBit = (sixBitTimestamp + '').slice(-3)
+      return this.timeKit.getTime(sixBitTimestamp) + lastThreeBit
     }
   }
 }

+ 15 - 0
src/components/viewer/table/BooleanViewer.vue

@@ -0,0 +1,15 @@
+<template>
+  <span v-if="value" class="teal--text">yes</span>
+  <span v-else class="pink--text">no</span>
+</template>
+
+<script>
+export default {
+  name: 'BooleanViewer',
+  props: ['value']
+}
+</script>
+
+<style scoped>
+
+</style>

+ 9 - 2
src/plugins/model/Tx.js

@@ -54,7 +54,7 @@ export default class Tx {
       localRecord.comment= remoteRecord.comment
       localRecord.from = remoteRecord.fromAddress
       localRecord.to = remoteRecord.toAddress
-      localRecord.gasPrice = remoteRecord.gasPriceStr
+      localRecord.gasPrice = Tx.parseGasPrice(remoteRecord.gasPriceStr)
       localRecord.timestamp = remoteRecord.timestamp
       localRecord.transferList = remoteRecord.transferList
 
@@ -68,8 +68,15 @@ export default class Tx {
 
       return localRecord
     } catch (e) {
-      console.log(e)
       return undefined
     }
   }
+
+  static parseGasPrice(gasPriceStr) {
+    try {
+      return parseFloat(gasPriceStr) / 1e9
+    } catch (e) {
+      return gasPriceStr
+    }
+  }
 }