央行可视化完成

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,6 +141,8 @@ getTransaction()
             </template>
           </el-table-column>
         </el-table>
+      
+      </div>
       <pagination
        v-show="broadcastTotal>0"
       :total="broadcastTotal"
@@ -146,8 +150,6 @@ getTransaction()
       v-model:limit="broadcastParams.size"
       @pagination="getBroadcast"
            />
-      </div>
-   
       <el-dialog
     v-model="dialogVisible"
     title="查看数字货币"
@@ -187,7 +189,6 @@ getTransaction()
   </el-form>
     <template #footer>
       <span class="dialog-footer">
-       
         <el-button type="primary" @click="decodeVisible = false">数字签名 生成数字货币</el-button>
       </span>
     </template>

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,6 +142,7 @@ getIndividual()
             </template>
           </el-table-column> -->
         </el-table>
+      </div>
       <pagination
        v-show="broadcastTotal>0"
       :total="broadcastTotal"
@@ -147,7 +150,6 @@ getIndividual()
       v-model:limit="broadcastParams.size"
       @pagination="getBroadcast"
            />
-      </div>
       <el-dialog
     v-model="dialogVisible"
     title="查看数字货币"

src/views/visual/components/merkle.vue

@@ -64,31 +64,31 @@ const getData=async()=>{
 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 {

src/views/visual/components/transaction-broadcast.vue

@@ -38,13 +38,13 @@
         </el-table-column>
       </el-table>
     </div>
-    <!-- <pagination
+    <pagination
        v-show="total1>0"
       :total="total1"
       v-model:page="params1.index"
       v-model:limit="params1.size"
-      @pagination="getDigital"
-           /> -->
+      @pagination="getIndividualAssets"
+           />
     <el-dialog v-model="QuotaVisible" title="区块哈希" width="34%" draggable>
       <div class="overview">
         <div class="overview-title">
@@ -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;
-      }
-    }
-  }
 }
 </style>

src/views/visual/components/transaction.vue

@@ -8,9 +8,7 @@
     <div class="visualization">
       <div class="visMain">
         <div class="top">
-          <span class="linear-gradient-text"
-            >{{transactionOverview.schoolName}}人民币数字货币交易总览</span
-          >
+          <span class="linear-gradient-text">{{transactionOverview.schoolName}}人民币数字货币交易总览</span>
         </div>
         <div class="main">
           <div class="leftMain">
@@ -337,7 +335,6 @@ onBeforeUnmount(() => {
   }
 }
 }
-
 .visualization {
   height: 760px;
   display: flex;