diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java index 840ffbf4..0a4ef93a 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java @@ -44,12 +44,27 @@ public class BmNumLogs extends BaseEntity { @Excel(name = "实例/任务") private String task; + /** + * 任务名称 + */ + private String taskName; + /** * 规格id */ @Excel(name = "规格id") private Integer typeId; + /** + * 规格名称 + */ + private String typeName; + + /** + * 父级规格名称 + */ + private String typeParentName; + /** * 数量 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java index 6b226e62..381c4732 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java @@ -53,7 +53,7 @@ public class BackApplyController extends BaseController { @PostMapping("getbackList") public AjaxResult getbackList(@RequestBody BackApplyInfo record) { try { - record.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + record.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); List list = backApplyService.getbackList(record); return success(list); } catch (Exception e) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 30394be8..2e756eff 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -189,7 +189,7 @@ public class BackReceiveController extends BaseController { } } - @Log(title = "退料接收-结束任务", businessType = BusinessType.INSERT) + @Log(title = "退料接收-结束任务", businessType = BusinessType.MATERIAL) @PostMapping("endBack") public AjaxResult endBack(@RequestBody BackApplyInfo record) { try { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/CompositeQueryController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/CompositeQueryController.java index fce07652..d94dfcdd 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/CompositeQueryController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/CompositeQueryController.java @@ -1,13 +1,10 @@ package com.bonus.sgzb.app.controller; -import cn.hutool.core.collection.CollUtil; import com.bonus.sgzb.app.domain.StorageStatus; import com.bonus.sgzb.app.service.HoldingLedgerService; -import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; -import com.bonus.sgzb.common.log.enums.BusinessType; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index cdc48d37..cc3e6951 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java @@ -128,7 +128,7 @@ public class LeaseOutDetailsController extends BaseController { * * @param record 出库内容 */ - @Log(title = "领料出库", businessType = BusinessType.UPDATE) + @Log(title = "领料出库", businessType = BusinessType.MATERIAL) @PostMapping("/submitOut") public AjaxResult submitOut(@RequestBody LeaseOutDetails record) { return leaseOutDetailsService.submitOut(record); @@ -138,7 +138,7 @@ public class LeaseOutDetailsController extends BaseController { * @param recordList * @return */ - @Log(title = "领料出库", businessType = BusinessType.UPDATE) + @Log(title = "领料出库", businessType = BusinessType.MATERIAL) @PostMapping("/submitOutRfid") public AjaxResult submitOutRfid(@RequestBody List recordList) { if (CollUtil.isEmpty(recordList)){ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 4a5ab90b..4bfbb726 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -177,7 +177,7 @@ public class TmTaskController extends BaseController { } if (StringUtils.isNotBlank(task.getLeaseApplyInfo().getPhone())) { String phone = task.getLeaseApplyInfo().getPhone(); - if (!PhoneUtil.isMobile(phone)){ + if (!PhoneUtil.isMobile(phone)) { logger.error("手机号格式错误 :{}", phone); return AjaxResult.error("手机号格式错误"); } @@ -406,7 +406,7 @@ public class TmTaskController extends BaseController { /** * 查询机具领料管理列表 * - * @param task 筛选条件 + * @param task 筛选条件 * @param sourceBy app为1 web为0 * @return 列表 */ @@ -496,13 +496,19 @@ public class TmTaskController extends BaseController { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); } - startPage(); if (SecurityUtils.getLoginUser() != null) { Long userid = SecurityUtils.getLoginUser().getUserid(); task.setUserId(String.valueOf(userid)); } - List leaseAuditList = tmTaskService.getLeaseAuditListByOne(task); - return AjaxResult.success(getDataTable(leaseAuditList)); + // app端传1 + if (task.getSouceBy() == 1) { + List leaseAuditList = tmTaskService.getLeaseAuditListByOne(task); + return AjaxResult.success(leaseAuditList); + } else { + startPage(); + List leaseAuditList = tmTaskService.getLeaseAuditListByOne(task); + return AjaxResult.success(getDataTable(leaseAuditList)); + } } /** @@ -527,18 +533,40 @@ public class TmTaskController extends BaseController { } /** - * 修改任务信息 + * 宁夏修改任务信息 */ - @Log(title = "修改任务信息", businessType = BusinessType.UPDATE) + @Log(title = "宁夏修改任务信息", businessType = BusinessType.UPDATE) @PostMapping("/edit") public AjaxResult edit(@RequestBody TmTask task) { - if (StringUtils.isNull(task)) { - return AjaxResult.error("参数错误,传入信息为空!"); + try { + if (StringUtils.isNull(task)) { + return AjaxResult.error("参数错误,传入信息为空!"); + } + tmTaskService.edit(task); + return AjaxResult.success("修改成功"); + } catch (Exception e) { + return AjaxResult.error("修改失败"); } - tmTaskService.edit(task); - return AjaxResult.success("修改成功"); + } + /** + * 重庆修改任务信息 + */ + @Log(title = "重庆修改任务信息", businessType = BusinessType.UPDATE) + @PostMapping("/editCq") + public AjaxResult editCq(@RequestBody TmTask task) { + try { + if (StringUtils.isNull(task)) { + return AjaxResult.error("参数错误,传入信息为空!"); + } + tmTaskService.editCq(task); + return AjaxResult.success("修改成功"); + } catch (Exception e) { + return AjaxResult.error("修改失败"); + } + + } /** * 通过主键查询单条数据 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index 3c108b28..f83a8792 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -186,4 +186,16 @@ public class BackApplyInfo { private String endTime; private Integer flag; private Integer partNum; + /** + * 合格数量 + */ + private Integer hgNum; + /** + * 维修数量 + */ + private Integer wxNum; + /** + * 报废数量 + */ + private Integer bfNum; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index dec96c96..5f03dddc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -265,5 +265,6 @@ public class TmTask implements Serializable { private Date estimateLeaseTime; private Integer souceByRefuse; + private int souceBy; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java index 9c6fc3e0..0996f458 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java @@ -103,9 +103,6 @@ public class TmTaskDto implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @Excel(name = "申请时间", sort = 5) private Date createTime; /** @@ -209,6 +206,9 @@ public class TmTaskDto implements Serializable { private String examineStatus; @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Excel(name = "申请时间", sort = 5) private String createTimes; @ApiModelProperty(value = "更新时间") diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java index 0b625f01..01da2bc8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.app.mapper; import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; +import com.bonus.sgzb.app.domain.MachinePart; import com.bonus.sgzb.app.domain.TmTask; import org.apache.ibatis.annotations.Mapper; @@ -52,4 +53,8 @@ public interface BackApplyAppMapper { int refuse(BackApplyInfo record); int updateTmTask(BackApplyInfo record); + + List getMaTypeDetails(BackApplyInfo backApplyInfo); + + MachinePart getMachineParts(TmTask typeId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java index d6693379..0060ec8b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java @@ -18,7 +18,7 @@ public interface LeaseApplyInfoMapper { int deleteByPrimaryKey(Integer id); int insert(LeaseApplyInfo record); - LeaseApplyInfo selectByTaskIdAndCompId(@Param("taskId") String taskId, @Param("companyId") String companyId); + LeaseApplyInfo selectByTaskIdAndCompId(@Param("taskId") String taskId, @Param("companyId") Integer companyId); int insertOrUpdate(LeaseApplyInfo record); @@ -37,4 +37,6 @@ public interface LeaseApplyInfoMapper { int updateBatchSelective(List list); int batchInsert(@Param("list") List list); + + LeaseApplyInfo selectByTaskIdAndCompIdCq(@Param("taskId") String taskId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 7930eab4..73a04675 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -138,4 +138,8 @@ public interface TmTaskMapper { * @return */ int deleteTaskAgreementByTaskId(@Param("taskId") String taskId); + + int updateLeaseApplyInfoRejectInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo); + + int updateLeaseApplyInfoAuditInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index 5bf836c4..e7359a8b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -70,6 +70,7 @@ public interface TmTaskService{ int updateByPrimaryKeySelective(TmTask record); int edit(TmTask tmTask); + int editCq(TmTask tmTask); Integer getAgreementIdByUnit(TmTask task); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java index 829f568e..796c78fe 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java @@ -3,11 +3,13 @@ package com.bonus.sgzb.app.service.impl; import cn.hutool.core.collection.CollUtil; import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; +import com.bonus.sgzb.app.domain.MachinePart; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.mapper.BackApplyAppMapper; import com.bonus.sgzb.app.service.BackApplyService; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -112,7 +114,27 @@ public class BackApplyServiceImpl implements BackApplyService { @Override public List examineView(BackApplyInfo record) { - return backApplyMapper.examineView(record); + List backApplyInfoList = backApplyMapper.examineView(record); + return getMaTypeDetails(backApplyInfoList); + } + + private List getMaTypeDetails(List view) { + if (view.size() > 0) { + for (BackApplyInfo backApplyInfo : view) { + if ("2".equals(backApplyInfo.getManageType())) { + List machineParts = new ArrayList<>(); + List typeIds = backApplyMapper.getMaTypeDetails(backApplyInfo); + typeIds.removeIf(item -> item == null); + for (TmTask typeId : typeIds) { + MachinePart machinePart = backApplyMapper.getMachineParts(typeId); + machinePart.setPartNum((typeId.getPartNum() * Double.parseDouble(backApplyInfo.getPreNum()))); + machineParts.add(machinePart); + } + backApplyInfo.setMaTypeDetails(machineParts); + } + } + } + return view; } @Override @@ -124,11 +146,11 @@ public class BackApplyServiceImpl implements BackApplyService { record.setCreateBy(userId); if (roles.contains("jjfgs") || roles.contains("admin")) { record.setStatus("1"); - backApplyMapper.audit(record); + backApplyMapper.audit(record); } if (roles.contains("tsfgs") || roles.contains("admin")) { record.setStatus("3"); - backApplyMapper.audit(record); + backApplyMapper.audit(record); } List taskIdById = backApplyMapper.getTaskIdById(record); if (CollUtil.isNotEmpty(taskIdById)) { @@ -149,8 +171,8 @@ public class BackApplyServiceImpl implements BackApplyService { public int refuse(BackApplyInfo record) { int num = 0; Set roles = SecurityUtils.getLoginUser().getRoles(); - String username = SecurityUtils.getLoginUser().getUsername(); - record.setCreateBy(username); + Long userid = SecurityUtils.getLoginUser().getUserid(); + record.setCreateBy(userid.toString()); if (roles.contains("jjfgs") || roles.contains("admin")) { record.setStatus("2"); return backApplyMapper.refuse(record); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 73e1b9a7..03a644d6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -205,8 +205,11 @@ public class TmTaskServiceImpl implements TmTaskService { if (CollUtil.isNotEmpty(leaseApplyInfoList)) { for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { if (leaseApplyInfo != null) { - //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); - result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo); + if (leaseApplyInfo.getCompanyId() == null) { + result += tmTaskMapper.updateLeaseApplyInfoAuditInfoCq(leaseApplyInfo); + } else { + result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo); + } } } } @@ -898,8 +901,11 @@ public class TmTaskServiceImpl implements TmTaskService { if (CollUtil.isNotEmpty(leaseApplyInfoList)) { for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { if (leaseApplyInfo != null) { - //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); - result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo); + if (leaseApplyInfo.getCompanyId() == null) { + result += tmTaskMapper.updateLeaseApplyInfoRejectInfoCq(leaseApplyInfo); + } else { + result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo); + } } } } @@ -1019,12 +1025,12 @@ public class TmTaskServiceImpl implements TmTaskService { @Override @Transactional(rollbackFor = Exception.class) public int edit(TmTask tmTask) { - int flag = 0; int res = 0; - int taskResult = this.updateByPrimaryKeySelective(tmTask); + //修改任务信息（tm_task） + this.updateByPrimaryKeySelective(tmTask); try { if (CollUtil.isEmpty(tmTask.getLeaseApplyInfoList())) { - flag = 1; + throw new RuntimeException("参数异常"); } // 修改任务关联的协议 this.updateAgreementByTask(tmTask); @@ -1050,7 +1056,44 @@ public class TmTaskServiceImpl implements TmTaskService { } } catch (Exception e) { log.error(e.getMessage(), e); + } + return res; + } + @Override + @Transactional(rollbackFor = Exception.class) + public int editCq(TmTask tmTask) { + int res = 0; + //修改任务信息（tm_task） + this.updateByPrimaryKeySelective(tmTask); + try { + if (CollUtil.isEmpty(tmTask.getLeaseApplyInfoList())) { + throw new RuntimeException("参数异常"); + } + // 修改任务关联的协议 + this.updateAgreementByTask(tmTask); + //先删除leaseApplyDetail + res = deletePreDetailData(tmTask); + if (res == 0) { + throw new RuntimeException("删除leaseApplyDetail异常"); + } + //再删除leaseApplyInfo + res = deletePreData(tmTask); + if (res == 0) { + throw new RuntimeException("删除leaseApplyInfo异常"); + } + // 先查询lease apply info，根据task id,company id,不存在则插入，领料任务，领料单号，领料人，联系电话，备注，存在则不插入 + res = insertNewDataCq(tmTask); + if (res == 0) { + throw new RuntimeException("insertNewData异常"); + } + // 再插入lease apply detail + res = insertNewDetailData(tmTask); + if (res == 0) { + throw new RuntimeException("insertNewDetailData异常"); + } + } catch (Exception e) { + log.error(e.getMessage(), e); } return res; } @@ -1079,7 +1122,53 @@ public class TmTaskServiceImpl implements TmTaskService { Long taskId = task.getTaskId(); if (CollUtil.isNotEmpty(leaseApplyDetails)) { for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { - LeaseApplyInfo leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), String.valueOf(leaseApplyDetail.getCompanyId())); + LeaseApplyInfo leaseApplyInfos = new LeaseApplyInfo(); + if (leaseApplyDetail.getCompanyId() == null) { + leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompIdCq(String.valueOf(taskId)); + } else { + leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), leaseApplyDetail.getCompanyId()); + } + if (leaseApplyInfos == null) { + LeaseApplyInfo leaseApplyInfo = new LeaseApplyInfo(); + String code = this.genderLeaseCode(); + leaseApplyInfo.setCode(code); + leaseApplyInfo.setTaskId(task.getTaskId().intValue()); + leaseApplyInfo.setCode(task.getLeaseApplyInfoList().get(0).getCode()); + leaseApplyInfo.setLeasePerson(leasePerson); + leaseApplyInfo.setPhone(phone); + if (task.getTaskStatus() == 32 && task.getSouceByRefuse() == 1) { + leaseApplyInfo.setDeptAuditBy(task.getLeaseApplyInfoList().get(0).getDeptAuditBy()); + leaseApplyInfo.setDeptAuditTime(task.getLeaseApplyInfoList().get(0).getDeptAuditTime()); + leaseApplyInfo.setDeptAuditRemark(task.getLeaseApplyInfoList().get(0).getDeptAuditRemark()); + } + leaseApplyInfo.setRemark(remark); + leaseApplyInfo.setType(task.getLeaseApplyInfoList().get(0).getType()); + leaseApplyInfo.setCompanyId(leaseApplyDetail.getCompanyId()); + leaseApplyInfo.setEstimateLeaseTime(task.getEstimateLeaseTime()); + leaseApplyInfo.setLeaseType(task.getLeaseType()); + res = leaseApplyInfoMapper.insert(leaseApplyInfo); + } + } + } + return res; + } + + private int insertNewDataCq(TmTask task) { + int res = 0; + LeaseApplyInfo leaseApplyInfo1 = task.getLeaseApplyInfo(); + String leasePerson = ""; + String remark = ""; + String phone = ""; + if (leaseApplyInfo1 != null) { + leasePerson = leaseApplyInfo1.getLeasePerson(); + remark = leaseApplyInfo1.getRemark(); + phone = leaseApplyInfo1.getPhone(); + } + List leaseApplyDetails = task.getLeaseApplyDetails(); + Long taskId = task.getTaskId(); + if (CollUtil.isNotEmpty(leaseApplyDetails)) { + for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + LeaseApplyInfo leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompIdCq(String.valueOf(taskId)); if (leaseApplyInfos == null) { LeaseApplyInfo leaseApplyInfo = new LeaseApplyInfo(); String code = this.genderLeaseCode(); @@ -1111,9 +1200,17 @@ public class TmTaskServiceImpl implements TmTaskService { Long taskId = task.getTaskId(); if (CollUtil.isNotEmpty(leaseApplyDetails)) { for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { - LeaseApplyInfo leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), String.valueOf(leaseApplyDetail.getCompanyId())); + LeaseApplyInfo leaseApplyInfos = new LeaseApplyInfo(); + if (leaseApplyDetail.getCompanyId() == null) { + leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompIdCq(String.valueOf(taskId)); + } else { + leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), leaseApplyDetail.getCompanyId()); + } Integer id = leaseApplyInfos.getId(); - if (leaseApplyDetail.getCompanyId().equals(leaseApplyInfos.getCompanyId())) { + if (leaseApplyDetail.getCompanyId() == null && leaseApplyInfos.getCompanyId() == null) { + leaseApplyDetail.setParenntId(id); + res = leaseApplyDetailsMapper.insert(leaseApplyDetail); + } else if (leaseApplyDetail.getCompanyId().equals(leaseApplyInfos.getCompanyId())) { leaseApplyDetail.setParenntId(id); res = leaseApplyDetailsMapper.insert(leaseApplyDetail); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java index de434013..e61da57c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author c liu * @date 2023/12/11 @@ -134,4 +136,9 @@ public class RepairTask { @ApiModelProperty(value = "维修时间") @Excel(name = "维修时间",sort = 16) private String updateTime; + + /** 导出选中列表 */ + @ApiModelProperty(value = "导出选中列表") + private List dataCondition; + } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml index 7432ec36..d1eeff16 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml @@ -466,7 +466,7 @@ GROUP_CONCAT(bai.company_id) as companyId, GROUP_CONCAT(DISTINCT bad.type_id) as typeId, GROUP_CONCAT(CONCAT_WS('/', IFNULL(mt2.type_name, ''))) AS typeName, - SUM(DISTINCT bad.pre_num) AS num, + SUM(bad.pre_num) AS num, bai.direct_audit_remark as directAuditRemark FROM back_apply_info bai @@ -488,6 +488,9 @@ SELECT mt.type_name typeCode, CONCAT_WS('/', IFNULL(mt2.type_name, '')) AS typeName, + bad.type_id as typeId, + mt.manage_type as manageType, + bad.pre_num as preNum, bad.pre_num as num FROM back_apply_details bad @@ -511,6 +514,27 @@ (SELECT * FROM back_apply_info bai2 WHERE bai2.id = #{id}) dd on bai1.task_id = dd.task_id + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index fe18cbab..f16c7ec5 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -621,8 +621,7 @@ WHERE tt.task_status IN ( 37, 38, 39, 40 ) - and (bai.code like concat('%', #{keyWord}, '%') or - bagi.agreement_code like concat('%', #{keyWord}, '%')) + and bai.code like concat('%', #{keyWord}, '%') and bui.unit_id = #{unitId} @@ -964,8 +963,10 @@ SELECT mt2.type_name AS typeName, mt1.type_name AS typeCode, - ifnull(sum( bcd.back_num ), 0) AS backNum, - mm.ma_code as maCode, + SUM( CASE WHEN bcd.back_status = 1 THEN bcd.back_num ELSE 0 END ) AS hgNum, + SUM( CASE WHEN bcd.back_status = 2 THEN bcd.back_num ELSE 0 END ) AS wxNum, + SUM( CASE WHEN bcd.back_status = 3 THEN bcd.back_num ELSE 0 END ) AS bfNum, + mm.ma_code AS maCode, bcd.create_time AS backTime, bcd.type_id as modelId, bcd.back_status AS backStatus diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml index 715c5070..238b663c 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml @@ -44,6 +44,15 @@ where task_id = #{taskId} and company_id = #{companyId} + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index d83cb258..f63ea7e1 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -526,6 +526,7 @@ AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or tt.code like concat('%', #{record.keyWord}, '%')) + GROUP BY tt.task_id ORDER BY tt.update_time DESC @@ -810,6 +811,75 @@ UPDATE lease_apply_info SET lease_person = #{leasePerson}, phone = #{phone}, remark = #{remark} WHERE task_id = #{taskId} + + UPDATE + lease_apply_info + set + + + company_audit_by = #{record.companyAuditBy}, + company_audit_time = now(), + company_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, + + + dept_audit_by = #{record.companyAuditBy}, + dept_audit_time = now(), + dept_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, + + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, + + + WHERE + task_id = #{record.taskId} and company_id is null + + + UPDATE + lease_apply_info + set + + + company_audit_by = #{record.companyAuditBy}, + company_audit_time = now(), + company_audit_remark = #{record.companyAuditRemark}, + + + dept_audit_by = #{record.companyAuditBy}, + dept_audit_time = now(), + dept_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, + + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, + + + update_by = #{record.companyAuditBy}, + update_time = now(), + + + update_by = #{record.companyAuditBy}, + update_time = now(), + + + update_by = #{record.companyAuditBy}, + update_time = now(), + + + update_by = #{record.companyAuditBy}, + update_time = now(), + + + WHERE + task_id = #{record.taskId} and company_id is null + diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java index 12566f2f..bbf4927e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java @@ -3,6 +3,8 @@ package com.bonus.sgzb.material.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.bonus.sgzb.common.log.annotation.Log; +import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.material.domain.LeaseApplyInfo; import com.bonus.sgzb.material.domain.MaInputRecord; import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService; @@ -45,6 +47,18 @@ public class PurchaseMacodeInfoController extends BaseController { return AjaxResult.success(list); } + /** + * 查询新购验收编号管理列表 + */ + @ApiOperation(value = "查询单个新购验收编号管理列表详情") + @GetMapping("/details") + public AjaxResult details(PurchaseMacodeInfo purchaseMacodeInfo) throws Exception { + if (purchaseMacodeInfo.getTaskId() == null || purchaseMacodeInfo.getTaskId() == 0) { + throw new Exception("任务taskId为空!!!"); + } + List list = purchaseMacodeInfoService.selectPurchaseMacodeInfoListDetails(purchaseMacodeInfo); + return AjaxResult.success(list); + } /** * 导出新购验收编号管理列表 */ @@ -107,6 +121,7 @@ public class PurchaseMacodeInfoController extends BaseController { * 通过/不通过 */ @ApiOperation(value = "新购入库审核") + @Log(title = "新购验收任务", businessType = BusinessType.MATERIAL) @PutMapping("/manageStatus") public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputVO)); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java index 37ede482..9d8f7232 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java @@ -280,4 +280,6 @@ public interface PurchaseMacodeInfoMapper { int selectPurchaseCheckDetailsStatus(Long taskId); int updateMaTypeNum(MachinePart wholeSetDetail); + + List selectPurchaseMacodeInfoListDetails(PurchaseMacodeInfo purchaseMacodeInfo); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java index 1faf8175..6dd79771 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java @@ -32,6 +32,7 @@ public interface IPurchaseMacodeInfoService * @return 新购验收编号管理purchase_macode_info集合 */ public List selectPurchaseMacodeInfoList(PurchaseMacodeInfo purchaseMacodeInfo); + public List selectPurchaseMacodeInfoListDetails(PurchaseMacodeInfo purchaseMacodeInfo); /** * 新增新购验收编号管理purchase_macode_info diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index 725b8ac5..02d3fa20 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -92,6 +92,12 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService return purchaseMacodeInfoList; } + @Override + public List selectPurchaseMacodeInfoListDetails(PurchaseMacodeInfo purchaseMacodeInfo) { + List purchaseMacodeInfoList = purchaseMacodeInfoMapper.selectPurchaseMacodeInfoListDetails(purchaseMacodeInfo); + return purchaseMacodeInfoList; + } + /** * 新增新购验收编号管理 * diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index 737eb966..14d02896 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pmi.code_type = #{codeType} and pmi.status = #{status} and pmi.company_id = #{companyId} + GROUP BY pcd.type_id + update ma_type set num = #{num} where type_id = #{typeId} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java index 15e4947d..a2a19dbf 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java @@ -27,9 +27,9 @@ public class BmNumLogsController extends BaseController { private BmNumLogsService bmNumLogsService; @GetMapping("/list") - public TableDataInfo list() { + public TableDataInfo list(BmNumLogs record) { startPage(); - List list = bmNumLogsService.selectAll(); + List list = bmNumLogsService.selectAll(record); return getDataTable(list); } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java index 62b9dfb5..3e8bbe1d 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java @@ -15,7 +15,7 @@ public interface BmNumLogsMapper { BmNumLogs selectByPrimaryKey(Integer id); - List selectAll(); + List selectAll(BmNumLogs record); int updateByPrimaryKeySelective(BmNumLogs record); diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java index d6fc772a..60d0845a 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java @@ -24,8 +24,8 @@ public class BmNumLogsService{ return bmNumLogsMapper.insert(record); } - public List selectAll() { - return bmNumLogsMapper.selectAll(); + public List selectAll(BmNumLogs record) { + return bmNumLogsMapper.selectAll(record); } public int insertSelective(BmNumLogs record) { diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml index 8572b87b..13e6331a 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml @@ -6,8 +6,8 @@ server: spring: servlet: multipart: - max-request-size: 10MB - max-file-size: 10MB + max-request-size: 50MB + max-file-size: 30MB application: # 应用名称 name: sgzb-system diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml index 9d8460e1..d9830732 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml @@ -8,7 +8,10 @@ + + + @@ -25,18 +28,32 @@ - @@ -48,11 +65,11 @@ insert into bm_num_logs (model_title, `method`, task, - type_id, num, description, json_result, + type_id, description, json_result, `time`, creator, remark ) values (#{modelTitle,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{task,jdbcType=VARCHAR}, - #{typeId,jdbcType=INTEGER}, #{num,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{jsonResult,jdbcType=VARCHAR}, + #{typeId,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR}, #{jsonResult,jdbcType=VARCHAR}, #{time,jdbcType=TIMESTAMP}, #{creator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR} ) diff --git a/sgzb-screen/config/dev.env.js b/sgzb-screen/config/dev.env.js index 5ea4eff9..36efffd7 100644 --- a/sgzb-screen/config/dev.env.js +++ b/sgzb-screen/config/dev.env.js @@ -6,8 +6,8 @@ var prodEnv = require('./prod.env') // var testUrl = '14.29.196.32:8802' // var testUrl = '10.14.16.165:8802' // var testUrl = '112.29.103.165:21624' //线上 -var testUrl = '192.168.0.14:21626' //线上 -// var testUrl = '192.168.0.166:8080' +// var testUrl = '192.168.0.14:21626' //线上 +var testUrl = '10.40.92.8:8080' // var testUrl = '223.243.184.53:8480' // var testUrl = 'www.lingyangplat.com' // var testUrl = '' diff --git a/sgzb-screen/config/index.js b/sgzb-screen/config/index.js index d43320aa..29b3c331 100644 --- a/sgzb-screen/config/index.js +++ b/sgzb-screen/config/index.js @@ -20,7 +20,9 @@ module.exports = { cssSourceMap: true, proxyTable: { '/screen': { - target: 'http://112.29.103.165:21624', + // target: 'http://112.29.103.165:21626',//重庆 + target: 'http://192.168.0.14:21624',//测试 + // target: 'http://10.40.92.74:8080', changeOrigin: true, // secure: true, //如果是https接口，需要配置这个参数 pathRewrite: { diff --git a/sgzb-screen/src/api/finance.js b/sgzb-screen/src/api/finance.js index 349f0c74..89a024c8 100644 --- a/sgzb-screen/src/api/finance.js +++ b/sgzb-screen/src/api/finance.js @@ -120,13 +120,4 @@ export default { ) }, - // 根据名称获取大宗原材料柱状图数据 - screenSaleMaterial: params => { - return API.GET( - URL_PREFIXRightUrl.concat( - 'gywlw/screenSaleMaterial/data' - ), - params - ) - }, } diff --git a/sgzb-screen/src/api/screen.js b/sgzb-screen/src/api/screen.js index 25d6bf69..bc07f74e 100644 --- a/sgzb-screen/src/api/screen.js +++ b/sgzb-screen/src/api/screen.js @@ -22,4 +22,6 @@ export const getTotalOwnershipApi = params => POST(`/screen/base/largeScreen/hom export const getCarUseByMonthApi = params => POST(`/screen/base/largeScreen/home/getCarUseByMonth?maType=${params.maType}`,) // 当月使用车辆 export const getMaintenanceWarningApi = params => POST(`/screen/base/largeScreen/home/getMaintenanceWarning`,) +//各公司机具保有量 +export const getTotalOwnershipByCompany = params => POST(`/screen/base/largeScreen/home/getTotalOwnershipByCompany`) diff --git a/sgzb-screen/src/components/home/center3DMap.vue b/sgzb-screen/src/components/home/center3DMap.vue new file mode 100644 index 00000000..d7dd07d9 --- /dev/null +++ b/sgzb-screen/src/components/home/center3DMap.vue @@ -0,0 +1,471 @@ + + + + + + + + \ No newline at end of file diff --git a/sgzb-screen/src/components/home/centerFold.vue b/sgzb-screen/src/components/home/centerFold.vue index 3e56275d..4b82a26e 100644 --- a/sgzb-screen/src/components/home/centerFold.vue +++ b/sgzb-screen/src/components/home/centerFold.vue @@ -42,7 +42,7 @@ export default { isCollapse: false, newArrOne: [ { name: '施工机具总保有量', value: 9999 }, - { url: GROUP, name: '工器具总保有量', value: 9999 }, + // { url: GROUP, name: '工器具总保有量', value: 9999 }, ], newArr: [ { url: GROUP, name: '在库机具', value: 999 }, @@ -75,7 +75,7 @@ export default { getTotalOwnershipApi().then(res => { this.newArrOne.push( { name: '施工机具总保有量', value: res.data[0].totalOwnershipNum }, - { url: GROUP, name: '工器具总保有量', value: res.data[1].totalOwnershipNum }, + // { url: GROUP, name: '工器具总保有量', value: res.data[1].totalOwnershipNum }, ) this.newArr.push( { url: GROUP, name: '在库机具', value: res.data[0].stockNum }, @@ -83,11 +83,11 @@ export default { { url: GROUP, name: '在用机具', value: res.data[0].useNum }, { url: GROUP, name: '在修机具', value: res.data[0].repairNum }, { url: GROUP, name: '报废机具', value: res.data[0].scrapNum }, - { url: GROUP, name: '在库工器具', value: res.data[1].stockNum }, - { url: GROUP, name: '待入库工器具', value: res.data[1].storedNum }, - { url: GROUP, name: '在用工器具', value: res.data[1].useNum }, - { url: GROUP, name: '在修工器具', value: res.data[1].repairNum }, - { url: GROUP, name: '报废工器具', value: res.data[1].scrapNum }, + // { url: GROUP, name: '在库工器具', value: res.data[1].stockNum }, + // { url: GROUP, name: '待入库工器具', value: res.data[1].storedNum }, + // { url: GROUP, name: '在用工器具', value: res.data[1].useNum }, + // { url: GROUP, name: '在修工器具', value: res.data[1].repairNum }, + // { url: GROUP, name: '报废工器具', value: res.data[1].scrapNum }, ) }) }, diff --git a/sgzb-screen/src/components/home/leftFour.vue b/sgzb-screen/src/components/home/leftFour.vue new file mode 100644 index 00000000..5a61d7a8 --- /dev/null +++ b/sgzb-screen/src/components/home/leftFour.vue @@ -0,0 +1,209 @@ + + + + + + + \ No newline at end of file diff --git a/sgzb-screen/src/components/home/leftOne.vue b/sgzb-screen/src/components/home/leftOne.vue index c019dff1..990b65f1 100644 --- a/sgzb-screen/src/components/home/leftOne.vue +++ b/sgzb-screen/src/components/home/leftOne.vue @@ -4,10 +4,10 @@
领料数据
- -
+ +
diff --git a/sgzb-screen/src/components/home/leftTwo.vue b/sgzb-screen/src/components/home/leftTwo.vue index 0be59a0d..f46bb56c 100644 --- a/sgzb-screen/src/components/home/leftTwo.vue +++ b/sgzb-screen/src/components/home/leftTwo.vue @@ -4,10 +4,10 @@
退料数据
- -
+ +
diff --git a/sgzb-screen/src/untils/china.json b/sgzb-screen/src/untils/china.json index 15826b23..fc341fd1 100644 --- a/sgzb-screen/src/untils/china.json +++ b/sgzb-screen/src/untils/china.json @@ -57295,3959 +57295,7 @@ ] } }, - { - "type": "Feature", - "properties": { - "adcode": 460000, - "name": "海南省", - "center": [ - 110.33119, - 20.031971 - ], - "centroid": [ - 109.754859, - 19.189767 - ], - "childrenNum": 19, - "level": "province", - "parent": { - "adcode": 100000 - }, - "subFeatureIndex": 20, - "acroutes": [ - 100000 - ] - }, - "geometry": { - "type": "MultiPolygon", - "coordinates": [ - [ - [ - [ - 110.106396, - 20.026812 - ], - [ - 110.042339, - 19.991384 - ], - [ - 109.997375, - 19.980136 - ], - [ - 109.965346, - 19.993634 - ], - [ - 109.898825, - 19.994196 - ], - [ - 109.855093, - 19.984073 - ], - [ - 109.814441, - 19.993072 - ], - [ - 109.76147, - 19.981261 - ], - [ - 109.712195, - 20.017253 - ], - [ - 109.657993, - 20.01163 - ], - [ - 109.585312, - 19.98801 - ], - [ - 109.526797, - 19.943573 - ], - [ - 109.498464, - 19.873236 - ], - [ - 109.411001, - 19.895184 - ], - [ - 109.349407, - 19.898561 - ], - [ - 109.300748, - 19.917693 - ], - [ - 109.25948, - 19.898561 - ], - [ - 109.255784, - 19.867045 - ], - [ - 109.231147, - 19.863105 - ], - [ - 109.159082, - 19.79048 - ], - [ - 109.169553, - 19.736411 - ], - [ - 109.147379, - 19.704863 - ], - [ - 109.093792, - 19.68965 - ], - [ - 109.048829, - 19.619764 - ], - [ - 108.993394, - 19.587065 - ], - [ - 108.92872, - 19.524468 - ], - [ - 108.855424, - 19.469182 - ], - [ - 108.806148, - 19.450561 - ], - [ - 108.765496, - 19.400894 - ], - [ - 108.694047, - 19.387346 - ], - [ - 108.644772, - 19.349518 - ], - [ - 108.609048, - 19.276661 - ], - [ - 108.591186, - 19.141592 - ], - [ - 108.598577, - 19.055633 - ], - [ - 108.630606, - 19.003017 - ], - [ - 108.637997, - 18.924346 - ], - [ - 108.595497, - 18.872256 - ], - [ - 108.593033, - 18.809386 - ], - [ - 108.65278, - 18.740258 - ], - [ - 108.663866, - 18.67337 - ], - [ - 108.641077, - 18.565614 - ], - [ - 108.644772, - 18.486738 - ], - [ - 108.68912, - 18.447571 - ], - [ - 108.776583, - 18.441894 - ], - [ - 108.881293, - 18.416344 - ], - [ - 108.905315, - 18.389087 - ], - [ - 108.944735, - 18.314107 - ], - [ - 109.006329, - 18.323198 - ], - [ - 109.108575, - 18.323766 - ], - [ - 109.138756, - 18.268081 - ], - [ - 109.17448, - 18.260125 - ], - [ - 109.287813, - 18.264671 - ], - [ - 109.355566, - 18.215221 - ], - [ - 109.441182, - 18.199303 - ], - [ - 109.467051, - 18.173718 - ], - [ - 109.527413, - 18.169169 - ], - [ - 109.584696, - 18.143579 - ], - [ - 109.661688, - 18.175424 - ], - [ - 109.726362, - 18.177698 - ], - [ - 109.749767, - 18.193618 - ], - [ - 109.785492, - 18.339672 - ], - [ - 109.919767, - 18.375457 - ], - [ - 110.022629, - 18.360121 - ], - [ - 110.070672, - 18.376025 - ], - [ - 110.090382, - 18.399309 - ], - [ - 110.116867, - 18.506602 - ], - [ - 110.214186, - 18.578662 - ], - [ - 110.246215, - 18.609859 - ], - [ - 110.329366, - 18.642185 - ], - [ - 110.367555, - 18.631977 - ], - [ - 110.499366, - 18.651824 - ], - [ - 110.499366, - 18.751592 - ], - [ - 110.578206, - 18.784458 - ], - [ - 110.590525, - 18.838841 - ], - [ - 110.585597, - 18.88075 - ], - [ - 110.619474, - 19.152334 - ], - [ - 110.676756, - 19.286264 - ], - [ - 110.706321, - 19.320153 - ], - [ - 110.729727, - 19.378878 - ], - [ - 110.787009, - 19.399765 - ], - [ - 110.844292, - 19.449996 - ], - [ - 110.888023, - 19.518827 - ], - [ - 110.920668, - 19.552668 - ], - [ - 111.008747, - 19.60398 - ], - [ - 111.061718, - 19.612436 - ], - [ - 111.071573, - 19.628784 - ], - [ - 111.043856, - 19.763448 - ], - [ - 111.013675, - 19.850159 - ], - [ - 110.966248, - 20.018377 - ], - [ - 110.940994, - 20.028499 - ], - [ - 110.871393, - 20.01163 - ], - [ - 110.808567, - 20.035808 - ], - [ - 110.778386, - 20.068415 - ], - [ - 110.744509, - 20.074036 - ], - [ - 110.717408, - 20.148778 - ], - [ - 110.687843, - 20.163947 - ], - [ - 110.655814, - 20.134169 - ], - [ - 110.562191, - 20.110006 - ], - [ - 110.526467, - 20.07516 - ], - [ - 110.495054, - 20.077408 - ], - [ - 110.387265, - 20.113378 - ], - [ - 110.318279, - 20.108882 - ], - [ - 110.28933, - 20.056047 - ], - [ - 110.243135, - 20.077408 - ], - [ - 110.144585, - 20.074598 - ], - [ - 110.106396, - 20.026812 - ] - ] - ], - [ - [ - [ - 112.208597, - 3.876129 - ], - [ - 112.241858, - 3.845677 - ], - [ - 112.280046, - 3.86777 - ], - [ - 112.260336, - 3.917925 - ], - [ - 112.219068, - 3.908969 - ], - [ - 112.208597, - 3.876129 - ] - ] - ], - [ - [ - [ - 113.266165, - 8.125929 - ], - [ - 113.311129, - 8.177469 - ], - [ - 113.343157, - 8.193463 - ], - [ - 113.288955, - 8.119412 - ], - [ - 113.349933, - 8.172137 - ], - [ - 113.386273, - 8.238479 - ], - [ - 113.386273, - 8.289412 - ], - [ - 113.354244, - 8.304217 - ], - [ - 113.353628, - 8.237887 - ], - [ - 113.293882, - 8.176284 - ], - [ - 113.266165, - 8.125929 - ] - ] - ], - [ - [ - [ - 111.99733, - 3.848065 - ], - [ - 112.015192, - 3.823583 - ], - [ - 112.064467, - 3.830152 - ], - [ - 112.073707, - 3.865979 - ], - [ - 112.03367, - 3.892251 - ], - [ - 111.99733, - 3.848065 - ] - ] - ], - [ - [ - [ - 111.463311, - 17.077491 - ], - [ - 111.536607, - 17.104949 - ], - [ - 111.4861, - 17.058039 - ], - [ - 111.559397, - 17.087788 - ], - [ - 111.542151, - 17.11982 - ], - [ - 111.452224, - 17.092936 - ], - [ - 111.463311, - 17.077491 - ] - ] - ], - [ - [ - [ - 117.708319, - 15.182712 - ], - [ - 117.712631, - 15.118592 - ], - [ - 117.726798, - 15.105303 - ], - [ - 117.827812, - 15.111659 - ], - [ - 117.72495, - 15.131302 - ], - [ - 117.720638, - 15.195418 - ], - [ - 117.74466, - 15.217941 - ], - [ - 117.784696, - 15.16885 - ], - [ - 117.838899, - 15.15903 - ], - [ - 117.782848, - 15.187333 - ], - [ - 117.748355, - 15.230068 - ], - [ - 117.715095, - 15.222561 - ], - [ - 117.708319, - 15.182712 - ] - ] - ], - [ - [ - [ - 112.241858, - 3.942404 - ], - [ - 112.292365, - 3.946583 - ], - [ - 112.288053, - 3.97345 - ], - [ - 112.254177, - 3.97942 - ], - [ - 112.241858, - 3.942404 - ] - ] - ], - [ - [ - [ - 111.734324, - 16.19732 - ], - [ - 111.779903, - 16.19732 - ], - [ - 111.81686, - 16.224329 - ], - [ - 111.813164, - 16.261676 - ], - [ - 111.782367, - 16.273741 - ], - [ - 111.716462, - 16.249036 - ], - [ - 111.789758, - 16.250186 - ], - [ - 111.790374, - 16.220307 - ], - [ - 111.734324, - 16.19732 - ] - ] - ], - [ - [ - [ - 111.649324, - 16.255931 - ], - [ - 111.577875, - 16.208239 - ], - [ - 111.56802, - 16.162834 - ], - [ - 111.611136, - 16.156511 - ], - [ - 111.690592, - 16.211112 - ], - [ - 111.606825, - 16.177779 - ], - [ - 111.598817, - 16.198469 - ], - [ - 111.681353, - 16.262251 - ], - [ - 111.649324, - 16.255931 - ] - ] - ], - [ - [ - [ - 113.896887, - 7.607204 - ], - [ - 113.919677, - 7.566865 - ], - [ - 113.98743, - 7.536014 - ], - [ - 114.058879, - 7.537794 - ], - [ - 114.157429, - 7.561525 - ], - [ - 114.289856, - 7.617288 - ], - [ - 114.368696, - 7.638642 - ], - [ - 114.407501, - 7.683126 - ], - [ - 114.419819, - 7.765557 - ], - [ - 114.464167, - 7.814771 - ], - [ - 114.540543, - 7.862201 - ], - [ - 114.555326, - 7.891249 - ], - [ - 114.540543, - 7.945783 - ], - [ - 114.511594, - 7.966527 - ], - [ - 114.47279, - 7.968898 - ], - [ - 114.414892, - 7.952895 - ], - [ - 114.268298, - 7.870501 - ], - [ - 114.211632, - 7.786904 - ], - [ - 114.095219, - 7.721082 - ], - [ - 114.029314, - 7.670078 - ], - [ - 113.921524, - 7.639235 - ], - [ - 113.896887, - 7.607204 - ] - ] - ], - [ - [ - [ - 113.976959, - 8.872888 - ], - [ - 114.013299, - 8.836817 - ], - [ - 114.035473, - 8.783591 - ], - [ - 114.060111, - 8.816119 - ], - [ - 114.041017, - 8.843913 - ], - [ - 113.989894, - 8.878801 - ], - [ - 113.976959, - 8.872888 - ] - ] - ], - [ - [ - [ - 113.956017, - 8.840365 - ], - [ - 113.975111, - 8.793054 - ], - [ - 114.012068, - 8.798376 - ], - [ - 113.977575, - 8.841548 - ], - [ - 113.956017, - 8.840365 - ] - ] - ], - [ - [ - [ - 111.97454, - 16.323715 - ], - [ - 112.002258, - 16.306484 - ], - [ - 112.07617, - 16.323715 - ], - [ - 112.074938, - 16.349558 - ], - [ - 112.047221, - 16.360469 - ], - [ - 112.002874, - 16.350707 - ], - [ - 111.97454, - 16.323715 - ] - ] - ], - [ - [ - [ - 111.739251, - 16.452898 - ], - [ - 111.766969, - 16.470116 - ], - [ - 111.786679, - 16.520039 - ], - [ - 111.759577, - 16.545857 - ], - [ - 111.765737, - 16.495366 - ], - [ - 111.739251, - 16.452898 - ] - ] - ], - [ - [ - [ - 112.216604, - 8.866383 - ], - [ - 112.206133, - 8.88767 - ], - [ - 112.180264, - 8.862244 - ], - [ - 112.216604, - 8.866383 - ] - ] - ], - [ - [ - [ - 113.792177, - 7.373422 - ], - [ - 113.828518, - 7.362145 - ], - [ - 113.829134, - 7.383511 - ], - [ - 113.792177, - 7.373422 - ] - ] - ], - [ - [ - [ - 114.194386, - 8.764664 - ], - [ - 114.201161, - 8.727991 - ], - [ - 114.248588, - 8.724442 - ], - [ - 114.222103, - 8.784773 - ], - [ - 114.194386, - 8.764664 - ] - ] - ], - [ - [ - [ - 112.232619, - 16.996239 - ], - [ - 112.207981, - 16.987081 - ], - [ - 112.222764, - 16.960751 - ], - [ - 112.292981, - 16.96762 - ], - [ - 112.266496, - 16.993949 - ], - [ - 112.232619, - 16.996239 - ] - ] - ], - [ - [ - [ - 114.689601, - 10.345648 - ], - [ - 114.702536, - 10.312677 - ], - [ - 114.725941, - 10.319154 - ], - [ - 114.747499, - 10.37214 - ], - [ - 114.717318, - 10.380381 - ], - [ - 114.689601, - 10.345648 - ] - ] - ], - [ - [ - [ - 115.837712, - 9.709775 - ], - [ - 115.861117, - 9.694438 - ], - [ - 115.867277, - 9.650191 - ], - [ - 115.901153, - 9.67084 - ], - [ - 115.925791, - 9.781734 - ], - [ - 115.901153, - 9.795888 - ], - [ - 115.870972, - 9.778785 - ], - [ - 115.837712, - 9.709775 - ] - ] - ], - [ - [ - [ - 114.617536, - 9.965688 - ], - [ - 114.642173, - 9.917351 - ], - [ - 114.672355, - 9.927963 - ], - [ - 114.685905, - 9.979245 - ], - [ - 114.617536, - 9.965688 - ] - ] - ], - [ - [ - [ - 113.769387, - 7.636862 - ], - [ - 113.773699, - 7.601865 - ], - [ - 113.814967, - 7.603051 - ], - [ - 113.831597, - 7.644573 - ], - [ - 113.769387, - 7.636862 - ] - ] - ], - [ - [ - [ - 109.463972, - 7.344339 - ], - [ - 109.463972, - 7.315254 - ], - [ - 109.513247, - 7.320002 - ], - [ - 109.571761, - 7.373422 - ], - [ - 109.654297, - 7.479648 - ], - [ - 109.709115, - 7.511095 - ], - [ - 109.791651, - 7.524742 - ], - [ - 109.938861, - 7.504569 - ], - [ - 109.948716, - 7.522962 - ], - [ - 109.904984, - 7.55144 - ], - [ - 109.816289, - 7.572797 - ], - [ - 109.72205, - 7.575763 - ], - [ - 109.653065, - 7.559745 - ], - [ - 109.536037, - 7.448792 - ], - [ - 109.463972, - 7.344339 - ] - ] - ], - [ - [ - [ - 116.273181, - 8.879392 - ], - [ - 116.294123, - 8.858105 - ], - [ - 116.332311, - 8.901269 - ], - [ - 116.305826, - 8.917233 - ], - [ - 116.273181, - 8.879392 - ] - ] - ], - [ - [ - [ - 112.476531, - 16.001247 - ], - [ - 112.570154, - 16.011027 - ], - [ - 112.612037, - 16.039212 - ], - [ - 112.588016, - 16.070844 - ], - [ - 112.462364, - 16.043813 - ], - [ - 112.448814, - 16.005274 - ], - [ - 112.476531, - 16.001247 - ] - ] - ], - [ - [ - [ - 112.537509, - 8.846278 - ], - [ - 112.57077, - 8.815527 - ], - [ - 112.639755, - 8.818484 - ], - [ - 112.598487, - 8.859288 - ], - [ - 112.537509, - 8.846278 - ] - ] - ], - [ - [ - [ - 114.469095, - 10.836261 - ], - [ - 114.475254, - 10.814512 - ], - [ - 114.513442, - 10.848605 - ], - [ - 114.565181, - 10.836261 - ], - [ - 114.593514, - 10.856245 - ], - [ - 114.587355, - 10.909138 - ], - [ - 114.55471, - 10.900911 - ], - [ - 114.469095, - 10.836261 - ] - ] - ], - [ - [ - [ - 112.409393, - 16.294996 - ], - [ - 112.383524, - 16.265698 - ], - [ - 112.411241, - 16.2634 - ], - [ - 112.475915, - 16.288677 - ], - [ - 112.531349, - 16.285805 - ], - [ - 112.536893, - 16.312228 - ], - [ - 112.509176, - 16.317397 - ], - [ - 112.409393, - 16.294996 - ] - ] - ], - [ - [ - [ - 116.48876, - 10.395686 - ], - [ - 116.461658, - 10.34918 - ], - [ - 116.467202, - 10.309144 - ], - [ - 116.511549, - 10.297957 - ], - [ - 116.566368, - 10.304434 - ], - [ - 116.644592, - 10.335051 - ], - [ - 116.637817, - 10.365076 - ], - [ - 116.514629, - 10.34918 - ], - [ - 116.542346, - 10.41982 - ], - [ - 116.526332, - 10.426883 - ], - [ - 116.48876, - 10.395686 - ] - ] - ], - [ - [ - [ - 112.349031, - 16.912088 - ], - [ - 112.360734, - 16.925257 - ], - [ - 112.334249, - 16.962469 - ], - [ - 112.30222, - 16.963041 - ], - [ - 112.349031, - 16.912088 - ] - ] - ], - [ - [ - [ - 111.500267, - 16.45175 - ], - [ - 111.49534, - 16.4374 - ], - [ - 111.545847, - 16.43453 - ], - [ - 111.538455, - 16.461507 - ], - [ - 111.500267, - 16.45175 - ] - ] - ], - [ - [ - [ - 115.500177, - 9.897897 - ], - [ - 115.54822, - 9.869007 - ], - [ - 115.585177, - 9.896128 - ], - [ - 115.581481, - 9.917351 - ], - [ - 115.518039, - 9.933857 - ], - [ - 115.500177, - 9.897897 - ] - ] - ], - [ - [ - [ - 114.669891, - 8.210048 - ], - [ - 114.691449, - 8.18517 - ], - [ - 114.74134, - 8.189316 - ], - [ - 114.726557, - 8.21064 - ], - [ - 114.669891, - 8.210048 - ] - ] - ], - [ - [ - [ - 114.507899, - 8.120004 - ], - [ - 114.530073, - 8.103415 - ], - [ - 114.595978, - 8.120596 - ], - [ - 114.624311, - 8.149626 - ], - [ - 114.595978, - 8.15792 - ], - [ - 114.507899, - 8.120004 - ] - ] - ], - [ - [ - [ - 115.16757, - 8.386523 - ], - [ - 115.18112, - 8.345668 - ], - [ - 115.235939, - 8.321982 - ], - [ - 115.285214, - 8.314876 - ], - [ - 115.315395, - 8.356326 - ], - [ - 115.299381, - 8.370537 - ], - [ - 115.202678, - 8.395403 - ], - [ - 115.16757, - 8.386523 - ] - ] - ], - [ - [ - [ - 113.895039, - 8.00505 - ], - [ - 113.904894, - 7.963564 - ], - [ - 113.9708, - 7.944597 - ], - [ - 113.969568, - 7.974825 - ], - [ - 113.940003, - 8.018088 - ], - [ - 113.895039, - 8.00505 - ] - ] - ], - [ - [ - [ - 115.436119, - 9.393447 - ], - [ - 115.450286, - 9.345028 - ], - [ - 115.469996, - 9.3592 - ], - [ - 115.456445, - 9.417064 - ], - [ - 115.436119, - 9.393447 - ] - ] - ], - [ - [ - [ - 116.457347, - 9.174326 - ], - [ - 116.477057, - 9.137103 - ], - [ - 116.500462, - 9.164282 - ], - [ - 116.457347, - 9.174326 - ] - ] - ], - [ - [ - [ - 113.638192, - 8.976942 - ], - [ - 113.654823, - 8.962163 - ], - [ - 113.730583, - 9.004133 - ], - [ - 113.719496, - 9.020092 - ], - [ - 113.644968, - 8.989355 - ], - [ - 113.638192, - 8.976942 - ] - ] - ], - [ - [ - [ - 114.696992, - 11.004322 - ], - [ - 114.710543, - 11.001972 - ], - [ - 114.793079, - 11.07657 - ], - [ - 114.799854, - 11.10476 - ], - [ - 114.766593, - 11.110045 - ], - [ - 114.710543, - 11.039567 - ], - [ - 114.696992, - 11.004322 - ] - ] - ], - [ - [ - [ - 114.62, - 11.432264 - ], - [ - 114.652644, - 11.436957 - ], - [ - 114.661884, - 11.522584 - ], - [ - 114.621232, - 11.518479 - ], - [ - 114.62, - 11.432264 - ] - ] - ], - [ - [ - [ - 114.910723, - 10.863298 - ], - [ - 114.931049, - 10.841551 - ], - [ - 114.959998, - 10.902087 - ], - [ - 114.934129, - 10.902674 - ], - [ - 114.910723, - 10.863298 - ] - ] - ], - [ - [ - [ - 111.572948, - 16.470116 - ], - [ - 111.578491, - 16.447158 - ], - [ - 111.614216, - 16.44027 - ], - [ - 111.592658, - 16.490775 - ], - [ - 111.572948, - 16.470116 - ] - ] - ], - [ - [ - [ - 113.939387, - 8.875253 - ], - [ - 113.912285, - 8.888853 - ], - [ - 113.893807, - 8.862836 - ], - [ - 113.916597, - 8.837999 - ], - [ - 113.939387, - 8.875253 - ] - ] - ], - [ - [ - [ - 109.936397, - 7.848566 - ], - [ - 109.936397, - 7.823665 - ], - [ - 109.988136, - 7.8124 - ], - [ - 110.050346, - 7.846194 - ], - [ - 110.082991, - 7.896584 - ], - [ - 110.078063, - 7.949339 - ], - [ - 110.0331, - 7.944597 - ], - [ - 109.953027, - 7.888878 - ], - [ - 109.936397, - 7.848566 - ] - ] - ], - [ - [ - [ - 116.727128, - 11.501473 - ], - [ - 116.765316, - 11.430504 - ], - [ - 116.772092, - 11.445755 - ], - [ - 116.738215, - 11.514961 - ], - [ - 116.727128, - 11.501473 - ] - ] - ], - [ - [ - [ - 111.690592, - 16.587731 - ], - [ - 111.724469, - 16.560198 - ], - [ - 111.717078, - 16.59404 - ], - [ - 111.690592, - 16.587731 - ] - ] - ], - [ - [ - [ - 112.507328, - 16.466098 - ], - [ - 112.586784, - 16.525777 - ], - [ - 112.575081, - 16.537251 - ], - [ - 112.499321, - 16.493645 - ], - [ - 112.507328, - 16.466098 - ] - ] - ], - [ - [ - [ - 111.761425, - 16.061642 - ], - [ - 111.791606, - 16.028859 - ], - [ - 111.828563, - 16.049565 - ], - [ - 111.829795, - 16.070844 - ], - [ - 111.761425, - 16.061642 - ] - ] - ], - [ - [ - [ - 113.845764, - 10.018733 - ], - [ - 113.865474, - 10.00341 - ], - [ - 113.872249, - 10.123029 - ], - [ - 113.856851, - 10.12185 - ], - [ - 113.845764, - 10.018733 - ] - ] - ], - [ - [ - [ - 114.791847, - 8.160882 - ], - [ - 114.777064, - 8.114079 - ], - [ - 114.812173, - 8.110524 - ], - [ - 114.818332, - 8.141332 - ], - [ - 114.791847, - 8.160882 - ] - ] - ], - [ - [ - [ - 116.557129, - 9.745167 - ], - [ - 116.566368, - 9.718623 - ], - [ - 116.593469, - 9.723932 - ], - [ - 116.557129, - 9.745167 - ] - ] - ], - [ - [ - [ - 115.28275, - 10.191951 - ], - [ - 115.288294, - 10.172513 - ], - [ - 115.333257, - 10.200198 - ], - [ - 115.28891, - 10.211388 - ], - [ - 115.28275, - 10.191951 - ] - ] - ], - [ - [ - [ - 116.832454, - 10.476908 - ], - [ - 116.855243, - 10.468669 - ], - [ - 116.868794, - 10.495739 - ], - [ - 116.832454, - 10.476908 - ] - ] - ], - [ - [ - [ - 114.703151, - 16.170307 - ], - [ - 114.816484, - 16.198469 - ], - [ - 114.802934, - 16.215135 - ], - [ - 114.704383, - 16.199044 - ], - [ - 114.703151, - 16.170307 - ] - ] - ], - [ - [ - [ - 115.97753, - 9.321997 - ], - [ - 115.926407, - 9.311366 - ], - [ - 115.943037, - 9.269433 - ], - [ - 115.976298, - 9.268252 - ], - [ - 115.999088, - 9.293649 - ], - [ - 115.97753, - 9.321997 - ] - ] - ], - [ - [ - [ - 113.660366, - 9.231039 - ], - [ - 113.676997, - 9.202683 - ], - [ - 113.697323, - 9.225722 - ], - [ - 113.660366, - 9.231039 - ] - ] - ], - [ - [ - [ - 114.665579, - 7.590001 - ], - [ - 114.671739, - 7.563898 - ], - [ - 114.72163, - 7.59178 - ], - [ - 114.703767, - 7.614915 - ], - [ - 114.665579, - 7.590001 - ] - ] - ], - [ - [ - [ - 114.493116, - 10.717504 - ], - [ - 114.513442, - 10.722208 - ], - [ - 114.562717, - 10.778064 - ], - [ - 114.539312, - 10.793349 - ], - [ - 114.493116, - 10.717504 - ] - ] - ], - [ - [ - [ - 117.770529, - 10.773361 - ], - [ - 117.798862, - 10.753371 - ], - [ - 117.835819, - 10.803931 - ], - [ - 117.831507, - 10.838612 - ], - [ - 117.801942, - 10.839788 - ], - [ - 117.775457, - 10.809222 - ], - [ - 117.770529, - 10.773361 - ] - ] - ], - [ - [ - [ - 114.242429, - 10.242014 - ], - [ - 114.263371, - 10.239658 - ], - [ - 114.326197, - 10.284414 - ], - [ - 114.312646, - 10.300901 - ], - [ - 114.265219, - 10.275581 - ], - [ - 114.242429, - 10.242014 - ] - ] - ], - [ - [ - [ - 114.688985, - 11.469217 - ], - [ - 114.722246, - 11.429331 - ], - [ - 114.737644, - 11.463938 - ], - [ - 114.720398, - 11.49209 - ], - [ - 114.688985, - 11.469217 - ] - ] - ], - [ - [ - [ - 116.638433, - 10.503977 - ], - [ - 116.653215, - 10.491031 - ], - [ - 116.70865, - 10.492797 - ], - [ - 116.699411, - 10.517511 - ], - [ - 116.638433, - 10.503977 - ] - ] - ], - [ - [ - [ - 110.459946, - 8.116449 - ], - [ - 110.471032, - 8.072012 - ], - [ - 110.554184, - 8.093935 - ], - [ - 110.599764, - 8.156735 - ], - [ - 110.568351, - 8.17273 - ], - [ - 110.461793, - 8.128298 - ], - [ - 110.459946, - 8.116449 - ] - ] - ], - [ - [ - [ - 111.463311, - 8.52504 - ], - [ - 111.497187, - 8.523857 - ], - [ - 111.509506, - 8.550489 - ], - [ - 111.463311, - 8.52504 - ] - ] - ], - [ - [ - [ - 115.258113, - 8.509652 - ], - [ - 115.271048, - 8.477098 - ], - [ - 115.296301, - 8.510836 - ], - [ - 115.258113, - 8.509652 - ] - ] - ], - [ - [ - [ - 113.221817, - 8.073789 - ], - [ - 113.235984, - 8.068456 - ], - [ - 113.283411, - 8.111117 - ], - [ - 113.269861, - 8.120004 - ], - [ - 113.221817, - 8.073789 - ] - ] - ], - [ - [ - [ - 114.074893, - 10.929118 - ], - [ - 114.064422, - 10.904437 - ], - [ - 114.110002, - 10.918541 - ], - [ - 114.096451, - 10.947921 - ], - [ - 114.074893, - 10.929118 - ] - ] - ], - [ - [ - [ - 117.258068, - 10.320331 - ], - [ - 117.299336, - 10.313855 - ], - [ - 117.299952, - 10.343293 - ], - [ - 117.274698, - 10.358011 - ], - [ - 117.258068, - 10.320331 - ] - ] - ], - [ - [ - [ - 114.212864, - 16.040937 - ], - [ - 114.31203, - 16.034611 - ], - [ - 114.306487, - 16.057616 - ], - [ - 114.268914, - 16.059342 - ], - [ - 114.212864, - 16.040937 - ] - ] - ], - [ - [ - [ - 110.609003, - 8.010976 - ], - [ - 110.642879, - 7.989049 - ], - [ - 110.641648, - 8.031125 - ], - [ - 110.622553, - 8.041199 - ], - [ - 110.609003, - 8.010976 - ] - ] - ], - [ - [ - [ - 115.509416, - 8.490712 - ], - [ - 115.521735, - 8.460523 - ], - [ - 115.55438, - 8.461115 - ], - [ - 115.569162, - 8.49012 - ], - [ - 115.558691, - 8.523265 - ], - [ - 115.514344, - 8.519122 - ], - [ - 115.509416, - 8.490712 - ] - ] - ], - [ - [ - [ - 111.539071, - 7.54432 - ], - [ - 111.542767, - 7.524742 - ], - [ - 111.583419, - 7.543134 - ], - [ - 111.612368, - 7.592374 - ], - [ - 111.566788, - 7.606017 - ], - [ - 111.539071, - 7.54432 - ] - ] - ], - [ - [ - [ - 111.657947, - 8.672974 - ], - [ - 111.665955, - 8.622683 - ], - [ - 111.717694, - 8.6499 - ], - [ - 111.697368, - 8.67889 - ], - [ - 111.657947, - 8.672974 - ] - ] - ], - [ - [ - [ - 110.460561, - 7.799948 - ], - [ - 110.487663, - 7.783346 - ], - [ - 110.511684, - 7.805878 - ], - [ - 110.485199, - 7.827815 - ], - [ - 110.460561, - 7.799948 - ] - ] - ], - [ - [ - [ - 112.345952, - 8.926101 - ], - [ - 112.392763, - 8.919598 - ], - [ - 112.384756, - 8.946793 - ], - [ - 112.345952, - 8.926101 - ] - ] - ], - [ - [ - [ - 116.469665, - 9.810041 - ], - [ - 116.47952, - 9.785272 - ], - [ - 116.50847, - 9.79117 - ], - [ - 116.490607, - 9.821246 - ], - [ - 116.469665, - 9.810041 - ] - ] - ], - [ - [ - [ - 111.925265, - 8.070827 - ], - [ - 111.949287, - 8.05068 - ], - [ - 111.994866, - 8.047125 - ], - [ - 112.018888, - 8.065494 - ], - [ - 112.013344, - 8.093342 - ], - [ - 111.95483, - 8.106377 - ], - [ - 111.925265, - 8.070827 - ] - ] - ], - [ - [ - [ - 114.457392, - 15.599305 - ], - [ - 114.466631, - 15.576823 - ], - [ - 114.491884, - 15.59354 - ], - [ - 114.457392, - 15.599305 - ] - ] - ], - [ - [ - [ - 114.985252, - 11.078332 - ], - [ - 115.013585, - 11.063062 - ], - [ - 115.021592, - 11.085967 - ], - [ - 114.985252, - 11.078332 - ] - ] - ], - [ - [ - [ - 114.10569, - 16.004124 - ], - [ - 114.110618, - 15.978235 - ], - [ - 114.132176, - 16.007575 - ], - [ - 114.10569, - 16.004124 - ] - ] - ], - [ - [ - [ - 116.045283, - 10.095338 - ], - [ - 116.067457, - 10.065876 - ], - [ - 116.09579, - 10.09357 - ], - [ - 116.070537, - 10.12892 - ], - [ - 116.045283, - 10.095338 - ] - ] - ], - [ - [ - [ - 117.266691, - 10.69163 - ], - [ - 117.348611, - 10.672811 - ], - [ - 117.404661, - 10.671047 - ], - [ - 117.418212, - 10.702803 - ], - [ - 117.369553, - 10.7422 - ], - [ - 117.293176, - 10.735144 - ], - [ - 117.266691, - 10.69163 - ] - ] - ], - [ - [ - [ - 114.854057, - 7.244611 - ], - [ - 114.819564, - 7.192957 - ], - [ - 114.869455, - 7.198895 - ], - [ - 114.854057, - 7.244611 - ] - ] - ], - [ - [ - [ - 112.823305, - 8.910729 - ], - [ - 112.859645, - 8.889444 - ], - [ - 112.873196, - 8.908364 - ], - [ - 112.823305, - 8.910729 - ] - ] - ], - [ - [ - [ - 111.670266, - 7.651098 - ], - [ - 111.707223, - 7.648725 - ], - [ - 111.749722, - 7.703884 - ], - [ - 111.726317, - 7.729977 - ], - [ - 111.691208, - 7.711593 - ], - [ - 111.670266, - 7.651098 - ] - ] - ], - [ - [ - [ - 112.207981, - 8.835634 - ], - [ - 112.235699, - 8.827355 - ], - [ - 112.241242, - 8.852783 - ], - [ - 112.207981, - 8.835634 - ] - ] - ], - [ - [ - [ - 112.527654, - 5.79444 - ], - [ - 112.531965, - 5.766455 - ], - [ - 112.562762, - 5.75931 - ], - [ - 112.562146, - 5.820637 - ], - [ - 112.527654, - 5.79444 - ] - ] - ], - [ - [ - [ - 114.599058, - 8.846278 - ], - [ - 114.645869, - 8.844504 - ], - [ - 114.68221, - 8.881166 - ], - [ - 114.665579, - 8.900087 - ], - [ - 114.61692, - 8.881166 - ], - [ - 114.599058, - 8.846278 - ] - ] - ], - [ - [ - [ - 114.868223, - 7.983715 - ], - [ - 114.907643, - 7.951117 - ], - [ - 114.914419, - 8.00742 - ], - [ - 114.883006, - 8.011569 - ], - [ - 114.868223, - 7.983715 - ] - ] - ], - [ - [ - [ - 112.945261, - 8.410204 - ], - [ - 112.985297, - 8.429149 - ], - [ - 112.949572, - 8.432701 - ], - [ - 112.945261, - 8.410204 - ] - ] - ], - [ - [ - [ - 113.600004, - 6.961929 - ], - [ - 113.580294, - 6.920344 - ], - [ - 113.62341, - 6.942325 - ], - [ - 113.600004, - 6.961929 - ] - ] - ], - [ - [ - [ - 116.695099, - 16.345538 - ], - [ - 116.708034, - 16.299591 - ], - [ - 116.738831, - 16.303612 - ], - [ - 116.747454, - 16.360469 - ], - [ - 116.717889, - 16.373676 - ], - [ - 116.695099, - 16.345538 - ] - ] - ], - [ - [ - [ - 117.347995, - 10.090624 - ], - [ - 117.354154, - 10.06293 - ], - [ - 117.385567, - 10.063519 - ], - [ - 117.373864, - 10.106532 - ], - [ - 117.347995, - 10.090624 - ] - ] - ], - [ - [ - [ - 112.993304, - 19.472003 - ], - [ - 113.038883, - 19.480466 - ], - [ - 113.048123, - 19.506417 - ], - [ - 113.029028, - 19.52898 - ], - [ - 112.993304, - 19.52616 - ], - [ - 112.980369, - 19.496263 - ], - [ - 112.993304, - 19.472003 - ] - ] - ], - [ - [ - [ - 114.448153, - 16.034035 - ], - [ - 114.485109, - 16.034611 - ], - [ - 114.521449, - 16.056466 - ], - [ - 114.465399, - 16.067393 - ], - [ - 114.448153, - 16.034035 - ] - ] - ], - [ - [ - [ - 113.832213, - 19.158552 - ], - [ - 113.874097, - 19.151203 - ], - [ - 113.914749, - 19.172119 - ], - [ - 113.920293, - 19.223551 - ], - [ - 113.875945, - 19.237113 - ], - [ - 113.80696, - 19.222986 - ], - [ - 113.799568, - 19.19925 - ], - [ - 113.832213, - 19.158552 - ] - ] - ], - [ - [ - [ - 112.650842, - 5.106941 - ], - [ - 112.655769, - 5.055676 - ], - [ - 112.682871, - 5.048522 - ], - [ - 112.719211, - 5.075944 - ], - [ - 112.678559, - 5.121247 - ], - [ - 112.650842, - 5.106941 - ] - ] - ], - [ - [ - [ - 111.638853, - 7.907254 - ], - [ - 111.665339, - 7.887099 - ], - [ - 111.712766, - 7.887099 - ], - [ - 111.713382, - 7.927408 - ], - [ - 111.651788, - 7.932743 - ], - [ - 111.638853, - 7.907254 - ] - ] - ], - [ - [ - [ - 112.244322, - 8.874662 - ], - [ - 112.281278, - 8.855148 - ], - [ - 112.288669, - 8.885896 - ], - [ - 112.244322, - 8.874662 - ] - ] - ], - [ - [ - [ - 112.89229, - 7.844416 - ], - [ - 112.929862, - 7.827815 - ], - [ - 112.93171, - 7.867537 - ], - [ - 112.89229, - 7.844416 - ] - ] - ], - [ - [ - [ - 112.583088, - 5.56159 - ], - [ - 112.606494, - 5.51751 - ], - [ - 112.614501, - 5.465683 - ], - [ - 112.642834, - 5.489512 - ], - [ - 112.616349, - 5.568737 - ], - [ - 112.583088, - 5.56159 - ] - ] - ], - [ - [ - [ - 112.523342, - 5.656289 - ], - [ - 112.5449, - 5.616386 - ], - [ - 112.565842, - 5.63068 - ], - [ - 112.56153, - 5.677133 - ], - [ - 112.528886, - 5.687257 - ], - [ - 112.523342, - 5.656289 - ] - ] - ], - [ - [ - [ - 115.361591, - 13.948985 - ], - [ - 115.397315, - 13.92517 - ], - [ - 115.438583, - 13.943757 - ], - [ - 115.423185, - 13.977443 - ], - [ - 115.377605, - 13.968732 - ], - [ - 115.361591, - 13.948985 - ] - ] - ], - [ - [ - [ - 113.596924, - 10.240836 - ], - [ - 113.617866, - 10.22199 - ], - [ - 113.638192, - 10.243192 - ], - [ - 113.596924, - 10.240836 - ] - ] - ], - [ - [ - [ - 113.860546, - 15.477068 - ], - [ - 113.893807, - 15.463802 - ], - [ - 113.890112, - 15.490909 - ], - [ - 113.860546, - 15.477068 - ] - ] - ], - [ - [ - [ - 112.907072, - 4.993079 - ], - [ - 112.943413, - 4.991887 - ], - [ - 112.952652, - 5.047926 - ], - [ - 112.910768, - 5.038388 - ], - [ - 112.907072, - 4.993079 - ] - ] - ], - [ - [ - [ - 112.557219, - 5.109326 - ], - [ - 112.568922, - 5.071771 - ], - [ - 112.610806, - 5.091443 - ], - [ - 112.601567, - 5.120055 - ], - [ - 112.557219, - 5.109326 - ] - ] - ], - [ - [ - [ - 112.350263, - 5.621747 - ], - [ - 112.385988, - 5.615791 - ], - [ - 112.385372, - 5.643187 - ], - [ - 112.350263, - 5.621747 - ] - ] - ], - [ - [ - [ - 112.226459, - 16.759147 - ], - [ - 112.254177, - 16.751698 - ], - [ - 112.262184, - 16.778057 - ], - [ - 112.211061, - 16.795819 - ], - [ - 112.226459, - 16.759147 - ] - ] - ], - [ - [ - [ - 112.233851, - 15.69612 - ], - [ - 112.25972, - 15.734718 - ], - [ - 112.240626, - 15.741055 - ], - [ - 112.20367, - 15.71398 - ], - [ - 112.233851, - 15.69612 - ] - ] - ], - [ - [ - [ - 112.612037, - 5.367973 - ], - [ - 112.640371, - 5.347715 - ], - [ - 112.685334, - 5.371548 - ], - [ - 112.690878, - 5.406702 - ], - [ - 112.62374, - 5.401935 - ], - [ - 112.612037, - 5.367973 - ] - ] - ], - [ - [ - [ - 112.472219, - 5.73966 - ], - [ - 112.496857, - 5.736683 - ], - [ - 112.498089, - 5.775387 - ], - [ - 112.472219, - 5.73966 - ] - ] - ], - [ - [ - [ - 113.217506, - 6.306249 - ], - [ - 113.230441, - 6.285429 - ], - [ - 113.243991, - 6.325878 - ], - [ - 113.217506, - 6.306249 - ] - ] - ], - [ - [ - [ - 116.152457, - 9.579384 - ], - [ - 116.189413, - 9.565221 - ], - [ - 116.187565, - 9.595317 - ], - [ - 116.152457, - 9.579384 - ] - ] - ], - [ - [ - [ - 114.948911, - 7.508722 - ], - [ - 114.960614, - 7.484988 - ], - [ - 115.012353, - 7.484988 - ], - [ - 115.013585, - 7.525928 - ], - [ - 114.948911, - 7.508722 - ] - ] - ], - [ - [ - [ - 111.553854, - 7.807656 - ], - [ - 111.585267, - 7.771487 - ], - [ - 111.619759, - 7.840265 - ], - [ - 111.603745, - 7.861608 - ], - [ - 111.553854, - 7.807656 - ] - ] - ], - [ - [ - [ - 113.938771, - 15.8355 - ], - [ - 113.973263, - 15.805558 - ], - [ - 113.9708, - 15.83953 - ], - [ - 113.938771, - 15.8355 - ] - ] - ], - [ - [ - [ - 114.926122, - 16.036911 - ], - [ - 114.895325, - 16.036336 - ], - [ - 114.910723, - 16.001823 - ], - [ - 114.926122, - 16.036911 - ] - ] - ], - [ - [ - [ - 116.749302, - 9.056736 - ], - [ - 116.699411, - 9.049053 - ], - [ - 116.70865, - 9.024229 - ], - [ - 116.740679, - 9.028367 - ], - [ - 116.749302, - 9.056736 - ] - ] - ], - [ - [ - [ - 112.64653, - 16.385733 - ], - [ - 112.681639, - 16.400661 - ], - [ - 112.660081, - 16.426494 - ], - [ - 112.64653, - 16.385733 - ] - ] - ], - [ - [ - [ - 111.203384, - 19.92557 - ], - [ - 111.203384, - 19.925007 - ], - [ - 111.204, - 19.92557 - ], - [ - 111.204, - 19.926132 - ], - [ - 111.203384, - 19.92557 - ] - ] - ], - [ - [ - [ - 115.758256, - 10.461018 - ], - [ - 115.776118, - 10.434534 - ], - [ - 115.801987, - 10.463372 - ], - [ - 115.758256, - 10.461018 - ] - ] - ], - [ - [ - [ - 117.21372, - 10.735144 - ], - [ - 117.187235, - 10.741612 - ], - [ - 117.206945, - 10.707507 - ], - [ - 117.21372, - 10.735144 - ] - ] - ], - [ - [ - [ - 112.671784, - 16.331755 - ], - [ - 112.701349, - 16.331755 - ], - [ - 112.677943, - 16.35932 - ], - [ - 112.671784, - 16.331755 - ] - ] - ], - [ - [ - [ - 115.782277, - 10.541046 - ], - [ - 115.795212, - 10.499858 - ], - [ - 115.805067, - 10.524571 - ], - [ - 115.782277, - 10.541046 - ] - ] - ], - [ - [ - [ - 112.512255, - 9.544566 - ], - [ - 112.50856, - 9.525679 - ], - [ - 112.568922, - 9.516826 - ], - [ - 112.567074, - 9.554008 - ], - [ - 112.512255, - 9.544566 - ] - ] - ], - [ - [ - [ - 114.610145, - 15.649447 - ], - [ - 114.581195, - 15.625242 - ], - [ - 114.610761, - 15.615444 - ], - [ - 114.610145, - 15.649447 - ] - ] - ], - [ - [ - [ - 117.299336, - 11.077745 - ], - [ - 117.264227, - 11.063062 - ], - [ - 117.284553, - 11.02547 - ], - [ - 117.304263, - 11.027232 - ], - [ - 117.299336, - 11.077745 - ] - ] - ], - [ - [ - [ - 117.691073, - 11.048965 - ], - [ - 117.653501, - 11.046029 - ], - [ - 117.655965, - 11.024882 - ], - [ - 117.690457, - 11.016658 - ], - [ - 117.691073, - 11.048965 - ] - ] - ], - [ - [ - [ - 114.166668, - 9.38459 - ], - [ - 114.175291, - 9.342075 - ], - [ - 114.195617, - 9.350933 - ], - [ - 114.194386, - 9.391676 - ], - [ - 114.166668, - 9.38459 - ] - ] - ], - [ - [ - [ - 114.714854, - 9.736909 - ], - [ - 114.693296, - 9.741038 - ], - [ - 114.680978, - 9.707416 - ], - [ - 114.704999, - 9.700337 - ], - [ - 114.714854, - 9.736909 - ] - ] - ], - [ - [ - [ - 112.554139, - 5.97839 - ], - [ - 112.553523, - 5.942676 - ], - [ - 112.575697, - 5.971247 - ], - [ - 112.554139, - 5.97839 - ] - ] - ] - ] - } - }, + { "type": "Feature", "properties": { @@ -102092,1219 +98140,6 @@ ] ] } - }, - { - "type": "Feature", - "properties": { - "name": "", - "adchar": "JD", - "adcode": "100000_JD" - }, - "geometry": { - "type": "MultiPolygon", - "coordinates": [ - [ - [ - [ - 122.51865306, - 23.46078502 - ], - [ - 122.79861399, - 24.57367379 - ], - [ - 122.79889322, - 24.57678999 - ], - [ - 122.79819583, - 24.57983997 - ], - [ - 122.79659008, - 24.58252516 - ], - [ - 122.79423315, - 24.58458272 - ], - [ - 122.79135575, - 24.58581125 - ], - [ - 122.78823955, - 24.58609049 - ], - [ - 122.78518957, - 24.5853931 - ], - [ - 122.78250438, - 24.58378734 - ], - [ - 122.78044682, - 24.58143041 - ], - [ - 122.77921829, - 24.57855302 - ], - [ - 122.49925737, - 23.46566424 - ], - [ - 122.49897813, - 23.46254804 - ], - [ - 122.49967552, - 23.45949807 - ], - [ - 122.50128127, - 23.45681287 - ], - [ - 122.5036382, - 23.45475531 - ], - [ - 122.5065156, - 23.45352678 - ], - [ - 122.50963181, - 23.45324755 - ], - [ - 122.51268178, - 23.45394494 - ], - [ - 122.51536697, - 23.45555069 - ], - [ - 122.51742454, - 23.45790762 - ], - [ - 122.51865306, - 23.46078502 - ] - ] - ], - [ - [ - [ - 121.17202617, - 20.8054593 - ], - [ - 121.90938804, - 21.68743347 - ], - [ - 121.9109946, - 21.69011818 - ], - [ - 121.91169291, - 21.69316794 - ], - [ - 121.91141462, - 21.69628423 - ], - [ - 121.91018696, - 21.699162 - ], - [ - 121.9081301, - 21.70151955 - ], - [ - 121.9054454, - 21.70312611 - ], - [ - 121.90239563, - 21.70382443 - ], - [ - 121.89927934, - 21.70354613 - ], - [ - 121.89640158, - 21.70231847 - ], - [ - 121.89404403, - 21.70026162 - ], - [ - 121.15668216, - 20.81828744 - ], - [ - 121.1550756, - 20.81560273 - ], - [ - 121.15437729, - 20.81255297 - ], - [ - 121.15465558, - 20.80943668 - ], - [ - 121.15588324, - 20.80655891 - ], - [ - 121.1579401, - 20.80420136 - ], - [ - 121.1606248, - 20.8025948 - ], - [ - 121.16367457, - 20.80189649 - ], - [ - 121.16679085, - 20.80217478 - ], - [ - 121.16966862, - 20.80340244 - ], - [ - 121.17202617, - 20.8054593 - ] - ] - ], - [ - [ - [ - 119.47366172, - 18.00707291 - ], - [ - 120.02569734, - 19.02403788 - ], - [ - 120.02674143, - 19.02698721 - ], - [ - 120.02682302, - 19.03011484 - ], - [ - 120.02593412, - 19.0331146 - ], - [ - 120.02416175, - 19.03569286 - ], - [ - 120.02167941, - 19.03759723 - ], - [ - 120.01873007, - 19.03864132 - ], - [ - 120.01560245, - 19.03872291 - ], - [ - 120.01260269, - 19.03783401 - ], - [ - 120.01002443, - 19.03606165 - ], - [ - 120.00812005, - 19.0335793 - ], - [ - 119.45608443, - 18.01661433 - ], - [ - 119.45504035, - 18.01366499 - ], - [ - 119.45495876, - 18.01053737 - ], - [ - 119.45584765, - 18.00753761 - ], - [ - 119.45762002, - 18.00495935 - ], - [ - 119.46010237, - 18.00305497 - ], - [ - 119.4630517, - 18.00201089 - ], - [ - 119.46617933, - 18.0019293 - ], - [ - 119.46917909, - 18.0028182 - ], - [ - 119.47175735, - 18.00459056 - ], - [ - 119.47366172, - 18.00707291 - ] - ] - ], - [ - [ - [ - 119.0726757, - 15.04098494 - ], - [ - 119.0726757, - 16.04388528 - ], - [ - 119.07218626, - 16.04697545 - ], - [ - 119.07076587, - 16.04976313 - ], - [ - 119.06855355, - 16.05197545 - ], - [ - 119.06576587, - 16.05339584 - ], - [ - 119.0626757, - 16.05388528 - ], - [ - 119.05958553, - 16.05339584 - ], - [ - 119.05679784, - 16.05197545 - ], - [ - 119.05458553, - 16.04976313 - ], - [ - 119.05316513, - 16.04697545 - ], - [ - 119.0526757, - 16.04388528 - ], - [ - 119.0526757, - 15.04105889 - ], - [ - 119.0521839, - 15.00781004 - ], - [ - 119.05262758, - 15.00471297 - ], - [ - 119.05400659, - 15.00190458 - ], - [ - 119.05618595, - 14.99965979 - ], - [ - 119.05895232, - 14.99819832 - ], - [ - 119.06203491, - 14.99766324 - ], - [ - 119.06513198, - 14.99810691 - ], - [ - 119.06794036, - 14.99948592 - ], - [ - 119.07018516, - 15.00166528 - ], - [ - 119.07164663, - 15.00443165 - ], - [ - 119.07218171, - 15.00751424 - ], - [ - 119.0726746, - 15.04083704 - ], - [ - 119.0726757, - 15.04098494 - ] - ] - ], - [ - [ - [ - 118.68646749, - 11.18959191 - ], - [ - 118.52518702, - 10.91547751 - ], - [ - 118.52404181, - 10.91256595 - ], - [ - 118.52385237, - 10.909443 - ], - [ - 118.52463726, - 10.90641436 - ], - [ - 118.52631962, - 10.9037765 - ], - [ - 118.5287348, - 10.90178762 - ], - [ - 118.53164636, - 10.90064241 - ], - [ - 118.53476931, - 10.90045298 - ], - [ - 118.53779795, - 10.90123786 - ], - [ - 118.54043581, - 10.90292022 - ], - [ - 118.54242469, - 10.9053354 - ], - [ - 118.70409227, - 11.18010771 - ], - [ - 118.70476212, - 11.18147468 - ], - [ - 118.87431591, - 11.606662 - ], - [ - 118.87459939, - 11.60747236 - ], - [ - 118.98894963, - 11.98573108 - ], - [ - 118.98937534, - 11.98883067 - ], - [ - 118.9888224, - 11.99191011 - ], - [ - 118.98734492, - 11.99466796 - ], - [ - 118.98508753, - 11.99683427 - ], - [ - 118.98227119, - 11.99819697 - ], - [ - 118.9791716, - 11.99862269 - ], - [ - 118.97609216, - 11.99806975 - ], - [ - 118.97333431, - 11.99659227 - ], - [ - 118.97116801, - 11.99433487 - ], - [ - 118.9698053, - 11.99151854 - ], - [ - 118.85557939, - 11.6136711 - ], - [ - 118.68646749, - 11.18959191 - ] - ] - ], - [ - [ - [ - 115.54466883, - 7.14672265 - ], - [ - 116.2504858, - 7.979279 - ], - [ - 116.25211077, - 7.98195261 - ], - [ - 116.25283001, - 7.9849975 - ], - [ - 116.25257312, - 7.98811563 - ], - [ - 116.25136525, - 7.99100176 - ], - [ - 116.24932463, - 7.99337338 - ], - [ - 116.24665102, - 7.99499834 - ], - [ - 116.24360613, - 7.99571758 - ], - [ - 116.240488, - 7.99546069 - ], - [ - 116.23760187, - 7.99425282 - ], - [ - 116.23523025, - 7.99221221 - ], - [ - 115.52941328, - 7.15965587 - ], - [ - 115.52778832, - 7.15698226 - ], - [ - 115.52706908, - 7.15393736 - ], - [ - 115.52732596, - 7.15081924 - ], - [ - 115.52853383, - 7.1479331 - ], - [ - 115.53057445, - 7.14556148 - ], - [ - 115.53324806, - 7.14393652 - ], - [ - 115.53629295, - 7.14321728 - ], - [ - 115.53941108, - 7.14347417 - ], - [ - 115.54229721, - 7.14468204 - ], - [ - 115.54466883, - 7.14672265 - ] - ] - ], - [ - [ - [ - 112.30705249, - 3.53487257 - ], - [ - 111.78690114, - 3.41687263 - ], - [ - 111.78399583, - 3.41571167 - ], - [ - 111.78159146, - 3.41370973 - ], - [ - 111.77992341, - 3.41106279 - ], - [ - 111.77915495, - 3.40802995 - ], - [ - 111.77936129, - 3.40490807 - ], - [ - 111.78052226, - 3.40200275 - ], - [ - 111.78252419, - 3.39959839 - ], - [ - 111.78517113, - 3.39793033 - ], - [ - 111.78820398, - 3.39716187 - ], - [ - 111.79132585, - 3.39736822 - ], - [ - 112.31181658, - 3.51544515 - ], - [ - 112.31248917, - 3.51562254 - ], - [ - 112.52147408, - 3.5785908 - ], - [ - 112.52281386, - 3.57910186 - ], - [ - 112.85206367, - 3.73256867 - ], - [ - 112.85465776, - 3.7343178 - ], - [ - 112.85658437, - 3.73678292 - ], - [ - 112.85765492, - 3.73972276 - ], - [ - 112.85776462, - 3.74284952 - ], - [ - 112.85690272, - 3.74585715 - ], - [ - 112.8551536, - 3.74845124 - ], - [ - 112.85268847, - 3.75037785 - ], - [ - 112.84974864, - 3.7514484 - ], - [ - 112.84662187, - 3.75155809 - ], - [ - 112.84361424, - 3.7506962 - ], - [ - 112.51501594, - 3.59753306 - ], - [ - 112.30705249, - 3.53487257 - ] - ] - ], - [ - [ - [ - 108.26055972, - 6.08912451 - ], - [ - 108.29013305, - 6.01266273 - ], - [ - 108.29170425, - 6.00995718 - ], - [ - 108.29403462, - 6.00786957 - ], - [ - 108.29689603, - 6.00660426 - ], - [ - 108.3000084, - 6.00628511 - ], - [ - 108.30306706, - 6.00694335 - ], - [ - 108.30577262, - 6.00851455 - ], - [ - 108.30786022, - 6.01084492 - ], - [ - 108.30912553, - 6.01370633 - ], - [ - 108.30944469, - 6.0168187 - ], - [ - 108.30878645, - 6.01987736 - ], - [ - 108.279563, - 6.09543449 - ], - [ - 108.25611734, - 6.22752625 - ], - [ - 108.21679964, - 6.53816468 - ], - [ - 108.21876335, - 6.94964057 - ], - [ - 108.24419535, - 7.07390742 - ], - [ - 108.24433543, - 7.07703297 - ], - [ - 108.24350281, - 7.08004883 - ], - [ - 108.24177899, - 7.0826598 - ], - [ - 108.2393327, - 7.08461028 - ], - [ - 108.23640341, - 7.08570936 - ], - [ - 108.23327786, - 7.08584944 - ], - [ - 108.230262, - 7.08501682 - ], - [ - 108.22765103, - 7.083293 - ], - [ - 108.22570055, - 7.08084671 - ], - [ - 108.22460147, - 7.07791743 - ], - [ - 108.19897125, - 6.95268198 - ], - [ - 108.1987683, - 6.95072469 - ], - [ - 108.19679674, - 6.53760583 - ], - [ - 108.19687578, - 6.53630242 - ], - [ - 108.23630689, - 6.22476797 - ], - [ - 108.23638164, - 6.22427602 - ], - [ - 108.26004031, - 6.09098419 - ], - [ - 108.26055972, - 6.08912451 - ] - ] - ], - [ - [ - [ - 110.12822847, - 11.36894451 - ], - [ - 110.05553696, - 11.25335394 - ], - [ - 110.05430621, - 11.25047749 - ], - [ - 110.05402458, - 11.2473615 - ], - [ - 110.05471962, - 11.24431099 - ], - [ - 110.05632331, - 11.24162456 - ], - [ - 110.05867865, - 11.23956519 - ], - [ - 110.0615551, - 11.23833444 - ], - [ - 110.06467109, - 11.23805281 - ], - [ - 110.0677216, - 11.23874785 - ], - [ - 110.07040803, - 11.24035153 - ], - [ - 110.07246741, - 11.24270688 - ], - [ - 110.14541497, - 11.35870461 - ], - [ - 110.14588682, - 11.35954163 - ], - [ - 110.20700505, - 11.48128846 - ], - [ - 110.20728377, - 11.48189306 - ], - [ - 110.25854422, - 11.60358735 - ], - [ - 110.25901765, - 11.60499559 - ], - [ - 110.30436343, - 11.7826124 - ], - [ - 110.30456934, - 11.78364161 - ], - [ - 110.32822801, - 11.94571326 - ], - [ - 110.32832827, - 11.94685414 - ], - [ - 110.33424294, - 12.14159753 - ], - [ - 110.33424553, - 12.14210167 - ], - [ - 110.33227398, - 12.24038351 - ], - [ - 110.33172267, - 12.24346324 - ], - [ - 110.33024665, - 12.24622187 - ], - [ - 110.3279904, - 12.24838938 - ], - [ - 110.32517479, - 12.24975358 - ], - [ - 110.32207543, - 12.25018094 - ], - [ - 110.3189957, - 12.24962962 - ], - [ - 110.31623706, - 12.2481536 - ], - [ - 110.31406956, - 12.24589736 - ], - [ - 110.31270536, - 12.24308175 - ], - [ - 110.312278, - 12.23998238 - ], - [ - 110.3142445, - 12.14195265 - ], - [ - 110.3083549, - 11.94803461 - ], - [ - 110.28485499, - 11.78705054 - ], - [ - 110.23982347, - 11.61066468 - ], - [ - 110.18898148, - 11.48996382 - ], - [ - 110.12822847, - 11.36894451 - ] - ] - ], - [ - [ - [ - 109.82951587, - 15.22896754 - ], - [ - 109.84522534, - 15.15316562 - ], - [ - 109.84633168, - 15.15023907 - ], - [ - 109.84828823, - 15.14779763 - ], - [ - 109.85090347, - 15.14608029 - ], - [ - 109.85392139, - 15.14525516 - ], - [ - 109.85704658, - 15.145403 - ], - [ - 109.85997314, - 15.14650935 - ], - [ - 109.86241457, - 15.1484659 - ], - [ - 109.86413191, - 15.15108113 - ], - [ - 109.86495704, - 15.15409906 - ], - [ - 109.8648092, - 15.15722425 - ], - [ - 109.84903675, - 15.23333003 - ], - [ - 109.84889209, - 15.23393326 - ], - [ - 109.78974541, - 15.45068337 - ], - [ - 109.7892391, - 15.45210582 - ], - [ - 109.69066131, - 15.67432448 - ], - [ - 109.6900529, - 15.67548445 - ], - [ - 109.59147511, - 15.83677407 - ], - [ - 109.59116145, - 15.8372556 - ], - [ - 109.53201478, - 15.92259221 - ], - [ - 109.53166592, - 15.92306523 - ], - [ - 109.30888011, - 16.20725797 - ], - [ - 109.30658844, - 16.20938798 - ], - [ - 109.30375073, - 16.21070558 - ], - [ - 109.30064474, - 16.21108179 - ], - [ - 109.29757451, - 16.21047978 - ], - [ - 109.29484059, - 16.20895848 - ], - [ - 109.29271057, - 16.20666681 - ], - [ - 109.29139298, - 16.2038291 - ], - [ - 109.29101677, - 16.20072311 - ], - [ - 109.29161878, - 16.19765288 - ], - [ - 109.29314007, - 16.19491896 - ], - [ - 109.51574449, - 15.91095759 - ], - [ - 109.57455994, - 15.82609887 - ], - [ - 109.67264555, - 15.66561455 - ], - [ - 109.77065019, - 15.44468789 - ], - [ - 109.82951587, - 15.22896754 - ] - ] - ] - ] - } } ] } \ No newline at end of file diff --git a/sgzb-screen/src/views/Home/index.vue b/sgzb-screen/src/views/Home/index.vue index 9ddd2789..c8409472 100644 --- a/sgzb-screen/src/views/Home/index.vue +++ b/sgzb-screen/src/views/Home/index.vue @@ -8,7 +8,9 @@
- + + +
@@ -17,12 +19,15 @@
- + + + +
-
+
- + +
@@ -83,12 +89,14 @@ import LeftOne from '../../components/home/leftOne.vue' import LeftTwo from '../../components/home/leftTwo.vue' import LeftThree from '../../components/home/leftThree.vue' +import LeftFour from '../../components/home/leftFour.vue' import RightOne from '../../components/home/rightOne.vue' import rightTwo from '../../components/home/rightTwo.vue' import rightThree from '../../components/home/rightThree.vue' import RightFour from '../../components/home/rightFour.vue' import CenterBottom from '../../components/home/centerBottom.vue' import CenterTop from '../../components/home/centerTop.vue' +import Center3DMap from '../../components/home/Center3DMap.vue' import CountryMap from '../../components/home/countryMap.vue' import CenterFold from '../../components/home/centerFold.vue' import { getMaintenanceWarningApi } from "../../api/screen"; @@ -97,11 +105,13 @@ export default { LeftOne, LeftTwo, LeftThree, + LeftFour, RightOne, rightTwo, rightThree, RightFour, CenterBottom, + Center3DMap, CenterTop, CountryMap, CenterFold diff --git a/sgzb-ui/src/api/inventoryLogs/index.js b/sgzb-ui/src/api/inventoryLogs/index.js index 7cec71df..8592f2af 100644 --- a/sgzb-ui/src/api/inventoryLogs/index.js +++ b/sgzb-ui/src/api/inventoryLogs/index.js @@ -2,11 +2,17 @@ import request from '@/utils/request' /* 日志列表 */ -export const getLogsListApi = (data) => { - return request.get('/bm_num_logs/list', data) +export const getLogsListApi = (params) => { + return request.get('/system/bm_num_logs/list', { + params:params + }) } /* 日志详情 */ export const getLogsDetailsApi = (id) => { - return request.get(`/bm_num_logs/selectByPrimaryKey/${id}`) + return request.get(`/system/bm_num_logs/selectByPrimaryKey`, { + params: { + id + } + }) } \ No newline at end of file diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue index 1d1538fd..da3f2be6 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue @@ -562,7 +562,7 @@ getUnitData, getProData, getAgreementInfoById, - getUseNumByTypeId + // getUseNumByTypeId } from '@/api/claimAndRefund/receive.js' import dialogForm from './dialogForm.vue' import Tree from './tree.vue' @@ -690,7 +690,7 @@ selectDrop(value) { this.queryParams.typeId = value }, - + /** 查询字典类型列表 startTime,结束日期endTime */ async getList() { this.loading = true @@ -888,12 +888,12 @@ getViewByApply(params).then((res) => { console.log(res) this.loadingList = res.data.rows - this.loadingList.forEach(item=>{ +/* this.loadingList.forEach(item=>{ getUseNumByTypeId({ typeId:item.typeId }).then(res=>{ item.useNum = res.data }) - - }) + + })*/ this.loadingTotal = res.data.total }) }, @@ -954,7 +954,7 @@ this.dialogQueryParams.keyWord = '' this.getDialogList() }, - + }, } diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue index 157ee1cc..54ff352f 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue @@ -341,11 +341,11 @@ align="center" class-name="small-padding fixed-width" width="200" - prop="num" + prop="preNum" >