Sfoglia il codice sorgente

feat: 完善页面展示

million 1 anno fa
parent
commit
b154ddd471

+ 1 - 1
front/admin-front/src/layout/components/AppMain.vue

@@ -20,7 +20,7 @@ export default {
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  min-height: calc(100vh - 50px);
+  /*min-height: calc(100vh - 50px);*/
   position: relative;
   overflow: hidden;
   margin: 96px ;

+ 1 - 0
front/admin-front/src/layout/index.vue

@@ -57,6 +57,7 @@ export default {
     position: relative;
     height: 100%;
     width: 100%;
+    overflow: auto;
     &.mobile.openSidebar{
       position: fixed;
       top: 0;

+ 1 - 1
front/admin-front/src/views/address/index.vue

@@ -83,7 +83,7 @@
                   {{scope.row.groupName}}
                 </div>
                 <div class="walletName" v-if="scope.row.addressType === 1">
-                  {{scope.row.groupName}}-{{scope.$index+1}}
+                  {{scope.row.groupName}}-{{(scope.$index+1) + (table.page-1)*5}}
                 </div>
                 <div class="walletAddress">
                   {{scope.row.address}}

+ 15 - 14
front/admin-front/src/views/autoplay/index.vue

@@ -599,18 +599,18 @@
               <el-input v-model="batchExecutionParams.intervalMax" placeholder="输入最大间隔时间/分"></el-input>
             </div>
           </div>
-          <div class="item">
-            <div class="title">
-              交互金额
-            </div>
-            <el-input v-model="batchExecutionParams.amount" placeholder="输入最大交互金额"></el-input>
-          </div>
-          <div class="item">
-            <div class="title">
-              最大 Gas fee
-            </div>
-            <el-input v-model="batchExecutionParams.maxGas" placeholder="输入最大 Gas fee"></el-input>
-          </div>
+<!--          <div class="item">-->
+<!--            <div class="title">-->
+<!--              交互金额-->
+<!--            </div>-->
+<!--            <el-input v-model="batchExecutionParams.amount" placeholder="输入最大交互金额"></el-input>-->
+<!--          </div>-->
+<!--          <div class="item">-->
+<!--            <div class="title">-->
+<!--              最大 Gas fee-->
+<!--            </div>-->
+<!--            <el-input v-model="batchExecutionParams.maxGas" placeholder="输入最大 Gas fee"></el-input>-->
+<!--          </div>-->
           <div class="item" v-for="item in paramsData">
             <div class="title">
               {{ item.note }}
@@ -1000,9 +1000,10 @@ export default {
     //justify-content: space-between;
     gap: 20px;
     flex-wrap: wrap;
-
+    height: 650px;
+    overflow: auto;
     .app-container-table-main-item {
-      width: 345px;
+      width: 340px;
       height: 315px;
       background: #FFFFFF;
       border: 1px solid #2980FF;

+ 46 - 9
front/admin-front/src/views/dashboard/index.vue

@@ -111,17 +111,24 @@
             <div class="title">
               交互任务进度
             </div>
-            <div class="progressBox">
-              <div class="item" v-for="(item,index) in progressData">
-                <div class="name">
-                  {{ item.taskName }}
-                </div>
-                <div class="progress">
-                  <div class="progress" :style="{width:(item.finishCount/item.totalCount*100)+'%'}"></div>
+            <div style="margin-top: 20px;height: 230px;overflow: hidden" id="progressViewBox" @mouseenter="rollStop()" @mouseleave="rollStart(60)">
+              <div class="progressBox" id="progressBoxOne">
+                <div class="item" v-for="(item,index) in progressData">
+                  <div class="name">
+                    {{ item.taskName }}
+                  </div>
+                  <div class="progress">
+                    <div class="progress" :style="{width:(item.finishCount/item.totalCount*100)+'%'}"></div>
+                  </div>
                 </div>
               </div>
+              <div class="progressBox" id="progressBoxTwo">
+
+              </div>
             </div>
+
           </div>
+
           <div class="address">
             <div class="title">
               地址统计
@@ -343,7 +350,8 @@ export default {
       echartsAddressData:{
         xAxisData:[],
         seriesData:[]
-      }
+      },
+      timer:null
     };
   },
   mounted() {
@@ -352,6 +360,10 @@ export default {
     this.getDailyCost()
     this.getTaskProgress()
     this.getAddressGroup()
+    this.roll(60)
+  },
+  beforeDestroy() {
+    if(this.timer) clearInterval(this.timer)
   },
   methods: {
     initEchartsAddress() {
@@ -581,6 +593,31 @@ export default {
         })
         this.initEchartsAddress()
       })
+    },
+
+    roll(t) {
+      let ul1 = document.getElementById('progressBoxOne')
+      let ul2 = document.getElementById('progressBoxTwo')
+      let ulbox = document.getElementById('progressViewBox')
+      ul2.innerHTML = ul1.innerHTML
+      ulbox.scrollTop = 0
+      this.rollStart(t)
+    },
+    rollStart(t) {
+      let ul1 = document.getElementById('progressBoxOne')
+      let ul2 = document.getElementById('progressBoxTwo')
+      let ulbox = document.getElementById('progressViewBox')
+      this.rollStop();
+      this.timer = setInterval(()=>{
+        if(ulbox.scrollTop >= ul1.scrollHeight) {
+          ulbox.scrollTop = 0
+        } else {
+          ulbox.scrollTop++
+        }
+      },t)
+    },
+    rollStop(){
+      clearInterval(this.timer)
     }
   },
 };
@@ -822,7 +859,7 @@ export default {
               }
 
               .progress {
-                width: 180px;
+                width: 160px;
                 height: 20px;
                 background: #222222;
                 border-radius: 0 20px 20px 0;