From ab36dc0ccaa25078fd95343d42977278e884b0e9 Mon Sep 17 00:00:00 2001
From: ZK <1057786341@qq.com>
Date: Thu, 11 Aug 2022 16:25:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BF=AE=E6=94=B9=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=9A=84=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/config.js                           |  4 +--
 src/utils/websocket_service.js                |  2 +-
 .../FacilityManagement/FacilityLists.vue      | 22 +++++++--------
 .../NewMainPageComponents/LeftCenter.vue      | 28 +++++++++----------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/utils/config.js b/src/utils/config.js
index fdc599f..ca689dc 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -3,6 +3,6 @@ module.exports = {
   // baseUrl: '49.234.81.196:2011'
   // baseUrl: '120.25.106.20:2011'
   // baseUrl: '120.25.106.20:2011'
-  // baseUrl: 'localhost:40000'
-  baseUrl: '192.168.0.105:2011'
+  baseUrl: 'localhost:40000'
+  // baseUrl: '192.168.0.105:2011'
 }
diff --git a/src/utils/websocket_service.js b/src/utils/websocket_service.js
index e7a74d3..cb32cc6 100644
--- a/src/utils/websocket_service.js
+++ b/src/utils/websocket_service.js
@@ -117,7 +117,7 @@ const heartCheck = {
       SocketService.Instance.ws.send('I am Your father！')
       // Message.info('HeartBeat')
       self.serverTimeoutObj = setTimeout(function() { // 如果超过一定时间还没重置，说明后端主动断开了
-        Message.warning('关闭服务')
+        // Message.warning('关闭服务')
         SocketService.Instance.ws.close()// 如果onclose会执行reconnect，我们执行 websocket.close()就行了.如果直接执行 reconnect 会触发onclose导致重连两次
       }, self.timeout)
     }, this.timeout)
diff --git a/src/views/FacilityManagement/FacilityLists.vue b/src/views/FacilityManagement/FacilityLists.vue
index 063c2c3..3ed6484 100644
--- a/src/views/FacilityManagement/FacilityLists.vue
+++ b/src/views/FacilityManagement/FacilityLists.vue
@@ -284,7 +284,7 @@
                 </el-col>
                 <el-col :span="6">
                   <el-form-item label="音量：" prop="volume">
-                    <el-input-number v-model="EquipmentOperation.volume" :disabled="isShow" :min="EquipmentOperation.minVolume" :max="100" label="音量" />
+                    <el-input-number v-model="EquipmentOperation.volume" :disabled="isShow" :min="EquipmentOperation.minVolume" :max="8" label="音量" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -308,7 +308,7 @@
               </el-row>
               <el-row>
                 <el-col :span="6">
-                  <el-form-item label="通道1灵敏度：" prop="passageway1">
+                  <el-form-item label="区位一灵敏度：" prop="passageway1">
                     <el-input-number v-model="EquipmentOperation.passageway1" :disabled="isShow" :min="1" :max="100" label="通道1灵敏度" />
                   </el-form-item>
                 </el-col>
@@ -356,7 +356,7 @@
               </el-row>
               <el-row>
                 <el-col :span="6">
-                  <el-form-item label="通道2灵敏度：" prop="passageway2">
+                  <el-form-item label="区位二灵敏度：" prop="passageway2">
                     <el-input-number v-model="EquipmentOperation.passageway2" :disabled="isShow" :min="1" :max="100" label="通道2灵敏度" />
                   </el-form-item>
                 </el-col>
@@ -392,7 +392,7 @@
                       :disabled="isShow"
                     >
                       <el-option
-                        v-for="item in options.powerLed"
+                        v-for="item in options.countDirection"
                         :key="item.id"
                         ref="option"
                         :label="item.label"
@@ -404,7 +404,7 @@
               </el-row>
               <el-row>
                 <el-col :span="6">
