diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js index fb756924..f28d23b7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js @@ -123,8 +123,8 @@ export const tabList = { gridColumn: "3", }, { - label: "跨径组合", - key: "spanCombination", + label: "结构类型", + key: "crossingType", gridColumn: "3", }, { @@ -133,8 +133,8 @@ export const tabList = { gridColumn: "3", }, { - label: "桥梁长度", - key: "bridgeLength", + label: "跨径组合", + key: "spanCombination", gridColumn: "3", }, { @@ -142,37 +142,6 @@ export const tabList = { key: "bridgeWidth", gridColumn: "3", }, - { - label: "集团公司", - key: "groupCompany", - gridColumn: "3", - }, - { - label: "管养公司", - key: "maintenanceAndOperatingCompany", - gridColumn: "3", - }, - { - label: "功能名称", - key: "functionName", - gridColumn: "3", - }, - { - label: "桥梁方向", - key: "bridgeDirection", - gridColumn: "3", - }, - { - label: "是否子桥", - key: "subBridge", - enum: "boolType", - gridColumn: "3", - }, - { - label: "总跨径", - key: "totalSpan", - gridColumn: "3", - }, { label: "经度", key: "longitude", @@ -184,41 +153,16 @@ export const tabList = { gridColumn: "3", }, { - label: "跨越类型", - key: "crossingType", - gridColumn: "3", - }, - { - label: "最大跨径", - key: "maximumSpan", - gridColumn: "3", - }, - { - label: "通车时间", - key: "openingTime", + label: "设计单位", + key: "designUnit", gridColumn: "3", }, { - label: "跨径类型名称", - key: "spanTypeName", - gridColumn: "3", - }, - { - label: "跨域结构名称", - key: "crossDomainStructureName", - gridColumn: "3", - }, - { - label: "上部结构名称", - key: "superstructureName", + label: "监测点数目", + key: "numberOfMonitor", gridColumn: "3", }, - { - label: "分中心全称", - key: "branchCenterFullName", - gridColumn: "3", - }, ], }, ], diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue index f153d571..20329752 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue @@ -166,6 +166,9 @@ export default { if(newVehiclesMap.length === 0 && newEmployees.length === 0){ this.$message.warning('未选择人员或车辆') return; + } else if (newEmployees.length < newVehiclesMap.length){ + this.$message.warning('人员数量不得少于车辆数量') + return; } if(this.action===0){ this.form.eventId = this.provideData.detail.id @@ -183,7 +186,7 @@ export default { this.$emit("handleRefresh",'reload'); });; } - + }, }, };