Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

packages/screen/src/views/RiskWarning/Dialog/mapInfoDialog.vue

@@ -1,34 +1,32 @@
 <template>
-  <base-dialog
+  <div
-    v-model:visible="props.visible"
+    v-if="props.visible"
-    :title="dialogTitle"
+    class="map-info-dialog"
-    :table-data="[]"
+    :style="{ backgroundImage: `url(${iconProject})` }"
-    :table-columns="[]"
-    :table-height="0"
-    :total="0"
-    :current-page="1"
-    :page-size="10"
-    :z-index="1000"
-    :max-width="400"
-    :show-filter="false"
-    :show-pagination="false"
-    @close="handleClose"
   >
-    <!-- 标题栏下方自定义插槽 -->
+    <!-- 关闭按钮 -->
-    <template #header>
+    <div class="dialog-close" @click="handleClose">×</div>
+
+    <!-- 标题栏 -->
+    <div class="dialog-header" @click="handleClose">
+      <span class="header-title">{{ dialogTitle }}</span>
+      <img class="header-icon" :src="iconTunnel" alt="" />
+    </div>
+
+    <!-- 内容区域 -->
     <div class="dialog-content">
-        <div class="info-item" v-for="(item, index) in dialogItems" :key="index">
+      <div class="info-row" v-for="(item, index) in dialogItems" :key="index">
-          <label class="info-label">{{ item.label }}：</label>
+        <span class="info-label">{{ item.label }}：</span>
         <span class="info-value">{{ item.value }}</span>
       </div>
     </div>
-    </template>
+  </div>
-  </base-dialog>
 </template>
 
 <script setup>
 import { defineProps, defineEmits, computed } from "vue";
