diff --git a/package.json b/package.json index 846cac7..480e527 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "pinia": "2.0.22", "vue": "3.2.45", "vue-cropper": "1.0.3", - "vue-router": "4.1.4" + "vue-router": "4.1.4", + "vue3-count-to": "^1.1.2" }, "devDependencies": { "@vitejs/plugin-vue": "3.1.0", diff --git a/src/api/user.js b/src/api/user.js index e9d22aa..3bb8b7b 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -167,4 +167,48 @@ export const getBalance = (query) => { method: 'get', params:query }) +} + + + + + + + + + + + +// ---------------------------------------------------------------------央行可视化 +// 交易总览 +export const getTransactionOverview = (query) => { + return request({ + url: 'api/stu/centralBank/getTransactionOverview', + method: 'get', + params:query + }) +} +// 获取交易区块 +export const getTransactionBlock = (query) => { + return request({ + url: 'api/stu/centralBank/getTransactionBlockList', + method: 'get', + params:query + }) +} +// 获取交易广播 +export const getTransactionBroadcast = (query) => { + return request({ + url: 'api/stu/centralBank/getTransactionBroadcastList', + method: 'get', + params:query + }) +} +//查看广播详情 +export const getBroadcastDetails = (query) => { + return request({ + url: 'api/stu/centralBank/getTransactionBroadcastList', + method: 'get', + params:query + }) } \ No newline at end of file diff --git a/src/assets/images/1110.zip b/src/assets/images/1110.zip new file mode 100644 index 0000000..a745786 Binary files /dev/null and b/src/assets/images/1110.zip differ diff --git a/src/assets/images/1110/按钮1-高亮.png b/src/assets/images/1110/按钮1-高亮.png new file mode 100644 index 0000000..db2d0c5 Binary files /dev/null and b/src/assets/images/1110/按钮1-高亮.png differ diff --git a/src/assets/images/1110/按钮1.png b/src/assets/images/1110/按钮1.png new file mode 100644 index 0000000..40b40b5 Binary files /dev/null and b/src/assets/images/1110/按钮1.png differ diff --git a/src/assets/images/1110/按钮2-高亮.png b/src/assets/images/1110/按钮2-高亮.png new file mode 100644 index 0000000..781480d Binary files /dev/null and b/src/assets/images/1110/按钮2-高亮.png differ diff --git a/src/assets/images/1110/按钮2.png b/src/assets/images/1110/按钮2.png new file mode 100644 index 0000000..59ffc69 Binary files /dev/null and b/src/assets/images/1110/按钮2.png differ diff --git a/src/assets/images/1110/按钮3-高亮.png b/src/assets/images/1110/按钮3-高亮.png new file mode 100644 index 0000000..c44d36d Binary files /dev/null and b/src/assets/images/1110/按钮3-高亮.png differ diff --git a/src/assets/images/1110/按钮3.png b/src/assets/images/1110/按钮3.png new file mode 100644 index 0000000..4cf9878 Binary files /dev/null and b/src/assets/images/1110/按钮3.png differ diff --git a/src/assets/images/1110/按钮4-高亮.png b/src/assets/images/1110/按钮4-高亮.png new file mode 100644 index 0000000..05868d4 Binary files /dev/null and b/src/assets/images/1110/按钮4-高亮.png differ diff --git a/src/assets/images/1110/按钮4.png b/src/assets/images/1110/按钮4.png new file mode 100644 index 0000000..0d4fe7d Binary files /dev/null and b/src/assets/images/1110/按钮4.png differ diff --git a/src/assets/images/__MACOSX/1110/._按钮1-高亮.png b/src/assets/images/__MACOSX/1110/._按钮1-高亮.png new file mode 100644 index 0000000..295db01 Binary files /dev/null and b/src/assets/images/__MACOSX/1110/._按钮1-高亮.png differ diff --git a/src/assets/images/切图.zip b/src/assets/images/切图.zip new file mode 100644 index 0000000..bc09f7a Binary files /dev/null and b/src/assets/images/切图.zip differ diff --git a/src/main.js b/src/main.js index f349872..034bfcd 100644 --- a/src/main.js +++ b/src/main.js @@ -42,7 +42,7 @@ import ImagePreview from "@/components/ImagePreview" import TreeSelect from '@/components/TreeSelect' // 字典标签组件 import DictTag from '@/components/DictTag' - +import countTo from 'vue3-count-to'; const app = createApp(App) // 全局方法挂载 @@ -66,6 +66,7 @@ app.component('RightToolbar', RightToolbar) app.component('Editor', Editor) app.use(router) +app.use(countTo) app.use(store) app.use(plugins) app.use(elementIcons) diff --git a/src/utils/auth.js b/src/utils/auth.js index dd53c5b..e31d7ee 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -31,7 +31,6 @@ export function getToken() { export function setToken(token) { return Cookies.set(TokenKey, token) } - export function removeToken() { return Cookies.remove(TokenKey) } diff --git a/src/utils/request.js b/src/utils/request.js index f3119ab..3836a27 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -22,7 +22,6 @@ const service = axios.create({ // 超时 timeout: 60000 }) - // request拦截器 service.interceptors.request.use(config => { // 是否需要设置 token 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/enterprise/index.vue b/src/views/enterprise/index.vue index cb9bbb6..23b8f29 100644 --- a/src/views/enterprise/index.vue +++ b/src/views/enterprise/index.vue @@ -15,10 +15,34 @@ const go = (idx) => { --> - + - diff --git a/src/views/visual/components/transaction.vue b/src/views/visual/components/transaction.vue index b0b7f1f..9000715 100644 --- a/src/views/visual/components/transaction.vue +++ b/src/views/visual/components/transaction.vue @@ -1,488 +1,671 @@ +// 获取交易总览数据 +const getTransactionOverviewData = () => { + getTransactionOverview({schoolId:getSchoolId()}).then(res=>{ + transactionOverview.value=res.data + console.log(transactionOverview.value,'人民币数字货币交易总览'); + }) +} +// 十秒发一次请求 +const time=setInterval(() => { + getTransactionOverviewData() +}, 10000); +// 页面销毁时清除定时器 +// 页面加载完毕 +const countToref = ref(null); +onMounted(() => { + getTransactionOverviewData() +}); +onBeforeUnmount(() => { + clearInterval(time); +}); + \ No newline at end of file +} + diff --git a/src/views/visual/index.vue b/src/views/visual/index.vue index 3d0d7bc..288bf88 100644 --- a/src/views/visual/index.vue +++ b/src/views/visual/index.vue @@ -23,10 +23,10 @@ const go = (idx) => {
Merkle
- - - - + + + +