Compare commits

..

2 Commits

Author SHA1 Message Date
vayne 27fbd39c6d Merge branch 'master' of http://222.71.165.188:3000/yangshiqiang/NX-zhihui
3 months ago
vayne 461c0d18ac 计量站点配置
3 months ago

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.MeasureSiteConfigMapper">
</mapper>

@ -0,0 +1,16 @@
package jnpf.mapper;
import jnpf.entity.MeasureSiteConfigEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* measureSiteConfig
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-07-29
*/
public interface MeasureSiteConfigMapper extends BaseMapper<MeasureSiteConfigEntity> {
}

@ -0,0 +1,35 @@
package jnpf.service;
import jnpf.model.measuresiteconfig.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* measureSiteConfig
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-07-29
*/
public interface MeasureSiteConfigService extends IService<MeasureSiteConfigEntity> {
List<MeasureSiteConfigEntity> getList(MeasureSiteConfigPagination measureSiteConfigPagination);
List<MeasureSiteConfigEntity> getTypeList(MeasureSiteConfigPagination measureSiteConfigPagination,String dataType);
MeasureSiteConfigEntity getInfo(String id);
void delete(MeasureSiteConfigEntity entity);
void create(MeasureSiteConfigEntity entity);
boolean update(String id, MeasureSiteConfigEntity entity);
//子表方法
//副表数据方法
String checkForm(MeasureSiteConfigForm form,int i);
void saveOrUpdate(MeasureSiteConfigForm measureSiteConfigForm,String id, boolean isSave) throws Exception;
}

