diff --git a/packages/mobile/src/components/BasePicker.vue b/packages/mobile/src/components/BasePicker.vue index f68b998..68470dd 100644 --- a/packages/mobile/src/components/BasePicker.vue +++ b/packages/mobile/src/components/BasePicker.vue @@ -34,7 +34,7 @@ import { Field, Popup, Picker } from 'vant' const props = defineProps({ // 双向绑定值 (v-model) modelValue: { - type: [String, Number], + type: [String, Number, Boolean], default: null }, // 选项数据,默认格式 [{ label: '显示名', value: '值' }] diff --git a/packages/mobile/src/views/DisasterManagement/DisasterManagement.vue b/packages/mobile/src/views/DisasterManagement/DisasterManagement.vue index bb92888..294d79e 100644 --- a/packages/mobile/src/views/DisasterManagement/DisasterManagement.vue +++ b/packages/mobile/src/views/DisasterManagement/DisasterManagement.vue @@ -34,7 +34,7 @@ - 冰雪填报 + 灾害填报 { loading.value = true try { - // TODO: 替换为实际的后端接口地址 - // const response = await fetch('/api/disaster/list', { - // method: 'POST', - // headers: { - // 'Content-Type': 'application/json' - // }, - // body: JSON.stringify({ - // keyword: keyword.trim(), - // disasterType: disasterType === 'all' ? '' : disasterType - // }) - // }) - // const result = await response.json() - // if (result.code === 200) { - // list.value = result.data - // } else { - // showToast(result.message || '获取数据失败') - // list.value = [] - // } - - // ========== 模拟数据 ========== - await new Promise((resolve) => setTimeout(resolve, 500)) - const mockData = mockDataJSON - - let filteredData = [...mockData] - - if (keyword) { - filteredData = filteredData.filter((item) => - item.title.toLowerCase().includes(keyword.toLowerCase()) - ) - } - - if (disasterType !== 'all') { - filteredData = filteredData.filter((item) => - item.disasterType === disasterType - ) - } - - list.value = filteredData - - if (keyword && filteredData.length === 0) { - emptyText.value = '未搜索到相关灾毁信息' - } else if (disasterType !== 'all' && filteredData.length === 0) { - const typeLabel = disasterTypes.find(t => t.value === disasterType)?.label || disasterType - emptyText.value = `暂无${typeLabel}类型灾毁信息` + const result = await request({ + url: '/snow-ops-platform/water-damage/list', + method: 'get', + params: { + keyword: keyword.trim(), + disasterType: disasterType === 'all' ? '' : disasterType + } + }) + if (result?.data?.records) { + list.value = result.data.records } else { - emptyText.value = '暂无相关灾毁信息' + showToast(result.message || '获取数据失败') + list.value = [] } - // ========== 模拟数据结束 ========== + } catch (error) { console.error('获取灾毁列表失败:', error) showToast('获取数据失败,请稍后重试') diff --git a/packages/mobile/src/views/DisasterManagement/DisasterReport.vue b/packages/mobile/src/views/DisasterManagement/DisasterReport.vue index d2df783..15c4694 100644 --- a/packages/mobile/src/views/DisasterManagement/DisasterReport.vue +++ b/packages/mobile/src/views/DisasterManagement/DisasterReport.vue @@ -15,7 +15,6 @@ @@ -31,13 +30,15 @@ diff --git a/packages/mobile/src/views/DisasterManagement/WaterDisaster/CubeCalculateDialog.vue b/packages/mobile/src/views/DisasterManagement/WaterDisaster/CubeCalculateDialog.vue new file mode 100644 index 0000000..7cd4ecb --- /dev/null +++ b/packages/mobile/src/views/DisasterManagement/WaterDisaster/CubeCalculateDialog.vue @@ -0,0 +1,159 @@ + + + + + + + + 米 + + + + + + + 米 + + + + + + + 米 + + + + + + + 元 + + + + + + 元 + + + + + + + diff --git a/packages/mobile/src/views/DisasterManagement/WaterDisaster/LossList.vue b/packages/mobile/src/views/DisasterManagement/WaterDisaster/LossList.vue new file mode 100644 index 0000000..0565258 --- /dev/null +++ b/packages/mobile/src/views/DisasterManagement/WaterDisaster/LossList.vue @@ -0,0 +1,112 @@ + + + + + + 方/万元 + + + + 添加损失 + + + + + + + + diff --git a/packages/mobile/src/views/DisasterManagement/WaterDisaster/LossPicker.vue b/packages/mobile/src/views/DisasterManagement/WaterDisaster/LossPicker.vue new file mode 100644 index 0000000..535a2f8 --- /dev/null +++ b/packages/mobile/src/views/DisasterManagement/WaterDisaster/LossPicker.vue @@ -0,0 +1,47 @@ + + + + + + + diff --git a/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue b/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue new file mode 100644 index 0000000..dd03a70 --- /dev/null +++ b/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue @@ -0,0 +1,524 @@ + + + + + + + + + + + + + + + + + + + + + 公里 + + + + + + + + 校准时间 + + + + + + + + + + + + + + + + 校准经纬度 + + + + + + + + + + + + + 校准经纬度 + + + + + + + + + + + + + + 处置措施 + + + 半幅封闭 + 全副封闭 + 便道通行 + 正常通行 + + + + + + + + + + + + + + + + + 人 + + + + + 人 + + + + + 人 + + + + + 辆 + + + + + 辆 + + + + + + + + + + + + 万元 + + + + + + + + + 台/班 + + + + + 人次 + + + + + 万元 + + + + + + + + + + + + + + + 万元 + + + + + + + + + diff --git a/packages/mobile/src/views/DisasterManagement/waterDisasterFormData.json b/packages/mobile/src/views/DisasterManagement/waterDisasterFormData.json new file mode 100644 index 0000000..d17fc06 --- /dev/null +++ b/packages/mobile/src/views/DisasterManagement/waterDisasterFormData.json @@ -0,0 +1,63 @@ +{ + "occurLocation": "G108国道 K2250+300处", + "occurTime": "2024-07-15 14:30:00", + "roadConditionType": "国道", + "routeNo": "G108", + "event": { + "blockedMileage": 1.5, + "blockedPointName": "磨盘山隧道口", + "contactPerson": "张明", + "contactPhone": "13812345678", + "damageCount": 3, + "district": "武侯区", + "endStakeLat": "30.658712", + "endStakeLng": "104.082356", + "endStakeNo": "K2251+200", + "estimatedRecoveryCost": 120.5, + "inspectionMileage": 25.6, + "isBlocked": true, + "needsRecovery": true, + "repairProgress": "抢修中", + "reporterUnit": "武侯区交通运输局", + "startStakeLat": "30.652145", + "startStakeLng": "104.075632", + "startStakeNo": "K2250+300" + }, + "report": { + "damagedVehicleCount": 2, + "strandedPersonCount": 12, + "deadCount": 0, + "strandedVehicleCount": 12, + "disposalMeasures": "halfClose,bypass", + "actualRecoverTime": "2024-07-17 12:00:00", + "expectRecoverTime": "2024-07-18 18:00:00", + "injuredCount": 1, + "investedFunds": 35.8, + "investedMachinery": 6, + "investedManpower": 45, + "remark": "已组织抢险队伍进行抢通,便道已修建完成", + "siteDescription": "因持续强降雨导致山体滑坡,掩埋路面约50米,边坡垮塌严重", + "totalLossAmount": 85.6 + }, + "lossList": [ + { + "length": 50, + "width": 8.5, + "height": 2.5, + "unitPrice": 380, + "totalAmount": 38.9, + "lossCategory": "路面损毁", + "remark": "沥青路面严重损坏" + }, + { + "length": 30, + "width": 2.5, + "height": 6, + "unitPrice": 520, + "totalAmount": 23.4, + "lossCategory": "挡墙损毁", + "remark": "浆砌片石挡墙垮塌" + } + ], + "fileList": [] +} \ No newline at end of file diff --git a/packages/screen/src/assets/MaMap_img/区县icon@2x.png b/packages/screen/src/assets/MaMap_img/区县icon@2x.png new file mode 100644 index 0000000..4cbaf25 Binary files /dev/null and b/packages/screen/src/assets/MaMap_img/区县icon@2x.png differ diff --git a/packages/screen/src/assets/MaMap_img/区县弹窗背景@2x.png b/packages/screen/src/assets/MaMap_img/区县弹窗背景@2x.png new file mode 100644 index 0000000..2e8a618 Binary files /dev/null and b/packages/screen/src/assets/MaMap_img/区县弹窗背景@2x.png differ diff --git a/packages/screen/src/assets/MaMap_img/蓝色@2x (1).png b/packages/screen/src/assets/MaMap_img/蓝色@2x (1).png new file mode 100644 index 0000000..2e20542 Binary files /dev/null and b/packages/screen/src/assets/MaMap_img/蓝色@2x (1).png differ diff --git a/packages/screen/src/assets/MaMap_img/蓝色@2x1.png b/packages/screen/src/assets/MaMap_img/蓝色@2x1.png new file mode 100644 index 0000000..39aad1e Binary files /dev/null and b/packages/screen/src/assets/MaMap_img/蓝色@2x1.png differ diff --git a/packages/screen/src/assets/MaMap_img/队伍icon定位@2x.png b/packages/screen/src/assets/MaMap_img/队伍icon定位@2x.png new file mode 100644 index 0000000..78fc806 Binary files /dev/null and b/packages/screen/src/assets/MaMap_img/队伍icon定位@2x.png differ diff --git a/packages/screen/src/assets/MaMap_img/隧洞icon定位@2x.png b/packages/screen/src/assets/MaMap_img/隧洞icon定位@2x.png new file mode 100644 index 0000000..2463a38 Binary files /dev/null and b/packages/screen/src/assets/MaMap_img/隧洞icon定位@2x.png differ diff --git a/packages/screen/src/assets/MaMap_img/项目@2x.png b/packages/screen/src/assets/MaMap_img/项目@2x.png new file mode 100644 index 0000000..618b949 Binary files /dev/null and b/packages/screen/src/assets/MaMap_img/项目@2x.png differ diff --git a/packages/screen/src/assets/xiangying/无回应@2x.png b/packages/screen/src/assets/xiangying/无回应@2x.png new file mode 100644 index 0000000..3f8f18c Binary files /dev/null and b/packages/screen/src/assets/xiangying/无回应@2x.png differ diff --git a/packages/screen/src/assets/xiangying/有回应@2x.png b/packages/screen/src/assets/xiangying/有回应@2x.png new file mode 100644 index 0000000..8f109b7 Binary files /dev/null and b/packages/screen/src/assets/xiangying/有回应@2x.png differ diff --git a/packages/screen/src/assets/xiangying/未选中1@2x.png b/packages/screen/src/assets/xiangying/未选中1@2x.png new file mode 100644 index 0000000..2fe76ba Binary files /dev/null and b/packages/screen/src/assets/xiangying/未选中1@2x.png differ diff --git a/packages/screen/src/assets/xiangying/未选中2@2x.png b/packages/screen/src/assets/xiangying/未选中2@2x.png new file mode 100644 index 0000000..d2928f2 Binary files /dev/null and b/packages/screen/src/assets/xiangying/未选中2@2x.png differ diff --git a/packages/screen/src/assets/xiangying/未选中3@2x.png b/packages/screen/src/assets/xiangying/未选中3@2x.png new file mode 100644 index 0000000..eb7fee1 Binary files /dev/null and b/packages/screen/src/assets/xiangying/未选中3@2x.png differ diff --git a/packages/screen/src/assets/xiangying/未选中4@2x.png b/packages/screen/src/assets/xiangying/未选中4@2x.png new file mode 100644 index 0000000..c069bcb Binary files /dev/null and b/packages/screen/src/assets/xiangying/未选中4@2x.png differ diff --git a/packages/screen/src/assets/xiangying/未选中bg@2x.png b/packages/screen/src/assets/xiangying/未选中bg@2x.png new file mode 100644 index 0000000..b205291 Binary files /dev/null and b/packages/screen/src/assets/xiangying/未选中bg@2x.png differ diff --git a/packages/screen/src/assets/xiangying/选中@2x.png b/packages/screen/src/assets/xiangying/选中@2x.png new file mode 100644 index 0000000..5799718 Binary files /dev/null and b/packages/screen/src/assets/xiangying/选中@2x.png differ diff --git a/packages/screen/src/assets/xiangying/选中bg@2x.png b/packages/screen/src/assets/xiangying/选中bg@2x.png new file mode 100644 index 0000000..bd800a7 Binary files /dev/null and b/packages/screen/src/assets/xiangying/选中bg@2x.png differ diff --git a/packages/screen/src/views/RiskWarning/Dialog/clearanceSituationDialog.vue b/packages/screen/src/views/RiskWarning/Dialog/clearanceSituationDialog.vue index c4984e5..e7d8415 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/clearanceSituationDialog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/clearanceSituationDialog.vue @@ -17,7 +17,7 @@ 影响区域 - + 类型 - + 管控措施 - + 影响区域 - + 驻地风险等级 - + 影响区域 - + 类型 - + diff --git a/packages/screen/src/views/RiskWarning/Dialog/responseSituationDiaLog.vue b/packages/screen/src/views/RiskWarning/Dialog/responseSituationDiaLog.vue index 672661c..fa81b51 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/responseSituationDiaLog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/responseSituationDiaLog.vue @@ -9,7 +9,7 @@ :current-page="currentPage" :page-size="pageSize" :z-index="1000" - :max-width="700" + :max-width="1000" @size-change="handleSizeChange" @current-change="handleCurrentChange" @close="handleClose" @@ -97,12 +97,12 @@ const stats = ref({ // 表格列配置 const tableColumns = ref([ - { prop: "id", label: "序号", width: "60px" }, - { prop: "district", label: "区县/镇街", width: "120px" }, - { prop: "name", label: "姓名", width: "100px" }, - { prop: "phone", label: "电话", width: "120px" }, - { prop: "role", label: "角色", width: "200px" }, - { prop: "position", label: "职务", width: "100px" }, + { prop: "id", label: "序号", width: "" }, + { prop: "district", label: "区县/镇街", width: "" }, + { prop: "name", label: "姓名", width: "" }, + { prop: "phone", label: "电话", width: "" }, + { prop: "role", label: "角色", width: "" }, + { prop: "position", label: "职务", width: "" }, { prop: "operation", label: "操作", width: "120px", slot: "operation" }, ]); diff --git a/packages/screen/src/views/RiskWarning/Dialog/responseStatusDialog.vue b/packages/screen/src/views/RiskWarning/Dialog/responseStatusDialog.vue index 19146a2..5fffb6e 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/responseStatusDialog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/responseStatusDialog.vue @@ -18,25 +18,80 @@ - - 影响桥梁 - 2933 + + + + 影响桥梁 + (1430) + - - 影响边坡 - 2933 + + + + 影响边坡 + (933) + - - 影响隧道 - 2933 + + + + 影响隧道 + (1033) + - - 影响项目 - 2933 + + + + 影响项目 + (832) + - - 影响路段 - 2432 + + + + 影响路段 + (832) + @@ -44,8 +99,8 @@ - - + - + --> - 影响点等级 + - 是否回应 + - {{ row.pointLevel }} + {{ + row.pointLevel + }} - {{ row.trafficDept.name }} + + {{ row.trafficDept.name }} + + {{ row.trafficDept.phone }} @@ -128,7 +198,9 @@ - {{ row.responseStatus }} + {{ + row.responseStatus + }} @@ -149,9 +221,24 @@ diff --git a/packages/screen/src/views/RiskWarning/Dialog/tongnanInfoDialog.vue b/packages/screen/src/views/RiskWarning/Dialog/tongnanInfoDialog.vue index aed149b..501960a 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/tongnanInfoDialog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/tongnanInfoDialog.vue @@ -1,88 +1,47 @@ - - - - - 潼南基本信息表 - - + + + + + + + + + + + + + - - - - - {{ column.label }} - - - - - {{ item.id }} - {{ item.region }} - {{ item.name }} - {{ item.phone }} - - - {{ item.stationName }} - - - {{ item.type }} - - - - - - - - - - - - - - - - - - - - 共{{ total }}条数据 - - - - - - {{ page }} - - - - - - - - + + + + {{ row.stationName }} + + + diff --git a/packages/screen/src/views/RiskWarning/Dialog/tongnanResponsibleDialog.vue b/packages/screen/src/views/RiskWarning/Dialog/tongnanResponsibleDialog.vue index 1fa55d7..150c7bf 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/tongnanResponsibleDialog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/tongnanResponsibleDialog.vue @@ -1,77 +1,29 @@ - - - - - 潼南建设项目责任人明细 - - - - - - - - - - {{ column.label }} - - - - - {{ item.id }} - {{ item.region }} - {{ item.totalCount }} - {{ item.whistleblower }} - {{ item.constructionUnit }} - {{ item.contractorUnit }} - {{ item.stationed }} - {{ item.districtLevel }} - {{ item.cityLevel }} - - 详情 - - - - - - - - 共{{ total }}条数据 - - - - - - {{ page }} - - - - - - - - + + + + 详情 + + diff --git a/packages/screen/src/views/RiskWarning/Dialog/tongnanTeamDialog.vue b/packages/screen/src/views/RiskWarning/Dialog/tongnanTeamDialog.vue index 82ece24..800cb1c 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/tongnanTeamDialog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/tongnanTeamDialog.vue @@ -1,74 +1,29 @@ - - - - - 潼南护路团队成员 - - - - - - - - - - {{ column.label }} - - - - - {{ item.id }} - {{ item.district }} - {{ item.totalCount }} - {{ item.trafficDept }} - {{ item.roadOrg }} - {{ item.maintenance }} - {{ item.roadKeeper }} - - 查看 - - - - - - - - - 上一个 - - - - {{ page }} - - - - 下一个 - - - - + + + + 查看 + + diff --git a/packages/screen/src/views/RiskWarning/Dialog/tunnelInfoDialog.vue b/packages/screen/src/views/RiskWarning/Dialog/tunnelInfoDialog.vue index 4909556..330cfbe 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/tunnelInfoDialog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/tunnelInfoDialog.vue @@ -1,50 +1,45 @@ - - - - - - - - - - {{ rescueTeamData.title }} + + + + + + {{ item.label }}: + {{ item.value }} + + + - - - - - - - - {{ item.label }}: - {{ item.value }} - - - - - - + + diff --git a/packages/screen/src/views/RiskWarning/Dialog/warningInfoDialog.vue b/packages/screen/src/views/RiskWarning/Dialog/warningInfoDialog.vue index 94886ad..66625ab 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/warningInfoDialog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/warningInfoDialog.vue @@ -1,138 +1,104 @@ - - - - - 响应情况 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - - - - + + + {{ row.warningLevel }} + - - - - - - - - {{ row.warningLevel }} - - - - - - - - - {{ row.called }} - - - - - - - - - - - - - - + + + {{ row.called }} + + - - diff --git a/packages/screen/src/views/RiskWarning/component/ChongqingMap.vue b/packages/screen/src/views/RiskWarning/component/ChongqingMap.vue index 1aa910c..e2a00fc 100644 --- a/packages/screen/src/views/RiskWarning/component/ChongqingMap.vue +++ b/packages/screen/src/views/RiskWarning/component/ChongqingMap.vue @@ -9,12 +9,21 @@ {{ error }} 重试 +