diff --git a/packages/screen/src/component/MyDialog/index.vue b/packages/screen/src/component/MyDialog/index.vue index 37bcd0a..7ce9f3b 100644 --- a/packages/screen/src/component/MyDialog/index.vue +++ b/packages/screen/src/component/MyDialog/index.vue @@ -10,7 +10,6 @@ :is="dynamicComponent" ref="dynamicComponentRef" v-bind="componentProps" - @vue:mounted="handleComponentMount" /> diff --git a/packages/screen/src/component/MyDrawer/index.vue b/packages/screen/src/component/MyDrawer/index.vue index ce36b36..88237c8 100644 --- a/packages/screen/src/component/MyDrawer/index.vue +++ b/packages/screen/src/component/MyDrawer/index.vue @@ -11,7 +11,6 @@ :is="dynamicComponent" ref="dynamicComponentRef" v-bind="componentProps" - @vue:mounted="handleComponentMount" /> diff --git a/packages/screen/src/views/MaterialManagement/detailDialog.vue b/packages/screen/src/views/MaterialManagement/detailDialog.vue index b3b40db..20237dd 100644 --- a/packages/screen/src/views/MaterialManagement/detailDialog.vue +++ b/packages/screen/src/views/MaterialManagement/detailDialog.vue @@ -3,7 +3,7 @@ - + {{ detailData.material?.wzmc }} @@ -38,7 +38,7 @@ - + {{ detailData.material?.qxmc }} @@ -51,7 +51,7 @@ - + {{ detailData.material?.fzr }} diff --git a/packages/screen/src/views/SnowEventManagement/detailDialog.vue b/packages/screen/src/views/SnowEventManagement/detailDialog.vue index f5575ad..5c14a9e 100644 --- a/packages/screen/src/views/SnowEventManagement/detailDialog.vue +++ b/packages/screen/src/views/SnowEventManagement/detailDialog.vue @@ -1,52 +1,128 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + {{ + detailData.event?.occurTime + }} + {{ + detailData.event?.occurLocation + }} + {{ + detailData.event?.routeNo + }} + {{ + detailData.event?.reportTime + }} + {{ + detailData.event?.reporterName + }} + {{ + detailData.event?.district + }} + {{ + detailData.event?.stationName + }} + + + + + 起点桩号: + {{ detailData.event?.startStakeNo }} + - - - - - - - - - - - - - + + + + + 受灾里程: {{ detailData.event?.disasterMileage }} + + + + + + + + + 止点桩号: + {{ detailData.event?.endStakeNo }} + - + + + + {{ + detailData.event?.disposalMeasures + }} + {{ + detailData.event?.expectRecoverTime + }} + + + + + {{ + detailData.material?.inputManpower + "人次" + }} + {{ + detailData.material?.inputFunds + "万元" + }} + {{ + detailData.material?.inputEquipment + "台班" + }} + {{ item.usageAmount + "" + item.materialUnit }} + + + + + {{ + { + 1: "正常通行", + 2: "限速通行", + 3: "封闭交通", + }[detailData.traffic?.currentStatus] || "未知状态" + }} + {{ + { + 0: "无", + 1: "有", + }[detailData.traffic?.hasStrandedVehicles] || "未知状态" + }} + {{ + detailData.traffic?.strandedVehicleCount + "辆" + }} + {{ + detailData.traffic?.actualRecoverTime + }} + + + + + @@ -60,4 +136,56 @@ const props = defineProps({ \ No newline at end of file diff --git a/packages/screen/src/views/SnowEventManagement/index.js b/packages/screen/src/views/SnowEventManagement/index.js index 2d1bc69..3483b1b 100644 --- a/packages/screen/src/views/SnowEventManagement/index.js +++ b/packages/screen/src/views/SnowEventManagement/index.js @@ -44,6 +44,19 @@ const model = reactive({ const dialogType = ref(''); // 弹窗类型 const dialogRef = ref(null); // 弹窗实例 +const drawerVisible = ref(false); // 抽屉显示状态 +const drawer = reactive({ + title: '', + content: null, + props: {}, + onCancel: null, + onConfirm: null, + direction: 'rtl', + size: '50%' +}); // 抽屉内容 +const drawerType = ref(''); // 抽屉类型 +const drawerRef = ref(null); // 抽屉实例 + const INIT_FORM = { rkrq: "", rkdw: "", @@ -86,7 +99,7 @@ const filterNode = (value, node) => { const getTreeData = async () => { try { const res = await request({ - url: '/snow-ops-platform/yhz/listAreaGroup', + url: '/snow-ops-platform/yhz/listAreaGroup?dataType=ICE_SNOW_EVENT', method: 'GET' }) if (res.code === '00000') { @@ -223,24 +236,24 @@ const columns = [ type: "primary", link: true, onClick: async () => { - dialogType.value = 'detail' + drawerType.value = 'detail' await getDetailData(row); }, }, () => "详情" ), - h( - ElButton, - { - type: "primary", - link: true, - onClick: async () => { - dialogType.value = 'edit' - await getDetailData(row); - }, - }, - () => "编辑" - ), + // h( + // ElButton, + // { + // type: "primary", + // link: true, + // onClick: async () => { + // dialogType.value = 'edit' + // await getDetailData(row); + // }, + // }, + // () => "编辑" + // ), h( ElButton, { @@ -248,16 +261,16 @@ const columns = [ link: true, onClick: async () => { try { - await ElMessageBox.confirm("确定要删除该设备吗?", "删除确认", { + await ElMessageBox.confirm("确定要删除该冰雪事件吗?", "删除确认", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", }); const res = await request({ - url: `/snow-ops-platform/yjwz/delete`, + url: `/snow-ops-platform/event/delete`, method: 'POST', data: { - rid: row.rid, + id: row.id, } }); if (res.code === '00000') { @@ -313,21 +326,21 @@ const getDetailData = async (row) => { throw new Error('获取事件详情失败') } if (res.code === '00000') { - if (dialogType.value === 'detail') { - model.title = `事件详情`; - model.content = DetailDialog; - model.props = { + if (drawerType.value === 'detail') { + drawer.title = `事件详情`; + drawer.content = DetailDialog; + drawer.props = { detailData: res.data, }; - model.onCancel = () => { - dialogType.value = ''; - modelVisible.value = false; + drawer.onCancel = () => { + drawerType.value = ''; + drawerVisible.value = false; }; - model.onConfirm = () => { - dialogType.value = ''; - modelVisible.value = false; + drawer.onConfirm = () => { + drawerType.value = ''; + drawerVisible.value = false; }; - modelVisible.value = true; + drawerVisible.value = true; } if (dialogType.value === 'edit') { model.title = `编辑物资`; @@ -433,5 +446,9 @@ export default () => { modelVisible, dialogRef, model, + drawerVisible, + drawer, + drawerRef, + yhzid, } } \ No newline at end of file diff --git a/packages/screen/src/views/SnowEventManagement/index.vue b/packages/screen/src/views/SnowEventManagement/index.vue index 0e3b26a..e4264a5 100644 --- a/packages/screen/src/views/SnowEventManagement/index.vue +++ b/packages/screen/src/views/SnowEventManagement/index.vue @@ -65,6 +65,17 @@ width="60%" > + @@ -73,6 +84,7 @@ import scriptFn from "./index.js"; import DynamicTable from "../../component/DynamicTable"; import MyDialog from "../../component/MyDialog"; +import MyDrawer from "../../component/MyDrawer"; const script = scriptFn(); const { treeRef, dialogRef } = script;