@ -0,0 +1,305 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.MeasureSiteConfigMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.measuresiteconfig.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* measureSiteConfig
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-07-29
*/
@Service
public class MeasureSiteConfigServiceImpl extends ServiceImpl<MeasureSiteConfigMapper, MeasureSiteConfigEntity> implements MeasureSiteConfigService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Override
public List<MeasureSiteConfigEntity> getList(MeasureSiteConfigPagination measureSiteConfigPagination){
return getTypeList(measureSiteConfigPagination,measureSiteConfigPagination.getDataType());
}
/** 列表查询 */
@Override
public List<MeasureSiteConfigEntity> getTypeList(MeasureSiteConfigPagination measureSiteConfigPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? MeasureSiteConfigConstant.getAppColumnData() : MeasureSiteConfigConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int measureSiteConfigNum =0;
QueryWrapper<MeasureSiteConfigEntity> measureSiteConfigQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(measureSiteConfigPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = measureSiteConfigPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<MeasureSiteConfigEntity> measureSiteConfigSuperWrapper = new QueryWrapper<>();
measureSiteConfigSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(measureSiteConfigSuperWrapper,MeasureSiteConfigEntity.class,queryJson,"0"));
int measureSiteConfigNum1 = measureSiteConfigSuperWrapper.getExpression().getNormal().size();
if (measureSiteConfigNum1>0){
List<String> measureSiteConfigList =this.list(measureSiteConfigSuperWrapper).stream().map(MeasureSiteConfigEntity::getId).collect(Collectors.toList());
allSuperList.addAll(measureSiteConfigList);
intersectionSuperList.add(measureSiteConfigList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if(superOp.equalsIgnoreCase("and")){
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<MeasureSiteConfigEntity> measureSiteConfigSuperWrapper = new QueryWrapper<>();
measureSiteConfigSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(measureSiteConfigSuperWrapper,MeasureSiteConfigEntity.class,ruleJson,"0"));
int measureSiteConfigNum1 = measureSiteConfigSuperWrapper.getExpression().getNormal().size();
if (measureSiteConfigNum1>0){
List<String> measureSiteConfigList =this.list(measureSiteConfigSuperWrapper).stream().map(MeasureSiteConfigEntity::getId).collect(Collectors.toList());
allRuleList.addAll(measureSiteConfigList);
intersectionRuleList.add(measureSiteConfigList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object measureSiteConfigObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(measureSiteConfigQueryWrapper,MeasureSiteConfigEntity.class,measureSiteConfigPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(measureSiteConfigObj)){
return new ArrayList<>();
} else {
measureSiteConfigQueryWrapper = (QueryWrapper<MeasureSiteConfigEntity>)measureSiteConfigObj;
if( measureSiteConfigQueryWrapper.getExpression().getNormal().size()>0){
measureSiteConfigNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object measureSiteConfigObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(measureSiteConfigQueryWrapper,MeasureSiteConfigEntity.class,measureSiteConfigPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(measureSiteConfigObj)){
return new ArrayList<>();
} else {
measureSiteConfigQueryWrapper = (QueryWrapper<MeasureSiteConfigEntity>)measureSiteConfigObj;
if( measureSiteConfigQueryWrapper.getExpression().getNormal().size()>0){
measureSiteConfigNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(measureSiteConfigPagination.getCode())){
measureSiteConfigNum++;
String value = measureSiteConfigPagination.getCode() instanceof List ?
JsonUtil.getObjectToString(measureSiteConfigPagination.getCode()) :
String.valueOf(measureSiteConfigPagination.getCode());
measureSiteConfigQueryWrapper.lambda().like(MeasureSiteConfigEntity::getCode,value);
}
if(ObjectUtil.isNotEmpty(measureSiteConfigPagination.getName())){
measureSiteConfigNum++;
String value = measureSiteConfigPagination.getName() instanceof List ?
JsonUtil.getObjectToString(measureSiteConfigPagination.getName()) :
String.valueOf(measureSiteConfigPagination.getName());
measureSiteConfigQueryWrapper.lambda().like(MeasureSiteConfigEntity::getName,value);
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
measureSiteConfigQueryWrapper.lambda().in(MeasureSiteConfigEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
measureSiteConfigQueryWrapper.lambda().and(t->t.in(MeasureSiteConfigEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
measureSiteConfigQueryWrapper.lambda().and(t->t.in(MeasureSiteConfigEntity::getId, finalAllRuleIDlist));
}
//假删除标志
measureSiteConfigQueryWrapper.lambda().isNull(MeasureSiteConfigEntity::getDeleteMark);
//排序
if(StringUtil.isEmpty(measureSiteConfigPagination.getSidx())){
measureSiteConfigQueryWrapper.lambda().orderByDesc(MeasureSiteConfigEntity::getId);
}else{
try {
String sidx = measureSiteConfigPagination.getSidx();
String[] strs= sidx.split("_name");
MeasureSiteConfigEntity measureSiteConfigEntity = new MeasureSiteConfigEntity();
Field declaredField = measureSiteConfigEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
measureSiteConfigQueryWrapper="asc".equals(measureSiteConfigPagination.getSort().toLowerCase())?measureSiteConfigQueryWrapper.orderByAsc(value):measureSiteConfigQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<MeasureSiteConfigEntity> page=new Page<>(measureSiteConfigPagination.getCurrentPage(), measureSiteConfigPagination.getPageSize());
IPage<MeasureSiteConfigEntity> userIPage=this.page(page, measureSiteConfigQueryWrapper);
return measureSiteConfigPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<MeasureSiteConfigEntity> list = new ArrayList();
return measureSiteConfigPagination.setData(list, list.size());
}
}else{
return this.list(measureSiteConfigQueryWrapper);
}
}
@Override
public MeasureSiteConfigEntity getInfo(String id){
QueryWrapper<MeasureSiteConfigEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(MeasureSiteConfigEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(MeasureSiteConfigEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, MeasureSiteConfigEntity entity){
return this.updateById(entity);
}
@Override
public void delete(MeasureSiteConfigEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(MeasureSiteConfigForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";
if (isUp){
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getCode())){
return "站点编码不能为空";
}
if(StringUtil.isNotEmpty(form.getCode())){
form.setCode(form.getCode().trim());
QueryWrapper<MeasureSiteConfigEntity> codeWrapper=new QueryWrapper<>();
codeWrapper.lambda().eq(MeasureSiteConfigEntity::getCode,form.getCode());
//假删除标志
codeWrapper.lambda().isNull(MeasureSiteConfigEntity::getDeleteMark);
if (isUp){
codeWrapper.lambda().ne(MeasureSiteConfigEntity::getId, id);
}
if((int) this.count(codeWrapper)>0){
countRecover = "站点编码"+form.getCode()+"已存在,请确认!";
}
}
if(StringUtil.isEmpty(form.getName())){
return "站点名称不能为空";
}
if(StringUtil.isEmpty(form.getIpAddress())){
return "IP地址不能为空";
}
if(StringUtil.isEmpty(form.getSiteLocation())){
return "站点位置不能为空";
}
return countRecover;
}
/**
* ()
* @param id
* @param measureSiteConfigForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(MeasureSiteConfigForm measureSiteConfigForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
measureSiteConfigForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(MeasureSiteConfigConstant.getFormData(),measureSiteConfigForm),MeasureSiteConfigForm.class);
MeasureSiteConfigEntity entity = JsonUtil.getJsonToBean(measureSiteConfigForm, MeasureSiteConfigEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setId(mainId);
entity.setVersion(0);
}else{
}
this.saveOrUpdate(entity);
}
}

@ -185,6 +185,19 @@ public class SpaceServiceImpl extends ServiceImpl<SpaceMapper, SpaceEntity> impl
spaceQueryWrapper.eq("a.id", value);
}
}else if (spacePagination.getType().equals("1")){
if (ObjectUtil.isNotEmpty(spacePagination.getPid())){
QueryWrapper<SpaceEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceEntity::getPid,spacePagination.getPid());
queryWrapper.lambda().eq(SpaceEntity::getType,"2");
queryWrapper.lambda().isNull(SpaceEntity::getDeleteMark);
List<SpaceEntity> list = spaceMapper.selectList(queryWrapper);
if (list != null && list.size() > 0) {
List<String> strList = list.stream().map(SpaceEntity::getId).collect(Collectors.toList());
spaceNum++;
spaceQueryWrapper.in("a.pid", strList);
}
}
}
}else{
spaceNum++;

@ -0,0 +1,524 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.measuresiteconfig.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
import cn.xuyanwu.spring.file.storage.FileInfo;
import lombok.Cleanup;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional;
/**
* measureSiteConfig
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-29
*/
@Slf4j
@RestController
@Tag(name = "measureSiteConfig" , description = "example")
@RequestMapping("/api/example/MeasureSiteConfig")
public class MeasureSiteConfigController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private MeasureSiteConfigService measureSiteConfigService;
@Autowired
private ConfigValueUtil configValueUtil;
/**
*
*
* @param measureSiteConfigPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody MeasureSiteConfigPagination measureSiteConfigPagination)throws IOException{
List<MeasureSiteConfigEntity> list= measureSiteConfigService.getList(measureSiteConfigPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (MeasureSiteConfigEntity entity : list) {
Map<String, Object> measureSiteConfigMap=JsonUtil.entityToMap(entity);
measureSiteConfigMap.put("id", measureSiteConfigMap.get("id"));
//副表数据
//子表数据
realList.add(measureSiteConfigMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, MeasureSiteConfigConstant.getFormData(), MeasureSiteConfigConstant.getColumnData(), measureSiteConfigPagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(measureSiteConfigPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param measureSiteConfigForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid MeasureSiteConfigForm measureSiteConfigForm) {
String b = measureSiteConfigService.checkForm(measureSiteConfigForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
try{
measureSiteConfigService.saveOrUpdate(measureSiteConfigForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* Excel
*
* @return
*/
@Operation(summary = "导出Excel")
@PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody MeasureSiteConfigPagination measureSiteConfigPagination) throws IOException {
if (StringUtil.isEmpty(measureSiteConfigPagination.getSelectKey())){
return ActionResult.fail("请选择导出字段");
}
List<MeasureSiteConfigEntity> list= measureSiteConfigService.getList(measureSiteConfigPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (MeasureSiteConfigEntity entity : list) {
Map<String, Object> measureSiteConfigMap=JsonUtil.entityToMap(entity);
measureSiteConfigMap.put("id", measureSiteConfigMap.get("id"));
//副表数据
//子表数据
realList.add(measureSiteConfigMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, MeasureSiteConfigConstant.getFormData(), MeasureSiteConfigConstant.getColumnData(), measureSiteConfigPagination.getModuleId(),false);
String[]keys=!StringUtil.isEmpty(measureSiteConfigPagination.getSelectKey())?measureSiteConfigPagination.getSelectKey():new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
return ActionResult.success(vo);
}
/**
*
*/
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
DownloadVO vo=DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>();
if(keys.length>0){
for(String key:keys){
switch(key){
case "code" :
entitys.add(new ExcelExportEntity("站点编码" ,"code"));
break;
case "name" :
entitys.add(new ExcelExportEntity("站点名称" ,"name"));
break;
case "quantum" :
entitys.add(new ExcelExportEntity("量程" ,"quantum"));
break;
case "ipAddress" :
entitys.add(new ExcelExportEntity("IP地址" ,"ipAddress"));
break;
case "site" :
entitys.add(new ExcelExportEntity("站点状态" ,"site"));
break;
case "siteLocation" :
entitys.add(new ExcelExportEntity("站点位置" ,"siteLocation"));
break;
case "description" :
entitys.add(new ExcelExportEntity("备注信息" ,"description"));
break;
default:
break;
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try{
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){
if (list.size()==0){
list.add(new HashMap<>());
}
//去除空数据
List<Map<String, Object>> dataList = new ArrayList<>();
for (Map<String, Object> map : list) {
int i = 0;
for (String key : keys) {
//子表
if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-" ));
String field = key.substring(key.indexOf("-" ) + 1);
Object o = map.get(tableField);
if (o != null) {
List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
for (Map<String, Object> childMap : childList) {
if (childMap.get(field) != null) {
i++;
}
}
}
} else {
Object o = map.get(key);
if (o != null) {
i++;
}
}
}
if (i > 0) {
dataList.add(map);
}
}
//复杂表头-表头和数据处理
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(MeasureSiteConfigConstant.getColumnData(), ColumnDataModel.class);
List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
}
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
}
String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
String temporaryFilePath = configValueUtil.getTemporaryFilePath();
FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
vo.setName(fileInfo.getFilename());
vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
} catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return vo;
}
@Operation(summary = "上传文件")
@PostMapping("/Uploader")
public ActionResult<Object> Uploader() {
List<MultipartFile> list = UpUtil.getFileAll();
MultipartFile file = list.get(0);
if (file.getOriginalFilename().endsWith(".xlsx") || file.getOriginalFilename().endsWith(".xls")) {
String filePath = XSSEscape.escape(configValueUtil.getTemporaryFilePath());
String fileName = XSSEscape.escape(RandomUtil.uuId() + "." + UpUtil.getFileType(file));
//上传文件
FileInfo fileInfo = FileUploadUtils.uploadFile(file, filePath, fileName);
DownloadVO vo = DownloadVO.builder().build();
vo.setName(fileInfo.getFilename());
return ActionResult.success(vo);
} else {
return ActionResult.fail("选择文件不符合导入");
}
}
/**
*
*
* @return
*/
@Operation(summary = "模板下载")
@GetMapping("/TemplateDownload")
public ActionResult<DownloadVO> TemplateDownload(){
DownloadVO vo = DownloadVO.builder().build();
UserInfo userInfo = userProvider.get();
Map<String, Object> dataMap = new HashMap<>();
//主表对象
List<ExcelExportEntity> entitys = new ArrayList<>();
//以下添加字段
entitys.add(new ExcelExportEntity("站点编码" ,"code"));
entitys.add(new ExcelExportEntity("站点名称" ,"name"));
entitys.add(new ExcelExportEntity("量程" ,"quantum"));
entitys.add(new ExcelExportEntity("IP地址" ,"ipAddress"));
entitys.add(new ExcelExportEntity("站点状态" ,"site"));
entitys.add(new ExcelExportEntity("站点位置" ,"siteLocation"));
List<Map<String, Object>> list = new ArrayList<>();
list.add(dataMap);
ExportParams exportParams = new ExportParams(null, "计量站点配置模板");
exportParams.setType(ExcelType.XSSF);
try{
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){
if (list.size()==0){
list.add(new HashMap<>());
}
//复杂表头-表头和数据处理
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(MeasureSiteConfigConstant.getColumnData(), ColumnDataModel.class);
List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
list = VisualUtils.complexHeaderDataHandel(list, complexHeaderList);
}
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
}
String fileName = "计量站点配置模板" + DateUtil.dateNow("yyyyMMddHHmmss") + ".xlsx";
MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
String temporaryFilePath = configValueUtil.getTemporaryFilePath();
FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
vo.setName(fileInfo.getFilename());
vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
} catch (Exception e) {
log.error("模板信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return ActionResult.success(vo);
}
/**
*
*
* @return
*/
@Operation(summary = "导入预览" )
@GetMapping("/ImportPreview")
public ActionResult<Map<String, Object>> ImportPreview(String fileName) throws Exception {
Map<String, Object> headAndDataMap = new HashMap<>(2);
String filePath = FileUploadUtils.getLocalBasePath() + configValueUtil.getTemporaryFilePath();
FileUploadUtils.downLocal(configValueUtil.getTemporaryFilePath(), filePath, fileName);
File temporary = new File(XSSEscape.escapePath(filePath + fileName));
int headerRowIndex = 1;
ImportParams params = new ImportParams();
params.setTitleRows(0);
params.setHeadRows(headerRowIndex);
params.setNeedVerify(true);
try {
List<MeasureSiteConfigExcelVO> excelDataList = ExcelImportUtil.importExcel(temporary, MeasureSiteConfigExcelVO.class, params);
// 导入字段
List<ExcelImFieldModel> columns = new ArrayList<>();
columns.add(new ExcelImFieldModel("code","站点编码"));
columns.add(new ExcelImFieldModel("name","站点名称"));
columns.add(new ExcelImFieldModel("quantum","量程"));
columns.add(new ExcelImFieldModel("ipAddress","IP地址"));
columns.add(new ExcelImFieldModel("site","站点状态"));
columns.add(new ExcelImFieldModel("siteLocation","站点位置"));
headAndDataMap.put("dataRow" , JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(excelDataList)));
headAndDataMap.put("headerRow" , JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(columns)));
} catch (Exception e){
e.printStackTrace();
return ActionResult.fail("表头名称不可更改,表头行不能删除");
}
return ActionResult.success(headAndDataMap);
}
/**
*
*
* @return
*/
@Operation(summary = "导入数据" )
@PostMapping("/ImportData")
public ActionResult<ExcelImportModel> ImportData(@RequestBody VisualImportModel visualImportModel) throws Exception {
List<Map<String, Object>> listData=new ArrayList<>();
for(Map<String, Object> map : visualImportModel.getList()){
listData.add(map);
}
ImportFormCheckUniqueModel uniqueModel = new ImportFormCheckUniqueModel();
uniqueModel.setDbLinkId(MeasureSiteConfigConstant.DBLINKID);
uniqueModel.setUpdate(Objects.equals("1", "2"));
ExcelImportModel excelImportModel = generaterSwapUtil.importData(MeasureSiteConfigConstant.getFormData(),listData,uniqueModel,
MeasureSiteConfigConstant.TABLEFIELDKEY,MeasureSiteConfigConstant.getTableList());
List<ImportDataModel> importDataModel = uniqueModel.getImportDataModel();
for (ImportDataModel model : importDataModel) {
String id = model.getId();
Map<String, Object> result = model.getResultData();
if(StringUtil.isNotEmpty(id)){
update(id, JsonUtil.getJsonToBean(result,MeasureSiteConfigForm.class), true);
}else {
create( JsonUtil.getJsonToBean(result,MeasureSiteConfigForm.class));
}
}
return ActionResult.success(excelImportModel);
}
/**
*
*
* @return
*/
@Operation(summary = "导出异常报告")
@PostMapping("/ImportExceptionData")
public ActionResult<DownloadVO> ImportExceptionData(@RequestBody VisualImportModel visualImportModel) {
DownloadVO vo=DownloadVO.builder().build();
List<MeasureSiteConfigExcelErrorVO> measureSiteConfigVOList = JsonUtil.getJsonToList(visualImportModel.getList(), MeasureSiteConfigExcelErrorVO.class);
UserInfo userInfo = userProvider.get();
try{
@Cleanup Workbook workbook = new HSSFWorkbook();
ExportParams exportParams = new ExportParams(null, "错误报告");
exportParams.setType(ExcelType.XSSF);
workbook = ExcelExportUtil.exportExcel(exportParams,
MeasureSiteConfigExcelErrorVO.class, measureSiteConfigVOList);
String fileName = "错误报告" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
String temporaryFilePath = configValueUtil.getTemporaryFilePath();
FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
vo.setName(fileInfo.getFilename());
vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
} catch (Exception e) {
e.printStackTrace();
}
return ActionResult.success(vo);
}
/**
*
* @param ids
* @return
*/
@DeleteMapping("/batchRemove")
@Transactional
@Operation(summary = "批量删除")
public ActionResult batchRemove(@RequestBody String ids){
List<String> idList = JsonUtil.getJsonToList(ids, String.class);
int i =0;
for (String allId : idList){
this.delete(allId);
i++;
}
if (i == 0 ){
return ActionResult.fail("删除失败");
}
return ActionResult.success("删除成功");
}
/**
*
* @param id
* @param measureSiteConfigForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid MeasureSiteConfigForm measureSiteConfigForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
measureSiteConfigForm.setId(id);
if (!isImport) {
String b = measureSiteConfigService.checkForm(measureSiteConfigForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
}
MeasureSiteConfigEntity entity= measureSiteConfigService.getInfo(id);
if(entity!=null){
try{
measureSiteConfigService.saveOrUpdate(measureSiteConfigForm,id,false);
}catch(Exception e){
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
}else{
return ActionResult.fail("更新失败,数据不存在");
}
}
/**
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
MeasureSiteConfigEntity entity= measureSiteConfigService.getInfo(id);
if(entity!=null){
//假删除
entity.setDeleteMark(1);
measureSiteConfigService.update(id,entity);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
MeasureSiteConfigEntity entity= measureSiteConfigService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> measureSiteConfigMap=JsonUtil.entityToMap(entity);
measureSiteConfigMap.put("id", measureSiteConfigMap.get("id"));
//副表数据
//子表数据
measureSiteConfigMap = generaterSwapUtil.swapDataDetail(measureSiteConfigMap,MeasureSiteConfigConstant.getFormData(),"587655098935544389",false);
return ActionResult.success(measureSiteConfigMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
MeasureSiteConfigEntity entity= measureSiteConfigService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> measureSiteConfigMap=JsonUtil.entityToMap(entity);
measureSiteConfigMap.put("id", measureSiteConfigMap.get("id"));
//副表数据
//子表数据
measureSiteConfigMap = generaterSwapUtil.swapDataForm(measureSiteConfigMap,MeasureSiteConfigConstant.getFormData(),MeasureSiteConfigConstant.TABLEFIELDKEY,MeasureSiteConfigConstant.TABLERENAMES);
return ActionResult.success(measureSiteConfigMap);
}
}

@ -0,0 +1,62 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-29
*/
@Data
@TableName("yq_measure_site_config")
public class MeasureSiteConfigEntity {
@TableId(value ="ID" )
private String id;
@TableField(value = "CODE" , updateStrategy = FieldStrategy.IGNORED)
private String code;
@TableField(value = "NAME" , updateStrategy = FieldStrategy.IGNORED)
private String name;
@TableField(value = "QUANTUM" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal quantum;
@TableField(value = "IP_ADDRESS" , updateStrategy = FieldStrategy.IGNORED)
private String ipAddress;
@TableField(value = "SITE" , updateStrategy = FieldStrategy.IGNORED)
private String site;
@TableField(value = "SITE_LOCATION" , updateStrategy = FieldStrategy.IGNORED)
private String siteLocation;
@TableField(value = "DESCRIPTION" , updateStrategy = FieldStrategy.IGNORED)
private String description;
@TableField("REMARK")
private String remark;
@TableField("F_CREATOR_TIME")
private Date creatorTime;
@TableField("F_CREATOR_USER_ID")
private String creatorUserId;
@TableField("F_LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("F_LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("F_DELETE_TIME")
private Date deleteTime;
@TableField("F_DELETE_USER_ID")
private String deleteUserId;
@TableField("F_DELETE_MARK")
private Integer deleteMark;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField("COMPANY_ID")
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
@TableField("F_VERSION")
private Integer version;
@TableField("F_FLOW_ID")
private String flowId;
}

@ -0,0 +1,22 @@
package jnpf.model.measuresiteconfig;
import lombok.Data;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.alibaba.fastjson.annotation.JSONField;
/**
*
* measureSiteConfig
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-29
*/
@Data
public class MeasureSiteConfigExcelErrorVO extends MeasureSiteConfigExcelVO{
@Excel(name = "异常原因",orderNum = "999")
@JSONField(name = "errorsInfo")
private String errorsInfo;
}

@ -0,0 +1,56 @@
package jnpf.model.measuresiteconfig;
import lombok.Data;
import java.sql.Time;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.alibaba.fastjson.annotation.JSONField;
import cn.afterturn.easypoi.excel.annotation.Excel;
import cn.afterturn.easypoi.excel.annotation.ExcelEntity;
import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
import java.math.BigDecimal;
import java.util.List;
/**
*
* measureSiteConfig
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-29
*/
@Data
public class MeasureSiteConfigExcelVO{
/** 站点编码 **/
@JSONField(name = "code")
@Excel(name = "站点编码",orderNum = "1", isImportField = "true" )
private String code;
/** 站点名称 **/
@JSONField(name = "name")
@Excel(name = "站点名称",orderNum = "1", isImportField = "true" )
private String name;
/** 量程 **/
@JSONField(name = "quantum")
@Excel(name = "量程",orderNum = "1", isImportField = "true" )
private Integer quantum;
/** IP地址 **/
@JSONField(name = "ipAddress")
@Excel(name = "IP地址",orderNum = "1", isImportField = "true" )
private String ipAddress;
/** 站点状态 **/
@JSONField(name = "site")
@Excel(name = "站点状态",orderNum = "1", isImportField = "true" )
private String site;
/** 站点位置 **/
@JSONField(name = "siteLocation")
@Excel(name = "站点位置",orderNum = "1", isImportField = "true" )
private String siteLocation;
}

@ -0,0 +1,44 @@
package jnpf.model.measuresiteconfig;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* measureSiteConfig
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-29
*/
@Data
public class MeasureSiteConfigForm {
/** 主键 */
private String id;
/** 乐观锁 **/
@JsonProperty("version")
private Integer version;
/** 站点编码 **/
@JsonProperty("code")
private String code;
/** 站点名称 **/
@JsonProperty("name")
private String name;
/** 量程 **/
@JsonProperty("quantum")
private BigDecimal quantum;
/** IP地址 **/
@JsonProperty("ipAddress")
private String ipAddress;
/** 站点状态 **/
@JsonProperty("site")
private Object site;
/** 站点位置 **/
@JsonProperty("siteLocation")
private String siteLocation;
/** 备注信息 **/
@JsonProperty("description")
private String description;
}

@ -0,0 +1,36 @@
package jnpf.model.measuresiteconfig;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
/**
*
* measureSiteConfig
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-29
*/
@Data
public class MeasureSiteConfigPagination extends Pagination {
/** 查询key */
private String[] selectKey;
/** json */
private String json;
/** 数据类型 0-当前页1-全部数据 */
private String dataType;
/** 高级查询 */
private String superQueryJson;
/** 功能id */
private String moduleId;
/** 菜单id */
private String menuId;
/** 站点编码 */
@JsonProperty("code")
private Object code;
/** 站点名称 */
@JsonProperty("name")
private Object name;
}

@ -6,17 +6,37 @@
<el-dropdown>
<el-link icon="icon-ym icon-ym-mpMenu" :underline="false" />
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="toggleTreeExpand(true)">展开全部</el-dropdown-item>
<el-dropdown-item @click.native="toggleTreeExpand(false)">折叠全部</el-dropdown-item>
<el-dropdown-item @click.native="toggleTreeExpand(true)"
>展开全部</el-dropdown-item
>
<el-dropdown-item @click.native="toggleTreeExpand(false)"
>折叠全部</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="JNPF-common-tree-search-box">
<el-input placeholder="输入关键字" v-model="keyword" suffix-icon="el-icon-search" clearable />
<el-input
placeholder="输入关键字"
v-model="keyword"
suffix-icon="el-icon-search"
clearable
/>
</div>
<el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox"
:expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps"
:default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false" v-if="refreshTree">
<el-tree
:data="treeData"
class="JNPF-common-el-tree"
highlight-current
ref="treeBox"
:expand-on-click-node="false"
@node-click="handleNodeClick"
node-key="id"
:props="treeProps"
:default-expand-all="expandsTree"
:filter-node-method="filterNode"
:lazy="false"
v-if="refreshTree"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<i :class="data.icon"></i>
<span class="text">{{ node.label }}</span>
@ -40,8 +60,12 @@
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="primary" icon="el-icon-search" @click="search()"
>查询</el-button
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
</el-form-item>
</el-col>
</el-form>
@ -49,64 +73,151 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
<el-button
type="primary"
icon="icon-ym icon-ym-btn-add"
@click="addOrUpdateHandle()"
>新增
</el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="exportData()">
<el-button
type="success"
icon="icon-ym icon-ym-btn-upload"
@click="exportData()"
>导出
</el-button>
<el-button type="danger" icon="icon-ym icon-ym-btn-download" @click="handelUpload()">
</el-button>
<el-button type="warning" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()">
<!-- <el-button
type="text"
icon="icon-ym icon-ym-btn-upload"
@click="handelUpload()"
>导入
</el-button> -->
<el-button
type="danger"
icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()"
>批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
<el-tooltip
effect="dark"
:content="$t('common.refresh')"
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="parkName" label="园区名称" align="center" width="250">
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
>
<el-table-column
prop="parkName"
label="园区名称"
align="center"
width="250"
>
</el-table-column>
<el-table-column prop="code" label="区域编码" align="center" width="200">
<el-table-column
prop="code"
label="区域编码"
align="center"
width="200"
>
</el-table-column>
<el-table-column prop="spaceNum" label="空间数量" align="center" width="100">
<el-table-column
prop="spaceNum"
label="空间数量"
align="center"
width="100"
>
<template slot-scope="scope" v-if="scope.row.spaceNum">
<JnpfNumber v-model="scope.row.spaceNum" :thousands="false" />
</template>
</el-table-column>
<el-table-column prop="name" label="区域名称" align="center" width="250">
<el-table-column
prop="name"
label="区域名称"
align="center"
width="250"
>
</el-table-column>
<el-table-column prop="description" label="区域描述" align="center" width="500">
<el-table-column
prop="description"
label="区域描述"
align="center"
width="500"
>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center">
<el-table-column
label="操作"
fixed="right"
width="150"
align="center"
>
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
<el-button
type="text"
class="JNPF-table-delBtn"
@click="handleDel(scope.row.id)"
>删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">
<el-button type="text" @click="goDetail(scope.row.id)"
>详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
<pagination
:total="total"
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<Detail
v-if="detailVisible"
ref="Detail"
@refresh="detailVisible = false"
/>
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
</div>
</template>
@ -399,8 +510,9 @@ export default {
// this.initData();
},
//
async initSearchData() { },
async initSearchData() {},
initData() {
this.getTreeView();
this.listLoading = true;
let _query = {
...this.listQuery,
@ -442,7 +554,7 @@ export default {
});
});
})
.catch(() => { });
.catch(() => {});
},
handelUpload() {
this.uploadBoxVisible = true;
@ -482,7 +594,7 @@ export default {
});
});
})
.catch(() => { });
.catch(() => {});
},
openSuperQuery() {
this.superQueryVisible = true;

@ -0,0 +1,143 @@
<template>
<el-dialog
title="详情"
:close-on-click-modal="false"
append-to-body
:visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center"
lock-scroll
width="1000px"
>
<el-row :gutter="15" class="">
<el-form
ref="formRef"
:model="dataForm"
size="small"
label-width="100px"
label-position="right"
>
<template v-if="!loading">
<el-col :span="8">
<jnpf-form-tip-item label="站点编码" prop="code">
<p>{{ dataForm.code }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="站点名称" prop="name">
<p>{{ dataForm.name }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="量程" prop="quantum">
<JnpfNumber
v-model="dataForm.quantum"
placeholder="数字文本"
disabled
:step="1"
>
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="IP地址" prop="ipAddress">
<p>{{ dataForm.ipAddress }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="站点状态" prop="site">
<p>{{ dataForm.site }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="站点位置" prop="siteLocation">
<p>{{ dataForm.siteLocation }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="备注信息" prop="description">
<p>{{ dataForm.description }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog>
</template>
<script>
import request from "@/utils/request";
import { getConfigData } from "@/api/onlineDev/visualDev";
import jnpf from "@/utils/jnpf";
import Detail from "@/views/basic/dynamicModel/list/detail";
import { thousandsFormat } from "@/components/Generator/utils/index";
export default {
components: { Detail },
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id: "",
code: "",
name: "",
quantum: "",
ipAddress: "",
site: "",
siteLocation: "",
description: ""
},
siteOptions: [
{ fullName: "正常", id: "1" },
{ fullName: "异常", id: "2" }
],
siteProps: { label: "fullName", value: "id" }
};
},
computed: {},
watch: {},
created() {},
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return;
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return;
let formData = JSON.parse(res.data.formData);
formData.popupType = "general";
this.detailVisible = true;
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue);
});
});
},
dataInfo(dataAll) {
let _dataAll = dataAll;
this.dataForm = _dataAll;
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true;
request({
url: "/api/example/MeasureSiteConfig/detail/" + this.dataForm.id,
method: "get"
}).then(res => {
this.dataInfo(res.data);
this.loading = false;
});
}
});
}
}
};
</script>

