diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/AirConditioning.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/AirConditioning.vue index a3e5bac6..ccb5e93c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/AirConditioning.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/IntegratedCabinet/components/AirConditioning.vue @@ -25,7 +25,7 @@ - + @@ -127,6 +127,22 @@ } }, methods:{ + validateAndCloseEditor(){ + // console.log(this.controlObject) + // console.log(this.openingPoint1) + const limits = this.rangeLimits[this.controlObject]; + const numberValue = Number(this.openingPoint1); + // console.log(numberValue) + // console.log(limits.min) + // console.log( limits.max) + // console.log(numberValue < limits.min || numberValue > limits.max) + if(numberValue < limits.min || numberValue > limits.max){ + alert('输入的值不在合理范围内'); + }else{ + this.openingPoint=this.openingPoint1; + this.isEditor = false; + } + }, submitForm(){ if((this.controlObject==null||this.controlObject=='')||(this.openingPoint==null||this.openingPoint=='')){ return null; 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 6e206650..42dccad4 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 @@ -412,11 +412,6 @@ export const tabList = { key: "facilityName", gridColumn: "3", }, - { - label: "道路名称", - key: "roadName", - gridColumn: "3", - }, { label: "位置桩号", key: "stakeMark", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDispatchDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDispatchDialog/index.vue index 846078a1..358c9d30 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDispatchDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDispatchDialog/index.vue @@ -11,7 +11,7 @@
{{ beautifyOperationTime(item.operationTime) }}
-
{{ item.operatorName }}
+
{{ item.operatorName }}
【{{ item.processName }}】