diff --git a/packages/screen/src/views/RiskWarning/component/ChongqingMap.vue b/packages/screen/src/views/RiskWarning/component/ChongqingMap.vue index 9bb85f1..8ce8cec 100644 --- a/packages/screen/src/views/RiskWarning/component/ChongqingMap.vue +++ b/packages/screen/src/views/RiskWarning/component/ChongqingMap.vue @@ -50,7 +50,7 @@ import tunnelLineIcon from '../../../assets/MaMap_img/线路icon定位@2x.png' import mapInfoDialog from '../Dialog/mapInfoDialog.vue' import centerInfoCard from '../Dialog/centerInfoCard.vue' import hazardPointSituationDialog from '../Dialog/hazardPointSituationDialog.vue' -import I from '../../../../dist/cesium/Workers/upsampleVerticesFromCesium3DTilesTerrain' +// import I from '../../../../dist/cesium/Workers/upsampleVerticesFromCesium3DTilesTerrain' const mapContainer = ref(null) const loading = ref(false) diff --git a/packages/screen/src/views/WarningManagement/law/detailDrawer.vue b/packages/screen/src/views/WarningManagement/law/detailDrawer.vue index 8b7c938..7a23ff9 100644 --- a/packages/screen/src/views/WarningManagement/law/detailDrawer.vue +++ b/packages/screen/src/views/WarningManagement/law/detailDrawer.vue @@ -1,159 +1,715 @@ - - - - - 基本信息 - - - - {{ detailData.headline }} - {{ '大雾预警' }} - {{ detailData.createTime }} - {{ detailData.onset }} - {{ detailData.receiveTime }} - {{ detailData.forwardTime }} - {{ detailData.expires }} - {{ detailData.description }} - {{ }} - - - - - - 影响情况 - - - - - + + + + + 基本信息 + + + + {{ detailData.headline || '-' }} + {{ detailData.weatherWarningType || '-' }} + {{ detailData.createTime || '-' }} + {{ detailData.onset || '-' }} + {{ detailData.receiveTime || '-' }} + {{ detailData.forwardTime || '-' }} + {{ detailData.expires || '-' }} + {{ detailData.description || '-' }} + {{}} + + + + + + 影响情况 + + + + + + + {{ item.name }} ({{ item.count }}) + + + + + + + + + + + + + + + + + + - - \ No newline at end of file + +.table { + display: flex; + flex-direction: column; + gap: 10px; +} + +// 统计卡片 +.stats-cards { +} + +.search-form { + display: flex; + flex-direction: row; + align-items: center; + flex-wrap: wrap; + gap: 12px; + .search-item { + width: 150px; + } +} + diff --git a/packages/screen/src/views/WarningManagement/law/index.js b/packages/screen/src/views/WarningManagement/law/index.js index 43825c6..ea584e9 100644 --- a/packages/screen/src/views/WarningManagement/law/index.js +++ b/packages/screen/src/views/WarningManagement/law/index.js @@ -5,6 +5,19 @@ import AddDialog from "./addDialog.vue"; import ScheduleDiaog from "../law/dutyManagement/addDialog.vue" import DetailDrawer from "./detailDrawer.vue"; +// 格式化时间函数 +const formatDateTime = (dateStr) => { + if (!dateStr) return '-'; + const date = new Date(dateStr); + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); + const day = String(date.getDate()).padStart(2, '0'); + const hours = String(date.getHours()).padStart(2, '0'); + const minutes = String(date.getMinutes()).padStart(2, '0'); + const seconds = String(date.getSeconds()).padStart(2, '0'); + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; +}; + const tableData = ref([]); // 表格数据 const modelVisible = ref(false); // 弹窗状态 const drawerVisible = ref(false); // 抽屉状态 @@ -54,11 +67,8 @@ const columns = [ label: "预警标题", }, { - // prop: "xxx", + prop: "weatherWarningType", label: "预警类型", - formatter: (row) => { - return h(ElText, { style: {} }, '大雾预警'); - } }, { prop: "createTime", @@ -67,6 +77,7 @@ const columns = [ { prop: "onset", label: "生效时间", + render: (row) => () => h('span', formatDateTime(row.onset)) }, { prop: "receiveTime", @@ -79,6 +90,7 @@ const columns = [ { prop: "expires", label: "预警结束时间", + render: (row) => () => h('span', formatDateTime(row.expires)) }, { prop: "affectedRoadSectionCount", @@ -258,7 +270,7 @@ const publishWarning = async (data) => { const openDetailDrawer = (row) => { drawer.title = '预警详情'; drawer.props = { - id: row.id, + row: row }; drawer.content = DetailDrawer; drawerVisible.value = true;