File diff suppressed because one or more lines are too long

@ -0,0 +1,536 @@
<template>
<el-dialog
:title="!dataForm.id ? '新建' : '编辑'"
:close-on-click-modal="false"
append-to-body
:visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center"
lock-scroll
width="1200px"
>
<el-row :gutter="15" class="">
<el-form
ref="formRef"
:model="dataForm"
:rules="dataRule"
size="small"
label-width="100px"
label-position="right"
>
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item label="站点编码" prop="code">
<JnpfInput
v-model="dataForm.code"
@change="changeData('code', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="站点名称" prop="name">
<JnpfInput
v-model="dataForm.name"
@change="changeData('name', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="量程" prop="quantum">
<el-input-number
v-model="dataForm.quantum"
@change="changeData('quantum', -1)"
placeholder="数字文本"
:step="1"
:style="{ width: '100%' }"
>
</el-input-number>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="IP地址" prop="ipAddress">
<JnpfInput
v-model="dataForm.ipAddress"
@change="changeData('ipAddress', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="站点状态" prop="site">
<JnpfSelect
v-model="dataForm.site"
@change="changeData('site', -1)"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
:options="siteOptions"
:props="siteProps"
>
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="站点位置" prop="siteLocation">
<JnpfInput
v-model="dataForm.siteLocation"
@change="changeData('siteLocation', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="备注信息" prop="description">
<JnpfInput
v-model="dataForm.description"
@change="changeData('description', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog
v-if="selectDialogVisible"
:config="currTableConf"
:formData="dataForm"
ref="selectDialog"
@select="addForSelect"
@close="selectDialogVisible = false"
/>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
</el-button
>
<el-button @click="visible = false"> </el-button>
</span>
</el-dialog>
</template>
<script>
import request from "@/utils/request";
import { mapGetters } from "vuex";
import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
import { getDefaultCurrentValueUserId } from "@/api/permission/user";
import { getDefaultCurrentValueDepartmentId } from "@/api/permission/organize";
import {
getDateDay,
getLaterData,
getBeforeData,
getBeforeTime,
getLaterTime
} from "@/components/Generator/utils/index.js";
import { thousandsFormat } from "@/components/Generator/utils/index";
export default {
components: {},
props: [],
data() {
return {
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
prevDis: false,
nextDis: false,
allList: [],
visible: false,
loading: false,
btnLoading: false,
formRef: "formRef",
setting: {},
eventType: "",
userBoxVisible: false,
selectDialogVisible: false,
currTableConf: {},
dataValueAll: {},
addTableConf: {},
//
ableAll: {},
tableRows: {},
Vmodel: "",
currVmodel: "",
dataForm: {
code: undefined,
name: undefined,
quantum: undefined,
ipAddress: undefined,
site: undefined,
siteLocation: undefined,
description: undefined,
version: 0
},
tableRequiredData: {},
dataRule: {
code: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
name: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
quantum: [
{
required: true,
message: "数字文本",
trigger: ["blur", "change"]
}
],
ipAddress: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
site: [
{
required: true,
message: "请选择",
trigger: "change"
}
],
siteLocation: [
{
required: true,
message: "请输入",
trigger: "blur"
}
]
},
siteOptions: [
{ fullName: "正常", id: "1" },
{ fullName: "异常", id: "2" }
],
siteProps: { label: "fullName", value: "id" },
childIndex: -1,
isEdit: false,
interfaceRes: {
code: [],
name: [],
quantum: [],
ipAddress: [],
site: [],
siteLocation: [],
description: []
}
};
},
computed: {
...mapGetters(["userInfo"])
},
watch: {},
created() {
this.dataAll();
this.initDefaultData();
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm));
},
mounted() {},
methods: {
prev() {
this.index--;
if (this.index === 0) {
this.prevDis = true;
}
this.nextDis = false;
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id);
}
}
},
next() {
this.index++;
if (this.index === this.allList.length - 1) {
this.nextDis = true;
}
this.prevDis = false;
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id);
}
}
},
getInfo(id) {
request({
url: "/api/example/MeasureSiteConfig/" + id,
method: "get"
}).then(res => {
this.dataInfo(res.data);
});
},
goBack() {
this.visible = false;
this.$emit("refreshDataList", true);
},
changeData(model, index) {
this.isEdit = false;
this.childIndex = index;
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key];
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = "get" + key + "Options";
if (this[options]) {
this[options]();
}
this.changeData(key, index);
}
}
}
}
},
changeDataFormData(type, data, model, index, defaultValue) {
if (!this.isEdit) {
if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) {
this.dataForm[data][i][model] = defaultValue;
} else if (index == i) {
this.dataForm[data][i][model] = defaultValue;
}
}
} else {
this.dataForm[data] = defaultValue;
}
}
},
dataAll() {},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
},
init(id, isDetail, allList) {
this.prevDis = false;
this.nextDis = false;
this.allList = allList || [];
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id);
if (this.index == 0) {
this.prevDis = true;
}
if (this.index == this.allList.length - 1) {
this.nextDis = true;
}
} else {
this.prevDis = true;
this.nextDis = true;
}
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true;
request({
url: "/api/example/MeasureSiteConfig/" + this.dataForm.id,
method: "get"
}).then(res => {
this.dataInfo(res.data);
this.loading = false;
});
} else {
this.clearData();
this.initDefaultData();
}
});
this.$store.commit("generator/UPDATE_RELATION_DATA", {});
},
//
initDefaultData() {},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0;
this.$refs["formRef"].validate(valid => {
if (valid) {
this.request();
}
});
},
request() {
let _data = this.dataList();
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true;
} else {
this.btnLoading = true;
}
if (!this.dataForm.id) {
request({
url: "/api/example/MeasureSiteConfig",
method: "post",
data: _data
})
.then(res => {
this.$message({
message: res.msg,
type: "success",
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData();
this.initDefaultData();
});
this.continueBtnLoading = false;
return;
}
this.visible = false;
this.btnLoading = false;
this.$emit("refresh", true);
}
});
})
.catch(() => {
this.btnLoading = false;
this.continueBtnLoading = false;
});
} else {
request({
url: "/api/example/MeasureSiteConfig/" + this.dataForm.id,
method: "PUT",
data: _data
})
.then(res => {
this.$message({
message: res.msg,
type: "success",
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2)
return (this.continueBtnLoading = false);
this.visible = false;
this.btnLoading = false;
this.$emit("refresh", true);
}
});
})
.catch(() => {
this.btnLoading = false;
this.continueBtnLoading = false;
});
}
},
openSelectDialog(key) {
this.currTableConf = this.addTableConf[key];
this.currVmodel = key;
this.selectDialogVisible = true;
this.$nextTick(() => {
this.$refs.selectDialog.init();
});
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i];
if (this["get" + this.currVmodel]) {
this["get" + this.currVmodel](t);
}
}
},
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null;
let timeValue = Number(timeValueData);
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue;
} else if (timeType == 2) {
timeDataValue = dataValue;
} else if (timeType == 3) {
timeDataValue = new Date().getTime();
} else if (timeType == 4) {
let previousDate = "";
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue);
timeDataValue = new Date(previousDate).getTime();
} else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue);
timeDataValue = new Date(previousDate).getTime();
} else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime();
}
} else if (timeType == 5) {
let previousDate = "";
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue);
timeDataValue = new Date(previousDate).getTime();
} else if (timeTarget == 3) {
previousDate = getLaterData(timeValue);
timeDataValue = new Date(previousDate).getTime();
} else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime();
}
}
}
return timeDataValue;
},
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == "HH:mm" ? "HH:mm:00" : formatType;
let timeDataValue = null;
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue || "00:00:00";
if (timeDataValue.split(":").length == 3) {
timeDataValue = timeDataValue;
} else {
timeDataValue = timeDataValue + ":00";
}
} else if (timeType == 2) {
timeDataValue = dataValue;
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format);
} else if (timeType == 4) {
let previousDate = "";
previousDate = getBeforeTime(timeTarget, timeValue);
timeDataValue = this.jnpf.toDate(previousDate, format);
} else if (timeType == 5) {
let previousDate = "";
previousDate = getLaterTime(timeTarget, timeValue);
timeDataValue = this.jnpf.toDate(previousDate, format);
}
}
return timeDataValue;
},
dataList() {
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll) {
let _dataAll = dataAll;
this.dataForm = _dataAll;
this.isEdit = true;
this.dataAll();
this.childIndex = -1;
}
}
};
</script>

