Просмотр исходного кода

Merge branch 'dev-meta' of xiongzhu/raex_back into master

sunkean 3 лет назад
Родитель
Сommit
7a30afb1a1

+ 6 - 0
src/main/java/com/izouma/nineth/domain/MetaTaskToUser.java

@@ -3,6 +3,7 @@ package com.izouma.nineth.domain;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.nineth.annotations.Searchable;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
 import com.izouma.nineth.enums.MetaTaskStatus;
 import com.izouma.nineth.enums.MetaTaskType;
 import io.swagger.annotations.ApiModel;
@@ -49,6 +50,11 @@ public class MetaTaskToUser extends BaseEntity{
     @ExcelProperty("任务类型")
     private MetaTaskType taskType;
 
+    @ApiModelProperty("奖励类型")
+    @ExcelProperty("奖励类型")
+    @Enumerated(EnumType.STRING)
+    private MetaAwardTypeEnum awardType;
+
     @ApiModelProperty("任务详情")
     @ExcelProperty("任务详情")
     @Column(columnDefinition = "TEXT")

+ 15 - 0
src/main/java/com/izouma/nineth/dto/FuAssetDTO.java

@@ -0,0 +1,15 @@
+package com.izouma.nineth.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FuAssetDTO {
+
+    private String prefixName;
+
+    private Long num;
+}

+ 2 - 0
src/main/java/com/izouma/nineth/enums/MetaAwardTypeEnum.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 @ApiModel("元宇宙奖励类型枚举")
 public enum MetaAwardTypeEnum {
 
+    NULL("空"),
+
     ACCESSORIES("配饰"),
 
     NFT("NFT"),

+ 4 - 0
src/main/java/com/izouma/nineth/repo/AssetRepo.java

@@ -1,6 +1,7 @@
 package com.izouma.nineth.repo;
 
 import com.izouma.nineth.domain.Asset;
+import com.izouma.nineth.dto.FuAssetDTO;
 import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.enums.CollectionType;
 import org.springframework.data.domain.Page;
@@ -142,4 +143,7 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
 
     @Query(value = "select a from Asset a where a.userId = ?6 and a.name like ?1 and a.name like ?4 and a.name not like ?5 and a.status in ?2 and a.id not in ?3 and a.del = false")
     List<Asset> findAllBoats(String name, List<AssetStatus> status, List<Long> boatIds, String like, String unLike, Long userId);
+
+    @Query(value = "select new com.izouma.nineth.dto.FuAssetDTO(a.prefixName, count(a.id)) from Asset a where a.userId = ?1 and a.status in ?2 and a.prefixName in ?3 and a.del = false group by a.prefixName")
+    List<FuAssetDTO> queryFu(Long userId, List<AssetStatus> status, List<String> prefixNames);
 }

+ 77 - 31
src/main/java/com/izouma/nineth/service/AssetService.java

@@ -1,5 +1,7 @@
 package com.izouma.nineth.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.google.common.collect.Lists;
 import com.google.common.hash.Hashing;
 import com.izouma.nineth.TokenHistory;
@@ -53,28 +55,28 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AssetService {
 
-    private AssetRepo               assetRepo;
-    private UserRepo                userRepo;
-    private CollectionRepo          collectionRepo;
-    private OrderRepo               orderRepo;
-    private TokenHistoryRepo        tokenHistoryRepo;
-    private SysConfigService        sysConfigService;
-    private RocketMQTemplate        rocketMQTemplate;
-    private GeneralProperties       generalProperties;
-    private ShowroomRepo            showroomRepo;
-    private ShowCollectionRepo      showCollectionRepo;
+    private AssetRepo assetRepo;
+    private UserRepo userRepo;
+    private CollectionRepo collectionRepo;
+    private OrderRepo orderRepo;
+    private TokenHistoryRepo tokenHistoryRepo;
+    private SysConfigService sysConfigService;
+    private RocketMQTemplate rocketMQTemplate;
+    private GeneralProperties generalProperties;
+    private ShowroomRepo showroomRepo;
+    private ShowCollectionRepo showCollectionRepo;
     private CollectionPrivilegeRepo collectionPrivilegeRepo;
-    private PasswordEncoder         passwordEncoder;
-    private MintActivityRepo        mintActivityRepo;
-    private DestroyRecordRepo       destroyRecordRepo;
-    private AirDropService          airDropService;
-    private HCChainService          hcChainService;
-    private RockRecordService       rockRecordService;
-    private RockRecordRepo          rockRecordRepo;
-    private AssetLockRepo           assetLockRepo;
-    private UserBalanceService      userBalanceService;
-    private PhotoAssetRepo          photoAssetRepo;
-    private NumberSeqRepo           numberSeqRepo;
+    private PasswordEncoder passwordEncoder;
+    private MintActivityRepo mintActivityRepo;
+    private DestroyRecordRepo destroyRecordRepo;
+    private AirDropService airDropService;
+    private HCChainService hcChainService;
+    private RockRecordService rockRecordService;
+    private RockRecordRepo rockRecordRepo;
+    private AssetLockRepo assetLockRepo;
+    private UserBalanceService userBalanceService;
+    private PhotoAssetRepo photoAssetRepo;
+    private NumberSeqRepo numberSeqRepo;
 
     public Page<Asset> all(PageQuery pageQuery) {
 
@@ -1020,16 +1022,16 @@ public class AssetService {
             if (tags.isEmpty()) return new PageImpl<>(Collections.emptyList());
             return assetRepo.findAll((Specification<Asset>) (root, query, criteriaBuilder) ->
                     query.distinct(true).where(
-                            // where userId=some id
-                            criteriaBuilder.equal(root.get("userId"), userId),
-                            // and (lockTo is null or (lockTo is not null and lockTo < now))
-                            criteriaBuilder.or(criteriaBuilder.isNull(root.get("lockTo")),
-                                    criteriaBuilder.and(criteriaBuilder.isNotNull(root.get("lockTo")),
-                                            criteriaBuilder.lessThan(root.get("lockTo"), LocalDateTime.now()))),
-                            // and status = 'NORMAL'
-                            criteriaBuilder.equal(root.get("status"), AssetStatus.NORMAL),
-                            // and has some tagId
-                            root.join("tags").get("id").in(tags.stream().map(Tag::getId).toArray()))
+                                    // where userId=some id
+                                    criteriaBuilder.equal(root.get("userId"), userId),
+                                    // and (lockTo is null or (lockTo is not null and lockTo < now))
+                                    criteriaBuilder.or(criteriaBuilder.isNull(root.get("lockTo")),
+                                            criteriaBuilder.and(criteriaBuilder.isNotNull(root.get("lockTo")),
+                                                    criteriaBuilder.lessThan(root.get("lockTo"), LocalDateTime.now()))),
+                                    // and status = 'NORMAL'
+                                    criteriaBuilder.equal(root.get("status"), AssetStatus.NORMAL),
+                                    // and has some tagId
+                                    root.join("tags").get("id").in(tags.stream().map(Tag::getId).toArray()))
                             .getRestriction(), pageable);
         } else {
             return assetRepo.findByUserIdAndStatusAndCompanyIdAndNameLike(userId, AssetStatus.NORMAL, companyId,
@@ -1268,4 +1270,48 @@ public class AssetService {
                 .duration(duration)
                 .build());
     }
+
+    public List<TransactionTopTenDTO> transactionTopTen() {
+        LocalDateTime localDateTime = LocalDateTime.now().plusDays(-7);
+        List<Map<String, String>> map = orderRepo.transactionTopTen(localDateTime);
+        JSONArray jsonArray = new JSONArray();
+        if (CollectionUtil.isEmpty(map)) {
+            return null;
+        }
+        jsonArray.addAll(map);
+        List<TransactionTopTenDTO> transactionTopTenDTOS = jsonArray.toJavaList(TransactionTopTenDTO.class);
+        if (CollectionUtil.isEmpty(transactionTopTenDTOS)) {
+            return null;
+        }
+        transactionTopTenDTOS.forEach(transactionTopTenDTO -> {
+            if (Objects.nonNull(transactionTopTenDTO.getId())) {
+                if (transactionTopTenDTO.getSource().equals(CollectionSource.OFFICIAL)) {
+                    Collection collection = collectionRepo.findById(transactionTopTenDTO.getId()).orElse(null);
+                    if (Objects.nonNull(collection)) {
+                        transactionTopTenDTO.setPic(collection.getPic());
+                    }
+                }
+                if (transactionTopTenDTO.getSource().equals(CollectionSource.TRANSFER)) {
+                    Asset asset = assetRepo.findById(transactionTopTenDTO.getId()).orElse(null);
+                    if (Objects.nonNull(asset)) {
+                        transactionTopTenDTO.setPic(asset.getPic());
+                    }
+                }
+            }
+            transactionTopTenDTO.setId(null);
+            transactionTopTenDTO.setSource(null);
+        });
+        return transactionTopTenDTOS;
+    }
+
+    public List<FuAssetDTO> queryFu() {
+        Long userId = SecurityUtils.getAuthenticatedUser().getId();
+        String prefixName = sysConfigService.getString("fu_prefixName");
+        if (StringUtils.isBlank(prefixName)) {
+            throw new BusinessException("缺少福分类配置");
+        }
+        String[] split = prefixName.split(",");
+        List<String> prefixNames = Arrays.asList(split);
+        return assetRepo.queryFu(userId, Constants.META_NORMAL_STATUS, prefixNames);
+    }
 }

+ 10 - 6
src/main/java/com/izouma/nineth/service/MetaTaskToUserService.java

@@ -34,7 +34,7 @@ public class MetaTaskToUserService {
 
     private MetaUserTaskProgressRepo metaUserTaskProgressRepo;
 
-    private final String PREFIX = "0 / ";
+    private final String PREFIX = "0/ ";
 
     public Page<MetaTaskToUser> all(PageQuery pageQuery) {
         return metaTaskToUserRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaTaskToUser.class), JpaUtils.toPageRequest(pageQuery));
@@ -66,6 +66,9 @@ public class MetaTaskToUserService {
         if (Objects.isNull(metaTask.getType())) {
             return MetaRestResult.returnError(String.format("任务[%S]缺少任务类型", metaTaskToUser.getTaskId()));
         }
+        if (Objects.isNull(metaTask.getAwardType())) {
+            return MetaRestResult.returnError(String.format("任务[%S]缺少任务奖励类型", metaTaskToUser.getTaskId()));
+        }
         if (Objects.isNull(metaTask.getDetail())) {
             return MetaRestResult.returnError(String.format("任务[%S]缺少任务详情", metaTaskToUser.getTaskId()));
         }
@@ -81,6 +84,7 @@ public class MetaTaskToUserService {
         metaTaskToUser.setTaskType(metaTask.getType());
         metaTaskToUser.setDetail(metaTask.getDetail());
         metaTaskToUser.setGetTime(LocalDateTime.now());
+        metaTaskToUser.setAwardType(metaTask.getAwardType());
         metaTaskToUser.setStatus(MetaTaskStatus.PROGRESS);
         return MetaRestResult.returnSuccess(metaTaskToUserRepo.save(metaTaskToUser));
     }
@@ -120,11 +124,11 @@ public class MetaTaskToUserService {
                     metaTaskToUser.setProcess(PREFIX.concat("1"));
                     break;
                 }
-                metaTaskToUser.setProcess(String.valueOf(signInSingleDay.size()).concat(" / 1"));
+                metaTaskToUser.setProcess(String.valueOf(signInSingleDay.size()).concat("/1"));
                 break;
             case SIGN_IN_CONTINUOUS:
                 int num = countSignIn(value, metaTaskToUser.getId());
-                metaTaskToUser.setProcess(String.valueOf(num).concat(" / 7"));
+                metaTaskToUser.setProcess(String.valueOf(num).concat("/7"));
                 break;
             case COLLECT_COLLECTION:
                 if (StringUtils.isBlank(value)) {
@@ -139,7 +143,7 @@ public class MetaTaskToUserService {
                     metaTaskToUser.setProcess(PREFIX.concat(String.valueOf(split.length)));
                     break;
                 }
-                metaTaskToUser.setProcess(String.valueOf(collectCollection.size()).concat(" / ").concat(String.valueOf(split.length)));
+                metaTaskToUser.setProcess(String.valueOf(collectCollection.size()).concat("/").concat(String.valueOf(split.length)));
                 break;
             case ON_LINE_TIME_DAILY:
                 if (StringUtils.isBlank(value)) {
@@ -153,7 +157,7 @@ public class MetaTaskToUserService {
                     metaTaskToUser.setProcess("0");
                     break;
                 }
-                metaTaskToUser.setProcess(onLineTimeDaily.getRemark().concat(" / ").concat(value));
+                metaTaskToUser.setProcess(onLineTimeDaily.getRemark().concat("/").concat(value));
                 break;
             case ACCUMULATE:
                 if (StringUtils.isBlank(value)) {
@@ -167,7 +171,7 @@ public class MetaTaskToUserService {
                     metaTaskToUser.setProcess(PREFIX.concat(value));
                     break;
                 }
-                metaTaskToUser.setProcess(String.valueOf(accumulate.size()).concat(" / ").concat(value));
+                metaTaskToUser.setProcess(String.valueOf(accumulate.size()).concat("/").concat(value));
                 break;
             default:
                 break;

+ 12 - 40
src/main/java/com/izouma/nineth/web/AssetController.java

@@ -1,14 +1,10 @@
 package com.izouma.nineth.web;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonView;
 import com.izouma.nineth.TokenHistory;
 import com.izouma.nineth.domain.Asset;
-import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.GiftOrder;
 import com.izouma.nineth.dto.*;
-import com.izouma.nineth.enums.CollectionSource;
 import com.izouma.nineth.enums.CollectionType;
 import com.izouma.nineth.enums.OperationSource;
 import com.izouma.nineth.exception.BusinessException;
@@ -43,13 +39,13 @@ import java.util.concurrent.ExecutionException;
 @RequestMapping("/asset")
 @AllArgsConstructor
 public class AssetController extends BaseController {
-    private AssetService            assetService;
-    private AssetRepo               assetRepo;
-    private GiftOrderService        giftOrderService;
-    private OrderRepo               orderRepo;
-    private CacheService            cacheService;
+    private AssetService assetService;
+    private AssetRepo assetRepo;
+    private GiftOrderService giftOrderService;
+    private OrderRepo orderRepo;
+    private CacheService cacheService;
     private UserAssetSummaryService userAssetSummaryService;
-    private CollectionRepo          collectionRepo;
+    private CollectionRepo collectionRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
 //    @PostMapping("/save")
@@ -260,36 +256,12 @@ public class AssetController extends BaseController {
     @GetMapping("/topTen")
     @Cacheable(value = "transactionTopTen")
     public List<TransactionTopTenDTO> transactionTopTen() {
-        LocalDateTime localDateTime = LocalDateTime.now().plusDays(-7);
-        List<Map<String, String>> map = orderRepo.transactionTopTen(localDateTime);
-        JSONArray jsonArray = new JSONArray();
-        if (CollectionUtil.isEmpty(map)) {
-            return null;
-        }
-        jsonArray.addAll(map);
-        List<TransactionTopTenDTO> transactionTopTenDTOS = jsonArray.toJavaList(TransactionTopTenDTO.class);
-        if (CollectionUtil.isEmpty(transactionTopTenDTOS)) {
-            return null;
-        }
-        transactionTopTenDTOS.forEach(transactionTopTenDTO -> {
-            if (Objects.nonNull(transactionTopTenDTO.getId())) {
-                if (transactionTopTenDTO.getSource().equals(CollectionSource.OFFICIAL)) {
-                    Collection collection = collectionRepo.findById(transactionTopTenDTO.getId()).orElse(null);
-                    if (Objects.nonNull(collection)) {
-                        transactionTopTenDTO.setPic(collection.getPic());
-                    }
-                }
-                if (transactionTopTenDTO.getSource().equals(CollectionSource.TRANSFER)) {
-                    Asset asset = assetRepo.findById(transactionTopTenDTO.getId()).orElse(null);
-                    if (Objects.nonNull(asset)) {
-                        transactionTopTenDTO.setPic(asset.getPic());
-                    }
-                }
-            }
-            transactionTopTenDTO.setId(null);
-            transactionTopTenDTO.setSource(null);
-        });
-        return transactionTopTenDTOS;
+        return assetService.transactionTopTen();
+    }
+
+    @GetMapping("/queryFu")
+    public List<FuAssetDTO> queryFu() {
+        return assetService.queryFu();
     }
 }
 

+ 266 - 265
src/main/vue/src/views/MetaTaskEdit.vue

@@ -1,273 +1,274 @@
 <template>
-    <div class="edit-view">
-        <page-title>
-            <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
-            <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-        </page-title>
-        <div class="edit-view__content-wrapper">
-            <div class="edit-view__content-section">
-                <el-form
-                    :model="formData"
-                    :rules="rules"
-                    ref="form"
-                    label-width="130px"
-                    label-position="right"
-                    size="small"
-                    style="max-width: 500px"
-                >
-                    <el-form-item prop="name" label="任务名称">
-                        <el-input v-model="formData.name"> </el-input>
-                    </el-form-item>
-                    <el-form-item prop="detail" label="详情" style="width: calc(100vw - 450px)">
-                        <el-input
-                            v-model="formData.detail"
-                            type="textarea"
-                            :autosize="{ minRows: 3, maxRows: 20 }"
-                            placeholder="请输入任务详情"
-                        >
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item prop="awardType" label="奖励类型">
-                        <el-select
-                            v-model="formData.awardType"
-                            clearable
-                            filterable
-                            placeholder="请选择"
-                            @change="changeAwardType"
-                        >
-                            <el-option
-                                v-for="item in awardTypeOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item
-                        prop="awardPic"
-                        label="奖励图片"
-                        v-if="formData.awardType && formData.awardType === 'NFT'"
-                    >
-                        <single-upload v-model="formData.awardPic"> </single-upload>
-                    </el-form-item>
-                    <el-form-item
-                        prop="goldNum"
-                        label="奖励金币数量"
-                        v-if="formData.awardType && formData.awardType === 'GOLD'"
-                    >
-                        <el-input-number type="goldNum" v-model="formData.goldNum" :step="1" :min="1">
-                        </el-input-number>
-                        <div class="tip">输入规则:正整数,最小为1</div>
-                    </el-form-item>
-                    <el-form-item prop="type" label="任务类型">
-                        <el-select v-model="formData.type" clearable filterable placeholder="请选择" @change="change">
-                            <el-option
-                                v-for="item in typeOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <template v-if="formData.type">
-                        <el-form-item v-if="formData.type === 'SIGN_IN_SINGLE_DAY'" prop="value" label="签到日期">
-                            <el-date-picker
-                                v-model="formData.value"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="指定签到日期"
-                            >
-                            </el-date-picker>
-                        </el-form-item>
-                        <el-form-item v-if="formData.type === 'SIGN_IN_CONTINUOUS'" prop="value" label="开始日期">
-                            <el-date-picker
-                                v-model="formData.value"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="指定开始日期"
-                            >
-                            </el-date-picker>
-                        </el-form-item>
-                        <el-form-item prop="value" label="藏品id" v-if="formData.type === 'COLLECT_COLLECTION'">
-                            <el-input v-model="formData.value" placeholder="请输入定藏品id"> </el-input>
-                            <div class="tip">多个藏品id请用空格隔开 例如 111 222 333</div>
-                        </el-form-item>
-                        <el-form-item prop="value" label="次数" v-if="formData.type === 'ACCUMULATE'">
-                            <el-input-number v-model="formData.value" :min="0"> </el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="value" label="在线时长(min)" v-if="formData.type === 'ON_LINE_TIME_DAILY'">
-                            <el-input-number v-model="formData.value" :min="0"> </el-input-number>
-                        </el-form-item>
-                    </template>
-                    <el-form-item prop="publish" label="是否发布">
-                        <el-switch v-model="formData.publish"> </el-switch>
-                    </el-form-item>
-                    <el-form-item prop="mark" label="是否展示角标">
-                        <el-switch v-model="formData.mark"> </el-switch>
-                    </el-form-item>
-                    <el-form-item class="form-submit">
-                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
-                        <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-                    </el-form-item>
-                </el-form>
-            </div>
-        </div>
-    </div>
+	<div class="edit-view">
+		<page-title>
+			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+		</page-title>
+		<div class="edit-view__content-wrapper">
+			<div class="edit-view__content-section">
+				<el-form
+					:model="formData"
+					:rules="rules"
+					ref="form"
+					label-width="130px"
+					label-position="right"
+					size="small"
+					style="max-width: 500px"
+				>
+					<el-form-item prop="name" label="任务名称">
+						<el-input v-model="formData.name"> </el-input>
+					</el-form-item>
+					<el-form-item prop="detail" label="详情" style="width: calc(100vw - 450px)">
+						<el-input
+							v-model="formData.detail"
+							type="textarea"
+							:autosize="{ minRows: 3, maxRows: 20 }"
+							placeholder="请输入任务详情"
+						>
+						</el-input>
+					</el-form-item>
+					<el-form-item prop="awardType" label="奖励类型">
+						<el-select
+							v-model="formData.awardType"
+							clearable
+							filterable
+							placeholder="请选择"
+							@change="changeAwardType"
+						>
+							<el-option
+								v-for="item in awardTypeOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item
+						prop="awardPic"
+						label="奖励图片"
+						v-if="formData.awardType && formData.awardType === 'NFT'"
+					>
+						<single-upload v-model="formData.awardPic"> </single-upload>
+					</el-form-item>
+					<el-form-item
+						prop="goldNum"
+						label="奖励金币数量"
+						v-if="formData.awardType && formData.awardType === 'GOLD'"
+					>
+						<el-input-number type="goldNum" v-model="formData.goldNum" :step="1" :min="1">
+						</el-input-number>
+						<div class="tip">输入规则:正整数,最小为1</div>
+					</el-form-item>
+					<el-form-item prop="type" label="任务类型">
+						<el-select v-model="formData.type" clearable filterable placeholder="请选择" @change="change">
+							<el-option
+								v-for="item in typeOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<template v-if="formData.type">
+						<el-form-item v-if="formData.type === 'SIGN_IN_SINGLE_DAY'" prop="value" label="签到日期">
+							<el-date-picker
+								v-model="formData.value"
+								type="date"
+								value-format="yyyy-MM-dd"
+								placeholder="指定签到日期"
+							>
+							</el-date-picker>
+						</el-form-item>
+						<el-form-item v-if="formData.type === 'SIGN_IN_CONTINUOUS'" prop="value" label="开始日期">
+							<el-date-picker
+								v-model="formData.value"
+								type="date"
+								value-format="yyyy-MM-dd"
+								placeholder="指定开始日期"
+							>
+							</el-date-picker>
+						</el-form-item>
+						<el-form-item prop="value" label="藏品id" v-if="formData.type === 'COLLECT_COLLECTION'">
+							<el-input v-model="formData.value" placeholder="请输入定藏品id"> </el-input>
+							<div class="tip">多个藏品id请用空格隔开 例如 111 222 333</div>
+						</el-form-item>
+						<el-form-item prop="value" label="次数" v-if="formData.type === 'ACCUMULATE'">
+							<el-input-number v-model="formData.value" :min="0"> </el-input-number>
+						</el-form-item>
+						<el-form-item prop="value" label="在线时长(min)" v-if="formData.type === 'ON_LINE_TIME_DAILY'">
+							<el-input-number v-model="formData.value" :min="0"> </el-input-number>
+						</el-form-item>
+					</template>
+					<el-form-item prop="publish" label="是否发布">
+						<el-switch v-model="formData.publish"> </el-switch>
+					</el-form-item>
+					<el-form-item prop="mark" label="是否展示角标">
+						<el-switch v-model="formData.mark"> </el-switch>
+					</el-form-item>
+					<el-form-item class="form-submit">
+						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+							删除
+						</el-button>
+						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</div>
+	</div>
 </template>
 <script>
 export default {
-    name: 'MetaTaskEdit',
-    created() {
-        if (this.$route.query.id) {
-            this.$http
-                .get('metaTask/get/' + this.$route.query.id)
-                .then(res => {
-                    this.formData = res;
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.$message.error(e.error);
-                });
-        }
-    },
-    data() {
-        return {
-            reg: /^[1-9]\d*$/,
-            saving: false,
-            formData: {},
-            rules: {
-                name: [
-                    {
-                        required: true,
-                        message: '请输入任务名称',
-                        trigger: 'blur'
-                    }
-                ],
-                detail: [
-                    {
-                        required: true,
-                        message: '请输入任务详情',
-                        trigger: 'blur'
-                    }
-                ],
-                type: [
-                    {
-                        required: true,
-                        message: '请输入任务类型',
-                        trigger: 'blur'
-                    }
-                ],
-                value: [
-                    {
-                        required: true,
-                        message: '请指定参数配置',
-                        trigger: 'blur'
-                    }
-                ],
-                goldNum: [
-                    {
-                        required: true,
-                        message: '请输入奖励金币数量',
-                        trigger: 'blur'
-                    },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!this.reg.test(value)) {
-                                callback(new Error('奖励金币数量必须为大于1的整数'));
-                                return;
-                            } else {
-                                callback();
-                            }
-                        }
-                    }
-                ],
-                awardType: [
-                    {
-                        required: true,
-                        message: '请选择奖励类型',
-                        trigger: 'blur'
-                    }
-                ],
-                awardPic: [
-                    {
-                        required: true,
-                        message: '请上传奖励图片',
-                        trigger: 'blur'
-                    }
-                ]
-            },
-            typeOptions: [
-                { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
-                { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
-                { label: '收集藏品', value: 'COLLECT_COLLECTION' },
-                { label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
-                { label: '累计', value: 'ACCUMULATE' }
-            ],
-            awardTypeOptions: [
-                { label: 'NFT', value: 'NFT' },
-                { label: '金币', value: 'GOLD' }
-            ]
-        };
-    },
-    methods: {
-        changeAwardType(row) {
-            this.$delete(this.formData, 'awardPic');
-            this.$delete(this.formData, 'goldNum');
-        },
-        change() {
-            if (this.formData.value) {
-                this.$delete(this.formData, 'value');
-            }
-        },
-        onSave() {
-            this.$refs.form.validate(valid => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-            let data = { ...this.formData };
+	name: 'MetaTaskEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('metaTask/get/' + this.$route.query.id)
+				.then(res => {
+					this.formData = res;
+				})
+				.catch(e => {
+					console.log(e);
+					this.$message.error(e.error);
+				});
+		}
+	},
+	data() {
+		return {
+			reg: /^[1-9]\d*$/,
+			saving: false,
+			formData: {},
+			rules: {
+				name: [
+					{
+						required: true,
+						message: '请输入任务名称',
+						trigger: 'blur'
+					}
+				],
+				detail: [
+					{
+						required: true,
+						message: '请输入任务详情',
+						trigger: 'blur'
+					}
+				],
+				type: [
+					{
+						required: true,
+						message: '请输入任务类型',
+						trigger: 'blur'
+					}
+				],
+				value: [
+					{
+						required: true,
+						message: '请指定参数配置',
+						trigger: 'blur'
+					}
+				],
+				goldNum: [
+					{
+						required: true,
+						message: '请输入奖励金币数量',
+						trigger: 'blur'
+					},
+					{
+						validator: (rule, value, callback) => {
+							if (!this.reg.test(value)) {
+								callback(new Error('奖励金币数量必须为大于1的整数'));
+								return;
+							} else {
+								callback();
+							}
+						}
+					}
+				],
+				awardType: [
+					{
+						required: true,
+						message: '请选择奖励类型',
+						trigger: 'blur'
+					}
+				],
+				awardPic: [
+					{
+						required: true,
+						message: '请上传奖励图片',
+						trigger: 'blur'
+					}
+				]
+			},
+			typeOptions: [
+				{ label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
+				{ label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
+				{ label: '收集藏品', value: 'COLLECT_COLLECTION' },
+				{ label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
+				{ label: '累计', value: 'ACCUMULATE' }
+			],
+			awardTypeOptions: [
+				{ label: '空', value: 'NULL' },
+				{ label: 'NFT', value: 'NFT' },
+				{ label: '金币', value: 'GOLD' }
+			]
+		};
+	},
+	methods: {
+		changeAwardType(row) {
+			this.$delete(this.formData, 'awardPic');
+			this.$delete(this.formData, 'goldNum');
+		},
+		change() {
+			if (this.formData.value) {
+				this.$delete(this.formData, 'value');
+			}
+		},
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
 
-            this.saving = true;
-            this.$http
-                .post('/metaTask/save', data, { body: 'json' })
-                .then(res => {
-                    this.saving = false;
-                    this.$message.success('成功');
-                    this.$router.go(-1);
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.saving = false;
-                    this.$message.error(e.error);
-                });
-        },
-        onDelete() {
-            this.$confirm('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
-                .then(() => {
-                    return this.$http.post(`/metaTask/del/${this.formData.id}`);
-                })
-                .then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                })
-                .catch(e => {
-                    if (e !== 'cancel') {
-                        console.log(e);
-                        this.$message.error((e || {}).error || '删除失败');
-                    }
-                });
-        }
-    }
+			this.saving = true;
+			this.$http
+				.post('/metaTask/save', data, { body: 'json' })
+				.then(res => {
+					this.saving = false;
+					this.$message.success('成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					console.log(e);
+					this.saving = false;
+					this.$message.error(e.error);
+				});
+		},
+		onDelete() {
+			this.$confirm('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+				.then(() => {
+					return this.$http.post(`/metaTask/del/${this.formData.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						console.log(e);
+						this.$message.error((e || {}).error || '删除失败');
+					}
+				});
+		}
+	}
 };
 </script>
 <style lang="less" scoped>

+ 239 - 238
src/main/vue/src/views/MetaTaskList.vue

@@ -1,248 +1,249 @@
 <template>
-	<div class="list-view">
-		<page-title>
-			<el-button
-				@click="addRow"
-				type="primary"
-				icon="el-icon-plus"
-				:disabled="fetchingData || downloading"
-				class="filter-item"
-			>
-				新增
-			</el-button>
-			<el-button
-				@click="download"
-				icon="el-icon-upload2"
-				:loading="downloading"
-				:disabled="fetchingData"
-				class="filter-item"
-			>
-				导出
-			</el-button>
-		</page-title>
-		<div class="filters-container">
-			<el-input
-				placeholder="搜索..."
-				v-model="search"
-				clearable
-				class="filter-item search"
-				@keyup.enter.native="getData"
-			>
-				<el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
-			</el-input>
-		</div>
-		<el-table
-			:data="tableData"
-			row-key="id"
-			ref="table"
-			header-row-class-name="table-header-row"
-			header-cell-class-name="table-header-cell"
-			row-class-name="table-row"
-			cell-class-name="table-cell"
-			:height="tableHeight"
-			v-loading="fetchingData"
-		>
-			<el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-			<el-table-column prop="id" label="ID" width="100"> </el-table-column>
-			<el-table-column prop="createdAt" label="创建时间"> </el-table-column>
-			<el-table-column prop="name" label="任务名称"> </el-table-column>
-			<el-table-column prop="type" label="任务类型" :formatter="typeFormatter"> </el-table-column>
-			<el-table-column prop="value" label="配置值"> </el-table-column>
-			<el-table-column prop="detail" label="详情"> </el-table-column>
-			<el-table-column prop="awardType" label="奖励类型" :formatter="awardTypeFormatter"> </el-table-column>
-			<el-table-column prop="awardPic" label="奖励图片">
-				<template slot-scope="{ row }">
-					<el-image
-						style="width: 30px; height: 30px"
-						:src="row.awardPic"
-						fit="cover"
-						:preview-src-list="[row.awardPic]"
-					>
-					</el-image>
-				</template>
-			</el-table-column>
-			<el-table-column prop="goldNum" label="奖励金币数量"> </el-table-column>
-			<el-table-column prop="publish" label="是否发布">
-				<template slot-scope="{ row }">
-					<el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column prop="mark" label="是否展示角标">
-				<template slot-scope="{ row }">
-					<el-tag :type="row.mark ? '' : 'info'"> {{ row.mark }} </el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column prop="finish" label="是否结束">
-				<template slot-scope="{ row }">
-					<el-tag :type="row.finish ? '' : 'info'"> {{ row.finish }} </el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作" align="center" fixed="right" width="250">
-				<template slot-scope="{ row }">
-					<el-button @click="editRow(row)" type="primary" size="mini" plain v-if="!row.finish">
-						编辑
-					</el-button>
-					<el-button @click="deleteRow(row)" type="danger" size="mini" plain> 删除 </el-button>
-					<el-button @click="finish(row)" type="danger" size="mini" plain v-if="!row.finish">
-						结束任务
-					</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div class="pagination-wrapper">
-			<el-pagination
-				background
-				@size-change="onSizeChange"
-				@current-change="onCurrentChange"
-				:current-page="page"
-				:page-sizes="[10, 20, 30, 40, 50]"
-				:page-size="pageSize"
-				layout="total, sizes, prev, pager, next, jumper"
-				:total="totalElements"
-			>
-			</el-pagination>
-		</div>
-	</div>
+    <div class="list-view">
+        <page-title>
+            <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
+                新增
+            </el-button>
+            <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="createdAt" label="创建时间"> </el-table-column>
+            <el-table-column prop="name" label="任务名称"> </el-table-column>
+            <el-table-column prop="type" label="任务类型" :formatter="typeFormatter"> </el-table-column>
+            <el-table-column prop="value" label="配置值"> </el-table-column>
+            <el-table-column prop="detail" label="详情"> </el-table-column>
+            <el-table-column prop="awardType" label="奖励类型" :formatter="awardTypeFormatter"> </el-table-column>
+            <el-table-column prop="awardPic" label="奖励图片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.awardPic"
+                        fit="cover"
+                        :preview-src-list="[row.awardPic]"
+                    >
+                    </el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="goldNum" label="奖励金币数量"> </el-table-column>
+            <el-table-column prop="publish" label="是否发布">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="mark" label="是否展示角标">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.mark ? '' : 'info'"> {{ row.mark }} </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="finish" label="是否结束">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.finish ? '' : 'info'"> {{ row.finish }} </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="250">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain v-if="!row.finish">
+                        编辑
+                    </el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain> 删除 </el-button>
+                    <el-button @click="finish(row)" type="danger" size="mini" plain v-if="!row.finish">
+                        结束任务
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
 </template>
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 
 export default {
-	name: 'MetaTaskList',
-	mixins: [pageableTable],
-	data() {
-		return {
-			multipleMode: false,
-			search: '',
-			url: '/metaTask/all',
-			downloading: false,
-			typeOptions: [
-				{ label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
-				{ label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
-				{ label: '收集藏品', value: 'COLLECT_COLLECTION' },
-				{ label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
-				{ label: '累计', value: 'ACCUMULATE' }
-			],
-			awardTypeOptions: [
-				{ label: 'NFT', value: 'NFT' },
-				{ label: '金币', value: 'GOLD' }
-			]
-		};
-	},
-	computed: {
-		selection() {
-			return this.$refs.table.selection.map(i => i.id);
-		}
-	},
-	methods: {
-		typeFormatter(row, column, cellValue, index) {
-			let selectedOption = this.typeOptions.find(i => i.value === cellValue);
-			if (selectedOption) {
-				return selectedOption.label;
-			}
-			return '';
-		},
-		awardTypeFormatter(row, column, cellValue, index) {
-			let selectedOption = this.awardTypeOptions.find(i => i.value === cellValue);
-			if (selectedOption) {
-				return selectedOption.label;
-			}
-			return '';
-		},
-		beforeGetData() {
-			return { search: this.search, query: { del: false } };
-		},
-		toggleMultipleMode(multipleMode) {
-			this.multipleMode = multipleMode;
-			if (!multipleMode) {
-				this.$refs.table.clearSelection();
-			}
-		},
-		addRow() {
-			this.$router.push({
-				path: '/metaTaskEdit',
-				query: {
-					...this.$route.query
-				}
-			});
-		},
-		editRow(row) {
-			this.$router.push({
-				path: '/metaTaskEdit',
-				query: {
-					id: row.id
-				}
-			});
-		},
-		download() {
-			this.downloading = true;
-			this.$axios
-				.get('/metaTask/excel', {
-					responseType: 'blob',
-					params: { size: 10000, query: { del: false } }
-				})
-				.then(res => {
-					console.log(res);
-					this.downloading = false;
-					const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-					const link = document.createElement('a');
-					link.href = downloadUrl;
-					link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
-					document.body.appendChild(link);
-					link.click();
-					link.remove();
-				})
-				.catch(e => {
-					console.log(e);
-					this.downloading = false;
-					this.$message.error(e.error);
-				});
-		},
-		operation1() {
-			this.$notify({
-				title: '提示',
-				message: this.selection
-			});
-		},
-		operation2() {
-			this.$message('操作2');
-		},
-		deleteRow(row) {
-			if (!row.finish) {
-				this.$alert('请先结束任务!', '警告', { type: 'error' });
-				return;
-			}
-			this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
-				.then(() => {
-					return this.$http.post(`/metaTask/del/${row.id}`);
-				})
-				.then(() => {
-					this.$message.success('删除成功');
-					this.getData();
-				})
-				.catch(e => {
-					if (e !== 'cancel') {
-						this.$message.error(e.error);
-					}
-				});
-		},
-		finish(row) {
-			this.$alert('任务结束后在不能再被领取,确定要结束任务吗?', '警告', { type: 'error' })
-				.then(() => {
-					return this.$http.post(`/metaTask/${row.id}/finish`);
-				})
-				.then(() => {
-					this.$message.success('结束成功');
-					this.getData();
-				})
-				.catch(e => {
-					if (e !== 'cancel') {
-						this.$message.error(e.error);
-					}
-				});
-		}
-	}
+    name: 'MetaTaskList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/metaTask/all',
+            downloading: false,
+            typeOptions: [
+                { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
+                { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
+                { label: '收集藏品', value: 'COLLECT_COLLECTION' },
+                { label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
+                { label: '累计', value: 'ACCUMULATE' }
+            ],
+            awardTypeOptions: [
+                { label: '空', value: 'NULL' },
+                { label: 'NFT', value: 'NFT' },
+                { label: '金币', value: 'GOLD' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        typeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        awardTypeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.awardTypeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/metaTaskEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/metaTaskEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/metaTask/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000, query: { del: false } }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            if (!row.finish) {
+                this.$alert('请先结束任务!', '警告', { type: 'error' });
+                return;
+            }
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaTask/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        finish(row) {
+            this.$alert('任务结束后在不能再被领取,确定要结束任务吗?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaTask/${row.id}/finish`);
+                })
+                .then(() => {
+                    this.$message.success('结束成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
 };
 </script>
 <style lang="less" scoped>