diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/controller/EngEqDataController.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/controller/EngEqDataController.java index 644a77a7..eb74aa9a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/controller/EngEqDataController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/controller/EngEqDataController.java @@ -36,6 +36,12 @@ public class EngEqDataController { return ResponseResult.successData(engEqDataService.getKendoListCust(dataSourceRequest)); } + @PostMapping("/data/day/GetKendoListCust") + @Operation(summary = "生态流量日数据") + public ResponseResult getDayKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { + return ResponseResult.successData(engEqDataService.getDayKendoListCust(dataSourceRequest)); + } + @PostMapping("/interval/GetKendoListCust") @Operation(summary = "生态流量达标情况") public ResponseResult getIntervalKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqDayDataVo.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqDayDataVo.java new file mode 100644 index 00000000..df557c6f --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqDayDataVo.java @@ -0,0 +1,123 @@ +package com.yfd.platform.qgc_eng.eq.entity.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@Schema(description = "生态流量日数据") +public class EngEqDayDataVo { + + @Schema(description = "主键") + private String id; + + @Schema(description = "电站编码") + private String stcd; + + @Schema(description = "电站名称") + private String stnm; + + @Schema(description = "工程名称") + private String ennm; + + @Schema(description = "基地编码") + private String baseId; + + @Schema(description = "基地名称") + private String baseName; + + @Schema(description = "基地流域编码") + private String hbrvcd; + + @Schema(description = "基地流域名称") + private String hbrvcdName; + + @Schema(description = "流域编码") + private String rvcd; + + @Schema(description = "流域名称") + private String rvcdName; + + @Schema(description = "行政区名称") + private String addvcdName; + + @Schema(description = "入库流量") + private BigDecimal qi; + + @Schema(description = "出库流量") + private BigDecimal qo; + + @Schema(description = "坝上水位") + private BigDecimal rz; + + @Schema(description = "坝下水位") + private BigDecimal dz; + + @Schema(description = "生态流量限值(环保部)") + private BigDecimal qecLimit; + + @Schema(description = "生态流量") + private BigDecimal qec; + + @Schema(description = "生态流量限值(水利部)") + private BigDecimal mwrLimit; + + @Schema(description = "生态流量限值(多年平均)") + private BigDecimal avqLimit; + + @Schema(description = "生态流量系数(环保部)") + private BigDecimal qecC; + + @Schema(description = "生态流量系数(水利部)") + private BigDecimal mwrC; + + @Schema(description = "生态流量系数(多年平均)") + private BigDecimal avqC; + + @Schema(description = "生态流量是否达标") + private Integer sfdb; + + @Schema(description = "生态流量是否达标中文") + private String sfdbName; + + @Schema(description = "生态流量是否达标(环保部)") + private Integer qecSfdb; + + @Schema(description = "生态流量是否达标(水利部)") + private Integer mwrSfdb; + + @Schema(description = "生态流量是否达标(水利部)中文") + private String mwrSfdbName; + + @Schema(description = "生态流量是否达标(多年平均)") + private Integer avqSfdb; + + @Schema(description = "生态流量是否达标(多年平均)中文") + private String avqSfdbName; + + @Schema(description = "日期") + private Date dt; + + @Schema(description = "环保部规则详情ID") + private String qecRuleDid; + + @Schema(description = "水利部规则详情ID") + private String qecMwrruleDid; + + @Schema(description = "去年同期生态流量") + private BigDecimal beforeQec; + + @Schema(description = "基地排序") + private Integer baseStepSort; + + @Schema(description = "流域排序") + private Integer rvcdStepSort; + + @Schema(description = "电站排序") + private Integer rstcdStepSort; + + @Schema(description = "站点排序") + private Integer siteStepSort; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/EngEqDataService.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/EngEqDataService.java index 03d06e3a..009a42dc 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/EngEqDataService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/EngEqDataService.java @@ -2,6 +2,7 @@ package com.yfd.platform.qgc_eng.eq.service; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; +import com.yfd.platform.qgc_eng.eq.entity.vo.EngEqDayDataVo; import com.yfd.platform.qgc_eng.eq.entity.vo.EngEqDayIntervalVo; import com.yfd.platform.qgc_eng.eq.entity.vo.EngEqHourIntervalVo; import com.yfd.platform.qgc_eng.eq.entity.vo.EngEqIntervalVo; @@ -18,6 +19,8 @@ public interface EngEqDataService { DataSourceResult getKendoListCust(DataSourceRequest dataSourceRequest); + DataSourceResult getDayKendoListCust(DataSourceRequest dataSourceRequest); + DataSourceResult getIntervalKendoListCust(DataSourceRequest dataSourceRequest); DataSourceResult getMsstbprptList(DataSourceRequest dataSourceRequest); diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java index 4a5f4b68..8dac6130 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java @@ -12,6 +12,7 @@ import com.yfd.platform.common.MicroservicDynamicSQLMapper; import com.yfd.platform.common.enums.QecIntervalEnum; import com.yfd.platform.common.enums.ShowEnum; import com.yfd.platform.qgc_eng.eq.entity.vo.EngEqDataVo; +import com.yfd.platform.qgc_eng.eq.entity.vo.EngEqDayDataVo; import com.yfd.platform.qgc_eng.eq.entity.vo.EngEqDayIntervalVo; import com.yfd.platform.qgc_eng.eq.entity.vo.EngFidVo; import com.yfd.platform.qgc_eng.eq.entity.vo.EngEqHourIntervalVo; @@ -60,6 +61,15 @@ public class EngEqDataServiceImpl implements EngEqDataService { return queryGroupList(dataSourceRequest, loadOptions); } + @Override + public DataSourceResult getDayKendoListCust(DataSourceRequest dataSourceRequest) { + DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest(); + if (CollUtil.isEmpty(dataSourceRequest == null ? null : dataSourceRequest.getGroup())) { + return queryDayDetailList(dataSourceRequest, loadOptions); + } + return queryDayGroupList(dataSourceRequest, loadOptions); + } + @Override public DataSourceResult getIntervalKendoListCust(DataSourceRequest dataSourceRequest) { DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest(); @@ -1485,6 +1495,101 @@ public class EngEqDataServiceImpl implements EngEqDataService { return result; } + private DataSourceResult queryDayDetailList(DataSourceRequest dataSourceRequest, + DataSourceLoadOptionsBase loadOptions) { + StringBuilder sql = new StringBuilder(); + sql.append("SELECT ") + .append(buildDayDetailSelectSql(dataSourceRequest == null ? null : dataSourceRequest.getSelect())) + .append(" FROM (") + .append(buildDayViewSql()) + .append(") t WHERE 1 = 1 "); + + Map paramMap = new HashMap<>(); + String filterSql = buildDayFilterCondition(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0}); + if (StrUtil.isNotBlank(filterSql)) { + sql.append(" AND ").append(filterSql).append(" "); + } + sql.append(buildDayDetailOrderBySql(dataSourceRequest == null ? null : dataSourceRequest.getSort())); + + Page page = loadOptions == null ? null : QgcQueryWrapperUtil.buildPage(loadOptions, loadOptions.getSkip(), loadOptions.getTake()); + List list = microservicDynamicSQLMapper.pageAllListWithResultType(page, sql.toString(), paramMap, EngEqDayDataVo.class); + DataSourceResult result = new DataSourceResult<>(); + result.setData(list); + result.setTotal(page != null ? page.getTotal() : list.size()); + result.setAggregates(new HashMap<>()); + return result; + } + + private DataSourceResult queryDayGroupList(DataSourceRequest dataSourceRequest, + DataSourceLoadOptionsBase loadOptions) { + List groups = dataSourceRequest.getGroup(); + GroupingInfo[] groupInfos = loadOptions == null ? new GroupingInfo[0] : loadOptions.getGroup(); + List selectItems = new ArrayList<>(); + for (DataSourceRequest.GroupDescriptor descriptor : groups) { + if (descriptor == null || StrUtil.isBlank(descriptor.getField())) { + continue; + } + String column = mapDayColumn(descriptor.getField()); + if (StrUtil.isBlank(column)) { + continue; + } + selectItems.add(column + " AS " + descriptor.getField().toUpperCase()); + selectItems.add("COUNT(*) AS COUNT_" + descriptor.getField().toUpperCase()); + if (CollUtil.isNotEmpty(descriptor.getAggregates())) { + for (DataSourceRequest.AggregateDescriptor aggregate : descriptor.getAggregates()) { + String aggregateColumn = mapDayColumn(aggregate.getField()); + if (StrUtil.isBlank(aggregateColumn) || StrUtil.isBlank(aggregate.getAggregate())) { + continue; + } + selectItems.add(buildAggregateSql(aggregate.getAggregate(), aggregateColumn, aggregate.getField())); + } + } + } + if (selectItems.isEmpty()) { + selectItems.add("t.STCD AS STCD"); + selectItems.add("COUNT(*) AS COUNT_STCD"); + } + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT ") + .append(String.join(", ", selectItems)) + .append(" FROM (") + .append(buildDayViewSql()) + .append(") t WHERE 1 = 1 "); + + Map paramMap = new HashMap<>(); + String filterSql = buildDayFilterCondition(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0}); + if (StrUtil.isNotBlank(filterSql)) { + sql.append(" AND ").append(filterSql).append(" "); + } + + List groupByColumns = new ArrayList<>(); + for (DataSourceRequest.GroupDescriptor descriptor : groups) { + if (descriptor == null || StrUtil.isBlank(descriptor.getField())) { + continue; + } + String column = mapDayColumn(descriptor.getField()); + if (StrUtil.isNotBlank(column)) { + groupByColumns.add(column); + } + } + if (!groupByColumns.isEmpty()) { + sql.append(" GROUP BY ").append(String.join(", ", groupByColumns)).append(" "); + } + sql.append(buildDayGroupOrderBySql(groups)); + + List> rows = microservicDynamicSQLMapper.pageAllList(null, sql.toString(), paramMap); + DataSourceResult result = new DataSourceResult<>(); + if (Boolean.TRUE.equals(dataSourceRequest.getGroupResultFlat())) { + result.setData((List) (List) new GroupHelper().faltGroup(rows, Arrays.asList(groupInfos))); + } else { + result.setData((List) (List) new GroupHelper().group(rows, Arrays.asList(groupInfos))); + } + result.setTotal((long) rows.size()); + result.setAggregates(new HashMap<>()); + return result; + } + private DataSourceResult queryIntervalDetailList(DataSourceRequest dataSourceRequest, DataSourceLoadOptionsBase loadOptions) { Map paramMap = new HashMap<>(); @@ -2513,6 +2618,79 @@ public class EngEqDataServiceImpl implements EngEqDataService { "LEFT JOIN SD_QEC_R bsqr ON bsqr.STCD = sqr.STCD AND ADD_MONTHS(bsqr.TM, 12) = sqr.TM AND NVL(bsqr.IS_DELETED, 0) = 0 "; } + private String buildDayViewSql() { + return "SELECT " + + "day.ID AS id, " + + "eng.STCD AS stcd, " + + "eng.ENNM AS stnm, " + + "eng.ENNM AS ennm, " + + "eng.BASE_ID AS baseId, " + + "hb.BASENAME AS baseName, " + + "eng.HBRVCD AS hbrvcd, " + + "hbrv.HBRVNM AS hbrvcdName, " + + "eng.RVCD AS rvcd, " + + "rv.RVNM AS rvcdName, " + + "addv.ADDVNM AS addvcdName, " + + "runDay.QI AS qi, " + + "runDay.QO AS qo, " + + "runDay.RZ AS rz, " + + "runDay.DZ AS dz, " + + "day.QEC_LIMIT AS qecLimit, " + + "day.QEC AS qec, " + + "day.MWR_LIMIT AS mwrLimit, " + + "day.AVQ_LIMIT AS avqLimit, " + + "day.QEC_C AS qecC, " + + "day.MWR_C AS mwrC, " + + "day.AVQ_C AS avqC, " + + "day.SFDB AS sfdb, " + + "CASE NVL(day.SFDB, -1) WHEN 0 THEN '不达标' WHEN 1 THEN '达标' WHEN 2 THEN '无生态流量数据' WHEN 3 THEN '无生态流量限值要求' ELSE NULL END AS sfdbName, " + + "day.SFDB AS qecSfdb, " + + "day.MWR_SFDB AS mwrSfdb, " + + "CASE NVL(day.MWR_SFDB, -1) WHEN 0 THEN '不达标' WHEN 1 THEN '达标' WHEN 2 THEN '无生态流量数据' WHEN 3 THEN '无生态流量限值要求' ELSE NULL END AS mwrSfdbName, " + + "day.AVQ_SFDB AS avqSfdb, " + + "CASE NVL(day.AVQ_SFDB, -1) WHEN 0 THEN '不达标' WHEN 1 THEN '达标' WHEN 2 THEN '无生态流量数据' WHEN 3 THEN '无生态流量限值要求' ELSE NULL END AS avqSfdbName, " + + "day.DT AS dt, " + + "day.QEC_RULE_DID AS qecRuleDid, " + + "day.QEC_MWRRULE_DID AS qecMwrruleDid, " + + "beforeDay.QEC AS beforeQec, " + + "NVL(hb.ORDER_INDEX, 999999) AS baseStepSort, " + + "NVL(along.ORDER_INDEX, 999999) AS rvcdStepSort, " + + "NVL(rstSort.SORT, 999999) AS rstcdStepSort, " + + "NVL(siteSort.SORT, 999999) AS siteStepSort " + + "FROM SD_QECDAY_S day " + + "INNER JOIN SD_ENGINFO_B_H eng ON eng.STCD = day.STCD AND NVL(eng.IS_DELETED, 0) = 0 " + + "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " + + "LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND hbrv.BASEID = eng.BASE_ID " + + " AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " + + "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " + + "LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD " + + "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " + + "LEFT JOIN ( " + + " SELECT det.SORT, cfg.RVCD, det.STCD " + + " FROM MS_ALONGDET_B det " + + " INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " + + " WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " + + ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = eng.STCD " + + "LEFT JOIN ( " + + " SELECT det.SORT, cfg.RVCD, det.STCD " + + " FROM MS_ALONGDET_B det " + + " INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " + + " WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " + + ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = eng.STCD " + + "LEFT JOIN (" + buildDayRunDaySql() + ") runDay ON runDay.STCD = day.STCD AND runDay.DT = day.DT " + + "LEFT JOIN SD_QECDAY_S beforeDay ON beforeDay.STCD = day.STCD " + + " AND ADD_MONTHS(beforeDay.DT, 12) = day.DT AND NVL(beforeDay.IS_DELETED, 0) = 0 " + + "WHERE NVL(day.IS_DELETED, 0) = 0"; + } + + private String buildDayRunDaySql() { + return "SELECT run.STCD, TRUNC(run.TM) AS DT, " + + "AVG(run.QI) AS QI, AVG(run.QO) AS QO, AVG(run.RZ) AS RZ, AVG(run.DZ) AS DZ " + + "FROM SD_HYDROPW_R run " + + "WHERE NVL(run.IS_DELETED, 0) = 0 " + + "GROUP BY run.STCD, TRUNC(run.TM)"; + } + private String buildDetailSelectSql(List selectFields) { Map columns = detailFieldColumns(); List selected = new ArrayList<>(); @@ -2532,6 +2710,25 @@ public class EngEqDataServiceImpl implements EngEqDataService { return String.join(", ", selected); } + private String buildDayDetailSelectSql(List selectFields) { + Map columns = dayFieldColumns(); + List selected = new ArrayList<>(); + if (CollUtil.isEmpty(selectFields)) { + selected.addAll(columns.values()); + } else { + for (String field : selectFields) { + String column = columns.get(field); + if (StrUtil.isNotBlank(column)) { + selected.add(column); + } + } + if (selected.isEmpty()) { + selected.addAll(columns.values()); + } + } + return String.join(", ", selected); + } + private Map detailFieldColumns() { Map columns = new LinkedHashMap<>(); columns.put("id", "sqr.ID AS id"); @@ -2576,6 +2773,48 @@ public class EngEqDataServiceImpl implements EngEqDataService { return columns; } + private Map dayFieldColumns() { + Map columns = new LinkedHashMap<>(); + columns.put("id", "t.id AS id"); + columns.put("stcd", "t.stcd AS stcd"); + columns.put("stnm", "t.stnm AS stnm"); + columns.put("ennm", "t.ennm AS ennm"); + columns.put("baseId", "t.baseId AS baseId"); + columns.put("baseName", "t.baseName AS baseName"); + columns.put("hbrvcd", "t.hbrvcd AS hbrvcd"); + columns.put("hbrvcdName", "t.hbrvcdName AS hbrvcdName"); + columns.put("rvcd", "t.rvcd AS rvcd"); + columns.put("rvcdName", "t.rvcdName AS rvcdName"); + columns.put("addvcdName", "t.addvcdName AS addvcdName"); + columns.put("qi", "t.qi AS qi"); + columns.put("qo", "t.qo AS qo"); + columns.put("rz", "t.rz AS rz"); + columns.put("dz", "t.dz AS dz"); + columns.put("qecLimit", "t.qecLimit AS qecLimit"); + columns.put("qec", "t.qec AS qec"); + columns.put("mwrLimit", "t.mwrLimit AS mwrLimit"); + columns.put("avqLimit", "t.avqLimit AS avqLimit"); + columns.put("qecC", "t.qecC AS qecC"); + columns.put("mwrC", "t.mwrC AS mwrC"); + columns.put("avqC", "t.avqC AS avqC"); + columns.put("sfdb", "t.sfdb AS sfdb"); + columns.put("sfdbName", "t.sfdbName AS sfdbName"); + columns.put("qecSfdb", "t.qecSfdb AS qecSfdb"); + columns.put("mwrSfdb", "t.mwrSfdb AS mwrSfdb"); + columns.put("mwrSfdbName", "t.mwrSfdbName AS mwrSfdbName"); + columns.put("avqSfdb", "t.avqSfdb AS avqSfdb"); + columns.put("avqSfdbName", "t.avqSfdbName AS avqSfdbName"); + columns.put("dt", "t.dt AS dt"); + columns.put("qecRuleDid", "t.qecRuleDid AS qecRuleDid"); + columns.put("qecMwrruleDid", "t.qecMwrruleDid AS qecMwrruleDid"); + columns.put("beforeQec", "t.beforeQec AS beforeQec"); + columns.put("baseStepSort", "t.baseStepSort AS baseStepSort"); + columns.put("rvcdStepSort", "t.rvcdStepSort AS rvcdStepSort"); + columns.put("rstcdStepSort", "t.rstcdStepSort AS rstcdStepSort"); + columns.put("siteStepSort", "t.siteStepSort AS siteStepSort"); + return columns; + } + private String buildDetailOrderBySql(List sortList) { if (CollUtil.isEmpty(sortList)) { return " ORDER BY baseStepSort ASC, rvcdStepSort ASC, rstcdStepSort ASC, siteStepSort ASC, tm DESC"; @@ -3353,6 +3592,10 @@ public class EngEqDataServiceImpl implements EngEqDataService { return "tm".equalsIgnoreCase(field); } + private boolean isEqDayDateField(String field) { + return "dt".equalsIgnoreCase(field) || "tm".equalsIgnoreCase(field); + } + private String buildEqValueExpr(String paramKey, boolean dateField, Object value) { if (!dateField || value == null) { return "#{map." + paramKey + "}"; @@ -3364,6 +3607,83 @@ public class EngEqDataServiceImpl implements EngEqDataService { return "TO_DATE(#{map." + paramKey + "}, 'YYYY-MM-DD HH24:MI:SS')"; } + private String buildDayFilterCondition(DataSourceRequest.FilterDescriptor filter, + Map paramMap, + int[] indexHolder) { + if (filter == null) { + return ""; + } + if (StrUtil.isNotBlank(filter.getField())) { + return buildDayLeafCondition(filter, paramMap, indexHolder); + } + if (CollUtil.isEmpty(filter.getFilters())) { + return ""; + } + List conditions = new ArrayList<>(); + for (DataSourceRequest.FilterDescriptor child : filter.getFilters()) { + String childSql = buildDayFilterCondition(child, paramMap, indexHolder); + if (StrUtil.isNotBlank(childSql)) { + conditions.add("(" + childSql + ")"); + } + } + if (conditions.isEmpty()) { + return ""; + } + String logic = "or".equalsIgnoreCase(filter.getLogic()) ? " OR " : " AND "; + return String.join(logic, conditions); + } + + private String buildDayLeafCondition(DataSourceRequest.FilterDescriptor filter, + Map paramMap, + int[] indexHolder) { + String column = mapDayColumn(filter.getField()); + if (StrUtil.isBlank(column)) { + return ""; + } + return buildGenericCondition(column, filter, paramMap, indexHolder, isEqDayDateField(filter.getField())); + } + + private String buildDayDetailOrderBySql(List sortList) { + if (CollUtil.isEmpty(sortList)) { + return " ORDER BY baseStepSort ASC, rvcdStepSort ASC, rstcdStepSort ASC, siteStepSort ASC, dt DESC"; + } + List orders = new ArrayList<>(); + for (DataSourceRequest.SortDescriptor sort : sortList) { + if (sort == null || StrUtil.isBlank(sort.getField())) { + continue; + } + String column = mapDayOrderColumn(sort.getField()); + if (StrUtil.isBlank(column)) { + continue; + } + String dir = "desc".equalsIgnoreCase(sort.getDir()) || "des".equalsIgnoreCase(sort.getDir()) ? "DESC" : "ASC"; + orders.add(column + " " + dir); + } + if (orders.isEmpty()) { + return " ORDER BY baseStepSort ASC, rvcdStepSort ASC, rstcdStepSort ASC, siteStepSort ASC, dt DESC"; + } + return " ORDER BY " + String.join(", ", orders); + } + + private String buildDayGroupOrderBySql(List groups) { + if (CollUtil.isEmpty(groups)) { + return ""; + } + List orders = new ArrayList<>(); + for (DataSourceRequest.GroupDescriptor descriptor : groups) { + if (descriptor == null || StrUtil.isBlank(descriptor.getField())) { + continue; + } + String column = mapDayColumn(descriptor.getField()); + if (StrUtil.isBlank(column)) { + continue; + } + String dir = "desc".equalsIgnoreCase(descriptor.getDir()) || "des".equalsIgnoreCase(descriptor.getDir()) ? "DESC" : "ASC"; + orders.add(column + " " + dir); + } + return orders.isEmpty() ? "" : " ORDER BY " + String.join(", ", orders); + } + @@ -3825,6 +4145,51 @@ public class EngEqDataServiceImpl implements EngEqDataService { }; } + private String mapDayColumn(String field) { + if (StrUtil.isBlank(field)) { + return null; + } + return switch (field) { + case "id" -> "t.id"; + case "stcd" -> "t.stcd"; + case "stnm", "ennm" -> "t.ennm"; + case "baseId" -> "t.baseId"; + case "baseName" -> "t.baseName"; + case "hbrvcd" -> "t.hbrvcd"; + case "hbrvcdName" -> "t.hbrvcdName"; + case "rvcd" -> "t.rvcd"; + case "rvcdName" -> "t.rvcdName"; + case "addvcdName" -> "t.addvcdName"; + case "qi" -> "t.qi"; + case "qo" -> "t.qo"; + case "rz" -> "t.rz"; + case "dz" -> "t.dz"; + case "qecLimit" -> "t.qecLimit"; + case "qec" -> "t.qec"; + case "mwrLimit" -> "t.mwrLimit"; + case "avqLimit" -> "t.avqLimit"; + case "qecC" -> "t.qecC"; + case "mwrC" -> "t.mwrC"; + case "avqC" -> "t.avqC"; + case "sfdb" -> "t.sfdb"; + case "sfdbName" -> "t.sfdbName"; + case "qecSfdb" -> "t.qecSfdb"; + case "mwrSfdb" -> "t.mwrSfdb"; + case "mwrSfdbName" -> "t.mwrSfdbName"; + case "avqSfdb" -> "t.avqSfdb"; + case "avqSfdbName" -> "t.avqSfdbName"; + case "dt", "tm" -> "t.dt"; + case "qecRuleDid" -> "t.qecRuleDid"; + case "qecMwrruleDid" -> "t.qecMwrruleDid"; + case "beforeQec" -> "t.beforeQec"; + case "baseStepSort" -> "NVL(t.baseStepSort, 999999)"; + case "rvcdStepSort" -> "NVL(t.rvcdStepSort, 999999)"; + case "rstcdStepSort" -> "NVL(t.rstcdStepSort, 999999)"; + case "siteStepSort" -> "NVL(t.siteStepSort, 999999)"; + default -> null; + }; + } + private String mapOrderColumn(String field) { if (StrUtil.isBlank(field)) { return null; @@ -3837,4 +4202,18 @@ public class EngEqDataServiceImpl implements EngEqDataService { default -> null; }; } + + private String mapDayOrderColumn(String field) { + if (StrUtil.isBlank(field)) { + return null; + } + return switch (field) { + case "baseStepSort", "rvcdStepSort", "rstcdStepSort", "siteStepSort", + "dt", "stcd", "stnm", "ennm", "qi", "qo", "qec", "sfdb", + "rz", "dz", "qecLimit", "mwrLimit", "avqLimit", "baseName", + "rvcdName", "hbrvcdName", "addvcdName", "beforeQec" -> field; + case "tm" -> "dt"; + default -> null; + }; + } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpVmsstbprptVo.java index 4ad9471d..174a4d1e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpVmsstbprptVo.java @@ -226,6 +226,9 @@ public class FpVmsstbprptVo implements Serializable { @Schema(description = "数据来源") private String vlsr; + @Schema(description = "LOGO") + private String logo; + @Schema(description = "数据来源时间") private Date vlsrTm; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java index 7ae27947..5cedcef4 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java @@ -98,6 +98,7 @@ public class FpBuildServiceImpl implements FpBuildService { StringBuilder sql = new StringBuilder(); sql.append("SELECT ") .append("fp.STCD AS stcd, ") + .append("fp.LOGO AS logo, ") .append("fp.STNM AS stnm, ") .append("fp.STTP AS sttpCode, ") .append("sttp.STTP_NAME AS sttpName, ") @@ -313,6 +314,7 @@ public class FpBuildServiceImpl implements FpBuildService { columnMap.put("sttpName", "sttp.STTP_NAME"); columnMap.put("sttpFullPath", "sttp.FULL_PATH"); columnMap.put("rstcd", "fp.RSTCD"); + columnMap.put("logo", "fp.LOGO"); columnMap.put("ennm", "eng.ENNM"); columnMap.put("baseId", "eng.BASE_ID"); columnMap.put("baseName", "hb.BASENAME"); diff --git a/frontend/src/api/gyss/index.ts b/frontend/src/api/gyss/index.ts index 55813673..ab92f77a 100644 --- a/frontend/src/api/gyss/index.ts +++ b/frontend/src/api/gyss/index.ts @@ -2,7 +2,14 @@ import request from '@/utils/request'; //过鱼设施介绍 export function vmsstbprptGetKendoList(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + url: '/vd/vmsstbprpt/GetKendoList', + method: 'post', + data + }); +} +export function fpVmsstbprptGetKendoList(data: any) { + return request({ + url: '/fp/vmsstbprpt/GetKendoList', method: 'post', data }); @@ -10,7 +17,7 @@ export function vmsstbprptGetKendoList(data: any) { //过鱼设施 export function buildGetKendoListCust(data: any) { return request({ - url: '/api/wmp-env-server/env/fp/build/GetKendoListCust', + url: '/fp/build/GetKendoListCust', method: 'post', data }); @@ -18,7 +25,7 @@ export function buildGetKendoListCust(data: any) { //过鱼总量 export function yearGetYearFpStatistics(data: any) { return request({ - url: '/api/wmp-env-server/env/fp/run/qgc/year/GetYearFpStatistics', + url: '/fp/run/qgc/year/GetYearFpStatistics', method: 'get', params:data }); diff --git a/frontend/src/components/MapModal/components/BasicInfo.vue b/frontend/src/components/MapModal/components/BasicInfo.vue index 52af4e0e..19289bf1 100644 --- a/frontend/src/components/MapModal/components/BasicInfo.vue +++ b/frontend/src/components/MapModal/components/BasicInfo.vue @@ -179,6 +179,30 @@ const columnsConfig = ref([ type: 'fp_point', columns: FPPointColumns }, + { + type: 'FP', + columns: FPPointColumns + }, + { + type: 'FP_1', + columns: FPPointColumns + }, + { + type: 'FP_2', + columns: FPPointColumns + }, + { + type: 'FP_3', + columns: FPPointColumns + }, + { + type: 'FP_4', + columns: FPPointColumns + }, + { + type: 'FP_5', + columns: FPPointColumns + }, { type: 'fb_point', columns: FBPointColumns diff --git a/frontend/src/components/MapModal/setting.config.ts b/frontend/src/components/MapModal/setting.config.ts index 68f7514a..6b045fc9 100644 --- a/frontend/src/components/MapModal/setting.config.ts +++ b/frontend/src/components/MapModal/setting.config.ts @@ -361,27 +361,27 @@ const FPTabs: Array = ]; // // 过鱼设施在建状态 -// const FPTabs1: Array = [ -// { -// name: '基础信息', -// key: 'basicInfo', -// type: 'basic', -// url: '/bbi/siteBipc/getSiteBasicInfo' -// }, -// { -// name: '实时视频', -// key: 'videoInfo', -// type: 'video', -// url: '/video/dataStcdFrame/getVideoMonitorList' -// }, -// { -// name: '建设情况', -// key: 'FishFacilityBuildState', //basicState -// type: 'FishFacilityBuildState', //basicState -// // url: "/env/fp/fpFacilities/getFpStcdConstructionInfo2", -// url: '/wmp-env-server/env/fp/run/secondBuild/GetKendoListCust' -// } -// ] +const FPTabs1: Array = [ + { + name: '基础信息', + key: 'basicInfo', + type: 'basic', + url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo' + }, + { + name: '实时视频', + key: 'videoInfo', + type: 'video', + url: '/video/dataStcdFrame/getVideoMonitorList' + }, + { + name: '建设情况', + key: 'FishFacilityBuildState', //basicState + type: 'FishFacilityBuildState', //basicState + // url: "/env/fp/fpFacilities/getFpStcdConstructionInfo2", + url: '/wmp-env-server/env/fp/run/secondBuild/GetKendoListCust' + } +]; //鱼类增殖站 √ const FBTabs: Array = [ { @@ -675,13 +675,13 @@ const WQFBTabs: Array = [ key: 'WaterQuality', type: 'WaterQuality', default: true // 默认显示 - }, - { - name: '实时视频', - key: 'videoInfo', - type: 'video', - url: '/video/dataStcdFrame/getVideoMonitorList' } + // { + // name: '实时视频', + // key: 'videoInfo', + // type: 'video', + // url: '/video/dataStcdFrame/getVideoMonitorList' + // } ]; const WQTabs: Array = [ ...WQFBTabs, @@ -1279,57 +1279,67 @@ const handleTabs = (modaldata: any) => { case 'DW_4': case 'DW_5': return DWTabs; - // case 'FP': //todo，后续再删除多余代码 - // case 'FP_1': //todo，后续再删除多余代码 - // // case "FP_2": //todo，后续再删除多余代码 - // case 'FP_3': //todo，后续再删除多余代码 - // case 'FP_4': //todo，后续再删除多余代码 - // // case "FP_5": //todo，后续再删除多余代码 - // if (Session.getAppCode() === 'hbb') { - // // mway为2的时侯显示在线监测数据 - // if (modaldata.bldsttCcode == '1' || modaldata.bldsttCcode == '0' || modaldata.bldstt == '1' || modaldata.bldstt == '0') { - // return [ - // ...FPTabs1 //建设情况 - // ] - // } else { - // if (modaldata.mway != 2) { - // return FPTabs.filter((item) => item.name !== '在线监测数据') - // } else { - // return [ - // ...FPTabs //有监测数据 - // ] - // } - // } - // } else { - // if (modaldata.bldsttCcode == '1' || modaldata.bldsttCcode == '0' || modaldata.bldstt == '1' || modaldata.bldstt == '0') { - // return [ - // ...FPTabs1 - // // { - // // name: "系统运行记录", - // // key: "FishSystemRunState", //Normal1 - // // type: "FishSystemRunState", //Normal - // // tabs: [] - // // } - // ] - // } else { - // return [ - // ...FPTabs - // // { - // // name: "系统运行记录", - // // key: "FishSystemRunState", //Normal1 - // // type: "FishSystemRunState", //Normal - // // tabs: [] - // // } - // ] - // } - // } - // case 'FP_2': //todo，后续再删除多余代码 - // case 'FP_5': //todo，后续再删除多余代码 - // if (modaldata.bldsttCcode == '1' || modaldata.bldsttCcode == '0' || modaldata.bldstt == '1' || modaldata.bldstt == '0') { - // return FPTabs1 - // } else { - // return FPTabs - // } + case 'FP': //todo，后续再删除多余代码 + case 'FP_1': //todo，后续再删除多余代码 + // case "FP_2": //todo，后续再删除多余代码 + case 'FP_3': //todo，后续再删除多余代码 + case 'FP_4': //todo，后续再删除多余代码 + // case "FP_5": //todo，后续再删除多余代码 + // // if (Session.getAppCode() === 'hbb') { + // mway为2的时侯显示在线监测数据 + if ( + modaldata.bldsttCcode == '1' || + modaldata.bldsttCcode == '0' || + modaldata.bldstt == '1' || + modaldata.bldstt == '0' + ) { + return [ + ...FPTabs1 //建设情况 + ]; + } else { + if (modaldata.mway != 2) { + return FPTabs.filter(item => item.name !== '在线监测数据'); + } else { + return [ + ...FPTabs //有监测数据 + ]; + } + } + // } else { + // if (modaldata.bldsttCcode == '1' || modaldata.bldsttCcode == '0' || modaldata.bldstt == '1' || modaldata.bldstt == '0') { + // return [ + // ...FPTabs1 + // // { + // // name: "系统运行记录", + // // key: "FishSystemRunState", //Normal1 + // // type: "FishSystemRunState", //Normal + // // tabs: [] + // // } + // ] + // } else { + // return [ + // ...FPTabs + // // { + // // name: "系统运行记录", + // // key: "FishSystemRunState", //Normal1 + // // type: "FishSystemRunState", //Normal + // // tabs: [] + // // } + // ] + // } + // } + case 'FP_2': //todo，后续再删除多余代码 + case 'FP_5': //todo，后续再删除多余代码 + if ( + modaldata.bldsttCcode == '1' || + modaldata.bldsttCcode == '0' || + modaldata.bldstt == '1' || + modaldata.bldstt == '0' + ) { + return FPTabs1; + } else { + return FPTabs; + } // case 'ZQ': // return ZQTabs // case 'FB': diff --git a/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue b/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue index 7174a72e..b9d6fa3b 100644 --- a/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue +++ b/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue @@ -7,9 +7,9 @@ - - {{ item.basename }} + + {{ item.wbsName }} @@ -115,7 +115,7 @@ dayjs.extend(isSameOrAfter) // Props 定义 const props = defineProps<{ - datas?: Array<{ baseid: string; basename: string }> // 基地列表 + datas?: Array<{ wbsCode: string; wbsName: string }> // 基地列表 type?: string // 时间维度 modalData?: string // 模态框数据 dateValue?: string | Dayjs // 日期值 diff --git a/frontend/src/modules/EnvironmentalQuality/index.vue b/frontend/src/modules/EnvironmentalQuality/index.vue index cee6c652..2d3c4279 100644 --- a/frontend/src/modules/EnvironmentalQuality/index.vue +++ b/frontend/src/modules/EnvironmentalQuality/index.vue @@ -23,7 +23,7 @@ - @@ -80,83 +80,6 @@ const datetimePicker = ref({ options: [], }); const baseid = ref("") -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]) const fieldOne = ref('') // 解析API返回的嵌套数据（支持两种结构） const parseApiResponse = (items: any[], currentValueForApi: string, lastYearValue: string) => { diff --git a/frontend/src/modules/GYZLLB/index.vue b/frontend/src/modules/GYZLLB/index.vue index 492be4d4..fbc8e841 100644 --- a/frontend/src/modules/GYZLLB/index.vue +++ b/frontend/src/modules/GYZLLB/index.vue @@ -27,16 +27,61 @@ + + + +
+ + + {{ modalData.year }} + + + {{ modalData.basinName }} + + + + {{ modalData.totalCount }} {{ getUnit() }} + + + + {{ modalData.baseid }} + + + + 鱼类分布详情 + + + + +
+ diff --git a/frontend/src/modules/churukushuiwenMod/index.vue b/frontend/src/modules/churukushuiwenMod/index.vue index 27ac8e3b..b565b801 100644 --- a/frontend/src/modules/churukushuiwenMod/index.vue +++ b/frontend/src/modules/churukushuiwenMod/index.vue @@ -76,86 +76,6 @@ const baseid = ref(''); // 当前选中的基地ID const modalVisible = ref(false); // 弹框显示状态 const clickDataInfo = ref(null); // 点击的数据点信息 const stationName = ref(''); // 站点名称 - -// ==================== 基地列表数据(硬编码) ==================== -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]) - // ==================== 数据处理函数 ==================== /** @@ -735,8 +655,8 @@ const getselsectData = async () => { let treeData: any = [] const dataMapNameArr: any = Object.entries(obj).map(([, v]) => v) treeData = dataMapNameArr?.sort((a: any, b: any) => { - const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); - const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); + const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value); + const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value); return indexA - indexB; }) console.log('treeData', treeData) diff --git a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue index e7a6ac04..655055fd 100644 --- a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue +++ b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue @@ -5,8 +5,8 @@ - - {{ item.basename }} + + {{ item.wbsName }} @@ -77,7 +77,7 @@ import { useModelStore } from "@/store/modules/model"; const modelStore = useModelStore(); // Props const props = defineProps<{ - datas?: Array<{ baseid: string; basename: string }> // 基地列表 + datas?: Array<{ wbsCode: string; wbsName: string }> // 基地列表 BID?: string // 基地ID data?: { name: string } // 设施类型名称 res?: { bldstt: string; hydrodtin: string } // 初始筛选条件 diff --git a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/index.vue b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/index.vue index df77fb78..e650e89f 100644 --- a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/index.vue +++ b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/index.vue @@ -23,7 +23,7 @@
-
@@ -58,83 +58,6 @@ const iconMap: Record = { '4': 'icon-dwsjhQita' }; -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]); const res = ref({ hydrodtin: '', bldstt: '' diff --git a/frontend/src/modules/guoyusheshijieshao/index.vue b/frontend/src/modules/guoyusheshijieshao/index.vue index 78bb7e98..1e30aa44 100644 --- a/frontend/src/modules/guoyusheshijieshao/index.vue +++ b/frontend/src/modules/guoyusheshijieshao/index.vue @@ -46,7 +46,7 @@ import { ref, onMounted, onUnmounted, computed, watch } from 'vue'; import SidePanelItem from '@/components/SidePanelItem/index.vue'; import { useJidiSelectEventStore } from "@/store/modules/jidiSelectEvent"; -import { vmsstbprptGetKendoList } from '@/api/gyss'; +import { fpVmsstbprptGetKendoList } from '@/api/gyss'; import ArtsDetail from '@/components/carouselIntroduce/ArtsDetail.vue'; import { Empty } from 'ant-design-vue'; @@ -75,7 +75,7 @@ defineOptions({ const JidiSelectEventStore = useJidiSelectEventStore(); const baseid = ref('all'); // 默认值为 'all' -const baseUrl = import.meta.env.VITE_APP_PREVIEW_URL; +const baseUrl = import.meta.env.VITE_APP_ATTACHMENT_URL; // 弹框控制 const modalVisible = ref(false); const currentItem = ref(null); @@ -259,7 +259,7 @@ const getCarouselData = async () => { sort: [{ field: 'rstcdStepSort', dir: 'asc' }] }; - const res = await vmsstbprptGetKendoList(params); + const res = await fpVmsstbprptGetKendoList(params); const data = res?.data?.data || []; if (data.length > 0) { diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue index 2f471328..9f31b064 100644 --- a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue @@ -55,7 +55,7 @@ :dataDimensionVal="detailModalData.baseid" :rvcd="detailModalData.rvcd" :stcd="detailModalData.stcd" - :jdList="jiDiList" /> + :jdList="JidiSelectEventStore.jidiData" /> @@ -98,86 +98,6 @@ const showChart = ref(true); // 详情弹框相关状态 const detailModalVisible = ref(false); const detailModalData = ref(null); - -// 基地列表（与父组件保持一致） -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]); - // 选择器相关 - 内部状态管理 const selectValue = ref(''); const selectOptions = ref([]); @@ -445,8 +365,8 @@ const getSelectConfig = async () => { if (dataOne.length > 0) { let dataMapNameMap: any = {} let jiDiListMap: any = {} - jiDiList.value.forEach((item: any) => { - jiDiListMap[item.baseid] = item.basename + JidiSelectEventStore.jidiData.forEach((item: any) => { + jiDiListMap[item.wbsCode] = item.wbsName }) dataOne.map((item: any, index: number) => { @@ -475,8 +395,8 @@ const getSelectConfig = async () => { }) }) dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => { - const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); - const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); + const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value); + const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value); return indexA - indexB; }) diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue index 6a327568..8038f574 100644 --- a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue @@ -19,7 +19,7 @@
+ :dataDimensionVal="modalData.baseid" :rvcd='modalData.rvcd' :stcd="modalData.stcd" :jdList="JidiSelectEventStore.jidiData" />
@@ -69,85 +69,6 @@ const stationName = ref(''); // 图表放大展示弹框状态 const zoomModalVisible = ref(false); -// 基地列表 -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]); - // 选择器配置 const select = ref({ show: true, @@ -238,8 +159,8 @@ const getSelectConfig = async () => { if (dataOne.length > 0) { let dataMapNameMap: any = {} let jiDiListMap: any = {} - jiDiList.value.forEach((item: any) => { - jiDiListMap[item.baseid] = item.basename + JidiSelectEventStore.jidiData.forEach((item: any) => { + jiDiListMap[item.wbsCode] = item.wbsName }) dataOne.map((item: any, index: number) => { @@ -268,8 +189,8 @@ const getSelectConfig = async () => { }) }) dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => { - const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); - const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); + const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value); + const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value); return indexA - indexB; }) select.value.options = filterSelectOptions(dataMapNameArr) diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue index d3fd8bbd..723ba4a8 100644 --- a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue @@ -5,8 +5,8 @@ - - {{ item.basename }} + + {{ item.wbsName }} diff --git a/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue b/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue index 6c04ace9..34a9fbfe 100644 --- a/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue +++ b/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue @@ -69,7 +69,8 @@ import { ref, computed, watch, onMounted, nextTick } from 'vue'; import { msstbprptGetKendoList, fhGetKendoListCust } from '@/api/qxd'; import BasicTable from '@/components/BasicTable/index.vue'; import { useModelStore } from '@/store/modules/model'; - +import { useJidiSelectEventStore } from "@/store/modules/jidiSelectEvent"; +const JidiSelectEventStore = useJidiSelectEventStore(); // ==================== Props 定义 ==================== const props = defineProps<{ baseId?: string; @@ -89,68 +90,7 @@ const tableRef = ref(); const stationOptions: any = ref([]); // ==================== 基地列表数据(硬编码) ==================== -const jiDiList: any = ref([ - { - value: 'all', - label: '当前全部' - }, - { - value: '01', - label: '金沙江干流' - }, - { - value: '02', - label: '雅砻江干流' - }, - { - value: '03', - label: '大渡河干流' - }, - { - value: '04', - label: '乌江干流' - }, - { - value: '05', - label: '长江上游干流' - }, - { - value: '10', - label: '湘西' - }, - { - value: '08', - label: '黄河上游干流' - }, - { - value: '09', - label: '黄河中游干流' - }, - { - value: '06', - label: '南盘江-红水河' - }, - { - value: '12', - label: '东北' - }, - { - value: '07', - label: '澜沧江干流' - }, - { - value: '13', - label: '怒江干流' - }, - { - value: '11', - label: '闽浙赣' - }, - { - value: 'other', - label: '其他' - } -]); +const jiDiList: any = ref([]); // 表格列定义 const columns = [ { @@ -439,6 +379,12 @@ const handleViewDetail = (record: any, type: any) => { onMounted(() => { getselectTwo(); handleSearch(); + JidiSelectEventStore.jidiData.forEach(element => { + jiDiList.value.push({ + label: element.wbsName, + value: element.wbsCode + }) + }); }); diff --git a/frontend/src/modules/qixidijchuXx/index.vue b/frontend/src/modules/qixidijchuXx/index.vue index 74e92a9f..6d070a83 100644 --- a/frontend/src/modules/qixidijchuXx/index.vue +++ b/frontend/src/modules/qixidijchuXx/index.vue @@ -49,68 +49,7 @@ defineOptions({ // ==================== 响应式变量定义 ==================== const JidiSelectEventStore = useJidiSelectEventStore(); // ==================== 基地列表数据(硬编码) ==================== -const jiDiList: any = ref([ - { - value: 'all', - label: '当前全部' - }, - { - value: '01', - label: '金沙江干流' - }, - { - value: '02', - label: '雅砻江干流' - }, - { - value: '03', - label: '大渡河干流' - }, - { - value: '04', - label: '乌江干流' - }, - { - value: '05', - label: '长江上游干流' - }, - { - value: '10', - label: '湘西' - }, - { - value: '08', - label: '黄河上游干流' - }, - { - value: '09', - label: '黄河中游干流' - }, - { - value: '06', - label: '南盘江-红水河' - }, - { - value: '12', - label: '东北' - }, - { - value: '07', - label: '澜沧江干流' - }, - { - value: '13', - label: '怒江干流' - }, - { - value: '11', - label: '闽浙赣' - }, - { - value: 'other', - label: '其他' - } -]); +const jiDiList: any = ref([]); const select = ref({ show: true, value: 'all', @@ -420,6 +359,12 @@ const handlePanelChange1 = async data => { // 页面加载时执行 onMounted(() => { // 延迟初始化，确保容器已渲染 + JidiSelectEventStore.jidiData.forEach(element => { + jiDiList.value.push({ + label: element.wbsName, + value: element.wbsCode + }) + }); }); // 组件卸载时清理 diff --git a/frontend/src/modules/shuiWenNianNeiFenBu/index.vue b/frontend/src/modules/shuiWenNianNeiFenBu/index.vue index 69779628..de788324 100644 --- a/frontend/src/modules/shuiWenNianNeiFenBu/index.vue +++ b/frontend/src/modules/shuiWenNianNeiFenBu/index.vue @@ -34,83 +34,7 @@ const showemit = ref(true) // 弹框相关状态 const modalVisible = ref(false) const currentData = ref({}) -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]); + const chartRef = ref(null) let chartInstance: echarts.ECharts | null = null @@ -258,10 +182,9 @@ const getselectData = async () => { } }) - // 按 jiDiList 顺序排序普通基地 dataMapNameArr.sort((a, b) => { - const indexA = jiDiList.value.findIndex((item: any) => item.baseid === a.value) - const indexB = jiDiList.value.findIndex((item: any) => item.baseid === b.value) + const indexA = JidiSelectEventStore.jidiData.findIndex((item: any) => item.wbsCode === a.value) + const indexB = JidiSelectEventStore.jidiData.findIndex((item: any) => item.wbsCode === b.value) return indexA - indexB }) diff --git a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue index 4a43f2a0..974a3508 100644 --- a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue +++ b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue @@ -11,7 +11,7 @@ import { message } from 'ant-design-vue' import { useModelStore } from '@/store/modules/model' import { handleTabs } from '@/components/MapModal/setting.config' import { getKendoList, getKendoListCust, getIntroduce } from '@/api/shuidiankaifa' - +import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent'; // ==================== 开发配置 ==================== const USE_MOCK_DATA = true // 开发时使用模拟数据，生产时改为 false @@ -62,7 +62,7 @@ interface ModalData { // 引入 modelStore 用于控制全局 MapModal const modelStore = useModelStore() - +const JidiSelectEventStore = useJidiSelectEventStore(); // 基地相关 const qid = ref('') const jiDiList = ref([]) @@ -1190,17 +1190,12 @@ watch( */ onMounted(() => { // 模拟加载基地列表（更真实的基地数据） - jiDiList.value = [ - { baseid: 'all', basename: '全部基地' }, - { baseid: 'cj', basename: '长江流域' }, - { baseid: 'hh', basename: '黄河流域' }, - { baseid: 'zj', basename: '珠江流域' }, - { baseid: 'hh2', basename: '淮河流域' }, - { baseid: 'hj', basename: '海河流域' }, - { baseid: 'sj', basename: '松花江流域' }, - { baseid: 'lj', basename: '辽河流域' }, - { baseid: 'other', basename: '其他' } - ] + JidiSelectEventStore.jidiData.forEach(element => { + jiDiList.value.push({ + label: element.wbsName, + value: element.wbsCode + }) + }); // 设置默认选中"全部基地" if (!qid.value) { diff --git a/frontend/src/modules/yanchengshuiwenChangeMod/index.vue b/frontend/src/modules/yanchengshuiwenChangeMod/index.vue index 2b0380e2..4f74f749 100644 --- a/frontend/src/modules/yanchengshuiwenChangeMod/index.vue +++ b/frontend/src/modules/yanchengshuiwenChangeMod/index.vue @@ -53,83 +53,6 @@ const prompts = computed(() => ({ show: true, value: `注:最新数据时间为${dataOne.value || getCurrentHourTime()}`, })); -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]) const showemit = ref(false) const loading = ref(false) // const selectOptions: any = ref([]) @@ -462,8 +385,8 @@ const getSelectConfig = async () => { if (dataOne.length > 0) { let dataMapNameMap: any = {} let jiDiListMap: any = {} - jiDiList.value.forEach((item: any) => { - jiDiListMap[item.baseid] = item.basename + JidiSelectEventStore.jidiData.forEach((item: any) => { + jiDiListMap[item.wbsCode] = item.wbsName }) dataOne.map((item: any, index: number) => { @@ -492,8 +415,8 @@ const getSelectConfig = async () => { }) }) dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => { - const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); - const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); + const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value); + const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value); return indexA - indexB; }) select.value.options = filterSelectOptions(dataMapNameArr) diff --git a/frontend/src/modules/zengzhizhanjiansheyunxing/index.vue b/frontend/src/modules/zengzhizhanjiansheyunxing/index.vue index 6944ae80..984a919f 100644 --- a/frontend/src/modules/zengzhizhanjiansheyunxing/index.vue +++ b/frontend/src/modules/zengzhizhanjiansheyunxing/index.vue @@ -1,6 +1,6 @@