@ -0,0 +1,555 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="站点编码">
<el-input v-model="query.code" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="站点名称">
<el-input v-model="query.name" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"
>查询</el-button
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button
type="primary"
icon="icon-ym icon-ym-btn-add"
@click="addOrUpdateHandle()"
>新增
</el-button>
<el-button
type="success"
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
>导出
</el-button>
<!-- <el-button
type="text"
icon="icon-ym icon-ym-btn-upload"
@click="handelUpload()"
>导入
</el-button> -->
<el-button
type="danger"
icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()"
>批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
</el-tooltip>
<el-tooltip
effect="dark"
:content="$t('common.refresh')"
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
</el-tooltip>
</div>
</div>
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
>
<el-table-column prop="code" label="站点编码" align="left">
</el-table-column>
<el-table-column prop="name" label="站点名称" align="left">
</el-table-column>
<el-table-column prop="quantum" label="量程" align="left">
<template slot-scope="scope" v-if="scope.row.quantum">
<JnpfNumber v-model="scope.row.quantum" :thousands="false" />
</template>
</el-table-column>
<el-table-column prop="ipAddress" label="IP地址" align="left">
</el-table-column>
<el-table-column label="站点状态" prop="site" algin="left">
<template slot-scope="scope">
{{ scope.row.site }}
</template>
</el-table-column>
<el-table-column prop="siteLocation" label="站点位置" align="left">
</el-table-column>
<el-table-column prop="description" label="备注信息" align="left">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑
</el-button>
<el-button
type="text"
class="JNPF-table-delBtn"
@click="handleDel(scope.row.id)"
>删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)"
>详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination
:total="total"
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail
v-if="detailVisible"
ref="Detail"
@refresh="detailVisible = false"
/>
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
</div>
</template>
<script>
import request from "@/utils/request";
import { mapGetters } from "vuex";
import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
import JNPFForm from "./form";
import Detail from "./Detail";
import ExportBox from "@/components/ExportBox";
import ToFormDetail from "@/views/basic/dynamicModel/list/detail";
import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
import { getConfigData } from "@/api/onlineDev/visualDev";
import { getDefaultCurrentValueUserIdAsync } from "@/api/permission/user";
import { getDefaultCurrentValueDepartmentIdAsync } from "@/api/permission/organize";
import columnList from "./columnList";
import { thousandsFormat } from "@/components/Generator/utils/index";
import SuperQuery from "@/components/SuperQuery";
import superQueryJson from "./superQueryJson";
export default {
components: {
JNPFForm,
Detail,
ExportBox,
ToFormDetail,
SuperQuery
},
data() {
return {
keyword: "",
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
code: undefined,
name: undefined
},
treeProps: {
children: "children",
label: "fullName",
value: "id",
isLeaf: "isLeaf"
},
list: [],
listLoading: true,
multipleSelection: [],
total: 0,
queryData: {},
listQuery: {
superQueryJson: "",
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: ""
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
siteOptions: [
{ fullName: "正常", id: "1" },
{ fullName: "异常", id: "2" }
],
siteProps: { label: "fullName", value: "id" },
interfaceRes: {}
};
},
computed: {
...mapGetters(["userInfo"]),
menuId() {
return this.$route.meta.modelId || "";
}
},
created() {
this.getColumnList(), this.initSearchDataAndListData();
this.queryData = JSON.parse(JSON.stringify(this.query));
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return;
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return;
let formData = JSON.parse(res.data.formData);
formData.popupType = "general";
this.toFormDetailVisible = true;
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue);
});
});
},
toggleTreeExpand(expands) {
this.refreshTree = false;
this.expandsTree = expands;
this.$nextTick(() => {
this.refreshTree = true;
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null);
});
});
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data;
const config = {
treeInterfaceId: "",
treeTemplateJson: []
};
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || "";
}
}
//
let query = {
paramList: config.treeTemplateJson || []
};
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data;
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
});
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList);
},
transformColumnList(columnList) {
let list = [];
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes("-")) {
list.push(e);
} else {
let prop = e.prop.split("-")[0];
let label = e.label.split("-")[0];
let vModel = e.prop.split("-")[1];
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
};
e.vModel = vModel;
if (!this.expandObj.hasOwnProperty(`${prop}Expand`))
this.$set(this.expandObj, `${prop}Expand`, false);
if (!list.some(o => o.prop === prop)) list.push(newItem);
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e);
break;
}
}
}
}
this.getMergeList(list);
this.getExportList(list);
return list;
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan];
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list));
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + "-child-first"
};
item.children.unshift(child);
}
});
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
});
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
});
}
});
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
});
}
});
},
getExportList(list) {
let exportList = [];
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === "table") {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j]);
}
} else {
exportList.push(list[i]);
}
}
this.exportList = exportList;
},
goDetail(id) {
this.detailVisible = true;
this.$nextTick(() => {
this.$refs.Detail.init(id);
});
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == "ascending" ? "asc" : "desc";
this.listQuery.sidx = !order ? "" : prop;
this.initData();
},
async initSearchDataAndListData() {
await this.initSearchData();
this.initData();
},
//
async initSearchData() {},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: "587655098935544389",
type: 1
};
request({
url: `/api/example/MeasureSiteConfig/getList`,
method: "post",
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj
}));
this.total = res.data.pagination.total;
this.listLoading = false;
});
},
handleDel(id) {
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
type: "warning"
})
.then(() => {
request({
url: `/api/example/MeasureSiteConfig/${id}`,
method: "DELETE"
}).then(res => {
this.$message({
type: "success",
message: res.msg,
onClose: () => {
this.initData();
}
});
});
})
.catch(() => {});
},
handelUpload() {
this.uploadBoxVisible = true;
this.$nextTick(() => {
this.$refs.UploadBox.init("", "example/MeasureSiteConfig");
});
},
handleSelectionChange(val) {
const res = val.map(item => item.id);
this.multipleSelection = res;
},
handleBatchRemoveDel() {
if (!this.multipleSelection.length) {
this.$message({
type: "error",
message: "请选择一条数据",
duration: 1500
});
return;
}
const ids = this.multipleSelection;
this.$confirm("您确定要删除这些数据吗, 是否继续?", "提示", {
type: "warning"
})
.then(() => {
request({
url: `/api/example/MeasureSiteConfig/batchRemove`,
data: ids,
method: "DELETE"
}).then(res => {
this.$message({
type: "success",
message: res.msg,
onClose: () => {
this.initData();
}
});
});
})
.catch(() => {});
},
openSuperQuery() {
this.superQueryVisible = true;
this.$nextTick(() => {
this.$refs.SuperQuery.init();
});
},
superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson;
this.listQuery.currentPage = 1;
this.initData();
},
addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : "";
this.formVisible = true;
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list);
});
},
exportData() {
this.exportBoxVisible = true;
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList);
});
},
download(data) {
let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
};
request({
url: `/api/example/MeasureSiteConfig/Actions/Export`,
method: "post",
data: query
}).then(res => {
if (!res.data.url) return;
this.jnpf.downloadFile(res.data.url);
this.$refs.ExportBox.visible = false;
this.exportBoxVisible = false;
});
},
search() {
this.listQuery.currentPage = 1;
this.listQuery.pageSize = 20;
this.listQuery.sort = "desc";
this.listQuery.sidx = "";
this.initData();
},
refresh(isrRefresh) {
this.formVisible = false;
if (isrRefresh) this.reset();
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData));
this.search();
},
colseFlow(isrRefresh) {
this.flowVisible = false;
if (isrRefresh) this.reset();
}
}
};
</script>