-                  <el-form-item label="通道3灵敏度：" prop="passageway3">
+                  <el-form-item label="区位三灵敏度：" prop="passageway3">
                     <el-input-number v-model="EquipmentOperation.passageway3" :disabled="isShow" :min="1" :max="100" label="通道3灵敏度" />
                   </el-form-item>
                 </el-col>
@@ -427,7 +427,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="工作报警声音：" prop="alarmTone">
+                  <el-form-item label="报警音调：" prop="alarmTone">
                     <el-input-number v-model="EquipmentOperation.alarmTone" :disabled="isShow" :min="1" :max="100" label="工作报警声音" />
                   </el-form-item>
                 </el-col>
@@ -452,7 +452,7 @@
               </el-row>
               <el-row>
                 <el-col :span="6">
-                  <el-form-item label="通道4灵敏度：" prop="passageway4">
+                  <el-form-item label="区位四灵敏度：" prop="passageway4">
                     <el-input-number v-model="EquipmentOperation.passageway4" :disabled="isShow" :min="1" :max="100" label="通道4灵敏度" />
                   </el-form-item>
                 </el-col>
@@ -499,7 +499,7 @@
               </el-row>
               <el-row>
                 <el-col :span="6">
-                  <el-form-item label="通道5灵敏度：" prop="passageway5">
+                  <el-form-item label="区位五灵敏度：" prop="passageway5">
                     <el-input-number v-model="EquipmentOperation.passageway5" :disabled="isShow" :min="1" :max="100" label="通道5灵敏度" />
                   </el-form-item>
                 </el-col>
@@ -547,7 +547,7 @@
               </el-row>
               <el-row>
                 <el-col :span="6">
-                  <el-form-item label="通道6灵敏度：" prop="passageway6">
+                  <el-form-item label="区位六灵敏度：" prop="passageway6">
                     <el-input-number v-model="EquipmentOperation.passageway6" :disabled="isShow" :min="1" :max="100" label="通道6灵敏度" />
                   </el-form-item>
                 </el-col>
@@ -594,7 +594,7 @@
               </el-row>
               <el-row>
                 <el-col :span="6">
-                  <el-form-item label="通道7灵敏度：" prop="passageway7">
+                  <el-form-item label="区位七灵敏度：" prop="passageway7">
                     <el-input-number v-model="EquipmentOperation.passageway7" :disabled="isShow" :min="1" :max="100" label="通道7灵敏度" />
                   </el-form-item>
                 </el-col>
@@ -642,7 +642,7 @@
               </el-row>
               <el-row>
                 <el-col :span="6">
-                  <el-form-item label="通道8灵敏度：" prop="passageway8">
+                  <el-form-item label="区位八灵敏度：" prop="passageway8">
                     <el-input-number v-model="EquipmentOperation.passageway8" :disabled="isShow" :min="1" :max="100" label="通道8灵敏度" />
                   </el-form-item>
                 </el-col>
diff --git a/src/views/NewMainPageComponents/LeftCenter.vue b/src/views/NewMainPageComponents/LeftCenter.vue
index 21021fc..a488f76 100644
--- a/src/views/NewMainPageComponents/LeftCenter.vue
+++ b/src/views/NewMainPageComponents/LeftCenter.vue
@@ -79,7 +79,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="音量：" prop="volume">
-                <el-input-number v-model="EquipmentOperation.volume" :disabled="isShow" :min="EquipmentOperation.minVolume" :max="100" label="音量" />
+                <el-input-number v-model="EquipmentOperation.volume" :disabled="isShow" :min="EquipmentOperation.minVolume" :max="8" label="音量" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -103,7 +103,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="通道1灵敏度：" prop="passageway1">
+              <el-form-item label="区位一灵敏度：" prop="passageway1">
                 <el-input-number v-model="EquipmentOperation.passageway1" :disabled="isShow" :min="1" :max="100" label="通道1灵敏度" />
               </el-form-item>
             </el-col>
