diff --git a/dist.tar b/dist.tar deleted file mode 100644 index 026dde5..0000000 Binary files a/dist.tar and /dev/null differ diff --git a/src/assets/images/央行可视化监控中心-切图/交易广播/图标.png b/src/assets/images/41.png similarity index 100% rename from src/assets/images/央行可视化监控中心-切图/交易广播/图标.png rename to src/assets/images/41.png diff --git a/src/assets/images/央行可视化监控中心-切图/交易区块/节点数.png b/src/assets/images/node1.png similarity index 100% rename from src/assets/images/央行可视化监控中心-切图/交易区块/节点数.png rename to src/assets/images/node1.png diff --git a/src/assets/images/央行可视化监控中心-切图/交易区块/链高度.png b/src/assets/images/node2.png similarity index 100% rename from src/assets/images/央行可视化监控中心-切图/交易区块/链高度.png rename to src/assets/images/node2.png diff --git a/src/assets/images/央行可视化监控中心-切图/交易区块/链.png b/src/assets/images/链.png similarity index 100% rename from src/assets/images/央行可视化监控中心-切图/交易区块/链.png rename to src/assets/images/链.png diff --git a/src/utils/index.js b/src/utils/index.js index 5ab5da3..f63af59 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,4 +1,10 @@ import { parseTime } from './ruoyi' +// 全屏公共方法 +export function toggleFullscreenContainer(Dome) { + if (document.querySelector(Dome).requestFullscreen) { + document.querySelector(Dome).requestFullscreen(); + } else if (document.querySelector(Dome).mozRequestFullScreen) { /* Firefox */ } else if (document.querySelector(Dome).webkitRequestFullscreen) { /* Chrome, Safari 和 Opera */ } else if (fullscreenContainer.msRequestFullscreen) { /* IE/Edge */ } +} export function uuid() { var s = []; var hexDigits = "0123456789abcdef"; diff --git a/src/utils/request.js b/src/utils/request.js index e403d1e..193f556 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,12 +15,13 @@ const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 // baseURL: import.meta.env.VITE_APP_BASE_API, // baseURL: 'http://118.31.7.2:8800/', - baseURL: 'http://192.168.2.17:8800/', + // baseURL: 'http://192.168.2.17:8800/', // baseURL: 'http://202.199.90.115:8800/', - // baseURL: 'http://qkljr.sztzjy.com:91/', + baseURL: 'http://qkljr.sztzjy.com:91/', // 超时 timeout: 60000 }) + // request拦截器 service.interceptors.request.use(config => { // 是否需要设置 token diff --git a/src/views/individual/consumermall/consumermall.vue b/src/views/individual/consumermall/consumermall.vue index aac88b7..766e3f9 100644 --- a/src/views/individual/consumermall/consumermall.vue +++ b/src/views/individual/consumermall/consumermall.vue @@ -584,8 +584,8 @@ getRedPacket() // flex-wrap: wrap; .red_packet_item{ - display: inline-block; - width: 232px; + display: inline-block; + width: 232px; height: 283px; border-radius: 10px; background: url('../../../assets/images/个人用户-切图/消费商城/消费红包.png') no-repeat; diff --git a/src/views/visual/components/transaction-block.vue b/src/views/visual/components/transaction-block.vue index 406a690..2c36208 100644 --- a/src/views/visual/components/transaction-block.vue +++ b/src/views/visual/components/transaction-block.vue @@ -1,42 +1,157 @@ + - - \ No newline at end of file + } + :deep(.el-scrollbar__thumb){ + background-color: #2B89FF !important; + } +} + diff --git a/src/views/visual/components/transaction-broadcast.vue b/src/views/visual/components/transaction-broadcast.vue index 71f68ff..3e6d55d 100644 --- a/src/views/visual/components/transaction-broadcast.vue +++ b/src/views/visual/components/transaction-broadcast.vue @@ -1,42 +1,57 @@ + - - \ No newline at end of file + } +} + diff --git a/src/views/visual/index.vue b/src/views/visual/index.vue index 6e1dd42..2adf87a 100644 --- a/src/views/visual/index.vue +++ b/src/views/visual/index.vue @@ -6,119 +6,12 @@ import transactionNode from './components/transaction-node.vue'; import transactionBlock from './components/transaction-block.vue'; import transactionBroadcast from './components/transaction-broadcast.vue'; import merkle from './components/merkle.vue'; -import useUserStore from "@/store/modules/user"; -const userStore = useUserStore(); -// 引入路由进行跳转 -import { useRouter } from 'vue-router'; -const router = useRouter(); -// 验证 -const dialogVisible = ref(false); -// 解密 -const decodeVisible = ref(false); -// 表格条数 -const total = ref(0); -// 验证弹窗数组 -const dialogList = reactive([ - { - name: '兑换行是否有缴存足额的准备金？', - value: '1', - checked: false - }, - { - name: '兑换行公钥和私钥是否一致？', - value: '2', - checked: false - }, - { - name: '兑换行公钥和私钥是否一致？', - value: '3', - checked: false - } -]) + // 投放系统切换 const isDeployed = ref(1); const go = (idx) => { - isDeployed.value=idx - -} -const verifylParams= reactive({ - userId:userStore.userId, - size:1, - index:1 -}) -const verifylList= ref(null) -// 获取信息验证表格数据 -const getTableData = async () => { - try { - const res = await centralBank.getTableData(verifylParams) - verifylList.value = res.data.list - total.value = res.data.total - } catch (error) { - - } + isDeployed.value=idx } -// 解密params -const decryptParams = reactive({ - Abstract:'', - detailId:'', - publicKey:'' -}) -//解密函数 -const decryptData = (val) => { - decodeVisible.value = true - decryptParams.Abstract=val.transactionCode - decryptParams.detailId=val.detailId - console.log(val,"val"); -}; -const submitDecryptedForm = async() => { - try { - const res = await centralBank.decrypt(decryptParams) - if(res.code == 200){ - decodeVisible.value = false - proxy.resetForm('ruleFormRef') - getTableData() - - } - } catch (error) { - - } -}; - -const showValidationAlert = (code) => { - dialogVisible.value = true - decryptParams.detailId=code -}; -const showverify = async() => { - try { - const res = await centralBank.verify(decryptParams.detailId) - if(res.code == 200){ - dialogVisible.value = false - // proxy.resetForm('ruleFormRef') - getTableData() - - } - } catch (error) { - - } -}; -//申请 -const apply = async(code) => { - - try { - decryptParams.detailId=code - const res = await centralBank.applygenerate(decryptParams.detailId) - if(res.code == 200){ - getTableData() - proxy.$modal.msgSuccess(res.msg); - // dialogVisible.value = false - // proxy.resetForm('ruleFormRef') - } - } catch (error) { - - } -}; -// 验证选择 -getTableData()