Compare commits

..

No commits in common. 'master' and 'dev_fjb' have entirely different histories.

Binary file not shown.

@ -6,7 +6,7 @@ export const uploadReport = (query) => {
method: 'post', method: 'post',
data:query data:query
}) })
} }
// 获取实验报告 // 获取实验报告
export const getReport = (query) => { export const getReport = (query) => {
return request({ return request({

@ -1,11 +1,9 @@
import hasRole from './permission/hasRole' import hasRole from './permission/hasRole'
import hasPermi from './permission/hasPermi' import hasPermi from './permission/hasPermi'
import copyText from './common/copyText' import copyText from './common/copyText'
import preReClick from './preRe/preReClick'
export default function directive(app){ export default function directive(app){
app.directive('hasRole', hasRole) app.directive('hasRole', hasRole)
app.directive('hasPermi', hasPermi) app.directive('hasPermi', hasPermi)
app.directive('copyText', copyText) app.directive('copyText', copyText)
app.directive('preReClick', preReClick)
} }

@ -1,13 +0,0 @@
export default {
mounted(el, binding) {
el.addEventListener('click', () => {
if (!el.disabled) {
el.disabled = true;
setTimeout(() => {
el.disabled = false;
}, binding.value || 2000)
}
})
}
}

@ -15,10 +15,10 @@ const service = axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分 // axios中请求配置有baseURL选项表示请求URL公共部分
// baseURL: import.meta.env.VITE_APP_BASE_API, // baseURL: import.meta.env.VITE_APP_BASE_API,
// baseURL: 'http://118.31.7.2:8800/', // baseURL: 'http://118.31.7.2:8800/',
// baseURL: 'http://192.168.2.15:8800/', baseURL: 'http://192.168.2.15:8800/',
// baseURL: 'http://192.168.2.4:8800/', // baseURL: 'http://192.168.2.4:8800/',
// baseURL: 'http://202.199.90.115:8800/', // baseURL: 'http://202.199.90.115:8800/',
baseURL: 'http://qkljr.sztzjy.com:91/', // baseURL: 'http://qkljr.sztzjy.com:91/',
// 超时 // 超时
timeout: 60000 timeout: 60000
}) })

@ -185,7 +185,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" prop="name" label="操作" width="200"> <el-table-column align="center" prop="name" label="操作" width="200">
<template #default="scope"> <template #default="scope">
<el-button link type="success" @click="redPacketvia(scope.row)" :disabled="scope.row.status == 1" v-preReClick> <el-button link type="success" @click="redPacketvia(scope.row)" :disabled="scope.row.status == 1">
<svg-icon icon-class="look"/>{{ scope.row.status ==1? "已发放":'发放' }} <svg-icon icon-class="look"/>{{ scope.row.status ==1? "已发放":'发放' }}
</el-button> </el-button>
<el-button link type="warning" @click="Details(scope.row)"> <el-button link type="warning" @click="Details(scope.row)">
@ -668,9 +668,9 @@ const submitForm=()=>{
if(isAddredParams.redPacketType=='等额红包'){ if(isAddredParams.redPacketType=='等额红包'){
isAddredParams.totalRedPacketAmount = isAddredParams.redPacketQuantity * isAddredParams.totalRedPacketAmount; isAddredParams.totalRedPacketAmount = isAddredParams.redPacketQuantity * isAddredParams.totalRedPacketAmount;
} }
if(valid){ if(valid){
if(isAddredParams.file === null) return proxy.$modal.msgError('请上传红包宣传图片') if(isAddredParams.file === null) return proxy.$modal.msgError('请上传红包宣传图片')
if(isAddredParams.redPacketQuantity>3) return proxy.$modal.msgError('红包数量不能超过3个')
const formData=new FormData() const formData=new FormData()
for(let key in isAddredParams){ for(let key in isAddredParams){
formData.append(key,isAddredParams[key]) formData.append(key,isAddredParams[key])

@ -280,8 +280,8 @@ const enterpriseaddRedPacket = () => {
} }
// = * // = *
if (valid) { if (valid) {
if (isAddredParams.file === '') return proxy.$modal.msgError("请上传红包宣传图片"); if (isAddredParams.file === '')
if(isAddredParams.redPacketQuantity>3) return proxy.$modal.msgError('红包数量不能超过3个') return proxy.$modal.msgError("请上传红包宣传图片");
const formData = new FormData(); const formData = new FormData();
for(let key in isAddredParams){ for(let key in isAddredParams){
formData.append(key,isAddredParams[key]) formData.append(key,isAddredParams[key])

@ -205,7 +205,7 @@ console.log(tableData,"tableData");
<template #default="scope" > <template #default="scope" >
<el-button link v-if="scope.row.node =='消费者'||scope.row.node =='企业'" @click="createNode(scope.row.node)"></el-button> <el-button link v-if="scope.row.node =='消费者'||scope.row.node =='企业'" @click="createNode(scope.row.node)"></el-button>
<el-button link v-if="scope.row.node =='消费者'||scope.row.node =='企业'" @click="createWallet(scope.row.node)"></el-button> <el-button link v-if="scope.row.node =='消费者'||scope.row.node =='企业'" @click="createWallet(scope.row.node)"></el-button>
<el-button link v-if="scope.row.node ==''" @click="recharge(scope.row,)" v-preReClick></el-button> <el-button link v-if="scope.row.node =='消费者'" @click="recharge(scope.row,)"></el-button>
<span v-if="scope.row.node =='商业银行'||scope.row.node =='中央银行'">/</span> <span v-if="scope.row.node =='商业银行'||scope.row.node =='中央银行'">/</span>
</template> </template>
</el-table-column> </el-table-column>

@ -441,7 +441,7 @@ getRedPacket()
</el-form> </el-form>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button type="primary" @click="getPacket" v-preReClick></el-button> <el-button type="primary" @click="getPacket"></el-button>
<el-button type="primary" @click="dialogVisible = false">取消</el-button> <el-button type="primary" @click="dialogVisible = false">取消</el-button>
</span> </span>
</template> </template>

@ -110,7 +110,7 @@ getCurrency()
</el-table-column> </el-table-column>
<el-table-column align="center" prop="address" label="操作" width="300"> <el-table-column align="center" prop="address" label="操作" width="300">
<template #default="scope"> <template #default="scope">
<el-button link type="warning" :disabled="scope.row.controlBitStatus== 'true'" @click="generate(scope.row)" v-preReClick> <el-button link type="warning" :disabled="scope.row.controlBitStatus== 'true'" @click="generate(scope.row)">
<svg-icon icon-class="generate"/>生成控制位 <svg-icon icon-class="generate"/>生成控制位
</el-button> </el-button>
<el-button link type="success" @click="look(scope.row.detailId)"> <el-button link type="success" @click="look(scope.row.detailId)">

@ -13,7 +13,6 @@ const loading=ref(false)
const dialogVisible = ref(false); const dialogVisible = ref(false);
// //
const dialogQuotaVisible = ref(false); const dialogQuotaVisible = ref(false);
const QuotaVisible = ref(false);
// //
const decodeVisible = ref(false); const decodeVisible = ref(false);
// total // total
@ -37,8 +36,8 @@ const getlist = async () => {
}; };
let controlData = reactive([]); let controlData = reactive([]);
const look = async (val) => { const look = async (val) => {
QuotaVisible.value = true; dialogQuotaVisible.value = true;
coding.value=val.detailId lookid.value=val.detailId
}; };
// //
const getSummaries = (params) => { const getSummaries = (params) => {
@ -138,12 +137,10 @@ function getChange() {
tableData.value = res.data.list; tableData.value = res.data.list;
}) })
}; };
// //
const destroy = () => { const destroy = () => {
lookid.value = ""; lookid.value = "";
encoding.value=""; encoding.value="";
coding.value=''
dialogVisible.value = false; dialogVisible.value = false;
if(dialogVisible.value==false){ if(dialogVisible.value==false){
controlData=[] controlData=[]
@ -151,12 +148,11 @@ const destroy = () => {
encoding.value='' encoding.value=''
}else if(QuotaVisible.value==false){ }else if(QuotaVisible.value==false){
coding.value='' coding.value=''
} }
console.log(coding.value,"coding.value");
}; };
// //
const QuotaVisible = ref(false);
// //
const getQuota = () => { const getQuota = () => {
@ -247,7 +243,6 @@ getlist();
> >
<template #default="scope"> <template #default="scope">
<el-button <el-button
:disabled="scope.row.digitalCurrencyGenerationStatus == 'true'"
link link
type="primary" type="primary"
@click="handleClose(scope.row)" @click="handleClose(scope.row)"
@ -378,7 +373,6 @@ getlist();
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button type="primary" @click="generate" <el-button type="primary" @click="generate"
v-preReClick
>数字签名 生成数字货币</el-button >数字签名 生成数字货币</el-button
> >
</span> </span>

@ -103,7 +103,7 @@ const getData=async()=>{
} }
// //
const height=ref(760) const height=ref(770)
const toggleFullscreen = () => { const toggleFullscreen = () => {
toggleFullscreenContainer('.merkleTree') toggleFullscreenContainer('.merkleTree')
document.addEventListener('fullscreenchange', exitFullscreenHandler); document.addEventListener('fullscreenchange', exitFullscreenHandler);
@ -117,7 +117,7 @@ const toggleFullscreen = () => {
if (!document.fullscreenElement && !document.mozFullScreenElement && if (!document.fullscreenElement && !document.mozFullScreenElement &&
!document.webkitFullscreenElement && !document.msFullscreenElement) { !document.webkitFullscreenElement && !document.msFullscreenElement) {
// 退 // 退
height.value=760 height.value=790
} }
} }
const cell=ref([]) const cell=ref([])

@ -27,12 +27,12 @@
<span>区块链</span> <span>区块链</span>
</div> </div>
<div class="block-item-content"> <div class="block-item-content">
<p>区块哈希{{ truncate(item.blockHash,15) }}</p> <p>区块哈希{{ item.blockHash }}</p>
<p>时间戳{{ item.timestamp }}</p> <p>时间戳{{ item.timestamp }}</p>
<p>前一区块哈希{{ truncate(item.previousBlock,15) }}</p> <p>前一区块哈希{{ item.previousBlock }}</p>
</div> </div>
<div class="block-item-footer"> <div class="block-item-footer">
交易数据{{ truncate(item.transactionCode,15) }} <span>交易数据{{ item.transactionCode }}</span>
</div> </div>
</div> </div>
</el-scrollbar> </el-scrollbar>
@ -44,7 +44,6 @@
import {getTransactionBlock} from '@/api/user.js' import {getTransactionBlock} from '@/api/user.js'
import {toggleFullscreenContainer} from '@/utils/index.js' import {toggleFullscreenContainer} from '@/utils/index.js'
import { getSchoolId } from '../../../utils/auth'; import { getSchoolId } from '../../../utils/auth';
import {truncate} from '@/utils/index.js'
const height = ref(600) const height = ref(600)
// //
const nodeNumber = ref(0) const nodeNumber = ref(0)
@ -170,7 +169,6 @@ onUnmounted(() => {
} }
} }
.block-item-footer { .block-item-footer {
display: block;
width: 242px; width: 242px;
height: 46px; height: 46px;
background: #2c6dff; background: #2c6dff;

@ -64,7 +64,7 @@
<span>交易总览</span> <span>交易总览</span>
</div> </div>
<div class="overview-content"> <div class="overview-content">
<p>交易哈希{{truncate(detailsData.transactionCode ,55) }}</p> <p>交易哈希{{truncate(detailsData.blockHash ,55) }}</p>
<p>交易结果{{ detailsData.transactionResult=="true" ? '成功' :'失败' }}</p> <p>交易结果{{ detailsData.transactionResult=="true" ? '成功' :'失败' }}</p>
<p>时间{{ parseTime(detailsData.timestamp, "{y}-{m}-{d} {h}:{i}:{s}") }}</p> <p>时间{{ parseTime(detailsData.timestamp, "{y}-{m}-{d} {h}:{i}:{s}") }}</p>
<p>发送方{{ detailsData.sender }}</p> <p>发送方{{ detailsData.sender }}</p>
@ -99,8 +99,14 @@ const getIndividualAssets = () => {
// //
const checkDetails = (id) => { const checkDetails = (id) => {
QuotaVisible.value = true; QuotaVisible.value = true;
getBroadcastDetails({
schoolId: id.schoolId,
index: 1,
size: 100,
}).then(res => {
// //
detailsData.value = id detailsData.value = res.data.list[0]
})
}; };
getIndividualAssets(); getIndividualAssets();
</script> </script>

Loading…
Cancel
Save