@@ -151,7 +151,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="通道2灵敏度：" prop="passageway2">
+              <el-form-item label="区位二灵敏度：" prop="passageway2">
                 <el-input-number v-model="EquipmentOperation.passageway2" :disabled="isShow" :min="1" :max="100" label="通道2灵敏度" />
               </el-form-item>
             </el-col>
@@ -187,7 +187,7 @@
                   :disabled="isShow"
                 >
                   <el-option
-                    v-for="item in options.powerLed"
+                    v-for="item in options.countDirection"
                     :key="item.id"
                     ref="option"
                     :label="item.label"
@@ -199,7 +199,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="通道3灵敏度：" prop="passageway3">
+              <el-form-item label="区位三灵敏度：" prop="passageway3">
                 <el-input-number v-model="EquipmentOperation.passageway3" :disabled="isShow" :min="1" :max="100" label="通道3灵敏度" />
               </el-form-item>
             </el-col>
@@ -222,7 +222,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="工作报警声音：" prop="alarmTone">
+              <el-form-item label="报警音调：" prop="alarmTone">
                 <el-input-number v-model="EquipmentOperation.alarmTone" :disabled="isShow" :min="1" :max="100" label="工作报警声音" />
               </el-form-item>
             </el-col>
@@ -247,13 +247,13 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="通道4灵敏度：" prop="passageway4">
+              <el-form-item label="区位四灵敏度：" prop="passageway4">
                 <el-input-number v-model="EquipmentOperation.passageway4" :disabled="isShow" :min="1" :max="100" label="通道4灵敏度" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="随机报警率：" prop="rndRate">
-                <el-input-number v-model="EquipmentOperation.rndRate" :disabled="isShow" :min="1" :max="100" label="随机报警率" />
+                <el-input-number v-model="EquipmentOperation.rndRate" :disabled="isShow" :min="0" :max="100" label="随机报警率" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -294,13 +294,13 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="通道5灵敏度：" prop="passageway5">
+              <el-form-item label="区位五灵敏度：" prop="passageway5">
                 <el-input-number v-model="EquipmentOperation.passageway5" :disabled="isShow" :min="1" :max="100" label="通道5灵敏度" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="报警人群随机率：" prop="rndAlmRate">
-                <el-input-number v-model="EquipmentOperation.rndAlmRate" :disabled="isShow" :min="1" :max="100" label="报警人群随机率" />
+                <el-input-number v-model="EquipmentOperation.rndAlmRate" :disabled="isShow" :min="0" :max="100" label="报警人群随机率" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -342,13 +342,13 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="通道6灵敏度：" prop="passageway6">
+              <el-form-item label="区位六灵敏度：" prop="passageway6">
                 <el-input-number v-model="EquipmentOperation.passageway6" :disabled="isShow" :min="1" :max="100" label="通道6灵敏度" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="随机报警声音：" prop="rndTone">
-                <el-input-number v-model="EquipmentOperation.rndTone" :disabled="isShow" :min="1" :max="100" label="随机报警声音" />
+                <el-input-number v-model="EquipmentOperation.rndTone" :disabled="isShow" :min="0" :max="100" label="随机报警声音" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -389,7 +389,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="通道7灵敏度：" prop="passageway7">
+              <el-form-item label="区位七灵敏度：" prop="passageway7">
                 <el-input-number v-model="EquipmentOperation.passageway7" :disabled="isShow" :min="1" :max="100" label="通道7灵敏度" />
               </el-form-item>
             </el-col>
@@ -437,7 +437,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="通道8灵敏度：" prop="passageway8">
+              <el-form-item label="区位八灵敏度：" prop="passageway8">
                 <el-input-number v-model="EquipmentOperation.passageway8" :disabled="isShow" :min="1" :max="100" label="通道8灵敏度" />
               </el-form-item>
             </el-col>
-- 
Gitee