Merge remote-tracking branch 'origin/master'

front/admin-front/src/api/task.js

@@ -30,3 +30,10 @@ export function modifyTaskInfo(data) {
     data
   })
 }
+
+export function parameterSearch(data) {
+  return request({
+    url: '/ams/airdrop-task/params/' + data,
+    method: 'get'
+  })
+}

front/admin-front/src/views/autoplay/index.vue

@@ -168,7 +168,8 @@
               </div>
               <div class="webLink">
                 <img src="../../assets/autoplay/language.svg" alt="language">
-                {{currentTaskInfo.projectUrl}}
+<!--                {{currentTaskInfo.projectUrl}}-->
+                <a :href="currentTaskInfo.projectUrl" target="_blank">{{currentTaskInfo.projectUrl}}</a>
               </div>
             </div>
           </div>
@@ -312,7 +313,7 @@
                 总计交互地址: 3/100
               </div>
             </div>
-            <div class="right">
+            <div class="right" style="cursor: pointer" @click="refresh">
               <img src="../../assets/autoplay/Frame.svg" alt="Frame">
             </div>
           </div>
@@ -576,6 +577,12 @@
             </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}}
+            </div>
+            <el-input v-model="item.value"></el-input>
+          </div>
         </div>
         <div class="accountPassword" v-if="accountPassword">
           <div class="title">
@@ -608,7 +615,7 @@
 </template>
 
 <script>
-import {batchExecution, getExecutionRecord, modifyTaskInfo, taskPage} from "@/api/task";
+import {batchExecution, getExecutionRecord, modifyTaskInfo, parameterSearch, taskPage} from "@/api/task";
 import {getGroupList} from "@/api/adress";
 import {getInteractionRecord} from "@/api/record";
 
@@ -666,6 +673,7 @@ export default {
       currentRecordData:{
 
       },
+      paramsData:[],
       url:process.env.VUE_APP_BASE_API,
     }
   },
@@ -702,6 +710,9 @@ export default {
       this.currentTaskInfo.taskType = item.taskType
       this.batchExecutionParams.projectId = item.amsProjectId
       this.batchExecutionParams.taskId = item.amsTaskId
+      if(item.taskCode){
+        this.getParameterSearch(item.taskCode)
+      }
     },
     getWalletAddress() {
       getGroupList().then(res=>{
@@ -715,6 +726,7 @@ export default {
       })
     },
     batchExecutionTask() {
+      this.batchExecutionParams.airdropParams = this.paramsData
       batchExecution(this.batchExecutionParams).then(()=>{
         this.accountPassword = false
         this.drawerStrategy = false
@@ -761,6 +773,21 @@ export default {
       getInteractionRecord(params).then(res=>{
         this.ongoingData = res.records
       })
+    },
+    refresh(){
+      let params = {
+        page:1,
+        pageSize:10,
+        executeId:this.currentRecordData.executeId
+      }
+      getInteractionRecord(params).then(res=>{
+        this.ongoingData = res.records
+      })
+    },
+    getParameterSearch(taskCode){
+      parameterSearch(taskCode).then(res=>{
+        this.paramsData = res
+      })
     }
   }
 }

front/admin-front/src/views/dashboard/index.vue

@@ -490,6 +490,7 @@ export default {
             type: 'bar',
             stack: 'Total',
             color: '#2980FF',
+            barMaxWidth: '25px',
             emphasis: {
               focus: 'series'
             },
@@ -500,7 +501,7 @@ export default {
             type: 'bar',
             stack: 'Total',
             color: '#FFD428',
-            barWidth: '25%',
+            barMaxWidth: '25px',
             itemStyle: {
               borderRadius: [100, 100, 0, 0]
             },