xiongzhu hace 2 años
padre
commit
fb6783165a
Se han modificado 4 ficheros con 17 adiciones y 7 borrados
  1. 4 0
      src/enums/index.js
  2. 11 5
      src/views/AccountsView.vue
  3. 1 1
      src/views/LogsView.vue
  4. 1 1
      src/views/TaskView.vue

+ 4 - 0
src/enums/index.js

@@ -34,7 +34,11 @@ export const TaskType = {
     swapEth: 'swapEth',
     swapEth: 'swapEth',
     syncSwapUsdc: 'syncSwapUsdc',
     syncSwapUsdc: 'syncSwapUsdc',
     syncSwapEth: 'syncSwapEth',
     syncSwapEth: 'syncSwapEth',
+    muteSwapUsdc: 'muteSwapUsdc',
+    muteSwapEth: 'muteSwapEth',
     addLiquidity: 'addLiquidity',
     addLiquidity: 'addLiquidity',
     removeLiquidity: 'removeLiquidity',
     removeLiquidity: 'removeLiquidity',
+    addLiquiditySyncSwap: 'addLiquiditySyncSwap',
+    removeLiquiditySyncSwap: 'removeLiquiditySyncSwap',
     mint: 'mint'
     mint: 'mint'
 }
 }

+ 11 - 5
src/views/AccountsView.vue

@@ -26,9 +26,9 @@
                     <WalletAddress :address="row.address" />
                     <WalletAddress :address="row.address" />
                 </template>
                 </template>
             </ElTableColumn>
             </ElTableColumn>
-            <ElTableColumn prop="ethBalance" label="ETH余额" min-width="160" />
-            <ElTableColumn prop="zkBalance" label="ETH余额(ZK)" min-width="160" />
-            <ElTableColumn prop="zkUsdcBalance" label="USDC余额(ZK)" min-width="160" />
+            <ElTableColumn prop="ethBalance" label="ETH余额" min-width="160" show-overflow-tooltip />
+            <ElTableColumn prop="zkBalance" label="ETH余额(ZK)" min-width="160" show-overflow-tooltip />
+            <ElTableColumn prop="zkUsdcBalance" label="USDC余额(ZK)" min-width="160" show-overflow-tooltip />
             <ElTableColumn prop="offBridgeNum" label="官方跨链" width="100" sortable></ElTableColumn>
             <ElTableColumn prop="offBridgeNum" label="官方跨链" width="100" sortable></ElTableColumn>
             <ElTableColumn
             <ElTableColumn
                 prop="lastOffBridge"
                 prop="lastOffBridge"
@@ -64,7 +64,13 @@
             <ElTableColumn prop="swapNum" label="swap" width="100" sortable></ElTableColumn>
             <ElTableColumn prop="swapNum" label="swap" width="100" sortable></ElTableColumn>
             <ElTableColumn prop="lastSwap" label="swap" width="150" :formatter="timeFormatter" sortable></ElTableColumn>
             <ElTableColumn prop="lastSwap" label="swap" width="150" :formatter="timeFormatter" sortable></ElTableColumn>
             <ElTableColumn prop="mintNum" label="mint" width="100" sortable></ElTableColumn>
             <ElTableColumn prop="mintNum" label="mint" width="100" sortable></ElTableColumn>
-            <ElTableColumn prop="lastMint" label="mint时间" width="150" :formatter="timeFormatter" sortable></ElTableColumn>
+            <ElTableColumn
+                prop="lastMint"
+                label="mint时间"
+                width="150"
+                :formatter="timeFormatter"
+                sortable
+            ></ElTableColumn>
             <ElTableColumn width="80" fixed="right">
             <ElTableColumn width="80" fixed="right">
                 <template #default="{ row }">
                 <template #default="{ row }">
                     <ElButton type="danger" size="small" @click.stop="deleteAccount(row)">删除</ElButton>
                     <ElButton type="danger" size="small" @click.stop="deleteAccount(row)">删除</ElButton>
@@ -96,7 +102,7 @@ import { ethers, Wallet } from 'ethers'
 import { RotateClockwise, DotsVertical } from '@vicons/tabler'
 import { RotateClockwise, DotsVertical } from '@vicons/tabler'
 import { useTimeFormatter } from '@/utils/formatter'
 import { useTimeFormatter } from '@/utils/formatter'
 
 
-const timeFormatter = useTimeFormatter()
+const timeFormatter = useTimeFormatter('MM-dd HH:mm:ss')
 const el = ref(null)
 const el = ref(null)
 const { width, height } = useElementSize(el)
 const { width, height } = useElementSize(el)
 const tableHeight = computed(() => {
 const tableHeight = computed(() => {

+ 1 - 1
src/views/LogsView.vue

@@ -46,7 +46,7 @@ import { useIntervalFn, useElementSize } from '@vueuse/core'
 import WalletAddress from '@/components/WalletAddress.vue'
 import WalletAddress from '@/components/WalletAddress.vue'
 import { RotateClockwise } from '@vicons/tabler'
 import { RotateClockwise } from '@vicons/tabler'
 
 
-const timeFormatter = useTimeFormatter('yyyy-MM-dd HH:mm:ss')
+const timeFormatter = useTimeFormatter('MM-dd HH:mm:ss')
 const taskTypeFormatter = useEnumFormatter(TaskType)
 const taskTypeFormatter = useEnumFormatter(TaskType)
 const pt = ref(null)
 const pt = ref(null)
 useIntervalFn(() => {
 useIntervalFn(() => {

+ 1 - 1
src/views/TaskView.vue

@@ -48,7 +48,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { http } from '@/plugins/http'
 import { http } from '@/plugins/http'
 
 
 const emit = defineEmits(['createTask'])
 const emit = defineEmits(['createTask'])
-const timeFormatter = useTimeFormatter('yyyy-MM-dd HH:mm:ss')
+const timeFormatter = useTimeFormatter('MM-dd HH:mm:ss')
 const taskTypeFormatter = useEnumFormatter(TaskType)
 const taskTypeFormatter = useEnumFormatter(TaskType)
 const pt = ref(null)
 const pt = ref(null)
 useIntervalFn(() => {
 useIntervalFn(() => {