File diff suppressed because one or more lines are too long

@ -11,8 +11,12 @@
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="primary" icon="el-icon-search" @click="search()"
>查询</el-button
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
</el-form-item>
</el-col>
</el-form>
@ -20,57 +24,129 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
<el-button
type="primary"
icon="icon-ym icon-ym-btn-add"
@click="addOrUpdateHandle()"
>新增
</el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="exportData()">
<el-button
type="success"
icon="icon-ym icon-ym-btn-upload"
@click="exportData()"
>导出
</el-button>
<el-button type="danger" icon="icon-ym icon-ym-btn-download" @click="handelUpload()">
</el-button>
<el-button type="warning" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()">
<!-- <el-button
type="text"
icon="icon-ym icon-ym-btn-upload"
@click="handelUpload()"
>导入
</el-button> -->
<el-button
type="danger"
icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()"
>批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
<el-tooltip
effect="dark"
:content="$t('common.refresh')"
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="code" label="园区编码" align="center" width="400">
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
>
<el-table-column
prop="code"
label="园区编码"
align="center"
width="400"
>
</el-table-column>
<el-table-column prop="name" label="园区名称" align="center" width="400">
<el-table-column
prop="name"
label="园区名称"
align="center"
width="400"
>
</el-table-column>
<el-table-column prop="description" label="园区描述" align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center">
<el-table-column
label="操作"
fixed="right"
width="150"
align="center"
>
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
<el-button
type="text"
class="JNPF-table-delBtn"
@click="handleDel(scope.row.id)"
>删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">
<el-button type="text" @click="goDetail(scope.row.id)"
>详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
<pagination
:total="total"
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<Detail
v-if="detailVisible"
ref="Detail"
@refresh="detailVisible = false"
/>
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
</div>
</template>
@ -327,7 +403,7 @@ export default {
// this.initData();
},
//
async initSearchData() { },
async initSearchData() {},
initData() {
this.listLoading = true;
let _query = {
@ -371,7 +447,7 @@ export default {
});
});
})
.catch(() => { });
.catch(() => {});
},
handelUpload() {
this.uploadBoxVisible = true;
@ -411,7 +487,7 @@ export default {
});
});
})
.catch(() => { });
.catch(() => {});
},
openSuperQuery() {
this.superQueryVisible = true;

@ -176,6 +176,7 @@ export default {
props: [],
data() {
return {
parentId: "",
disFlag: false,
dataFormSubmitType: 0,
continueBtnLoading: false,
@ -385,7 +386,8 @@ export default {
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
},
init(id, isDetail, allList, treeActiveId) {
init(id, isDetail, allList, treeActiveId, parentId) {
this.parentId = parentId;
if (id) {
this.disFlag = true;
} else {
@ -466,7 +468,7 @@ export default {
}
this.visible = false;
this.btnLoading = false;
this.$emit("refresh", true);
this.$emit("refresh", true, this.parentId);
}
});
})

@ -6,17 +6,38 @@
<el-dropdown>
<el-link icon="icon-ym icon-ym-mpMenu" :underline="false" />
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="toggleTreeExpand(true)">展开全部</el-dropdown-item>
<el-dropdown-item @click.native="toggleTreeExpand(false)">折叠全部</el-dropdown-item>
<el-dropdown-item @click.native="toggleTreeExpand(true)"
>展开全部</el-dropdown-item
>
<el-dropdown-item @click.native="toggleTreeExpand(false)"
>折叠全部</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="JNPF-common-tree-search-box">
<el-input placeholder="输入关键字" v-model="keyword" suffix-icon="el-icon-search" clearable />
<el-input
placeholder="输入关键字"
v-model="keyword"
suffix-icon="el-icon-search"
clearable
/>
</div>
<el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox"
:expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps"
:default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false" v-if="refreshTree">
<el-tree
:data="treeData"
class="JNPF-common-el-tree"
highlight-current
ref="treeBox"
:expand-on-click-node="false"
@node-click="handleNodeClick"
node-key="id"
:props="treeProps"
:default-expand-all="expandsTree"
:filter-node-method="filterNode"
:lazy="false"
v-if="refreshTree"
:default-checked-keys="['586459847935918405']"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<i :class="data.icon"></i>
<span class="text">{{ node.label }}</span>
@ -40,8 +61,12 @@
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="primary" icon="el-icon-search" @click="search()"
>查询</el-button
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
</el-form-item>
</el-col>
</el-form>
@ -49,77 +74,174 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
<el-button
type="primary"
icon="icon-ym icon-ym-btn-add"
@click="addOrUpdateHandle()"
>新增
</el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="exportData()">
<el-button
type="success"
icon="icon-ym icon-ym-btn-upload"
@click="exportData()"
>导出
</el-button>
<el-button type="danger" icon="icon-ym icon-ym-btn-download" @click="handelUpload()">
</el-button>
<el-button type="warning" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()">
<!-- <el-button
type="text"
icon="icon-ym icon-ym-btn-upload"
@click="handelUpload()"
>导入
</el-button> -->
<el-button
type="danger"
icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()"
>批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
<el-tooltip
effect="dark"
:content="$t('common.refresh')"
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="areaName" label="区域名称" align="center" width="250">
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
>
<el-table-column
prop="areaName"
label="区域名称"
align="center"
width="250"
>
</el-table-column>
<el-table-column label="状态" prop="state1" align="center" width="100">
<el-table-column
label="状态"
prop="state1"
align="center"
width="100"
>
<template slot-scope="scope">
{{ scope.row.state1 }}
</template>
</el-table-column>
<el-table-column prop="code" label="空间编码" align="center" width="200">
<el-table-column
prop="code"
label="空间编码"
align="center"
width="200"
>
</el-table-column>
<el-table-column prop="name" label="空间名称" align="center" width="250">
<el-table-column
prop="name"
label="空间名称"
align="center"
width="250"
>
</el-table-column>
<el-table-column prop="spaceArea" label="空间面积" align="center" width="120">
<el-table-column
prop="spaceArea"
label="空间面积"
align="center"
width="120"
>
<template slot-scope="scope" v-if="scope.row.spaceArea">
<JnpfNumber v-model="scope.row.spaceArea" :thousands="false" />
</template>
</el-table-column>
<el-table-column label="空间类型" prop="spaceType1" align="center" width="150">
<el-table-column
label="空间类型"
prop="spaceType1"
align="center"
width="150"
>
<template slot-scope="scope">
{{ scope.row.spaceType1 }}
</template>
</el-table-column>
<el-table-column prop="unitPrice" label="单价" align="center" width="120">
<el-table-column
prop="unitPrice"
label="单价"
align="center"
width="120"
>
<template slot-scope="scope" v-if="scope.row.unitPrice">
<JnpfNumber v-model="scope.row.unitPrice" :thousands="false" />
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center">
<el-table-column
label="操作"
fixed="right"
width="150"
align="center"
>
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
<el-button
type="text"
class="JNPF-table-delBtn"
@click="handleDel(scope.row.id)"
>删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">
<el-button type="text" @click="goDetail(scope.row.id)"
>详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
<pagination
:total="total"
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<Detail
v-if="detailVisible"
ref="Detail"
@refresh="detailVisible = false"
/>
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
</div>
</template>
@ -151,6 +273,8 @@ export default {
},
data() {
return {
parentId: "",
parentId1: "",
title: "",
keyword: "",
expandsTree: true,
@ -410,14 +534,6 @@ export default {
return fullPath;
},
handleNodeClick(data, node) {
if (data.type == "1") {
this.$message({
type: "error",
message: "请选择区域或者空间",
duration: 1500
});
return;
}
this.title = data.name;
this.treeActiveId = data.id;
for (let key in this.query) {
@ -425,6 +541,7 @@ export default {
}
this.query.pid = data.id;
this.query.type = data.type;
this.parentId = data.pid;
this.listQuery = {
currentPage: 1,
pageSize: 20,
@ -438,8 +555,9 @@ export default {
// this.initData();
},
//
async initSearchData() { },
async initSearchData() {},
initData() {
this.getTreeView();
this.listLoading = true;
let _query = {
...this.listQuery,
@ -482,7 +600,7 @@ export default {
});
});
})
.catch(() => { });
.catch(() => {});
},
handelUpload() {
this.uploadBoxVisible = true;
@ -522,7 +640,7 @@ export default {
});
});
})
.catch(() => { });
.catch(() => {});
},
openSuperQuery() {
this.superQueryVisible = true;
@ -547,7 +665,13 @@ export default {
let id = row ? row.id : "";
this.formVisible = true;
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list, this.treeActiveId);
this.$refs.JNPFForm.init(
id,
isDetail,
this.list,
this.treeActiveId,
this.parentId
);
});
},
exportData() {
@ -581,12 +705,19 @@ export default {
this.listQuery.sidx = "";
this.initData();
},
refresh(isrRefresh) {
refresh(isrRefresh, parentId) {
console.log(isrRefresh);
this.formVisible = false;
if (isrRefresh) this.reset();
if (isrRefresh) this.reset(parentId);
},
reset() {
reset(parentId) {
this.query = JSON.parse(JSON.stringify(this.queryData));
if (parentId) {
this.query.type = "1";
this.query.pid = parentId;
this.parentId1 = parentId;
}
this.search();
},
colseFlow(isrRefresh) {
@ -596,3 +727,8 @@ export default {
}
};
</script>
<style scope>
.active {
background: #999;
}
</style>

Loading…
Cancel
Save