From fe02c17b263405059837da6e3e5f7a353df58e99 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 七月 2024 15:02:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java | 30 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsLinkTypePO.java | 108 ++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java | 14
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue | 1026 +++++++++++++++++++++++++++++--------
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue | 4
Source/plt-web/plt-web-ui/src/api/modeling/attributePool/api.js | 66 ++
Source/plt-web/plt-web-ui/src/api/modeling/statusPool/api.js | 9
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java | 210 +++++++
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue | 109 +++
9 files changed, 1,328 insertions(+), 248 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsLinkTypePO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsLinkTypePO.java
new file mode 100644
index 0000000..b161c8d
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsLinkTypePO.java
@@ -0,0 +1,108 @@
+package com.vci.po;
+
+import com.vci.starter.poi.annotation.ExcelColumn;
+import com.vci.starter.web.pagemodel.BaseModelVO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 閾炬帴绫诲瀷瀵煎叆瀵硅薄
+ * @author yuxc
+ * @date 2024/7/30 16:27
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OsLinkTypePO extends BaseModelVO {
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = -2239512786206928201L;
+
+ /**
+ * 鎵�鍦ㄦ暟鎹
+ */
+ @ExcelColumn(rowIndexColumn = true,value = "")
+ private String rowIndex;
+
+ /**
+ * 鏍囩
+ */
+ @ExcelColumn(value="鏍囩",nullable = false)
+ private String tag;
+
+ /**
+ * 鍚嶇О
+ */
+ @ExcelColumn(value="鍚嶇О",nullable = false)
+ private String name;
+
+ /**
+ * 鎻忚堪
+ */
+ @ExcelColumn(value="鎻忚堪")
+ private String description;
+
+ /**
+ * 褰㈢姸
+ */
+ @ExcelColumn(value="褰㈢姸")
+ private String shape;
+
+ /**
+ * to绔搴斿叧绯�
+ */
+ @ExcelColumn(value="To绔搴斿叧绯�")
+ private String relationTo;
+
+ /**
+ * From绔搴斿叧绯�
+ */
+ @ExcelColumn(value="From绔搴斿叧绯�")
+ private String relationFrom;
+
+// /**
+// * 瀵瑰簲鍏崇郴锛宖rom绔湪鍓嶏紝to绔湪鍚�
+// */
+// @ExcelColumn(value="瀵瑰簲鍏崇郴锛宖rom绔湪鍓嶏紝to绔湪鍚�")
+// private String relation;
+
+ /**
+ * To绔富绫诲瀷
+ */
+ @ExcelColumn(value="To绔富绫诲瀷")
+ private String primitivesTo;
+
+ /**
+ * From绔富绫诲瀷
+ */
+ @ExcelColumn(value="From绔富绫诲瀷")
+ private String primitivesFrom;
+
+ /**
+ * 瀹炵幇绫�
+ */
+ @ExcelColumn(value="瀹炵幇绫�")
+ private String implClass;
+
+ /**
+ * From绔被鍨嬪垪琛�
+ */
+ @ExcelColumn(value="From绔被鍨嬪垪琛�")
+ private String btmItemsFrom;
+
+ /**
+ * To绔被鍨嬪垪琛�
+ */
+ @ExcelColumn(value="To绔被鍨嬪垪琛�")
+ private String btmItemsTo;
+
+ /**
+ * 灞炴�у垪琛�
+ */
+ @ExcelColumn(value="灞炴�у垪琛�")
+ private String attributes;
+
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java
index 5d9a344..eededfb 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java
@@ -1,14 +1,17 @@
package com.vci.web.controller;
+import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.ltm.LinkType;
import com.vci.pagemodel.OsBtmTypeAttributeVO;
import com.vci.pagemodel.OsLinkTypeAttributeVO;
import com.vci.pagemodel.OsLinkTypeVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
+import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.service.OsLinkTypeServiceI;
import org.apache.commons.lang3.StringUtils;
@@ -17,7 +20,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
@@ -227,4 +233,28 @@
return objectBaseResult;
}
}
+
+ /**
+ * 瀵煎嚭閾炬帴绫诲瀷
+ * name 閾炬帴绫诲瀷鍚嶇О
+ * @return
+ */
+ @GetMapping("/expData")
+ public void expData(String name,HttpServletResponse response) throws PLException, IOException {
+ linkTypeService.expData(name, response);
+ }
+
+ /**
+ * 瀵煎叆閾炬帴绫诲瀷
+ * @param file 涓婁紶鐨勬枃浠�
+ * @return
+ */
+ @PostMapping("/impData")
+ @VciUnCheckRight
+ public BaseResult impData(MultipartFile file){try {
+ return linkTypeService.impData(file);
+ }catch (Throwable e) {
+ throw new VciBaseException(VciBaseUtil.getExceptionMessage(e),new String[0],e);
+ }
+ }
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java
index 0fae7cb..d81d452 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java
@@ -8,7 +8,9 @@
import com.vci.pagemodel.OsBtmTypeAttributeVO;
import com.vci.pagemodel.OsLinkTypeAttributeVO;
import com.vci.pagemodel.OsLinkTypeVO;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Collection;
import java.util.List;
@@ -145,4 +147,16 @@
* @return 鍒涘缓缁撴灉
*/
BaseResult createView() throws PLException;
+ /**
+ * 瀵煎嚭閾炬帴绫诲瀷
+ * name 閾炬帴绫诲瀷鍚嶇О
+ * @return 鍒涘缓缁撴灉
+ */
+ void expData(String oid, HttpServletResponse response) throws PLException, IOException;
+ /**
+ * 瀵煎叆閾炬帴绫诲瀷
+ * @param file 涓婁紶鐨勬枃浠�
+ * @return
+ */
+ BaseResult impData(MultipartFile file) throws Exception;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
index 8b2cf40..febe978 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
@@ -1,26 +1,40 @@
package com.vci.web.service.impl;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.corba.omd.btm.BizType;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.ltm.LinkType;
+import com.vci.corba.omd.ltm.LinkTypeServicePrx;
+import com.vci.dto.OsAttributeDTO;
+import com.vci.omd.constants.LinkTypeConstants;
import com.vci.omd.utils.ObjectTool;
import com.vci.pagemodel.*;
+import com.vci.po.OsAttributePO;
+import com.vci.po.OsLinkTypePO;
+import com.vci.starter.poi.bo.ReadExcelOption;
+import com.vci.starter.poi.bo.WriteExcelData;
+import com.vci.starter.poi.bo.WriteExcelOption;
+import com.vci.starter.poi.constant.ExcelLangCodeConstant;
+import com.vci.starter.poi.util.ExcelUtil;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
+import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.BeanUtil;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.util.VciDateUtil;
+import com.vci.starter.web.util.*;
import com.vci.model.OsLinkTypeDO;
import com.vci.web.service.*;
+import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
+import javafx.scene.shape.HLineTo;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,8 +42,10 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -40,6 +56,16 @@
*/
@Service
public class OsLinkTypeServiceImpl implements OsLinkTypeServiceI {
+
+ private static final String OID = "oid";
+ private static final String NAME = "name";
+ private static final String LABEL = "label";
+ private static final String DESCRIPTION = "description";
+ private static final String TS = "ts";
+ private static final String CREATOR = "creator";
+ private static final String CREATETIME = "createTime";
+ private static final String MODIFIER = "modifier";
+ private static final String MODIFYTIME = "modifyTime";
/**
* 鏃ュ織
@@ -487,6 +513,182 @@
}
}
+ /**
+ * 瀵煎嚭閾炬帴绫诲瀷
+ * name 閾炬帴绫诲瀷鍚嶇О
+ * @return 鍒涘缓缁撴灉
+ */
+ @Override
+ public void expData(String names, HttpServletResponse response) throws PLException, IOException {
+ String defaultTempFolder = LocalFileUtil.getDefaultTempFolder();
+ //鍐檈xcel
+ String excelPath = defaultTempFolder + File.separator + "lt.xls";
+ //璁剧疆鍒楀悕
+ List<String> columns = new ArrayList<>(
+ Arrays.asList("鍚嶇О", "鏍囩", "瀹炵幇绫�", "褰㈢姸", "From绔被鍨嬪垪琛�", "From绔富绫诲瀷", "From绔搴斿叧绯�",
+ "To绔被鍨嬪垪琛�", "To绔富绫诲瀷", "To绔搴斿叧绯�", "灞炴�у垪琛�", "鎻忚堪")
+ );
+ try {
+ new File(excelPath).createNewFile();
+ //璁剧疆鍒�
+ List<WriteExcelData> excelDataList = new ArrayList<>();
+ //璁剧疆鍒楀ご
+ for (int index = 0; index < columns.size(); index++) {
+ excelDataList.add(new WriteExcelData(0,index, columns.get(index)));
+ }
+ HashSet<String> attributes = new HashSet<>();
+ int i = 0;
+ for (String name : names.split(",")) {
+ LinkType lt = platformClientUtil.getLinkTypeService().getLinkType(name);
+ excelDataList.add(new WriteExcelData(i+1,0, lt.name));
+ excelDataList.add(new WriteExcelData(i+1,1, lt.tag));
+ excelDataList.add(new WriteExcelData(i+1,2, lt.implClass));
+ excelDataList.add(new WriteExcelData(i+1,3, lt.shape));
+ excelDataList.add(new WriteExcelData(i+1,4, String.join(",",lt.btmItemsFrom)));
+ excelDataList.add(new WriteExcelData(i+1,5, lt.primitivesFrom));
+ excelDataList.add(new WriteExcelData(i+1,6, lt.relationFrom));
+ excelDataList.add(new WriteExcelData(i+1,7, String.join(",",lt.btmItemsTo)));
+ excelDataList.add(new WriteExcelData(i+1,8, lt.primitivesTo));
+ excelDataList.add(new WriteExcelData(i+1,9, lt.relationTo));
+ excelDataList.add(new WriteExcelData(i+1,10, String.join(",",lt.attributes)));
+ excelDataList.add(new WriteExcelData(i+1,11, lt.description));
+ attributes.addAll(Arrays.asList(lt.attributes));
+ i++;
+ }
+ WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
+ ExcelUtil.writeDataToFile(excelPath, excelOption);
+ //瀵煎嚭灞炴��
+ String attrPath = attributeService.exportAttributes("attr",
+ String.valueOf(attributes.stream().collect(Collectors.joining(","))));
+ //绉诲姩灞炴�у埌閾炬帴绫诲瀷鏂囦欢澶归噷闈㈠幓
+ FileUtil.move(new File(attrPath), new File(defaultTempFolder),true);
+ FileUtil.del(attrPath.substring(0,attrPath.lastIndexOf("\\")));
+ //todo 瀵煎嚭涓氬姟绫诲瀷杩樻病鏈夊疄鐜�
+// List<BizType> bts = new ArrayList<BizType>();
+// for (String btName : btNameSet) {
+// BizType bt = BtmProvider.getBtmItemByName(btName);
+// bts.add(bt);
+// }
+// boolean btFlag = BtmProvider.expData(rootPath, bts.toArray(new BizType[0]));
+ }catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ File zip = ZipUtil.zip(defaultTempFolder);
+ FileUtil.del(defaultTempFolder + File.separator);
+ ControllerUtil.writeFileToResponse(response,zip.getAbsoluteFile());
+ }
+
+ /**
+ * 瀵煎叆閾炬帴绫诲瀷
+ * @param file 涓婁紶鐨勬枃浠�
+ * @return
+ */
+ @Override
+ public BaseResult impData(MultipartFile file) throws Exception {
+ String defaultTempFolder = LocalFileUtil.getDefaultTempFolder();
+ String fileName = defaultTempFolder + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
+ file.transferTo(new File(fileName));
+ if (file == null) {
+ return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"鏃犲鍏ョ殑鏂囦欢"});
+ }
+ if (!fileName.endsWith(".zip")) {
+ throw new VciBaseException("浠呰兘涓婁紶zip鍘嬬缉鏂囦欢锛岃閲嶆柊涓婁紶锛�");
+ }
+ File unzip = ZipUtil.unzip(fileName);
+ File ltExcel = new File(unzip.getAbsolutePath() + File.separator + "lt.xls");
+ File attrExcel = new File(unzip.getAbsolutePath() + File.separator + "attr.xls");
+ if (!attrExcel.exists()) {
+ //澧炲姞瑙ｅ帇鐨勮矾寰勶紝鐪嬫枃浠惰繕鍦ㄦ病鏈�
+ attrExcel = new File(unzip.getAbsolutePath() + File.separator + unzip.getName() + File.separator + "attr.xls");
+ if (!attrExcel.exists()) {
+ return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"娌℃湁瀵煎叆鐨勫睘鎬ф枃浠躲�傚鍏ョ粓姝紒"});
+ }
+ }
+ BaseResult baseResult = attributeService.importAttributes(attrExcel);
+ if(!baseResult.isSuccess()){
+ //鍒犻櫎涓婁紶鐨勬枃浠跺す
+ FileUtil.del(defaultTempFolder + File.separator);
+ return baseResult;
+ }
+ //todo 杩橀渶瀵煎叆涓氬姟绫诲瀷锛岀瓑寰呭姛鑳藉疄鐜�
+ if (!ltExcel.exists()) {
+ //澧炲姞瑙ｅ帇鐨勮矾寰勶紝鐪嬫枃浠惰繕鍦ㄦ病鏈�
+ ltExcel = new File(unzip.getAbsolutePath() + File.separator + unzip.getName() + File.separator + "lt.xls");
+ if (!ltExcel.exists()) {
+ //鍒犻櫎涓婁紶鐨勬枃浠跺す
+ FileUtil.del(defaultTempFolder + File.separator);
+ return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"娌℃湁瀵煎叆鐨勯摼鎺ユ枃浠躲�傚鍏ョ粓姝紒"});
+ }
+ }
+ try{
+ //1銆佽鍙杄xcel涓殑鏁版嵁锛岀粍鎴愬璞�
+ ReadExcelOption excelOption = new ReadExcelOption();
+ List<OsLinkTypePO> poList = ExcelUtil.readDataObjectFromExcel(ltExcel, OsLinkTypePO.class,excelOption,(value, po, fieldName)->{});
+ //鍘婚櫎閮芥槸绌虹殑鎯呭喌
+ if(CollectionUtils.isEmpty(poList)){
+ return BaseResult.fail(ExcelLangCodeConstant.IMPORT_CONTENT_NULL,new String[]{});
+ }
+ //褰撳墠excel涓槸鍚﹂噸澶嶇敤鐨勫垽閲峂ap:锛坘ey锛氬垽閲嶅睘鎬э紝value锛氳鍙凤級
+ Map<String, String> excelReapeat = new HashMap<>();
+ int maxLength = platformClientUtil.getLinkTypeService().getLTNameMaxLength();
+
+ //鍒ゆ柇蹇呭～灞炴�ф槸鍚︿负绌猴紝鐢ㄦ埛鏄惁宸插瓨鍦紝浠ュ強閮ㄩ棬鏄惁濉敊绛夋牎楠岄�昏緫
+ poList.stream().forEach(osLinkTypePO -> {
+ if(Func.isBlank(osLinkTypePO.getName())){//灞炴�у悕鍒ょ┖
+ throw new VciBaseException("绗��"+osLinkTypePO.getRowIndex()+"銆戣锛宯ame");
+ }else if(osLinkTypePO.getName().length() > maxLength){
+ throw new VciBaseException("绗��"+osLinkTypePO.getRowIndex()+"銆戣锛岄摼鎺ョ被鍨嬪悕闀垮害涓嶈兘瓒呰繃" + maxLength);
+ }else if(!osLinkTypePO.getName().matches("^[A-Za-z]+$")){
+ throw new VciBaseException("绗��"+osLinkTypePO.getRowIndex()+"銆戣锛岄摼鎺ョ被鍨嬪悕绉板彧鑳戒负鑻辨枃瀛楁瘝");
+ }else if(excelReapeat.containsKey(osLinkTypePO.getName())){//灞炴�у悕琛ㄦ牸涓垽閲�
+ throw new VciBaseException("绗��"+excelReapeat.get(osLinkTypePO.getName())+"銆戣鍜岀銆�"+osLinkTypePO.getRowIndex()+"銆戣鏁版嵁锛屽睘鎬у悕閲嶅");
+ }
+ try {
+ LinkType historyLink = platformClientUtil.getLinkTypeService().getLinkType(osLinkTypePO.getName());
+ //宸叉湁姝ゆ暟鎹繘琛屽垹闄よ鐩�
+ if(historyLink != null && !historyLink.name.equals("")){
+ platformClientUtil.getLinkTypeService().deleteLinkType(historyLink);
+ }
+ } catch (PLException e) {
+ throw new RuntimeException(e);
+ }
+
+ //灞炴�у悕excel涓垽閲嶅鐞�
+ excelReapeat.put(osLinkTypePO.getName(),osLinkTypePO.getRowIndex());
+ LinkType linkType = new LinkType();
+ linkType.name = osLinkTypePO.getName();
+ linkType.attributes = osLinkTypePO.getAttributes().split(",");
+ linkType.btmItemsFrom = osLinkTypePO.getBtmItemsFrom().split(",");
+ linkType.primitivesFrom = osLinkTypePO.getPrimitivesFrom();
+ linkType.relationFrom = osLinkTypePO.getRelationFrom();
+ linkType.btmItemsTo = osLinkTypePO.getBtmItemsTo().split(",");
+ linkType.primitivesTo = osLinkTypePO.getPrimitivesTo();
+ linkType.relationTo = osLinkTypePO.getRelationTo();
+ linkType.relation = osLinkTypePO.getRelationFrom() + ":" + osLinkTypePO.getRelationTo();
+ linkType.description = osLinkTypePO.getDescription();
+ linkType.tag = osLinkTypePO.getTag();
+ linkType.shape = osLinkTypePO.getShape();
+ linkType.implClass = osLinkTypePO.getImplClass();
+ linkType.modifier = WebUtil.getCurrentUserId();
+ linkType.creator = WebUtil.getCurrentUserId();
+ try {
+ platformClientUtil.getLinkTypeService().addLinkType(linkType);
+ } catch (PLException e) {
+ throw new RuntimeException(e);
+ }
+
+ });
+ }catch (Exception e){
+ if(logger.isErrorEnabled()){
+ logger.error("璇诲彇excel鍐呭鏃舵垨淇濆瓨鐢ㄦ埛淇℃伅鏃跺嚭鐜颁簡閿欒锛屽叿浣撳師鍥狅細",VciBaseUtil.getExceptionMessage(e));
+ }
+ e.printStackTrace();
+ return BaseResult.fail(VciBaseUtil.getExceptionMessage(e),new String[]{},e);
+ }
+ //鍒犻櫎涓婁紶鐨勬枃浠跺す
+ FileUtil.del(defaultTempFolder + File.separator);
+ return BaseResult.success("閾炬帴绫诲瀷瀵煎叆鎴愬姛锛�");
+ }
/**
* 淇閾炬帴绫诲瀷鐨剎ml鏂囦欢
diff --git a/Source/plt-web/plt-web-ui/src/api/modeling/attributePool/api.js b/Source/plt-web/plt-web-ui/src/api/modeling/attributePool/api.js
index 1a9549c..3671d5e 100644
--- a/Source/plt-web/plt-web-ui/src/api/modeling/attributePool/api.js
+++ b/Source/plt-web/plt-web-ui/src/api/modeling/attributePool/api.js
@@ -13,14 +13,23 @@
});
}
-// // 鍒涘缓
-// export function gridAttribute(params) {
-// return request({
-// url: "/api/attributeController/gridAttribute",
-// method: "post",
-// params
-// });
-// }
+// 鍒涘缓
+export function updateAttribute(params) {
+ return request({
+ url: "/api/attributeController/updateAttribute",
+ method: "put",
+ data:params
+ });
+}
+
+// 淇敼
+export function addAttribute(params) {
+ return request({
+ url: "/api/attributeController/addAttribute",
+ method: "post",
+ data:params
+ });
+}
// 鍒犻櫎
export function deleteAttributes(params) {
@@ -48,3 +57,44 @@
params:params
});
}
+
+// 涓嬭浇瀵煎叆妯℃澘
+export function downloadAttributeTemplate (params) {
+ return request({
+ url: '/api/attributeController/downloadAttributeTemplate',
+ method: 'get',
+ headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'},
+ responseType: 'blob',
+ params
+ })
+}
+
+// 瀵煎嚭
+export function download (params) {
+ return request({
+ url: '/api/attributeController/importAttributes',
+ method: 'get',
+ headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'},
+ responseType: 'blob',
+ params
+ })
+}
+
+// 涓氬姟绫诲瀷鍙傜収
+export function getBizTypes(params) {
+ return request({
+ url: "/api/btmTypeController/getBizTypes",
+ method: "get",
+ params:params
+ });
+}
+
+// 閾炬帴绫诲瀷鍙傜収
+export function getAllLtName(params) {
+ return request({
+ url: "/api/linkTypeController/getAllLtName",
+ method: "get",
+ params:params
+ });
+}
+
diff --git a/Source/plt-web/plt-web-ui/src/api/modeling/statusPool/api.js b/Source/plt-web/plt-web-ui/src/api/modeling/statusPool/api.js
new file mode 100644
index 0000000..1a9a49b
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/api/modeling/statusPool/api.js
@@ -0,0 +1,9 @@
+import request from '@/router/axios';
+
+// 鍒楄〃鏌ヨ
+export function gridStatus(params) {
+ return request({
+ url: "/api/statusController/gridStatus",
+ method: "get",
+ });
+}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
index 1220e90..c2cb92a 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
@@ -21,6 +21,10 @@
<el-button icon="el-icon-plus" size="small" type="primary" @click="rowSaveHandlerClick">鍒涘缓</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="allDelHandler">鍒犻櫎</el-button>
<el-button icon="el-icon-view" plain size="small" type="primary" @click="chekView">鏌ョ湅浣跨敤鑼冨洿</el-button>
+ <el-button icon="el-icon-download" plain size="small" type="primary" @click="downloadTemplateHandler">涓嬭浇瀵煎叆妯℃澘
+ </el-button>
+ <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadHandler">瀵煎叆</el-button>
+ <el-button icon="el-icon-download" plain size="small" type="primary" @click="downLoadHandler">瀵煎嚭</el-button>
</template>
<template slot="menu" slot-scope="scope">
@@ -32,7 +36,7 @@
</avue-crud>
</basic-container>
</el-main>
-
+ <!-- 鍙充晶淇℃伅 -->
<el-aside width="30%">
<basic-container>
<div style="height: 85vh; overflow-y: auto">
@@ -126,7 +130,7 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
- 鏋氫妇绫诲瀷
+ 褰撳墠鏋氫妇绫诲瀷
</template>
{{ lastItem.enumId }}
</el-descriptions-item>
@@ -149,15 +153,15 @@
<template slot="label">
浣跨敤鏋氫妇
</template>
- <el-tag :type="lastItem.enumId ? 'success' : 'danger'">
- {{ lastItem.enumId ? '鏄�' : '鍚�' }}
+ <el-tag :type="lastItem.enumFlag ? 'success' : 'danger'">
+ {{ lastItem.enumFlag ? '鏄�' : '鍚�' }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
鏋氫妇绫诲瀷
</template>
- {{ lastItem.enumId }}
+ {{ lastItem.enumFlag }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
@@ -187,7 +191,265 @@
</div>
</basic-container>
</el-aside>
+ <!-- 鏂板瀵硅瘽妗� -->
+ <el-dialog
+ v-dialogDrag
+ v-loading="addLoading"
+ :title="dialogTitle === 'add' ? '鍒涘缓' : '缂栬緫'"
+ :visible.sync="addVisible"
+ append-to-body="true"
+ class="avue-dialog"
+ width="65%"
+ @close="addEscHandler"
+ >
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+ <el-row>
+ <div class="addDialog">
+ <div>
+ <h3>灞炴�ч」</h3>
+
+ <el-col :span="12">
+ <el-form-item label="鍚嶇О锛�" prop="id">
+ <el-input v-model="form.id"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏍囩锛�" prop="name">
+ <el-input v-model="form.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="灞炴�х被鍨嬶細" prop="attributeDataType">
+ <el-select v-model="form.attributeDataType" placeholder="璇烽�夋嫨灞炴�х被鍨�" @change="attributeDataTypeChange">
+ <el-option v-for="item in typeSelectList" :label="item" :value="item"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎻忚堪锛�" prop="description">
+ <el-input v-model="form.description" :rows="2" type="textarea"></el-input>
+ </el-form-item>
+ </el-col>
+
+ </div>
+ <div v-if="!hideType" class="addDialogBottom">
+ <div class="left">
+ <h3>{{ form.attributeDataType }}</h3>
+
+ <el-form-item
+ v-if="form.attributeDataType !== 'VTInteger' && form.attributeDataType !== 'VTLong'
+ && form.attributeDataType !== 'VTDouble' && form.attributeDataType !== 'VTBoolean'"
+ label="闀垮害锛�" prop="attrLength">
+ <el-input v-model="form.attrLength"></el-input>
+ </el-form-item>
+
+ <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="绮惧害锛�" prop="precisionLength">
+ <el-input v-model="form.precisionLength"></el-input>
+ </el-form-item>
+
+ <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="闀垮害锛�" prop="scaleLength">
+ <el-input v-model="form.scaleLength"></el-input>
+ </el-form-item>
+
+
+ <el-form-item v-if="form.attributeDataType !== 'VTBoolean' && !form.enumSwitch" label="榛樿鍊硷細"
+ prop="defaultValue">
+ <el-input v-model="form.defaultValue"></el-input>
+ </el-form-item>
+
+ <el-form-item v-if="form.attributeDataType === 'VTBoolean'" label="榛樿鍊硷細" prop="defaultValue">
+ <el-select v-model="form.defaultValue">
+ <el-option label="false" value="false"></el-option>
+ <el-option label="true" value="true"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="form.attributeDataType !== 'VTBoolean' && form.enumSwitch" label="榛樿鍊硷細"
+ prop="defaultValue">
+ <el-select v-model="form.defaultValue">
+ <el-option v-for="(item,index) in rangeOptionValue" :key="index" :label="item"
+ :value="item"></el-option>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="鍏佽涓虹┖锛�" prop="nullableFlag">
+ <el-switch v-model="form.nullableFlag"></el-switch>
+ </el-form-item>
+
+ </div>
+ <el-divider direction="vertical"></el-divider>
+ <!-- VTString -->
+ <div v-if="form.attributeDataType === 'VTString'" class="right">
+ <h3>鍊煎煙</h3>
+ <el-form-item label="褰撳墠鍊煎煙绫诲瀷锛�" prop="attributeSelectType">
+ <el-select v-model="form.attributeSelectType" placeholder="璇烽�夋嫨灞炴�х被鍨�"
+ @change="attributeSelectTypeChange">
+ <el-option label="涓氬姟绫诲瀷" value="business"></el-option>
+ <el-option label="閾炬帴绫诲瀷" value="link"></el-option>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item v-if="form.attributeSelectType === 'link'" label="鐗堟湰娆★細" prop="version">
+ <el-select v-model="form.version" placeholder="璇烽�夋嫨鐗堟湰娆�">
+ <el-option :value="1" label="褰撳墠鐗堟湰娆�"></el-option>
+ <el-option :value="3" label="鏈�鏂扮増鏈"></el-option>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="閫夋嫨鍙傜収绫诲瀷锛�" prop="referValue">
+ <el-input v-model="form.referValue" @focus="referFormFocusHandler"></el-input>
+ </el-form-item>
+
+ <span v-if="!form.referValue">
+ <el-form-item label="浣跨敤鏋氫妇锛�" prop="enumSwitch">
+ <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
+ </el-form-item>
+
+
+ <el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鏋氫妇鍊硷細'" prop="enumSwitch">
+ <el-select v-if="form.enumSwitch" v-model="form.enumId" placeholder="璇烽�夋嫨鏋氫妇绫诲瀷"
+ @change="enumSelectChange">
+ <el-option v-for="(item,index) in attributeDataTypePickList" :key="index" :label="item.key"
+ :value="item.key"></el-option>
+ </el-select>
+ <el-input v-if="!form.enumSwitch" v-model="form.enumAddValue">
+ </el-input>
+ </el-form-item>
+ <el-form-item v-if="!form.enumSwitch" label="杩愮畻绗︼細">
+ <div>
+ <el-button size="mini" @click="enumAddHandler"> = </el-button>
+ </div>
+ </el-form-item>
+ <el-form-item label="褰撳墠鏋氫妇鍊硷細" prop="rangeValue">
+ <textarea v-model="form.rangeValue"
+ style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
+ </textarea>
+ </el-form-item>
+ </span>
+ </div>
+ <!-- VTInteger VTLong -->
+ <div v-if="form.attributeDataType === 'VTInteger' || form.attributeDataType === 'VTLong' " class="right">
+ <h3>鍊煎煙</h3>
+
+ <el-form-item label="浣跨敤鏋氫妇锛�" prop="enumSwitch">
+ <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
+ </el-form-item>
+
+
+ <el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鏋氫妇鍊硷細'" prop="enumSwitch">
+ <el-select v-if="form.enumSwitch" v-model="form.enumId" placeholder="璇烽�夋嫨鏋氫妇绫诲瀷"
+ @change="enumSelectChange">
+ <el-option v-for="(item,index) in attributeDataTypePickList" :key="index" :label="item.key"
+ :value="item.key"></el-option>
+ </el-select>
+ <el-input v-if="!form.enumSwitch" v-model="form.enumAddValue">
+ </el-input>
+ </el-form-item>
+ <el-form-item v-if="!form.enumSwitch" label="杩愮畻绗︼細">
+ <div>
+ <el-button size="mini" @click="operationHandler('>')"> > </el-button>
+ <el-button size="mini" @click="operationHandler('<')"> < </el-button>
+ <el-button size="mini" @click="operationHandler('>=')"> >= </el-button>
+ <el-button size="mini" @click="operationHandler('<=')"> <= </el-button>
+ <el-button size="mini" @click="operationHandler('=')"> = </el-button>
+ <el-button size="mini" @click="operationHandler('!=')"> != </el-button>
+ <el-button size="mini" @click="operationHandler('()')"> () </el-button>
+ </div>
+ </el-form-item>
+ <el-form-item label="褰撳墠鏋氫妇鍊硷細" prop="rangeValue">
+ <textarea v-model="form.rangeValue"
+ style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
+ </textarea>
+ </el-form-item>
+ </div>
+ <!-- VTDouble -->
+ <div v-if="form.attributeDataType === 'VTDouble'" class="right">
+ <h3>鍊煎煙</h3>
+ <el-form-item label="娣诲姞鏋氫妇鍊硷細" prop="enumAddValue">
+ <el-input v-model="form.enumAddValue">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="杩愮畻绗︼細">
+ <div>
+ <el-button size="mini" @click="operationHandler('>')"> > </el-button>
+ <el-button size="mini" @click="operationHandler('<')"> < </el-button>
+ <el-button size="mini" @click="operationHandler('>=')"> >= </el-button>
+ <el-button size="mini" @click="operationHandler('<=')"> <= </el-button>
+ <el-button size="mini" @click="operationHandler('=')"> = </el-button>
+ <el-button size="mini" @click="operationHandler('!=')"> != </el-button>
+ <el-button size="mini" @click="operationHandler('()')"> () </el-button>
+ </div>
+ </el-form-item>
+ <el-form-item label="褰撳墠鏋氫妇鍊硷細" prop="rangeValue">
+ <textarea v-model="form.rangeValue"
+ style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
+ </textarea>
+ </el-form-item>
+ </div>
+ </div>
+ </div>
+ </el-row>
+ </el-form>
+
+ <!-- 涓氬姟绫诲瀷瀵硅瘽妗� -->
+ <el-dialog
+ v-dialogDrag
+ :visible.sync="businessVisible"
+ append-to-body="true"
+ class="avue-dialog"
+ title="涓氬姟绫诲瀷閫夋嫨"
+ width="70%"
+ >
+ <avue-crud
+ ref="businessCrud"
+ :data="businessData"
+ :option="businessOption"
+ :table-loading="businessLoading"
+ @search-change="businessHandleSearch"
+ @search-reset="businessHandleReset"
+ @row-click="businessRowClick"
+ >
+ </avue-crud>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="businessEmpty">娓� 绌�</el-button>
+ <el-button @click="businessVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="businessSaveHandler">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+
+ <!-- 閾炬帴绫诲瀷瀵硅瘽妗� -->
+ <el-dialog
+ v-dialogDrag
+ :visible.sync="linkTypeVisible"
+ append-to-body="true"
+ class="avue-dialog"
+ title="閾炬帴绫诲瀷閫夋嫨"
+ width="70%"
+ >
+ <avue-crud
+ ref="linkTypeCrud"
+ :data="linkTypeData"
+ :option="linkTypeOption"
+ :table-loading="linkTypeLoading"
+ @search-change="linkHandleSearch"
+ @search-reset="linkHandleReset"
+ @row-click="linkRowClick"
+ >
+ </avue-crud>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="linkEmpty">娓� 绌�</el-button>
+ <el-button @click="linkTypeVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="linkSaveHandler">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="addEscHandler">鍙� 娑�</el-button>
+ <el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <!--瀵煎叆 -->
+ <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆"
+ @updata="getTableList"></upload-file>
<!-- 鏌ョ湅浣跨敤鑼冨洿 -->
<el-dialog
v-dialogDrag
@@ -208,204 +470,104 @@
</avue-crud>
</el-dialog>
-
- <!-- 鏂板瀵硅瘽妗� -->
- <el-dialog
- v-dialogDrag
- v-loading="addLoading"
- :visible.sync="addVisible"
- append-to-body="true"
- class="avue-dialog"
- title="鍒涘缓"
- width="65%"
- >
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-row>
- <div class="addDialog">
- <div>
-
- <h3>灞炴�ч」</h3>
-
- <el-col :span="12">
- <el-form-item label="鍚嶇О锛�" prop="id">
- <el-input v-model="form.id"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏍囩锛�">
- <el-input v-model="form.name"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="灞炴�х被鍨嬶細">
- <el-select v-model="form.attributeDataType" placeholder="璇烽�夋嫨灞炴�х被鍨�" @change="attributeDataTypeChange">
- <el-option v-for="item in typeSelectList" :label="item" :value="item"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎻忚堪锛�">
- <el-input v-model="form.description" :rows="2" type="textarea"></el-input>
- </el-form-item>
- </el-col>
-
- </div>
- <div v-if="!hideType" class="addDialogBottom">
- <div class="left">
- <h3>{{ form.attributeDataType }}</h3>
-
- <el-form-item
- v-if="form.attributeDataType !== 'VTInteger' && form.attributeDataType !== 'VTLong'
- && form.attributeDataType !== 'VTDouble' && form.attributeDataType !== 'VTBoolean'"
- label="闀垮害锛�">
- <el-input v-model="form.attrLength"></el-input>
- </el-form-item>
-
- <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="绮惧害锛�">
- <el-input v-model="form.precisionLength"></el-input>
- </el-form-item>
-
- <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="闀垮害锛�">
- <el-input v-model="form.scaleLength"></el-input>
- </el-form-item>
-
-
- <el-form-item v-if="form.attributeDataType !== 'VTBoolean'" label="榛樿鍊硷細">
- <el-input v-model="form.defaultValue"></el-input>
- </el-form-item>
-
- <el-form-item v-if="form.attributeDataType === 'VTBoolean'" label="榛樿鍊硷細">
- <el-select>
- <el-option label="false" value="false"></el-option>
- <el-option label="true" value="true"></el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item label="鍏佽涓虹┖锛�">
- <el-switch v-model="form.nullableFlag"></el-switch>
- </el-form-item>
-
- </div>
- <el-divider direction="vertical"></el-divider>
- <!-- VTString -->
- <div v-if="form.attributeDataType === 'VTString'" class="right">
- <h3>鍊煎煙</h3>
- <el-form-item label="褰撳墠鍊煎煙绫诲瀷锛�">
- <el-select v-model="form.attributeSelectType" placeholder="璇烽�夋嫨灞炴�х被鍨�" @change="attributeSelectTypeChange">
- <el-option label="涓氬姟绫诲瀷" value="business"></el-option>
- <el-option label="閾炬帴绫诲瀷" value="link"></el-option>
- </el-select>
- </el-form-item>
-
-
- <el-form-item label="閫夋嫨鍙傜収绫诲瀷锛�">
- <el-input v-model="form.attrLength"></el-input>
- </el-form-item>
-
-
- <el-form-item label="浣跨敤鏋氫妇锛�">
- <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
- </el-form-item>
-
-
- <el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鏋氫妇鍊硷細'">
- <el-select v-if="form.enumSwitch" v-model="form.attributeDataTypePick" placeholder="璇烽�夋嫨鏋氫妇绫诲瀷"
- @change="enumSelectChange">
- <el-option v-for="(item,index) in attributeDataTypePickList" :key="index" :label="item.key"
- :value="item.key"></el-option>
- </el-select>
- <el-input v-if="!form.enumSwitch" v-model="form.enumAddValue">
- </el-input>
- </el-form-item>
- <el-form-item v-if="!form.enumSwitch" label="杩愮畻绗︼細">
- <div>
- <el-button size="mini" @click="enumAddHandler"> =</el-button>
- </div>
- </el-form-item>
- <el-form-item label="褰撳墠鏋氫妇鍊硷細">
- <textarea v-model="form.range"
- style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
- </textarea>
- </el-form-item>
- </div>
- <!-- VTInteger VTLong -->
- <div v-if="form.attributeDataType === 'VTInteger' || form.attributeDataType === 'VTLong' " class="right">
- <h3>鍊煎煙</h3>
-
- <el-form-item label="浣跨敤鏋氫妇锛�">
- <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
- </el-form-item>
-
-
- <el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鏋氫妇鍊硷細'">
- <el-select v-if="form.enumSwitch" v-model="form.attributeDataTypePick" placeholder="璇烽�夋嫨鏋氫妇绫诲瀷"
- @change="enumSelectChange">
- <el-option v-for="(item,index) in attributeDataTypePickList" :key="index" :label="item.key"
- :value="item.key"></el-option>
- </el-select>
- <el-input v-if="!form.enumSwitch" v-model="form.enumAddValue">
- </el-input>
- </el-form-item>
- <el-form-item v-if="!form.enumSwitch" label="杩愮畻绗︼細">
- <div>
- <el-button size="mini"> ></el-button>
- <el-button size="mini"> <</el-button>
- <el-button size="mini"> >=</el-button>
- <el-button size="mini"> <=</el-button>
- <el-button size="mini"> =</el-button>
- <el-button size="mini"> !=</el-button>
- <el-button size="mini"> ( )</el-button>
- </div>
- </el-form-item>
- <el-form-item label="褰撳墠鏋氫妇鍊硷細">
- <textarea v-model="form.range"
- style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
- </textarea>
- </el-form-item>
- </div>
- <!-- VTDouble -->
- <div v-if="form.attributeDataType === 'VTDouble'" class="right">
- <h3>鍊煎煙</h3>
-
-
- <el-form-item label="娣诲姞鏋氫妇鍊硷細">
- <el-input v-model="form.enumAddValue">
- </el-input>
- </el-form-item>
- <el-form-item label="杩愮畻绗︼細">
- <div>
- <el-button size="mini"> ></el-button>
- <el-button size="mini"> <</el-button>
- <el-button size="mini"> >=</el-button>
- <el-button size="mini"> <=</el-button>
- <el-button size="mini"> =</el-button>
- <el-button size="mini"> !=</el-button>
- <el-button size="mini"> ( )</el-button>
- </div>
- </el-form-item>
- <el-form-item label="褰撳墠鏋氫妇鍊硷細">
- <textarea v-model="form.range"
- style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
- </textarea>
- </el-form-item>
- </div>
- </div>
- </div>
- </el-row>
- </el-form>
- </el-dialog>
</el-container>
</template>
<script>
-import {gridAttribute, getUsedAttributeList, getEnumMapByType} from "@/api/modeling/attributePool/api";
+import {
+ gridAttribute,
+ getUsedAttributeList,
+ getEnumMapByType,
+ deleteAttributes,
+ download,
+ downloadAttributeTemplate,
+ getBizTypes,
+ getAllLtName,
+ addAttribute,
+ updateAttribute
+} from "@/api/modeling/attributePool/api";
import basicOption from '@/util/basic-option';
import {column} from "./option"
+import func from "@/util/func";
export default {
name: "index",
data() {
return {
+ rules: {
+ id: [
+ {required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur'},
+ {pattern: /^[a-zA-Z]+$/, message: '鍙兘杈撳叆鑻辨枃瀛楃', trigger: 'blur'}
+ ]
+ },
+ dialogTitle: "",
+ businessRow: {},
+ linkRow: {},
+ linkDataSearch: [],
+ businessSearchParams: {},
+ linkTypeSearchParams: {},
+ businessLoading: false,
+ linkTypeLoading: false,
+ businessVisible: false,
+ linkTypeVisible: false,
+ businessData: [],
+ linkTypeData: [],
+ businessOption: {
+ ...basicOption,
+ addBtn: false,
+ menu: false,
+ searchMenuSpan: 8,
+ selection: false,
+ refreshBtn: false,
+ searchLabelWidth: 100,
+ highlightCurrentRow: true,
+ column: [
+ {
+ label: '涓氬姟绫诲瀷鍚�',
+ prop: 'name',
+ sortable: true,
+ search: true
+ },
+ {
+ label: '鏍囩',
+ prop: 'label',
+ sortable: true,
+ },
+ {
+ label: '鐖剁被',
+ prop: 'fName',
+ sortable: true,
+ },
+ {
+ label: '鐗堟湰瑙勫垯',
+ prop: 'revRuleName',
+ sortable: true,
+ },
+ {
+ label: '鐢熷懡鍛ㄦ湡',
+ prop: 'lifeCycle',
+ sortable: true,
+ },
+ ]
+ },
+ linkTypeOption: {
+ ...basicOption,
+ addBtn: false,
+ menu: false,
+ searchMenuSpan: 8,
+ selection: false,
+ refreshBtn: false,
+ searchLabelWidth: 100,
+ highlightCurrentRow: true,
+ column: [
+ {
+ label: '閾炬帴绫诲瀷鍚�',
+ prop: 'name',
+ sortable: true,
+ search: true
+ },
+ ]
+ },
tableData: [],
option: {
...basicOption,
@@ -463,30 +625,30 @@
description: "",
nullableFlag: true,
attrLength: 50,
- enumId: false,
+ enumFlag: false,
+ enumId: "",
enumSwitch: false,
- attributeDataTypePick: "",
- enumAddValue: '',
- range: ''
+ enumAddValue: "",
+ range: "",
+ attributeSelectType: "business",
+ version: 1,
+ defaultValue: "",
+ referValue: "",
+ btmTypeId: "",
+ linkTypeName: "",
+ rangeValue: ""
+
},
- defaultForm: {
- id: "",
- name: "",
- attributeDataType: "VTString",
- description: "",
- nullableFlag: true,
- attrLength: 50,
- enumId: false,
- enumSwitch: false,
- attributeDataTypePick: "",
- enumAddValue: '',
- range: '',
- attributeSelectType:'business'
- },
- rules: [],
typeSelectList: ['VTString', 'VTInteger', 'VTLong', 'VTDouble', 'VTBoolean', 'VTDate', 'VTTime', 'VTDateTime', 'VTNote', 'VTFilePath', 'VTClob'],
attributeDataTypePickList: [],
- enumAddListChange: []
+ enumAddListChange: [],
+ tipList: [
+ "灞炴�у悕鍜屽睘鎬х被鍨嬩负蹇呭～瀛楁锛屽苟涓斿睘鎬у悕涓嶅彲鍜岀郴缁熶腑宸叉湁灞炴�у悕閲嶅",
+ "褰撳睘鎬х被鍨嬩负VTString鏃跺睘鎬ч暱搴﹀垪蹇呭～锛屼负鍏朵粬绫诲瀷鏃朵笉蹇呭～鍐�",
+ "鍙栧�艰寖鍥村垪濉啓鏃惰鐢ㄨ嫳鏂� ; 鍒嗛殧锛屼笉濉啓鏃堕粯璁や娇鐢ㄥ綋鍓嶉�変腑鐨勬灇涓剧殑鎵�鏈夋灇涓鹃」鐨勫�间綔涓哄彇鍊艰寖鍥�"
+ ],
+ upFileType: ['xls', 'xlsx'],
+ fileUrl: 'api/attributeController/importAttributes',
}
},
computed: {
@@ -518,6 +680,9 @@
this.form.attributeDataType === 'VTClob' ||
this.form.attributeDataType === 'VTDateTime' ||
this.form.attributeDataType === 'VTFilePath';
+ },
+ rangeOptionValue() {
+ return this.form.rangeValue.split('\n')
}
},
methods: {
@@ -540,13 +705,18 @@
},
// 鎼滅储
- handleSearch() {
-
+ handleSearch(params, done) {
+ this.searchParams = {
+ "conditionMap[id]": "*" + params.id + "*"
+ };
+ this.getTableList()
+ done();
},
// 閲嶇疆鎼滅储鏉′欢
handleReset() {
-
+ this.searchParams = {};
+ this.getTableList();
},
// 閫夋嫨妗�
@@ -557,7 +727,6 @@
// 鐐瑰嚮琛�
rowClickHandler(row) {
this.$refs.userCrud.toggleRowSelection(row);
- console.log(row);
},
// 鏉℃暟
@@ -573,12 +742,67 @@
// 鍒涘缓鎵撳紑瀵硅瘽妗�
rowSaveHandlerClick() {
this.addVisible = true;
- this.form = this.defaultForm;
+ this.dialogTitle = "add";
this.getEnumMapByTypeHandler('VTString');
},
- allDelHandler() {
+ // 琛屽垹闄�
+ rowDeleteHandler(row) {
+ let params = {
+ oid: row.oid,
+ name: row.id,
+ ts: row.ts
+ };
+ let data = [params];
+ this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎褰撳墠鐨勬暟鎹悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ deleteAttributes(data).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ }
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
+ },
+ // 澶氶�夊垹闄�
+ allDelHandler() {
+ if (this.selectList.length <= 0) {
+ this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹繘琛屽垹闄わ紒')
+ return;
+ }
+ let data = this.selectList.map(item => {
+ return {
+ oid: item.oid,
+ name: item.id,
+ ts: item.ts
+ }
+ })
+ this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎鎵�閫夋嫨鐨勬暟鎹悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ deleteAttributes(data).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ }
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
},
// 鏌ョ湅浣跨敤鑼冨洿
@@ -624,19 +848,38 @@
this.checkViewData = this.checkViewDataSearch;
},
+ // 琛岀紪杈戞寜閽�
+ editBtnClick(row) {
+ this.dialogTitle = "edit";
+ this.form = {...row};
- editBtnClick() {
+ if (row.enumId) this.form.enumSwitch = true;
+ this.form.rangeValue = row.range.replace(/;/g, '\n');
- },
+ if (row.btmTypeId) {
+ this.form.attributeSelectType = 'business'
+ this.form.referValue = row.btmTypeId;
+ }
+ if (row.linkTypeName) {
+ this.form.attributeSelectType = 'link'
+ this.form.referValue = row.linkTypeName;
+ }
- rowDeleteHandler() {
+ this.getEnumMapByTypeHandler(this.form.attributeDataType)
+ this.addVisible = true;
},
// 灞炴�х被鍨嬩笅鎷夋change
attributeDataTypeChange(val) {
+ this.form.rangeValue = null;
this.getEnumMapByTypeHandler(val);
this.form.enumSwitch = false;
+ if (val === 'VTBoolean') {
+ this.form.defaultValue = 'false';
+ } else {
+ this.form.defaultValue = '';
+ }
},
// 灞炴�х被鍨嬩笅鎷夋鏁版嵁澶勭悊
@@ -663,24 +906,28 @@
// 浣跨敤鏋氫妇鏃� 鏋氫妇閫夋嫨涓嬫媺妗哻hange浜嬩欢
enumSelectChange(val) {
const list = this.attributeDataTypePickList.find(item => item.key === val).values;
- this.form.range = list.join('\n');
+ this.form.rangeValue = list.join('\n');
+ this.form.defaultValue = list[0];
},
// 浣跨敤鏋氫妇switch婊戝潡change浜嬩欢
switchEnumChange(status) {
if (status) {
- this.form.attributeDataTypePick = this.attributeDataTypePickList[0].key;
+ this.form.enumId = this.attributeDataTypePickList[0].key;
+ this.form.defaultValue = this.attributeDataTypePickList[0].values[0];
const list = this.attributeDataTypePickList[0].values;
- this.form.range = list.join('\n');
+ this.form.rangeValue = list.join('\n');
} else {
- this.form.range = "";
+ this.form.defaultValue = "";
+ this.form.rangeValue = "";
+ this.enumId = "";
}
},
// 涓嶄娇鐢ㄦ灇涓� 鎵嬪姩娣诲姞鏋氫妇鍊�
enumAddHandler() {
// 妫�鏌ュ拰杞崲 this.form.range 涓烘暟缁勶紝鍚屾椂鎺掗櫎绌哄��
- let currentRangeArray = this.form.range ? this.form.range.split('\n').filter(item => item.trim() !== '') : [];
+ let currentRangeArray = this.form.rangeValue ? this.form.rangeValue.split('\n').filter(item => item.trim() !== '') : [];
let newValue = this.form.enumAddValue.trim();
if (currentRangeArray.includes(newValue)) {
@@ -690,14 +937,333 @@
currentRangeArray.push(newValue);
this.enumAddListChange = currentRangeArray;
- this.form.range = currentRangeArray.join('\n');
+ this.form.rangeValue = currentRangeArray.join('\n');
+ this.form.enumAddValue = "";
+ },
+
+ // 涓嶄娇鐢ㄦ灇涓� 鎵嬪姩娣诲姞鏋氫妇鍊�(澶氫釜杩愮畻绗�)
+ operationHandler(val) {
+ // 妫�鏌ュ拰杞崲 this.form.rangeValue 涓烘暟缁勶紝鍚屾椂鎺掗櫎绌哄��
+ let currentRangeArray = this.form.rangeValue
+ ? this.form.rangeValue.split('\n').filter(item => item.trim() !== '')
+ : [];
+
+ // 澶勭悊 '()' 杩愮畻绗︾殑鎯呭喌
+ if (val === '()') {
+ // 鍒囧壊 enumAddValue 鐨勯�楀彿
+ let values = this.form.enumAddValue.split(',').map(item => item.trim());
+
+ // 妫�鏌ユ槸鍚︽湁鏈夋晥鐨勫��
+ if (values.length < 2 || values.some(item => item === '')) {
+ this.$message.error('璇疯緭鍏ユ湁鏁堢殑鍊硷紝骞剁敤閫楀彿鍒嗛殧锛�');
+ return;
+ }
+
+ // 妫�鏌ュ乏杈瑰�兼槸鍚﹀皬浜庡彸杈瑰��
+ let leftValue = parseFloat(values[0]);
+ let rightValue = parseFloat(values[1]);
+
+ if (isNaN(leftValue) || isNaN(rightValue)) {
+ this.$message.error('璇疯緭鍏ユ湁鏁堢殑鏁板瓧鍊硷紒');
+ return;
+ }
+
+ if (leftValue >= rightValue) {
+ this.$message.error('宸﹁竟鐨勫�间笉鑳藉ぇ浜庢垨绛変簬鍙宠竟鐨勫�硷紒');
+ return;
+ }
+
+ // 鏋勫缓 newValue 鐨勫舰寮� (鍊�1,鍊�2)
+ let newValue = `(${values.join(',')})`;
+
+ // 妫�鏌ユ柊鐨勫�兼槸鍚﹀凡瀛樺湪
+ if (currentRangeArray.includes(newValue)) {
+ this.$message.error('璇ュ�煎煙瑙勫垯宸茬粡瀛樺湪锛�');
+ return;
+ }
+
+ // 娣诲姞鏂板�煎埌鏁扮粍涓�
+ currentRangeArray.push(newValue);
+ this.enumAddListChange = currentRangeArray;
+ this.form.rangeValue = currentRangeArray.join('\n');
+ this.form.enumAddValue = "";
+ return;
+ }
+
+ // 澶勭悊鍏朵粬杩愮畻绗�
+ const operatorMap = {
+ '>': '>',
+ '<': '<',
+ '>=': '>=',
+ '<=': '<=',
+ '=': '=',
+ '!=': '!='
+ };
+
+ // 鍒涘缓鏂扮殑鍊�
+ let newValue = operatorMap[val] + this.form.enumAddValue.trim();
+
+ // 妫�鏌ユ柊鐨勫�兼槸鍚﹀凡瀛樺湪
+ if (currentRangeArray.includes(newValue)) {
+ this.$message.error('璇ュ�煎煙瑙勫垯宸茬粡瀛樺湪锛�');
+ return;
+ }
+
+ // 娣诲姞鏂板�煎埌鏁扮粍涓�
+ currentRangeArray.push(newValue);
+ this.enumAddListChange = currentRangeArray;
+ this.form.rangeValue = currentRangeArray.join('\n');
this.form.enumAddValue = "";
},
// 鍊煎煙绫诲瀷鍒囨崲
- attributeSelectTypeChange(){
+ attributeSelectTypeChange() {
+ this.$forceUpdate(); // 寮哄埗鏇存柊form缁勪欢
+ this.form.referValue = null; // 鍒囨崲鍊煎煙绫诲瀷 娓呯┖褰撳墠鍙傜収
+ },
- }
+ // 閫夋嫨鍙傜収
+ referFormFocusHandler() {
+ this.form.enumSwitch = false;
+ this.form.rangeValue = "";
+ this.form.enumId = "";
+ const handlers = {
+ business: () => {
+ this.businessVisible = true;
+ this.businessLoading = true;
+ this.businessGetTable();
+ },
+ link: () => {
+ this.linkTypeVisible = true;
+ this.linkTypeLoading = true;
+ this.linkGetTable();
+ }
+ };
+
+ const {attributeSelectType} = this.form;
+ const handler = handlers[attributeSelectType];
+
+ if (handler) {
+ handler();
+ }
+ ;
+ },
+
+ // 涓氬姟绫诲瀷琛ㄦ牸鏁版嵁璇锋眰
+ businessGetTable() {
+ getBizTypes(this.businessSearchParams).then(res => {
+ const data = res.data.data;
+ this.businessData = data;
+ this.businessLoading = false;
+ })
+ },
+
+ // 涓氬姟绫诲瀷鍙傜収鎼滅储
+ businessHandleSearch(val, done) {
+ this.businessSearchParams = {
+ btmName: val.name
+ }
+ this.businessGetTable();
+ done()
+ },
+
+ // 涓氬姟绫诲瀷鍙傜収娓呯┖鎼滅储
+ businessHandleReset() {
+ this.businessSearchParams = {};
+ this.businessGetTable();
+ },
+
+ // 閾炬帴绫诲瀷琛ㄦ牸鏁版嵁璇锋眰
+ linkGetTable() {
+ getAllLtName(this.linkTypeSearchParams).then(res => {
+ const data = res.data.data.map(item => ({name: item}));
+ ;
+ this.linkTypeData = data;
+ this.linkDataSearch = data;
+ this.linkTypeLoading = false;
+ })
+ },
+
+ // 閾炬帴绫诲瀷鍙傜収鎼滅储
+ linkHandleSearch(params, done) {
+ const {name} = params;
+
+ if (!params.name) {
+ this.linkTypeData = this.linkDataSearch;
+ return done();
+ }
+ ;
+
+ this.linkTypeData = this.linkDataSearch.filter(item => {
+ console.log(item)
+ return item.name && item.name.includes(name);
+ });
+
+ done();
+ },
+
+ // 閾炬帴绫诲瀷鍙傜収娓呯┖鎼滅储
+ linkHandleReset() {
+ this.linkTypeData = this.linkDataSearch;
+ },
+
+ // 涓氬姟绫诲瀷琛ㄦ牸琛岀偣鍑�
+ businessRowClick(row) {
+ this.businessRow = row;
+ },
+
+ // 涓氬姟绫诲瀷纭畾淇濆瓨
+ businessSaveHandler() {
+ if (func.isEmptyObject(this.businessRow)) {
+ this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹紒')
+ return;
+ }
+
+ this.form.referValue = this.businessRow.name;
+ this.businessVisible = false;
+ },
+
+ // 涓氬姟绫诲瀷娓呯┖
+ businessEmpty() {
+ this.form.referValue = null;
+ this.businessVisible = false;
+ },
+
+ // 閾炬帴绫诲瀷纭畾淇濆瓨
+ linkRowClick(row) {
+ this.linkRow = row;
+ },
+
+ // 涓氬姟绫诲瀷纭畾淇濆瓨
+ linkSaveHandler() {
+ if (func.isEmptyObject(this.linkRow)) {
+ this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹紒')
+ return;
+ }
+
+ this.form.referValue = this.linkRow.name;
+ this.linkTypeVisible = false;
+ },
+
+ // 閾炬帴绫诲瀷娓呯┖
+ linkEmpty() {
+ this.form.referValue = null;
+ this.linkTypeVisible = false;
+ },
+
+ // 鏂板瀵硅瘽妗� 鍙栨秷浜嬩欢
+ addEscHandler() {
+ this.$refs.form.resetFields(); // 瀵规暣涓〃鍗曡繘琛岄噸缃紝灏嗘墍鏈夊瓧娈靛�奸噸缃负鍒濆鍊煎苟绉婚櫎鏍￠獙缁撴灉
+ this.addVisible = false;
+ const form = {
+ id: "",
+ name: "",
+ attributeDataType: "VTString",
+ description: "",
+ nullableFlag: true,
+ attrLength: 50,
+ enumFlag: false,
+ enumId: "",
+ enumSwitch: false,
+ enumAddValue: "",
+ range: "",
+ attributeSelectType: "business",
+ version: 1,
+ defaultValue: "",
+ referValue: "",
+ btmTypeId: "",
+ linkTypeName: "",
+ rangeValue: ""
+ };
+ this.form = form;
+ },
+
+ // 鏂板淇濆瓨
+ addSaveHandler() {
+ const form = {
+ id: "",
+ name: "",
+ attributeDataType: "VTString",
+ description: "",
+ nullableFlag: true,
+ attrLength: 50,
+ enumFlag: false,
+ enumId: "",
+ enumSwitch: false,
+ enumAddValue: "",
+ range: "",
+ attributeSelectType: "business",
+ version: 1,
+ defaultValue: "",
+ referValue: "",
+ btmTypeId: "",
+ linkTypeName: "",
+ rangeValue: ""
+ };
+ if (this.dialogTitle === 'add') {
+ this.form.range = this.form.rangeValue.replace(/\n/g, ';');
+ if (this.form.attributeSelectType === 'business') {
+ this.form.btmTypeId = this.form.referValue;
+ } else {
+ this.form.linkTypeName = this.form.referValue;
+ }
+ addAttribute(this.form).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.msg);
+ this.getTableList();
+ this.form = form;
+ this.addVisible = false;
+ }
+ })
+ }
+ if (this.dialogTitle === 'edit') {
+ this.form.range = this.form.rangeValue.replace(/\n/g, ';');
+ if (this.form.attributeSelectType === 'business') {
+ this.form.btmTypeId = this.form.referValue;
+ } else {
+ this.form.linkTypeName = this.form.referValue;
+ }
+ updateAttribute(this.form).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ this.form = form;
+ this.addVisible = false;
+ }
+ })
+ }
+ },
+
+ // 瀵煎叆
+ upLoadHandler() {
+ this.$refs.upload.visible = true;
+ },
+
+ // 瀵煎嚭
+ downLoadHandler() {
+ if (this.selectList.length <= 0) {
+ this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹繘琛屽鍑�');
+ return;
+ }
+
+ let attrNames = this.selectList.map(item => item.id).join(',');
+ download({attrNames: attrNames}).then(res => {
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('瀵煎嚭鎴愬姛');
+ }).catch(err => {
+ this.$message.error(err);
+ })
+ },
+
+ // 涓嬭浇瀵煎叆妯℃澘
+ downloadTemplateHandler() {
+ downloadAttributeTemplate().then(res => {
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('涓嬭浇鎴愬姛');
+ }).catch(err => {
+ this.$message.error(err);
+ })
+ },
}
}
</script>
@@ -731,6 +1297,6 @@
position: absolute;
top: 50%;
left: 50%;
- transform: translate(-50%, -10%);
+ transform: translate(-50%, -20%);
}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
index 67688b6..f6d274e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
@@ -21,8 +21,8 @@
<el-button icon="el-icon-view" plain size="small" type="primary" @click="chekView">鏌ョ湅浣跨敤鑼冨洿</el-button>
<el-button icon="el-icon-download" plain size="small" type="primary" @click="downloadTemplateHandler">涓嬭浇瀵煎叆妯℃澘
</el-button>
- <el-button icon="el-icon-download" plain size="small" type="primary" @click="downloadHandler">瀵煎嚭</el-button>
<el-button icon="el-icon-upload2" plain size="small" type="primary" @click="uploadUser">瀵煎叆</el-button>
+ <el-button icon="el-icon-download" plain size="small" type="primary" @click="downloadHandler">瀵煎嚭</el-button>
</template>
<template slot="menu" slot-scope="scope">
@@ -462,8 +462,6 @@
message: '宸插彇娑堝垹闄�'
});
});
-
-
},
// 瀵硅瘽妗嗘灇涓句繚瀛�
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
index a894f7f..e1499f1 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
@@ -1,13 +1,116 @@
<template>
- <p>鐘舵�佹睜</p>
+ <el-container>
+
+ <el-aside>
+ <basic-container>
+ <div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
+ <div class="headerCon">
+ <el-button icon="el-icon-plus" plain size="small" type="primary">鍒涘缓
+ </el-button>
+ <el-button icon="el-icon-edit" plain size="small" type="primary">淇敼
+ </el-button>
+ <el-button icon="el-icon-delete" plain size="small" type="danger">鍒犻櫎
+ </el-button>
+ <el-button icon="el-icon-download" plain size="small" type="primary">瀵煎嚭
+ </el-button>
+ <el-button icon="el-icon-upload2" plain size="small" type="primary">瀵煎叆
+ </el-button>
+ <el-button icon="el-icon-view" plain size="small" type="primary">鏌ョ湅
+ </el-button>
+ </div>
+ <!-- 宸︿晶鏍� -->
+ <div style="height: calc(100vh - 280px);">
+ <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <span slot-scope="{ node, data }" class="el-tree-node__label">
+ <span>
+ <i class="el-icon-s-promotion"></i>
+ {{ (node || {}).label }}
+ </span>
+ </span>
+ </avue-tree>
+ </div>
+ </div>
+ </basic-container>
+ </el-aside>
+
+ <el-main>
+ <basic-container>
+
+ </basic-container>
+ </el-main>
+
+ </el-container>
+
</template>
<script>
+import {gridStatus} from "@/api/modeling/statusPool/api";
+
export default {
- name: "index"
+ name: "index",
+ data() {
+ return {
+ treeOption: {
+ height: 'auto',
+ defaultExpandAll: false,
+ menu: false,
+ addBtn: false,
+ props: {
+ label: 'id',
+ value: 'id',
+ children: 'children'
+ }
+ },
+ treeData: [],
+ nodeRow:{}
+ }
+ },
+ created() {
+ this.getTreeList();
+ },
+ methods: {
+ getTreeList() {
+ gridStatus().then(res => {
+ const data = res.data.data;
+ this.treeData = data;
+ this.tableLoading = false;
+ }).catch(err => {
+ this.$message.error(err)
+ });
+ },
+ nodeClick(row) {
+ this.nodeRow = row;
+ }
+ }
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+::v-deep {
+ .el-scrollbar__wrap {
+ overflow: auto !important;
+ }
+}
+.headerCon {
+ display: flex;
+ flex-wrap: wrap;
+ margin-bottom: 5px;
+
+ .el-button + .el-button {
+ margin-left: 5px;
+ }
+
+ .el-button {
+ margin-top: 5px;
+ }
+}
+
+.headerCon > .el-button:nth-child(4) {
+ margin-left: 0;
+}
+
+.headerCon > .el-button:nth-child(7) {
+ margin-left: 0;
+}
</style>
--
Gitblit v1.9.3