-import baseDialog from "../component/baseDialog.vue";
+import iconProject from "../../../assets/RiskWarning_img/弹窗背景@2x.png";
+import iconTunnel from "../../../assets/RiskWarning_img/图标_media_dvr@2x.png";
 
 const props = defineProps({
   visible: {
@@ -58,6 +56,8 @@ const dialogTitle = computed(() => {
     tunnel: "隧道信息",
     bridge: "桥梁信息",
     road: "路段信息",
+    emergency: "抢险队伍",
+    slope: "边坡信息",
   };
   return titleMap[props.type] || "详细信息";
 });
@@ -69,50 +69,196 @@ const dialogItems = computed(() => {
   switch (type) {
     case "project":
       return [
-        { label: "项目名称", value: data.NAME || data.name || "-" },
+        { label: "项目名称", value: data.PROJECT_NAME || "-" },
-        { label: "所属区县", value: data.COUNTY || data.county || "-" },
+        { label: "子项目名称", value: data.SUB_PROJECT_NAME || "-" },
-        { label: "路线编号", value: data.ROUTE_CODE || data.routeCode || "-" },
+        { label: "行政区域", value: data.ADMINISTRATIVE_REGION || "-" },
-        { label: "路线名称", value: data.ROUTE_NAME || data.routeName || "-" },
+        { label: "驻地名称", value: data.SITE_NAME || "-" },
-        { label: "项目类型", value: data.TYPE || data.type || "-" },
+        { label: "驻地地址", value: data.SITE_ADDRESS || data.COUNTY || "-" },
-        { label: "建设状态", value: data.STATUS || data.status || "-" },
+        { label: "驻地人数", value: data.SITE_POPULATION || "-" },
-        { label: "开始时间", value: data.START_TIME || data.startTime || "-" },
+        { label: "驻地类型", value: data.SITE_TYPE || "-" },
-        { label: "预计完成", value: data.END_TIME || data.endTime || "-" },
+        { label: "驻地风险等级", value: data.RISK_LEVEL || "-" },
+        { label: "搬迁状态", value: data.RELOCATION_STATUS || "-" },
+        { label: "项目类型", value: data.PROJECT_TYPE || "-" },
+        { label: "房建类型", value: data.BUILDING_TYPE || "-" },
+        { label: "建设单位", value: data.CONSTRUCTION_UNIT || "-" },
+        { label: "业主责任人", value: data.OWNER_RESPONSIBLE_PERSON || "-" },
+        { label: "业主责任人电话", value: data.OWNER_RESPONSIBLE_PHONE || "-" },
+        { label: "施工责任人", value: data.CONSTRUCTOR_RESPONSIBLE_PERSON || "-" },
+        { label: "施工责任人电话", value: data.CONSTRUCTOR_RESPONSIBLE_PHONE || "-" },
+        { label: "驻地责任人", value: data.SITE_RESPONSIBLE_PERSON || "-" },
+        { label: "驻地责任人电话", value: data.SITE_RESPONSIBLE_PHONE || "-" },
+        { label: "市级责任人", value: data.CITY_RESPONSIBLE_PERSON || "-" },
+        { label: "市级责任人电话", value: data.CITY_RESPONSIBLE_PHONE || "-" },
+        { label: "区县责任人", value: data.DISTRICT_RESPONSIBLE_PERSON || "-" },
+        { label: "区县责任人电话", value: data.DISTRICT_RESPONSIBLE_PHONE || "-" },
+        { label: "吹哨人", value: data.WHISTLEBLOWER_NAME || "-" },
+        { label: "吹哨人电话", value: data.WHISTLEBLOWER_PHONE || "-" },
+        { label: "备注", value: data.REMARKS || "-" },
       ];
     case "tunnel":
       return [
-        { label: "隧道名称", value: data.NAME || data.name || data.GL1_SDMC || "-" },
+        {
-        { label: "所属区县", value: data.COUNTY || data.county || data.GL1_QXMC || "-" },
+          label: "隧道名称",
-        { label: "路线编号", value: data.ROUTE_CODE || data.routeCode || data.GL1_LXBM || "-" },
+          value: data.GL1_SDMC || "-",
-        { label: "路线名称", value: data.ROUTE_NAME || data.routeName || data.GL1_LXMC || "-" },
+        },
-        { label: "隧道长度", value: data.LENGTH || data.GL1_SDCD ? `${data.LENGTH || data.GL1_SDCD}(米)` : "-" },
+        {
-        { label: "隧道净宽", value: data.WIDTH || data.GL1_SDKD ? `${data.WIDTH || data.GL1_SDKD}(米)` : "-" },
+          label: "建成时间",
-        { label: "隧道净高", value: data.HEIGHT || data.GL1_SDGD ? `${data.HEIGHT || data.GL1_SDGD}(米)` : "-" },
+          value:
-        { label: "建成时间", value: data.BUILD_TIME || data.buildTime || data.GL1_JCSJ || "-" },
+            data.HEIGHT || data.GL1_SDGD
-        { label: "评定等级", value: data.GRADE || data.grade || data.GL1_PDDJ || "-" },
+              ? `${data.HEIGHT || data.GL1_SDGD}(米)`
+              : "-",
+        },
+
+        {
+          label: "编号",
+          value: data.GL1_ZJ || "-",
+        },
+        {
+          label: "入口桩号",
+          value: data.GL1_RKZH || "-",
+        },
+
+        {
+          label: "所属区县",
+          value: data.GL1_QXMC || "-",
+        },
+
+        {
+          label: "隧道净宽",
+          value: data.GL1_SDJG || "-",
+        },
+        {
+          label: "隧道净高",
+          value: data.GL1_SDJK || "-",
+        },
+        {
+          label: "隧道长度",
+          value: data.GL1_SDC || "-",
+        },
+
+        {
+          label: "路线编号",
+          value: data.GL1_LXBH || "-",
+        },
+        {
+          label: "长度分类",
+          value: data.GL1_SDLX || "-",
+        },
+        {
+          label: "路线名称",
+          value: data.GL1_LXMC || "-",
+        },
+
+        {
+          label: "评定等级",
+          value: data.GL1_PDDJ || "-",
+        },
       ];
     case "bridge":
       return [
-        { label: "桥梁名称", value: data.NAME || data.name || data.GL1_QLMC || "-" },
+        {
-        { label: "所属区县", value: data.COUNTY || data.county || data.GL1_QXMC || "-" },
+          label: "桥梁名称",
-        { label: "路线编号", value: data.ROUTE_CODE || data.routeCode || data.GL1_LXBM || "-" },
+          value: data.GL1_QLMC || "-",
-        { label: "路线名称", value: data.ROUTE_NAME || data.routeName || data.GL1_LXMC || "-" },
+        },
-        { label: "桥梁长度", value: data.LENGTH || data.GL1_QLCD ? `${data.LENGTH || data.GL1_QLCD}(米)` : "-" },
+        {
-        { label: "桥梁宽度", value: data.WIDTH || data.GL1_QLKD ? `${data.WIDTH || data.GL1_QLKD}(米)` : "-" },
+          label: "编号",
-        { label: "桥梁类型", value: data.TYPE || data.type || data.GL1_QLXZ || "-" },
+          value: data.GL1_QLDM || "-",
-        { label: "建成时间", value: data.BUILD_TIME || data.buildTime || data.GL1_JCSJ || "-" },
+        },
-        { label: "评定等级", value: data.GRADE || data.grade || data.GL1_PDDJ || "-" },
+        {
+          label: "所属区县",
+          value: data.GL1_QXMC || "-",
+        },
+        {
+          label: "桥梁长度",
+          value: data.GL1_QLQC || "-",
+        },
+        {
+          label: "路线编号",
+          value: data.GL1_QLDM || "-",
+        },
+        {
+          label: "路线名称",
+          value: data.GL1_LXMC || "-",
+        },
+        {
+          label: "建成时间",
+          value: data.TYPE || "-",
+        },
+        {
+          label: "中心桩号",
+          value: data.GL1_ZXZH  || "-",
+        },
+
+        {
+          label: "跨径总长",
+          value: data.GL1_AKJFLDM || "-",
+        },
+        {
+          label: "跨径分类",
+          value: data.GL1_AKJFLLX || "-",
+        },
+        {
+          label: "技术状况",
+          value: data.GL1_PDDJ || "-",
+        },
       ];
     case "road":
       return [
-        { label: "路段名称", value: data.NAME || data.name || data.GL1_LDMC || "-" },
+        {
-        { label: "所属区县", value: data.COUNTY || data.county || data.GL1_QXMC || "-" },
+          label: "区县名称",
-        { label: "路线编号", value: data.ROUTE_CODE || data.routeCode || data.GL1_LXBM || "-" },
+          value: data.GL1_QXMC || "-",
-        { label: "路线名称", value: data.ROUTE_NAME || data.routeName || data.GL1_LXMC || "-" },
+        },
-        { label: "路段长度", value: data.LENGTH || data.GL1_LDCD ? `${data.LENGTH || data.GL1_LDCD}(公里)` : "-" },
+        {
-        { label: "路面类型", value: data.PAVEMENT_TYPE || data.pavementType || data.GL1_LMLX || "-" },
+          label: "风险等级",
-        { label: "车道数量", value: data.LANE_COUNT || data.laneCount || data.GL1_CDSL || "-" },
+          value: data.GL1_JSDJ || "-",
-        { label: "设计时速", value: data.SPEED_LIMIT || data.speedLimit ? `${data.SPEED_LIMIT || data.speedLimit}(km/h)` : "-" },
+        },
+        {
+          label: "公路编号",
+          value: data.GL1_LXBH || "-",
+        },
+        {
+          label: "位置",
+          value: data.GL1_QDMC + '-' + data.GL1_ZDMC || "-",
+        },
+        {
+          label: "风险描述",
+          value:
+            data.LENGTH || data.GL1_LDCD
+              ? `${data.LENGTH || data.GL1_LDCD}(公里)`
+              : "-",
+        },
+        {
+          label: "采取措施",
+          value:
+            data.PAVEMENT_TYPE || data.pavementType || data.GL1_LMLX || "-",
+        },
+        {
+          label: "照片",
+          value: data.photos || data.photos || "-",
+        },
       ];
+    case "emergency":
+      return [
+        { label: "队伍名称", value: data.gl1Yjllmc || "-" },
+        { label: "防范状态", value: data.COUNTY || data.county || "-" },
+        { label: "人数", value: data.gl1Rysl || "-" },
+        { label: "联系人", value: data.gl1Lxr || "-" },
+        { label: "地址", value: data.gl1Xxdz || "-" },
+        { label: "物资装备", value: data.COUNTY || data.county || "-" },
+        { label: "照片", value: data.photos || data.photos || '-' },
+      ];
+    case "slope":
+      return [
+        { label: "边坡坡长(km)", value: data.NAME || data.name || "-" },
+        { label: "边坡最大高度(m)", value: data.COUNTY || data.county || "-" },
+        { label: "边坡构成", value: data.COUNTY || data.county || "-" },
+        { label: "风险等级", value: data.COUNTY || data.county || "-" },
+        { label: "支护形式", value: data.COUNTY || data.county || "-" },
+        { label: "监测设施设置", value: data.COUNTY || data.county || "-" },
+        { label: "起点桩号", value: data.photos || data.photos || [] },
+        { label: "止点桩号", value: data.photos || data.photos || [] },
+      ];
+
     default:
       return [
         { label: "名称", value: data.NAME || data.name || "-" },
@@ -127,21 +273,78 @@ const dialogItems = computed(() => {
   @return calc($px / 1920 * 100vw);
 }
 
-.dialog-content {
+.map-info-dialog {
-  padding: vw(10) vw(15);
+  position: fixed;
-  max-height: vw(300);
+  top: 50%;
-  overflow-y: auto;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: vw(400);
+  // min-height: vw(200);
+  background-size: 100% 100%;
+  padding-bottom: vw(20);
+  background-repeat: no-repeat;
+  background-position: center;
+  z-index: 1000;
+  padding: vw(20);
+  box-sizing: border-box;
 
-  .info-item {
+  .dialog-close {
+    position: absolute;
+    top: vw(22);
+    right: vw(15);
+    width: vw(24);
+    height: vw(24);
+    line-height: vw(24);
+    text-align: center;
+    font-size: vw(30);
+    color: #3e9ff0;
+    cursor: pointer;
+    opacity: 0.8;
+    transition: opacity 0.3s;
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+
+  .dialog-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: vw(15);
+    padding-bottom: vw(10);
+    border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+
+    .header-icon {
+      width: vw(24);
+      height: vw(24);
+      margin-left: vw(10);
+    }
+
+    .header-title {
+      font-size: vw(16);
+      font-weight: bold;
+      color: #fff;
+    }
+  }
+
+  .dialog-content {
+    max-height: vw(350);
+    padding-bottom: vw(20);
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+      display: none;
+    }
+
+    .info-row {
       display: flex;
       align-items: flex-start;
-    margin-bottom: vw(10);
+      margin-bottom: vw(8);
       line-height: 1.5;
 
       .info-label {
         color: rgba(255, 255, 255, 0.7);
         font-size: vw(13);
-      min-width: vw(80);
+        // min-width: vw(100);
         flex-shrink: 0;
       }
 
@@ -153,4 +356,5 @@ const dialogItems = computed(() => {
       }
     }
   }
+}
 </style>

packages/screen/src/views/RiskWarning/bottom.vue

@@ -257,6 +257,7 @@ const clearFilters = () => {
     orange: false,
     yellow: false,
   };
+  activeIndex.value = -1;
   // 触发清除地图标记事件
   emit("clearMapMarkers");
 };

packages/screen/src/views/RiskWarning/component/ChongqingMap.vue

@@ -55,6 +55,10 @@ const props = defineProps({
     type: Number,
     default: -1,
   },
+  dateRange: {
+    type: Array,
+    default: () => [],
+  },
 });
 
 // 定义 emits
@@ -85,6 +89,42 @@ const openTunnelDialog = (data) => {
   openMapInfoDialog("tunnel", data);
 };
 
+// 格式化日期时间为接口所需格式
+const formatDateTime = (date) => {
+  if (!date) return "";
+  const d = new Date(date);
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, "0");
+  const day = String(d.getDate()).padStart(2, "0");
+  const hours = String(d.getHours()).padStart(2, "0");
+  const minutes = String(d.getMinutes()).padStart(2, "0");
+  const seconds = String(d.getSeconds()).padStart(2, "0");
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+};
+
+// 获取时间参数
+const getTimeParams = () => {
+  if (props.dateRange && props.dateRange.length === 2) {
+    return {
+      start: formatDateTime(props.dateRange[0]),
+      end: formatDateTime(props.dateRange[1]),
+    };
+  }
+  // 默认时间范围：当月1号到当前时间
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, "0");
+  const day = String(now.getDate()).padStart(2, "0");
+  const hours = String(now.getHours()).padStart(2, "0");
+  const minutes = String(now.getMinutes()).padStart(2, "0");
+  const seconds = String(now.getSeconds()).padStart(2, "0");
+
+  return {
+    start: `${year}-${month}-01 00:00:00`,
+    end: `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`,
+  };
+};
+
 // 受影响对象数据
 const affectedCountyData = ref({
   byName: {},
@@ -94,13 +134,11 @@ const affectedCountyData = ref({
 // 获取受影响对象数据
 const getAffectedCountyData = async () => {
   try {
+    const timeParams = getTimeParams();
     const res = await request({
-      url: "snow-ops-platform/weather-warning/affected-county",
+      url: "/snow-ops-platform/weather-warning/affected-county",
       method: "GET",
-      params: {
+      params: timeParams,
-        start: "2025-03-03 12:33:00",
-        end: "2025-07-30 12:33:00",
-      },
     });
     console.log("受影响对象数据:", res);
     if (res.code === "00000" && res.data) {
@@ -108,6 +146,13 @@ const getAffectedCountyData = async () => {
       const warningStats = countWarningsByCounty(res.data);
       console.log("区县预警统计:", warningStats);
       affectedCountyData.value = warningStats;
+
+      getAffectedProjectData();
+      getAffectedTunnelData();
+      getAffectedBridgeData();
+      getAffectedRoadSectionData();
+      getEmergencyForceData();
+
       loadMapData();
     }
   } catch (error) {
@@ -119,13 +164,11 @@ const affectedBridgeData = ref([]);
 // 获取受影响桥梁数据
 const getAffectedBridgeData = async () => {
   try {
+    const timeParams = getTimeParams();
     const res = await request({
-      url: "snow-ops-platform/weather-warning/affected-object/bridge",
+      url: "/snow-ops-platform/weather-warning/affected-object/bridge",
       method: "GET",
-      params: {
+      params: timeParams,
-        start: "2025-03-03 12:33:00",
-        end: "2025-07-30 12:33:00",
-      },
     });
     if (res.code === "00000" && res.data) {
       res.data.forEach((item) => {
@@ -147,13 +190,11 @@ const tunnelInfoDialogRef = ref(null);
 // 获取受影响隧道数据
 const getAffectedTunnelData = async () => {
   try {
+    const timeParams = getTimeParams();
     const res = await request({
-      url: "snow-ops-platform/weather-warning/affected-object/tunnel",
+      url: "/snow-ops-platform/weather-warning/affected-object/tunnel",
       method: "GET",
-      params: {
+      params: timeParams,
-        start: "2025-03-03 12:33:00",
-        end: "2025-07-30 12:33:00",
-      },
     });
     console.log("受影响隧道数据:", res);
     if (res.code === "00000" && res.data) {
@@ -180,13 +221,11 @@ const affectedProjectData = ref([]);
 // 获取受影响项目数据
 const getAffectedProjectData = async () => {
   try {
+    const timeParams = getTimeParams();
     const res = await request({
-      url: "snow-ops-platform/weather-warning/affected-object/project",
+      url: "/snow-ops-platform/weather-warning/affected-object/project",
       method: "GET",
-      params: {
+      params: timeParams,
-        start: "2025-03-03 12:33:00",
-        end: "2025-07-30 12:33:00",
-      },
     });
     console.log("受影响项目数据:", res);
     if (res.code === "00000" && res.data) {
@@ -224,13 +263,11 @@ const affectedRoadSectionData = ref([]);
 // 获取受影响路段数据
 const getAffectedRoadSectionData = async () => {
   try {
+    const timeParams = getTimeParams();
     const res = await request({
-      url: "snow-ops-platform/weather-warning/affected-object/road-section",
+      url: "/snow-ops-platform/weather-warning/affected-object/road-section",
       method: "GET",
-      params: {
+      params: timeParams,
-        start: "2025-03-03 12:33:00",
-        end: "2025-07-30 12:33:00",
-      },
     });
     console.log("受影响路段数据:", res);
     if (res.code === "00000" && res.data) {
@@ -254,31 +291,26 @@ const emergencyForceData = ref([]);
 // 获取应急力量数据
 const getEmergencyForceData = async () => {
   try {
+    const timeParams = getTimeParams();
     const res = await request({
       url: "/snow-ops-platform/yhYjll/list",
       method: "GET",
-      params: {
+      params: timeParams,
-        start: "2025-03-03 12:33:00",
-        end: "2025-07-30 12:33:00",
-      },
     });
     console.log("应急力量数据:", res);
-    if (
+    if (res.code === "00000" && res.data) {
-      res.code === "00000" &&
-      res.data 
-    ) {
       // 解析坐标数据
-      const parsedData = res.data.map((item) => {
+      res.data.forEach((item) => {
-        const newItem = { ...item };
+        if (item.gl1Lx == 1 || item.gl1Lx == 2) {
-        newItem.COORDINATE_POINT = [item.gl1Lng, item.gl1Lat];
+          item.COORDINATE_POINT = [item.gl1Lng, item.gl1Lat];
-        console.log("解析后坐标:", newItem.COORDINATE_POINT);
+          console.log("解析后坐标:", item.COORDINATE_POINT);
-        return newItem;
+        }
       });
-      emergencyForceData.value = parsedData;
+      emergencyForceData.value = res.data;
 
       // 在地图上添加应急力量标记
-      console.log("开始添加应急力量标记...", parsedData);
+      console.log("开始添加应急力量标记...", res.data);
-      addProjectMarkers(parsedData, tunnelIcon, "tunnel");
+      addProjectMarkers(res.data, rescueTeamIcon, "emergency");
     } else {
       console.warn("没有获取到应急力量数据或返回码错误:", res);
     }
@@ -326,7 +358,7 @@ const addProjectMarkers = (data, iconUrl, type = "project") => {
   // 创建自定义图标
   const projectIconObj = window.L.icon({
     iconUrl: iconUrl,
-    iconSize: [30, 30],
+    iconSize: [35, 35],
     iconAnchor: [10, 10],
     popupAnchor: [0, -10],
   });
@@ -623,10 +655,10 @@ const simplifyDistrictName = (name) => {
 // 根据预警等级获取颜色
 const getColorByLevel = (level) => {
   const colorMap = {
-    红色预警: "#FF4D4F",
+    红色预警: "#912210",
-    橙色预警: "#EC7345",
+    橙色预警: "#BA6527",
-    黄色预警: "#705D42",
+    黄色预警: "#A47109",
-    蓝色预警: "#3799FC",
+    蓝色预警: "#185A91",
     未知: "#1890ff",
   };
   return colorMap[level] || "#1890ff";
@@ -644,7 +676,7 @@ const initMap = (geoJsonData) => {
     // 创建地图实例
     mapInstance = new window.L.Map(mapContainer.value, {
       center: [29.563, 106.551], // 重庆中心坐标
-      zoom: 6,
+      zoom: 8,
       minZoom: 6,
       maxZoom: 18,
       zoomControl: false,
@@ -668,7 +700,8 @@ const initMap = (geoJsonData) => {
       style: (feature) => {
         // const districtName = feature.properties.name;
         const districtName = simplifyDistrictName(feature.properties.name);
-        let fillColor = "#132C44"; // 默认
+        let fillColor = "#132C44"; // 默认深蓝色背景
+        let fillOpacity = 0.4; // 默认透明度更高（更透明）
         // 如果有预警统计数据，应用主要预警颜色
         if (
           affectedCountyData.value &&
@@ -678,14 +711,15 @@ const initMap = (geoJsonData) => {
           const districtData = affectedCountyData.value.byName[districtName];
           console.log(districtData.levels);
           fillColor = getMainWarningColor(districtData.levels);
+          fillOpacity = 1; // 有预警时稍微不透明一些
         }
 
         return {
           fillColor: fillColor,
-          weight: 1.5,
+          weight: 0.5,
-          opacity: 0.5,
+          opacity: 0.6,
-          color: "#40a9ff",
+          color: "#00d4ff",
-          fillOpacity: 0.5,
+          fillOpacity: fillOpacity,
         };
       },
       onEachFeature: (feature, layer) => {
@@ -836,6 +870,9 @@ watch(
       case 4:
         await getAffectedRoadSectionData();
         break;
+      case 5:
+        await getEmergencyForceData();
+        break;
       default:
         break;
     }
@@ -843,6 +880,37 @@ watch(
   { immediate: false },
 );
 
+// 监听 dateRange 变化，重新加载数据
+watch(
+  () => props.dateRange,
+  async (newVal) => {
+    console.log("dateRange 变化:", newVal);
+    if (newVal && newVal.length === 2) {
+      // 先重新加载受影响区县数据
+      await getAffectedCountyData();
+
+      // 根据当前 activeIndex 重新加载对应数据
+      switch (props.activeIndex) {
+        case 0:
+          await getAffectedProjectData();
+          break;
+        case 1:
+          await getAffectedTunnelData();
+          break;
+        case 3:
+          await getAffectedBridgeData();
+          break;
+        case 4:
+          await getEmergencyForceData();
+          break;
+        default:
+          break;
+      }
+    }
+  },
+  { deep: true },
+);
+
 // 组件挂载时加载地图
 onMounted(() => {
   // 获取受影响对象数据
@@ -930,7 +998,6 @@ defineExpose({
 .map-container {
   width: 100%;
   height: 100%;
-  background: #0f1c2e;
 }
 
 .loading-overlay,

packages/screen/src/views/RiskWarning/index.vue

@@ -102,7 +102,7 @@
     <div class="center">
       <!-- 地图底层 -->
       <div class="map-layer">
-        <ChongqingMap ref="chongqingMapRef" :activeIndex="activeIndex" />
+        <ChongqingMap ref="chongqingMapRef" :activeIndex="activeIndex" :dateRange="dateRange" />
       </div>
 
       <!-- 地图遮罩层 -->
@@ -111,7 +111,7 @@
     <div class="bottom">
       <bottom @changeActiveIndex="changeActiveIndex" @clearMapMarkers="clearMapMarkers"></bottom>
     </div>
-    <top class="top" @openAIResult="openDialog('aiWarningResult')"></top>
+    <top class="top" @openAIResult="openDialog('aiWarningResult')" @dateRangeChange="handleDateRangeChange"></top>
 
     <!-- 响应情况对话框 -->
     <responseSituationDiaLog
@@ -309,6 +309,15 @@ const dialogVisible = ref({
 });
 const activeIndex = ref(0);
 
+// 日期范围
+const dateRange = ref([]);
+
+// 处理日期范围变化
+const handleDateRangeChange = (val) => {
+  console.log("日期范围变化:", val);
+  dateRange.value = val;
+};
+
 // 地图组件引用
 const chongqingMapRef = ref(null);
 

packages/screen/src/views/RiskWarning/left.vue

@@ -287,7 +287,7 @@ const weatherWarningData = ref([
 
 // 影响点数据
 const impactData = ref([
-  { name: "路段", count: 0 },
+  { name: "路段", count: 11 },
   { name: "桥梁", count: 312 },
   { name: "隧道", count: 405 },
   { name: "边坡", count: 634 },
@@ -492,6 +492,13 @@ const loadBarChartData = async () => {
           return { ...item, name };
         });
 
+        // 将路段放到数组第一个
+        const roadIndex = convertedData.findIndex((item) => item.name === "路段");
+        if (roadIndex > 0) {
+          const roadItem = convertedData.splice(roadIndex, 1)[0];
+          convertedData.unshift(roadItem);
+        }
+
         impactData.value = convertedData;
       }
     }

packages/screen/src/views/RiskWarning/right.vue

@@ -245,7 +245,9 @@ const getYhYjllList = async () => {
       let gl1Rysls = 0; // 人员数
       let gl1Yjllmcs = 0; // 队伍数
       res.data.forEach((item) => {
+        if (item.gl1Lx == 1 || item.gl1Lx == 2) {
           gl1Yjllmcs = gl1Yjllmcs + 1;
+        }
         gl1Rysls = Number(item.gl1Rysl) + gl1Rysls;
       });
       if (gl1Rysls > 10000) {
@@ -256,7 +258,6 @@ const getYhYjllList = async () => {
         resourceData.value[1].unit = "人";
       }
       resourceData.value[0].value = gl1Yjllmcs;
-
     }
   } catch (error) {
     console.error("获取应急力量列表失败:", error);

packages/screen/src/views/RiskWarning/top.vue

@@ -23,22 +23,38 @@
 import { ref, watch, inject } from "vue";
 import { Calendar } from "@element-plus/icons-vue";
 
-const emit = defineEmits(["openAIResult"]);
+const emit = defineEmits(["openAIResult", "dateRangeChange"]);
 
 // 注入兄弟组件通信机制
 const triggerRefreshLeftData = inject('triggerRefreshLeftData');
 
 const dateRange = ref([]);
 
+// 设置日期时间为当天的23:59:59
+const setEndOfDay = (date) => {
+  if (!date) return date;
+  const d = new Date(date);
+  d.setHours(23, 59, 59, 999);
+  return d;
+};
+
 // 监听 dateRange 变化
 watch(dateRange, (newVal, oldVal) => {
   // 只有当值真正发生变化时才触发
   if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
     console.log('dateRange 发生变化:', newVal);
+    
+    // 如果有结束日期，将其设置为当天的23:59:59
+    if (newVal && newVal.length === 2 && newVal[1]) {
+      newVal[1] = setEndOfDay(newVal[1]);
+    }
+    
     // 触发兄弟组件刷新
     if (triggerRefreshLeftData) {
       triggerRefreshLeftData();
     }
+    // 向父组件传递时间范围
+    emit("dateRangeChange", newVal);
   }
 }, { deep: true });
 
@@ -103,7 +119,7 @@ const handleAIClick = () => {
       height: 2.6em !important;
     }
     :deep(.el-date-editor) {
-      width: 180px;
+      width: 200px;
       max-width: vw(350);
       background: #183c67;
       box-shadow: inset 0px 0px 8px 0px #4fecff;