From e1072ac2e897b49dc66068a868f72e4f0d85ff48 Mon Sep 17 00:00:00 2001 From: lilin <18811154576@163.com> Date: Mon, 6 Jul 2026 17:09:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B2=BF=E7=A8=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=9B=BE=E4=BE=8B=E6=95=B0=E6=8D=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=A0=E9=99=A4=E8=8F=9C=E5=8D=95=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E4=B9=9F=E5=88=A0=E9=99=A4=E5=9B=BE=E5=B1=82=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/qgc_base/domain/SdHbrvDic.java | 6 +++++ .../qgc_base/mapper/SdHbrvDicMapper.java | 14 ++++++++++ .../qgc_base/service/ISdHbrvDicService.java | 1 + .../service/impl/SdHbrvDicServiceImpl.java | 7 +++++ .../along/controller/MsAlongBController.java | 27 ++++++++++++++----- .../controller/MsAlongDetBController.java | 10 +++++++ .../along/service/IMsAlongBService.java | 4 +++ .../service/impl/MsAlongBServiceImpl.java | 8 ++++++ .../mapLayer/mapper/MsMapmoduleBMapper.java | 23 +++++++++++++++- .../service/impl/MapLegendBizServiceImpl.java | 2 +- .../service/impl/MapmoduleBServiceImpl.java | 8 +++--- 11 files changed, 99 insertions(+), 11 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java index 6c355d33..dd97de8a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java @@ -99,4 +99,10 @@ public class SdHbrvDic implements Serializable { * 删除时间 */ private Date deleteTime; + + /** + * 基地名称 + */ + @TableField(exist = false) + private String basename; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java index 3dde38df..2751611f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java @@ -1,8 +1,10 @@ package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.qgc_base.domain.SdHbrvDic; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -27,4 +29,16 @@ public interface SdHbrvDicMapper extends BaseMapper { * 查询所有启用的流域 */ List selectEnabledList(); + + @Select("SELECT\n" + + " shd.*,\n" + + " sh.BASENAME\n" + + "FROM\n" + + " SD_HBRV_DIC shd\n" + + " LEFT JOIN SD_HYDROBASE sh ON sh.BASEID = shd.BASEID\n" + + "WHERE\n" + + " 1 = 1 \n" + + " AND shd.IS_DELETED = 0 \n" + + " AND sh.IS_DELETED = 0") + List getWbsbList(DataSourceRequest dataSourceRequest); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java index c38003c0..ad5984bd 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java @@ -62,4 +62,5 @@ public interface ISdHbrvDicService extends IService { List getHbrvdList(DataSourceRequest dataSourceRequest); + List getWbsbList(DataSourceRequest dataSourceRequest); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java index 5d58e2fe..1e41c5ba 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java @@ -52,6 +52,7 @@ public class SdHbrvDicServiceImpl extends ServiceImpl getWbsbList(DataSourceRequest dataSourceRequest) { + List sdHbrvDics = hbrvDicMapper.getWbsbList(dataSourceRequest); + return sdHbrvDics; + } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java index fbdbf065..ddaaff51 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java @@ -7,8 +7,11 @@ import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.common.exception.BizException; import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.service.ISdHbrvDicService; +import com.yfd.platform.qgc_env.wt.service.SdWtMonitorService; import com.yfd.platform.qgc_lygk.along.domain.MsAlongB; import com.yfd.platform.qgc_lygk.along.service.IMsAlongBService; +import com.yfd.platform.qgc_sys.mapcfg.service.IMapmoduleBService; import com.yfd.platform.utils.DataSourceRequestUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -32,6 +35,12 @@ public class MsAlongBController { @Resource private IMsAlongBService msAlongBService; + + @Resource + private SdWtMonitorService sdWtMonitorService; + + @Resource + private ISdHbrvDicService hbrvDicService; /** * 条件过滤数据列表 */ @@ -61,10 +70,16 @@ public class MsAlongBController { return ResponseResult.success("保存成功."); } -// @Operation(summary = "沿程配置删除") -// @PostMapping("/delete") -// public ResponseResult deleteData(@RequestBody List ids) { -// mapmoduleBService.delelteByIds(ids); -// return ResponseResult.success("删除成功."); -// } + @PostMapping("/wbsb/GetKendoList") + @Operation(summary = "查询水电基地流域字典列表") + public ResponseResult getWbsbList(@RequestBody DataSourceRequest dataSourceRequest) { + return ResponseResult.successData(hbrvDicService.getWbsbList(dataSourceRequest)); + } + + @Operation(summary = "沿程配置删除") + @PostMapping("/delete") + public ResponseResult deleteData(@RequestBody List ids) { + msAlongBService.delelteByIds(ids); + return ResponseResult.success("删除成功."); + } } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java index dcb90386..8f489ee6 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java @@ -51,4 +51,14 @@ public class MsAlongDetBController { msAlongDetBService.saveOrUpdate(msAlongDetB); return ResponseResult.success("保存成功."); } + + /** + * 条件过滤数据列表定制 + */ + @Operation(summary = "条件过滤数据列表定制") + @PostMapping("/GetKendoListCust") + public ResponseResult getKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { + DataSourceResult result = msAlongDetBService.getKendoList(dataSourceRequest); + return ResponseResult.successData(result); + } } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java index 3f23532b..9260fb42 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java @@ -5,6 +5,8 @@ import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.qgc_lygk.along.domain.MsAlongB; +import java.util.List; + /** * 沿程配置表 Service 接口 * @@ -19,6 +21,8 @@ public interface IMsAlongBService extends IService { */ DataSourceResult getKendoList(DataSourceRequest dataSourceRequest); + void delelteByIds(List ids); + // /** // * 保存或更新沿程配置 // * diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java index 7fd2fd93..0de796e3 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java @@ -13,6 +13,7 @@ import com.yfd.platform.utils.DataSourceRequestUtil; import com.yfd.platform.utils.QgcQueryWrapperUtil; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -52,6 +53,13 @@ public class MsAlongBServiceImpl extends ServiceImpl i return dataSourceResult; } + @Override + public void delelteByIds(List ids) { + for (String id : ids) { + this.delelteByIds(Collections.singletonList(id)); + } + } + // @Override // public boolean saveOrUpdate(MsAlongB msAlongB) { // super.saveOrUpdate(msAlongB); diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java index ee8da0e4..00b8523a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java @@ -109,6 +109,27 @@ public interface MsMapmoduleBMapper extends BaseMapper { + "" + "ORDER BY BMM.ORDER_INDEX, BML.ORDER_INDEX" + "") - List getModuleMapLegendList(@Param("moduleId") String moduleId); + List getModuleMapLegendListData(@Param("moduleId") String moduleId); + @Select("SELECT *\n" + + "FROM MS_MAPMODULE_B\n" + + "WHERE MODULE_ID = (\n" + + " SELECT msdmb.MODULE_ID\n" + + " FROM MS_MAPMODULE_B msdmb\n" + + " LEFT JOIN MS_MAPLEGEND_B mslmb ON msdmb.RES_ID = mslmb.ID\n" + + " LEFT JOIN MS_MAPLAYER_B msmab ON msmab.CODE = mslmb.LAYER_CODE\n" + + " WHERE msdmb.ID = #{id}\n" + + " AND msdmb.IS_DELETED = 0\n" + + ")\n" + + "AND RES_TYPE = 'layer'\n" + + "AND RES_ID = (\n" + + " SELECT msmab.id\n" + + " FROM MS_MAPMODULE_B msdmb\n" + + " LEFT JOIN MS_MAPLEGEND_B mslmb ON msdmb.RES_ID = mslmb.ID\n" + + " LEFT JOIN MS_MAPLAYER_B msmab ON msmab.CODE = mslmb.LAYER_CODE\n" + + " WHERE msdmb.ID = #{id}\n" + + " AND msdmb.IS_DELETED = 0\n" + + ")\n" + + "AND IS_DELETED = 0") + MsMapmoduleB selectLayerById(@Param("id") String id); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendBizServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendBizServiceImpl.java index 5ca81ae0..1ad9c34e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendBizServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendBizServiceImpl.java @@ -148,7 +148,7 @@ public class MapLegendBizServiceImpl implements IMapLegendBizService { public List getModuleMapLegendList(String moduleId) { List list = new ArrayList<>(); // 通过 JOIN 查询 MS_MAPLEGEND_B 和 MS_MAPMODULE_B（单参数版本） - List bbiMapLegendList = msMapmoduleBMapper.getModuleMapLegendList(moduleId); + List bbiMapLegendList = msMapmoduleBMapper.getModuleMapLegendListData(moduleId); if (bbiMapLegendList == null || bbiMapLegendList.isEmpty()) { return list; diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/service/impl/MapmoduleBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/service/impl/MapmoduleBServiceImpl.java index 1b7b5098..75d92b56 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/service/impl/MapmoduleBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/service/impl/MapmoduleBServiceImpl.java @@ -59,10 +59,12 @@ public class MapmoduleBServiceImpl extends ServiceImpl ids) { - if (ids != null) { - for (String id : ids) { - this.baseMapper.deleteById(id); + for (String id : ids) { + MsMapmoduleB msMapmoduleB = baseMapper.selectLayerById(id); + if (msMapmoduleB != null && msMapmoduleB.getId() != null){ + this.baseMapper.deleteById(msMapmoduleB.getId()); } + this.baseMapper.deleteById(id); } } From ec8ba69d654652b1f7270b0bf7b99d5654800eb5 Mon Sep 17 00:00:00 2001 From: lilin <18811154576@163.com> Date: Tue, 7 Jul 2026 18:55:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B2=BF=E7=A8=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../along/controller/MsAlongBController.java | 18 ++- .../controller/MsAlongDetBController.java | 12 +- .../along/domain/MsAlongDetTreeDto.java | 18 +++ .../qgc_lygk/along/domain/PowerDto.java | 26 +++++ .../qgc_lygk/along/mapper/MsAlongBMapper.java | 17 ++- .../along/mapper/MsAlongDetBMapper.java | 17 ++- .../along/service/IMsAlongBService.java | 3 + .../along/service/IMsAlongDetBService.java | 6 + .../service/impl/MsAlongBServiceImpl.java | 49 +++++++- .../service/impl/MsAlongDetBServiceImpl.java | 106 +++++++++++++++++- .../src/main/resources/application-prod.yml | 5 +- 11 files changed, 256 insertions(+), 21 deletions(-) create mode 100644 backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/MsAlongDetTreeDto.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/PowerDto.java diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java index ddaaff51..133c13e1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java @@ -13,13 +13,12 @@ import com.yfd.platform.qgc_lygk.along.domain.MsAlongB; import com.yfd.platform.qgc_lygk.along.service.IMsAlongBService; import com.yfd.platform.qgc_sys.mapcfg.service.IMapmoduleBService; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -66,8 +65,11 @@ public class MsAlongBController { if (StrUtil.isBlank(msAlongB.getCode())) { throw new BizException("沿程配置编码(code)不能为空."); } + msAlongB.setRecordUser(SecurityUtils.getUserId()); + //msAlongB.setRecordUser(SecurityUtils.getCurrentUsername()); msAlongBService.saveOrUpdate(msAlongB); - return ResponseResult.success("保存成功."); + return ResponseResult.successData(msAlongB.getId()); + } @PostMapping("/wbsb/GetKendoList") @@ -82,4 +84,10 @@ public class MsAlongBController { msAlongBService.delelteByIds(ids); return ResponseResult.success("删除成功."); } + + @PostMapping("/noAuth/GetKendoList") + @Operation(summary = "查询水电基地流域字典列表") + public ResponseResult getWbsbList(@RequestParam String stcd) { + return ResponseResult.successData(msAlongBService.getWbsbList(stcd)); + } } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java index 8f489ee6..d0cf9918 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java @@ -1,5 +1,6 @@ package com.yfd.platform.qgc_lygk.along.controller; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; @@ -7,6 +8,7 @@ import com.yfd.platform.common.exception.BizException; import com.yfd.platform.config.ResponseResult; import com.yfd.platform.qgc_lygk.along.domain.MsAlongB; import com.yfd.platform.qgc_lygk.along.domain.MsAlongDetB; +import com.yfd.platform.qgc_lygk.along.domain.MsAlongDetTreeDto; import com.yfd.platform.qgc_lygk.along.service.IMsAlongDetBService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -16,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 沿程配置明细表控制器 * @@ -44,11 +48,11 @@ public class MsAlongDetBController { */ @Operation(summary = "保存或修改") @PostMapping("/save") - public ResponseResult save(@RequestBody MsAlongDetB msAlongDetB) { - if (msAlongDetB == null) { - return ResponseResult.error("沿程配置明细信息不能为空."); + public ResponseResult save(@RequestBody List treeList) { + if (CollUtil.isEmpty(treeList)) { + return ResponseResult.error("数据不能为空."); } - msAlongDetBService.saveOrUpdate(msAlongDetB); + msAlongDetBService.saveOrUpdateBatchData(treeList); return ResponseResult.success("保存成功."); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/MsAlongDetTreeDto.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/MsAlongDetTreeDto.java new file mode 100644 index 00000000..faacbd8a --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/MsAlongDetTreeDto.java @@ -0,0 +1,18 @@ +package com.yfd.platform.qgc_lygk.along.domain; + +import lombok.Data; + +import java.util.List; + +@Data +public class MsAlongDetTreeDto { + private String id; // 记录ID（更新时传） + private String alongId; // 关联主表ID + private String stcd; // 断面编码 + private String sttp; // 类型编码 + private Integer sort; // 排序 + private String stnm; // 仅用于显示，不存表 + private String rstcd; // 仅用于显示，不存表 + private String parentId; // 前端用，不存表 + private List children; // 子节点 +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/PowerDto.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/PowerDto.java new file mode 100644 index 00000000..5653482e --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/PowerDto.java @@ -0,0 +1,26 @@ +package com.yfd.platform.qgc_lygk.along.domain; + +import lombok.Data; + +import java.util.List; +@Data +public class PowerDto { + // 水电水利工程编码 + private String stcd; + + // 水电水利工程名称 + private String stnm; + + // 水电水利工程名称 + private String sttp; + + // 主表实体 + private String sttpCode; + + // 主表实体 + private String sttpName; + + // 主表实体 + private String rstcd; + +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/mapper/MsAlongBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/mapper/MsAlongBMapper.java index bc85485c..71c188e5 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/mapper/MsAlongBMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/mapper/MsAlongBMapper.java @@ -2,7 +2,10 @@ package com.yfd.platform.qgc_lygk.along.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yfd.platform.qgc_lygk.along.domain.MsAlongB; -import org.apache.ibatis.annotations.Mapper; +import com.yfd.platform.qgc_lygk.along.domain.PowerDto; +import org.apache.ibatis.annotations.*; + +import java.util.List; /** * 沿程配置表 Mapper 接口 @@ -12,4 +15,16 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MsAlongBMapper extends BaseMapper { + @Select("SELECT STCD, STNM, STTP, STTP_CODE, STTP_NAME, RSTCD " + + "FROM V_MS_STBPRP_T " + + "WHERE RSTCD = #{stcd}") + @Results({ + @Result(column = "STCD", property = "stcd"), + @Result(column = "STNM", property = "stnm"), + @Result(column = "STTP", property = "sttp"), + @Result(column = "STTP_CODE", property = "sttpCode"), + @Result(column = "STTP_NAME", property = "sttpName"), + @Result(column = "RSTCD", property = "rstcd") + }) + List getWbsbList(@Param("stcd") String stcd); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/mapper/MsAlongDetBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/mapper/MsAlongDetBMapper.java index 0e0e17bd..08439a35 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/mapper/MsAlongDetBMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/mapper/MsAlongDetBMapper.java @@ -2,7 +2,10 @@ package com.yfd.platform.qgc_lygk.along.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yfd.platform.qgc_lygk.along.domain.MsAlongDetB; -import org.apache.ibatis.annotations.Mapper; +import com.yfd.platform.qgc_lygk.along.domain.PowerDto; +import org.apache.ibatis.annotations.*; + +import java.util.List; /** * 沿程配置明细表 Mapper 接口 @@ -12,4 +15,16 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MsAlongDetBMapper extends BaseMapper { + @Select("SELECT STCD, STNM, STTP, STTP_CODE, STTP_NAME, RSTCD " + + "FROM V_MS_STBPRP_T " + + "WHERE STCD = #{stcd}") + @Results({ + @Result(column = "STCD", property = "stcd"), + @Result(column = "STNM", property = "stnm"), + @Result(column = "STTP", property = "sttp"), + @Result(column = "STTP_CODE", property = "sttpCode"), + @Result(column = "STTP_NAME", property = "sttpName"), + @Result(column = "RSTCD", property = "rstcd") + }) + List getWbsbList(@Param("stcd") String stcd); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java index 9260fb42..731c1ea6 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.qgc_lygk.along.domain.MsAlongB; +import com.yfd.platform.qgc_lygk.along.domain.PowerDto; import java.util.List; @@ -23,6 +24,8 @@ public interface IMsAlongBService extends IService { void delelteByIds(List ids); + List getWbsbList(String stcd); + // /** // * 保存或更新沿程配置 // * diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongDetBService.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongDetBService.java index 39aced84..9d34b194 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongDetBService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongDetBService.java @@ -3,7 +3,11 @@ package com.yfd.platform.qgc_lygk.along.service; import com.baomidou.mybatisplus.extension.service.IService; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; +import com.yfd.platform.config.ResponseResult; import com.yfd.platform.qgc_lygk.along.domain.MsAlongDetB; +import com.yfd.platform.qgc_lygk.along.domain.MsAlongDetTreeDto; + +import java.util.List; /** * 沿程配置明细表 Service 接口 @@ -19,4 +23,6 @@ public interface IMsAlongDetBService extends IService { * @return 数据源结果 */ DataSourceResult getKendoList(DataSourceRequest dataSourceRequest); + + ResponseResult saveOrUpdateBatchData(List treeList); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java index 0de796e3..283d3dcc 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java @@ -1,20 +1,28 @@ package com.yfd.platform.qgc_lygk.along.service.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.DataSourceLoadOptionsBase; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; +import com.yfd.platform.qgc_base.domain.SdRvcdDic; +import com.yfd.platform.qgc_base.mapper.SdRvcdDicMapper; import com.yfd.platform.qgc_lygk.along.domain.MsAlongB; +import com.yfd.platform.qgc_lygk.along.domain.PowerDto; import com.yfd.platform.qgc_lygk.along.mapper.MsAlongBMapper; import com.yfd.platform.qgc_lygk.along.service.IMsAlongBService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.QgcQueryWrapperUtil; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * 沿程配置表 Service 实现类 @@ -24,6 +32,11 @@ import java.util.List; @Service public class MsAlongBServiceImpl extends ServiceImpl implements IMsAlongBService { + @Resource + private MsAlongBMapper msAlongBMapper; + @Resource + private SdRvcdDicMapper sdRvcdDicMapper; + @Override public DataSourceResult getKendoList(DataSourceRequest dataSourceRequest) { // 1. 构建查询条件 @@ -46,7 +59,29 @@ public class MsAlongBServiceImpl extends ServiceImpl i resultPage.setTotal(list.size()); } - // 4. 构建结果 + // 4. 循环填充 rvnm + List records = resultPage.getRecords(); + if (CollUtil.isNotEmpty(records)) { + for (MsAlongB record : records) { + String rvcd = record.getRvcd(); + if (StrUtil.isNotBlank(rvcd)) { + // 调用现有 Mapper 方法，查询单个 rvcd + List dictList = sdRvcdDicMapper.selectRegDropdown(null, rvcd); + if (CollUtil.isNotEmpty(dictList)) { + // 取第一条记录的 RVNM（即 DISPLAY_RVNM） + String displayRvnm = dictList.get(0).getRvnm(); + // 如果只需要末级名称，可截取最后一个 '-' 后的部分 + // 如果直接使用完整路径，则直接赋值 + record.setRvnm(displayRvnm); + // 若需要末级名称： + // int lastDash = displayRvnm.lastIndexOf('-'); + // record.setRvnm(lastDash > 0 ? displayRvnm.substring(lastDash + 1) : displayRvnm); + } + } + } + } + + // 5. 构建结果 DataSourceResult dataSourceResult = new DataSourceResult<>(); dataSourceResult.setData(resultPage.getRecords()); dataSourceResult.setTotal(resultPage.getTotal()); @@ -56,10 +91,16 @@ public class MsAlongBServiceImpl extends ServiceImpl i @Override public void delelteByIds(List ids) { for (String id : ids) { - this.delelteByIds(Collections.singletonList(id)); + this.removeById(id); } } + @Override + public List getWbsbList(String stcd) { + List powerDtos = msAlongBMapper.getWbsbList(stcd); + return powerDtos; + } + // @Override // public boolean saveOrUpdate(MsAlongB msAlongB) { // super.saveOrUpdate(msAlongB); diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongDetBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongDetBServiceImpl.java index 5410fbd5..c4700493 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongDetBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongDetBServiceImpl.java @@ -1,23 +1,29 @@ package com.yfd.platform.qgc_lygk.along.service.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.DataSourceLoadOptionsBase; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; +import com.yfd.platform.config.ResponseResult; import com.yfd.platform.qgc_lygk.along.domain.MsAlongDetB; +import com.yfd.platform.qgc_lygk.along.domain.MsAlongDetTreeDto; +import com.yfd.platform.qgc_lygk.along.domain.PowerDto; +import com.yfd.platform.qgc_lygk.along.mapper.MsAlongBMapper; import com.yfd.platform.qgc_lygk.along.mapper.MsAlongDetBMapper; import com.yfd.platform.qgc_lygk.along.service.IMsAlongDetBService; -import com.yfd.platform.utils.CodeToNameMetadataBo; -import com.yfd.platform.utils.DataSourceRequestUtil; -import com.yfd.platform.utils.DictCodeToNameConverter; -import com.yfd.platform.utils.QgcQueryWrapperUtil; +import com.yfd.platform.utils.*; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * 沿程配置明细表 Service 实现类 @@ -30,6 +36,9 @@ public class MsAlongDetBServiceImpl extends ServiceImpl CODE_TO_NAME_META_LIST = new ArrayList<>(); static { @@ -62,10 +71,99 @@ public class MsAlongDetBServiceImpl extends ServiceImpl records = resultPage.getRecords(); + if (CollUtil.isNotEmpty(records)) { + for (MsAlongDetB record : records) { + String stcd = record.getStcd(); + if (StrUtil.isNotBlank(stcd)) { + // 调用 Mapper 方法查询测站信息 + List powerDtos = msAlongDetBMapper.getWbsbList(stcd); + if (CollUtil.isNotEmpty(powerDtos)) { + // 取第一个结果（通常一个 STCD 只对应一条记录） + String stnm = powerDtos.get(0).getStnm(); + record.setStnm(stnm); + } + } + } + } + // 4. 构建结果 DataSourceResult dataSourceResult = new DataSourceResult<>(); dataSourceResult.setData(resultPage.getRecords()); dataSourceResult.setTotal(resultPage.getTotal()); return dataSourceResult; } + + @Override + public ResponseResult saveOrUpdateBatchData(List treeList) { + // 1. 递归扁平化：将树形结构转为平铺的实体列表 + List flatList = new ArrayList<>(); + for (MsAlongDetTreeDto root : treeList) { + flattenTree(root, flatList); + } + + if (flatList.isEmpty()) { + return ResponseResult.error("没有有效数据."); + } + + // 2. 校验每条记录的 alongId 不为空 + for (MsAlongDetB item : flatList) { + if (StrUtil.isBlank(item.getAlongId())) { + return ResponseResult.error("沿程配置ID(alongId)不能为空."); + } + } + + // 3. 【新增】提取所有不同的 alongId，删除这些主键下的旧明细 + Set alongIdSet = flatList.stream() + .map(MsAlongDetB::getAlongId) + .filter(StrUtil::isNotBlank) + .collect(Collectors.toSet()); + + if (CollUtil.isNotEmpty(alongIdSet)) { + LambdaUpdateWrapper deleteWrapper = new LambdaUpdateWrapper<>(); + deleteWrapper.in(MsAlongDetB::getAlongId, alongIdSet) + .set(MsAlongDetB::getIsDeleted, "1"); // 逻辑删除标记 + this.update(deleteWrapper); + } + + // 4. 插入新数据（注意：需要清空旧记录的主键ID，让数据库自增或雪花ID生成） + for (MsAlongDetB item : flatList) { + item.setId(null); // 确保都是新增 + } + + // 5. 批量保存（有则更新，无则新增） + this.saveOrUpdateBatch(flatList); + + return ResponseResult.success("保存成功."); + } + + /** + * 递归展开树形节点，将每个节点转换为 MsAlongDetB 实体 + */ + private void flattenTree(MsAlongDetTreeDto node, List flatList) { + // 1. 将当前节点转为实体 + MsAlongDetB entity = new MsAlongDetB(); + // 仅复制表中存在的字段 + entity.setId(node.getId()); + entity.setAlongId(node.getAlongId()); + entity.setStcd(node.getStcd()); + entity.setSttp(node.getSttp()); + entity.setRstcd(node.getRstcd()); + entity.setRecordUser(SecurityUtils.getUserId()); // 创建人 + //entity.setRecordUser(SecurityUtils.getCurrentUsername()); // 创建人 + if (node.getSort() != null){ + entity.setSort(String.valueOf(node.getSort())); // 若传了排序 + } + if (StrUtil.isBlank(entity.getId())) { + entity.setId(null); + } + flatList.add(entity); + // 2. 递归处理子节点 + if (CollUtil.isNotEmpty(node.getChildren())) { + for (MsAlongDetTreeDto child : node.getChildren()) { + flattenTree(child, flatList); + } + } + } } \ No newline at end of file diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml index 294c61ea..48e5a037 100644 --- a/backend/src/main/resources/application-prod.yml +++ b/backend/src/main/resources/application-prod.yml @@ -111,9 +111,10 @@ spring: matching-strategy: ant_path_matcher data: redis: - host: ${REDIS_HOST:localhost} + host: ${REDIS_HOST:172.16.21.142} port: ${REDIS_PORT:6379} - password: ${REDIS_PASSWORD:} + password: ${REDIS_PASSWORD:zny5678} + database: ${REDIS_DATABASE:15} timeout: 10000ms lettuce: pool: From e624cf3bb90d1b047933ed7ca063caab6cfad961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E5=87=AF?= <2448379534@qq.com> Date: Tue, 7 Jul 2026 18:59:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E4=B8=8E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MapModal/components/BasicInfo.vue | 7 +- .../src/modules/liuyu/ai/spdzwaijc/AISPTK.vue | 1 + .../ai/spdzwaijc/components/VideoDetails.vue | 3 + .../index.vue | 4 +- .../TwoLayer/HuanJingSJJRQK.vue | 2 +- .../TwoLayer/ShuiDianKaiFQKTwoLayer.vue | 36 +---- .../yunXingGaoJIng/Aisbdbyx/AISBTK.vue | 1 + .../Aisbdbyx/components/VideoPlayer.vue | 3 + frontend/src/styles/index.scss | 5 + frontend/src/utils/request.ts | 2 +- .../views/home/shuiDianKaiFaZhuangKuang.vue | 147 ------------------ 11 files changed, 28 insertions(+), 183 deletions(-) diff --git a/frontend/src/components/MapModal/components/BasicInfo.vue b/frontend/src/components/MapModal/components/BasicInfo.vue index 70a185dd..363ca155 100644 --- a/frontend/src/components/MapModal/components/BasicInfo.vue +++ b/frontend/src/components/MapModal/components/BasicInfo.vue @@ -266,6 +266,10 @@ const columnsConfig = ref([ type: 'EQ_7', columns: EQPointColumns7 }, + { + type: 'EQ', + columns: EQPointColumns7 + }, { type: 'WE', columns: wePointColumns @@ -365,9 +369,10 @@ const getData = async () => { item => item.type == (modelStore.params.sttp == 'EQ' - ? modelStore.params.anchoPointState + ? modelStore.params.sttp : modelStore.params.sttp) ).columns; + // debugger columns.forEach(item => { if (item.visible) { diff --git a/frontend/src/modules/liuyu/ai/spdzwaijc/AISPTK.vue b/frontend/src/modules/liuyu/ai/spdzwaijc/AISPTK.vue index ab353c35..306ae0fe 100644 --- a/frontend/src/modules/liuyu/ai/spdzwaijc/AISPTK.vue +++ b/frontend/src/modules/liuyu/ai/spdzwaijc/AISPTK.vue @@ -1707,6 +1707,7 @@ onBeforeUnmount(() => { align-items: center; justify-content: center; height: 100%; + background:#fff; } } diff --git a/frontend/src/modules/liuyu/ai/spdzwaijc/components/VideoDetails.vue b/frontend/src/modules/liuyu/ai/spdzwaijc/components/VideoDetails.vue index 75a95abf..c9f21f1e 100644 --- a/frontend/src/modules/liuyu/ai/spdzwaijc/components/VideoDetails.vue +++ b/frontend/src/modules/liuyu/ai/spdzwaijc/components/VideoDetails.vue @@ -314,4 +314,7 @@ onMounted(() => { height: 100%; } } +:deep(.media-empty){ + background:#fff !important; +} diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue index fc37d643..1d2c566b 100644 --- a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue @@ -196,9 +196,7 @@ const getSelectConfig = async () => { return indexA - indexB; }) select.value.options = filterSelectOptions(dataMapNameArr) - if (baseid.value === 'all') { - select.value.value = 'SJLY176' - } else if (filterSelectOptions(dataMapNameArr)[0]?.children) { + if (filterSelectOptions(dataMapNameArr)[0]?.children) { select.value.value = filterSelectOptions(dataMapNameArr)[0]?.children[0]?.value } else if (filterSelectOptions(dataMapNameArr)[0]?.value) { select.value.value = filterSelectOptions(dataMapNameArr)[0]?.value diff --git a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/HuanJingSJJRQK.vue b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/HuanJingSJJRQK.vue index fcf61feb..44eb39da 100644 --- a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/HuanJingSJJRQK.vue +++ b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/HuanJingSJJRQK.vue @@ -368,7 +368,7 @@ const chartSetting = computed(() => { title: [ { text: String(total || 0), - left: '28%', + left: '30%', top: '43%', textStyle: { fontSize: 24, fontWeight: 'bold', color: '#333' } }, diff --git a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue index c19013f5..153e36bd 100644 --- a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue +++ b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue @@ -230,47 +230,23 @@ async function fetchPieData(params: any): Promise { let list = resData.flatMap((item: any) => { let arr: PieDataItem[] = []; - const itmeData = - qid.value === 'all' || qid.value === 'other' - ? item?.items - : item?.items[0]?.items; + const itmeData = item?.items; itmeData?.map((outItem: any) => { - const level5Data = - qid.value === 'all' || qid.value === 'other' - ? outItem?.items?.[0]?.items?.[0]?.items?.[0] - : outItem?.items?.[0]?.items?.[0]; + const level5Data = outItem?.items?.[0]?.items?.[0]?.items?.[0]; - const name = - qid.value === 'all' - ? outItem?.items?.[0]?.key - : qid.value === 'other' - ? outItem?.items?.[0]?.key - : outItem?.key || outItem?.HBRVCDNAME; + const name = outItem?.items?.[0]?.key; if (name) { arr.push({ - key: - qid.value === 'all' - ? outItem?.key - : qid.value === 'other' - ? outItem?.key - : outItem?.HBRVCD || outItem?.key, + key: outItem?.key, dataDimensionRecursive: 'true', name: name, unit: '', value: - qid.value === 'all' && useTtpwrFilter + useTtpwrFilter ? level5Data?.SUM_TTPWR && +transUnit(level5Data?.SUM_TTPWR) - : qid.value === 'all' && !useTtpwrFilter - ? level5Data?.COUNT_BLDSTTCCODE - : qid.value === 'other' && useTtpwrFilter - ? level5Data?.SUM_TTPWR && +transUnit(level5Data?.SUM_TTPWR) - : qid.value === 'other' && !useTtpwrFilter - ? level5Data?.COUNT_BLDSTTCCODE - : (level5Data?.SUM_TTPWR && - +transUnit(level5Data?.SUM_TTPWR)) || - level5Data?.COUNT_BLDSTTCCODE + : level5Data?.COUNT_BLDSTTCCODE }); } }); diff --git a/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/AISBTK.vue b/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/AISBTK.vue index 5e9ae3d7..86dac576 100644 --- a/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/AISBTK.vue +++ b/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/AISBTK.vue @@ -2041,6 +2041,7 @@ onBeforeUnmount(() => { align-items: center; justify-content: center; height: 100%; + background:#fff; } } diff --git a/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/components/VideoPlayer.vue b/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/components/VideoPlayer.vue index 708cc412..1279546b 100644 --- a/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/components/VideoPlayer.vue +++ b/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/components/VideoPlayer.vue @@ -215,4 +215,7 @@ const handlePageChange = (page: number, pageSize: number) => { } } /* 样式继承自父组件 */ +:deep(.media-empty){ + background:#fff !important; +} diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index e6118041..d09926ac 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -118,3 +118,8 @@ svg { .ant-select-tree-node-selected { background-color: #bae7ff !important; } +.ant-empty{ + p{ + text-indent: 0em !important; + } +} diff --git a/frontend/src/utils/request.ts b/frontend/src/utils/request.ts index 0f9323c2..b3da9e99 100644 --- a/frontend/src/utils/request.ts +++ b/frontend/src/utils/request.ts @@ -34,7 +34,7 @@ service.interceptors.request.use( config.headers._sysid = '10EC2E0B-AEA9-4757-83A2-201BA1BC54E9'; config.headers.authorization = - 'bearer 863782c5-5e51-49c6-95fd-13e6f25b9bf2'; + 'bearer f2438154-ca4c-4acb-8e56-739534932ebb'; config.baseURL = '/'; } else { const user = useUserStoreHook(); diff --git a/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue b/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue index 0bd6849b..e83bcb42 100644 --- a/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue +++ b/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue @@ -5,136 +5,8 @@ import RightDrawer from '@/components/RightDrawer/index.vue'; import jidiInfoMod from '@/modules/jidiInfoMod/index.vue'; import shuidianhuangjingjieruMod from '@/modules/shuidianhuangjingjieruMod/index.vue'; import { useModelStore } from '@/store/modules/model'; - -const modelStore = useModelStore(); -// import { getQgcStaticData } from "@/api/ecoFlow"; onMounted(() => { - // const params = { - // filter: { - // logic: "and", - // filters: [ - // { field: "dtin", operator: "eq", dataType: "string", value: "1" }, - // { field: "type", operator: "eq", dataType: "string", value: "hour" }, - // { field: "tm", operator: "gte", dataType: "date", value: "2026-03-02 00:00:00" }, - // { field: "tm", operator: "lte", dataType: "date", value: "2026-04-02 23:59:59" }, - // ], - // }, - // }; - // getQgcStaticData(params).then((res) => { - // console.log(res); - // }); }); - -const showMapModal = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'ENG'; - modelStore.title = '三峡 '; - modelStore.isBasicEdit = true; -}; -const showMapModal1 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'WT'; - modelStore.title = '水温 '; - modelStore.isBasicEdit = true; -}; -const showMapModal2 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'WQFB'; - modelStore.title = '水质 '; - modelStore.isBasicEdit = true; -}; -const showMapModal3 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'FH'; - modelStore.title = '栖息地 '; - modelStore.isBasicEdit = true; -}; // -const showMapModal4 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'fh_zq_point'; - modelStore.title = '栖息地流量 '; - modelStore.isBasicEdit = true; -}; -const showMapModal5 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'fp_point'; - modelStore.title = '过鱼设施 '; - modelStore.isBasicEdit = true; -}; -const showMapModal6 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'FB'; - modelStore.title = '鱼类增殖站 '; - modelStore.isBasicEdit = true; -}; -// -const showMapModal7 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'VA'; - modelStore.title = '动物救助站 '; - modelStore.isBasicEdit = true; -}; -const showMapModal8 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'VP'; - modelStore.title = '珍稀植物园 '; - modelStore.isBasicEdit = true; -}; -const showMapModal9 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'WE'; - modelStore.title = '水生生态调查断面 '; - modelStore.isBasicEdit = true; -}; -const showMapModal10 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'WVA'; - modelStore.title = '野生动物监测 '; - modelStore.isBasicEdit = true; -}; -const showMapModal11 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'VD_FBFM'; - modelStore.title = 'AI视频监控站 '; - modelStore.isBasicEdit = true; -}; -const showMapModal12 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'eng_alarm_point'; - modelStore.title = '水电站告警情况 '; - modelStore.isBasicEdit = true; -}; -const showMapModal13 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'FPRD'; - modelStore.title = '鱼类调查装置 '; - modelStore.isBasicEdit = true; -}; -const showMapModal14 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'DW_2'; - modelStore.title = '低温水减缓设施-叠梁门 '; - modelStore.isBasicEdit = true; -}; -const showMapModal15 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'DW_5'; - modelStore.title = '前置挡墙 '; - modelStore.isBasicEdit = true; -}; -const showMapModal16 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'DW_6'; - modelStore.title = '隔水幕墙 '; - modelStore.isBasicEdit = true; -}; -const showMapModal17 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'DW_1'; - modelStore.title = '夹岩双层取水 '; - modelStore.isBasicEdit = true; -}; -//DW_5