From fdd10be6ce0ea2479d306cde7cc6bcaf74597a49 Mon Sep 17 00:00:00 2001 From: qinzhenpen Date: Wed, 15 Nov 2023 16:30:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=AE=E8=A1=8C=E5=8F=AF=E8=A7=86=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enterprise/deal/deal.vue | 9 ++-- src/views/individual/detail/detail.vue | 6 ++- src/views/visual/components/merkle.vue | 52 +++++++++---------- .../components/transaction-broadcast.vue | 43 +++++---------- src/views/visual/components/transaction.vue | 5 +- 5 files changed, 48 insertions(+), 67 deletions(-) diff --git a/src/views/enterprise/deal/deal.vue b/src/views/enterprise/deal/deal.vue index d2c9330..4082209 100644 --- a/src/views/enterprise/deal/deal.vue +++ b/src/views/enterprise/deal/deal.vue @@ -2,6 +2,7 @@ import * as enterpriseUser from '@/api/enterpriseUser'; import useUserStore from '@/store/modules/user'; const userStore = useUserStore(); +import {getSchoolId} from "@/utils/auth.js" // 验证 const dialogVisible = ref(false); // 解密 @@ -45,6 +46,7 @@ const transactionParams=reactive({ // 上链广播parasm const broadcastParams=reactive({ userId:userStore.userId, + schoolId:getSchoolId(), index:1, size:5 }) @@ -139,15 +141,15 @@ getTransaction() - + - - diff --git a/src/views/individual/detail/detail.vue b/src/views/individual/detail/detail.vue index 5d072dc..a008cca 100644 --- a/src/views/individual/detail/detail.vue +++ b/src/views/individual/detail/detail.vue @@ -2,6 +2,7 @@ import * as enterpriseUser from '@/api/enterpriseUser'; import * as user from '@/api/user' import useUserStore from "@/store/modules/user"; +import {getSchoolId} from "@/utils/auth.js" const userStore = useUserStore(); // 验证 const dialogVisible = ref(false); @@ -45,6 +46,7 @@ const IndividualParams=reactive({ }) const broadcastParams=reactive({ userId:userStore.userId, + schoolId:getSchoolId(), index:1, size:5 }) @@ -140,14 +142,14 @@ getIndividual() --> - + - { const height=ref(1084) const toggleFullscreen = () => { toggleFullscreenContainer('.merkleTree') - document.addEventListener('fullscreenchange', exitFullscreenHandler); - document.addEventListener('webkitfullscreenchange', exitFullscreenHandler); - document.addEventListener('mozfullscreenchange', exitFullscreenHandler); - document.addEventListener('MSFullscreenChange', exitFullscreenHandler); - const element = document.querySelector('.umlMain'); - element.style.position='relative' - element.style.transform='scale(1)' - element.style.top='0' - element.style.right='0' + // document.addEventListener('fullscreenchange', exitFullscreenHandler); + // document.addEventListener('webkitfullscreenchange', exitFullscreenHandler); + // document.addEventListener('mozfullscreenchange', exitFullscreenHandler); + // document.addEventListener('MSFullscreenChange', exitFullscreenHandler); + // const element = document.querySelector('.umlMain'); + // element.style.position='relative' + // element.style.transform='scale(1)' + // element.style.top='0' + // element.style.right='0' // height.value =950 } // 处理退出全屏的函数 - function exitFullscreenHandler() { - if (!document.fullscreenElement && !document.mozFullScreenElement && - !document.webkitFullscreenElement && !document.msFullscreenElement) { - // 退出全屏后执行的代码 - // console.log('已退出全屏'); - const element = document.querySelector('.umlMain'); - element.style.position='absolute' - element.style.transform='scale(0.44)' - element.style.top='' - element.style.right='' - // 在这里可以添加你想要执行的操作 - } -} +// function exitFullscreenHandler() { +// if (!document.fullscreenElement && !document.mozFullScreenElement && +// !document.webkitFullscreenElement && !document.msFullscreenElement) { +// // 退出全屏后执行的代码 +// // console.log('已退出全屏'); +// const element = document.querySelector('.umlMain'); +// element.style.position='absolute' +// element.style.transform='scale(0.44)' +// element.style.top='' +// element.style.right='' +// // 在这里可以添加你想要执行的操作 +// } +// } const cell=ref([]) const graph=ref([]) const umlContainer=ref(null) @@ -1757,10 +1757,10 @@ graph.value.zoomToFit({ padding: 10, maxScale: 1 }) .umlMain{ width: 3840px; height: 1084px; - transform: scale(0.44) translateX(0); - position: absolute; - right: -1085px; - top: -135px; + // transform: scale(0.44) translateX(0); + // position: absolute; + // right: -1085px; + // top: -135px; } } #umlContainer { diff --git a/src/views/visual/components/transaction-broadcast.vue b/src/views/visual/components/transaction-broadcast.vue index 155a970..de6e1ea 100644 --- a/src/views/visual/components/transaction-broadcast.vue +++ b/src/views/visual/components/transaction-broadcast.vue @@ -38,13 +38,13 @@ - + @pagination="getIndividualAssets" + />
@@ -80,17 +80,20 @@ import { getSchoolId } from "../../../utils/auth"; import { getTransactionBroadcast,getBroadcastDetails } from "@/api/user.js"; import {truncate} from '@/utils/index.js' const QuotaVisible = ref(false); -//获取交易广播 +//获取交易广播params +const params1 = reactive({ + index: 1, + size: 100, + schoolId: getSchoolId(), +}); +const total1=ref(0) const IndividualAssetsData = ref(null); // 存储详情 const detailsData = ref({}); const getIndividualAssets = () => { - getTransactionBroadcast({ - schoolId: getSchoolId(), - index: 1, - size: 100, - }).then((res) => { + getTransactionBroadcast(params1).then((res) => { IndividualAssetsData.value = res.data.list; + total1.value=res.data.total }); }; // 查看详情 @@ -193,27 +196,5 @@ getIndividualAssets(); } } } - .el-dialog__footer { - text-align: center; - padding-bottom: 30px; - .dialog-footer { - .el-button { - // width: 244px; - padding: 0 107px; - height: 38px; - border: 2px solid #25f4f9; - background: linear-gradient( - 0deg, - #0654b5 0%, - #003155 50%, - #2cd1e4 100% - ); - box-shadow: 0px 5px 6px 0px rgba(0, 48, 255, 0.77); - border-radius: 8px; - // background: url('../../../assets/images/中央银行-切图/验证+解密弹窗-切图/确定.png') no-repeat !important ; - // background-size:100% 100% !important; - } - } - } } diff --git a/src/views/visual/components/transaction.vue b/src/views/visual/components/transaction.vue index 6e129b0..9000715 100644 --- a/src/views/visual/components/transaction.vue +++ b/src/views/visual/components/transaction.vue @@ -8,9 +8,7 @@
- {{transactionOverview.schoolName}}人民币数字货币交易总览 + {{transactionOverview.schoolName}}人民币数字货币交易总览
@@ -337,7 +335,6 @@ onBeforeUnmount(() => { } } } - .visualization { height: 760px; display: flex;