From 5830bcc92021b6a8e3a806bd723d11355b72679a Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Wed, 13 Nov 2024 10:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BE=93=E5=85=A5=E6=8C=89?=
 =?UTF-8?q?=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AirConditioning.vue             | 18 +++++++++++++++++-
 .../Dialogs/RoadNetworkFacilities/data.js      |  5 -----
 .../dispatch/EventDispatchDialog/index.vue     |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

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 @@
               <ButtonGradient class="btn" style="margin-left: 5px;" @click.native="isEditor=false">
                   <i class="el-icon-refresh-left"></i>
               </ButtonGradient>
-              <ButtonGradient class="btn"  style="margin-left: 5px;" @click.native="isEditor=false;openingPoint=openingPoint1;">
+              <ButtonGradient class="btn"  style="margin-left: 5px;" @click="validateAndCloseEditor">
                   <i class="el-icon-check"></i>
               </ButtonGradient>
           </div>
@@ -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 @@
           <div class="body" id="printbody">
               <div v-for="(item, index) in data" :key="index" style="display: flex;gap:10px">
                 <div style="width:130px">{{ beautifyOperationTime(item.operationTime) }}</div>
-                <div style="width:50px">{{ item.operatorName }}</div>
+                <div style="width:80px">{{ item.operatorName }}</div>
                 
                 <div style="width: 80px" v-if="item.processName && item.type !== 'text'">【{{ item.processName }}】</div>
                 <el-image v-if="['bmp','jpg','jpeg','png'].indexOf(item.type)!==-1" :preview-src-list="[formatUrl(item.context)]" :src="formatUrl(item.context)" style="width: 200px;height: auto"></el-image>