From afedc750392324028ad09921a2b4a667ea2e9de6 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Mon, 22 May 2023 11:44:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=AA=E5=88=AB=E7=89=B9?=
 =?UTF-8?q?=E6=95=88=E8=BE=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InPlantProducts/content/chart/gateway.vue     |  9 +++++----
 src/views/PaintShopView/View1/bottom.vue          |  6 +++---
 src/views/PaintShopView/View1/top.vue             |  4 ++--
 src/views/PaintShopView/components/pm.vue         |  5 ++++-
 .../PaintShopView/components/verticalNum.vue      | 11 ++++++-----
 src/views/PaintShopView/finishView/top.vue        |  8 ++++----
 src/views/PaintShopView/machiningView/top.vue     |  8 ++++----
 src/views/PaintShopView/stuffView/top.vue         |  8 ++++----
 src/views/PaintShopView/weldView/top.vue          |  8 ++++----
 .../electronicControlAmbient/chart/humidity.vue   |  3 ++-
 .../chart/verticalNum.vue                         |  8 ++++----
 src/views/electronicControlAmbient/top.vue        |  6 +++---
 src/views/realtimeSecurity/content/chart/pipe.vue | 15 ++++++++++-----
 .../realtimeSecurity/content/chart/pressure.vue   | 13 ++++++++-----
 .../realtimeSecurity/content/chart/toptip.vue     | 10 +++++-----
 .../content/chart/verticalNum.vue                 |  9 +++++----
 .../content/chart/verticalNumLoop.vue             |  7 ++++---
 src/views/realtimeSecurity/content/content.vue    |  2 +-
 src/views/realtimeSecurity/index.vue              |  9 +++++----
 .../content/chart/pipe.vue                        | 14 +++++++++-----
 .../content/chart/pressure.vue                    |  6 +++---
 .../content/chart/toptip.vue                      |  7 ++++---
 .../content/chart/verticalNum.vue                 |  6 +++---
 .../content/chart/verticalNumLoop.vue             |  6 +++---
 24 files changed, 105 insertions(+), 83 deletions(-)

diff --git a/src/views/InPlantProducts/content/chart/gateway.vue b/src/views/InPlantProducts/content/chart/gateway.vue
index 89f2c57..4db8934 100644
--- a/src/views/InPlantProducts/content/chart/gateway.vue
+++ b/src/views/InPlantProducts/content/chart/gateway.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\InPlantProducts\content\chart\gateway.vue
+ * @FilePath: \gitscreenFront\src\views\InPlantProducts\content\chart\gateway.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 11:51:32
@@ -9,7 +9,7 @@
 -->
 <template>
     <div :key="keynum" :style="{width:boxWH.width,height:boxWH.height}">
-  <border5 ref="refborder5">
+  <border6 ref="refborder5">
       <template v-slot>
         
           <div ref="gateway" class="box" :style="{width:boxWH.width,height:boxWH.height}">
@@ -20,14 +20,15 @@
             <h2 class="devnum">{{t('messages.DevNum')}}:{{ value.num }}</h2>
           </div>
       </template>
-  </border5>
+  </border6>
   </div>
 </template>
 
 <script setup lang="ts">
 import {getCurrentInstance, onMounted, reactive, ref} from "vue"
 import {gatewayType} from '@/type/InPlantProducts'
-import border5 from "@/components/borderBox/border5.vue"
+// import border5 from "@/components/borderBox/border5.vue"
+import border6 from "@/components/borderBox/border6.vue";
 import { useI18n } from 'vue-i18n'
 let {t} = useI18n();
 let props=defineProps<{
diff --git a/src/views/PaintShopView/View1/bottom.vue b/src/views/PaintShopView/View1/bottom.vue
index c187085..f4abff1 100644
--- a/src/views/PaintShopView/View1/bottom.vue
+++ b/src/views/PaintShopView/View1/bottom.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\PaintShopView\View1\bottom.vue
+ * @FilePath: \gitscreenFront\src\views\PaintShopView\View1\bottom.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 14:43:28
@@ -23,11 +23,11 @@
             ref="Productionref"
           ></chart>
           <div>
-            <border3 ref="borderref">
+            <border6 ref="borderref">
                   <template v-slot>
                       <pm name="Electriccontrol" title="PM2.5/PM10" ref="pmref"></pm>
                   </template>
-              </border3>
+              </border6>
           </div>
         </div>
       </el-col>
diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue
index 82410a1..e42a089 100644
--- a/src/views/PaintShopView/View1/top.vue
+++ b/src/views/PaintShopView/View1/top.vue
@@ -18,11 +18,11 @@
           <verticalNum ref="verticalNum6" :title="t('messages.CH2Ojiance')"></verticalNum>
           <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
           <div>
-            <border3 ref="borderref">
+            <border6 ref="borderref">
               <template v-slot>
                 <humidity name="Electriccontrol" :title="t('messages.TemperatureHumidity')" ref="humidityref"></humidity>
               </template>
-            </border3>
+            </border6>
           </div>
           <chart :title="ductOption.title" :option="ductOption.option" ref="ductref"></chart>
         </div>
diff --git a/src/views/PaintShopView/components/pm.vue b/src/views/PaintShopView/components/pm.vue
index c9fb13d..f872fd4 100644
--- a/src/views/PaintShopView/components/pm.vue
+++ b/src/views/PaintShopView/components/pm.vue
@@ -231,4 +231,7 @@ defineExpose({
 });
 </script>
 
-<style scope></style>
+<style scope>
+.content-small{
+  margin-top: 5px;
+}</style>
diff --git a/src/views/PaintShopView/components/verticalNum.vue b/src/views/PaintShopView/components/verticalNum.vue
index f510a96..6c228a0 100644
--- a/src/views/PaintShopView/components/verticalNum.vue
+++ b/src/views/PaintShopView/components/verticalNum.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\PaintShopView\components\verticalNum.vue
+ * @FilePath: \gitscreenFront\src\views\PaintShopView\components\verticalNum.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 08:22:35
@@ -9,7 +9,7 @@
 -->
 <template>
   <div ref="numBox1" :style="{ height: boxSize.height, width: boxSize.width }">
-    <border3 ref="refborder3">
+    <border6 ref="refborder3">
       <template v-slot>
         <div class="box" ref="classBox1">
           <h2>{{ item.name }}</h2>
@@ -32,13 +32,13 @@
 
         </div>
       </template>
-    </border3>
+    </border6>
   </div>
 </template>
   
 <script setup lang="ts">
 import { onMounted, reactive, ref, watch, computed, onUnmounted } from "vue";
-import border3 from "@/components/borderBox/border3.vue";
+import border6 from "@/components/borderBox/border6.vue";
 import { verticalNumPerson } from "@/type/realtimeSecurity";
 import { warningNot } from "@/utils/notification";
 
@@ -142,6 +142,7 @@ defineExpose({
   flex-direction: column;
   justify-content: space-evenly;
   align-items: center;
+  
 }
 
 .box>h5 {
@@ -209,7 +210,7 @@ p {
 .box>h2 {
   font-size: 20px;
   position: absolute;
-  top: 15px;
+  top: 20px;
   left: 20px;
 }
 
diff --git a/src/views/PaintShopView/finishView/top.vue b/src/views/PaintShopView/finishView/top.vue
index 58a056c..87ddfd9 100644
--- a/src/views/PaintShopView/finishView/top.vue
+++ b/src/views/PaintShopView/finishView/top.vue
@@ -18,11 +18,11 @@
           <verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
           <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
           <div>
-            <border3 ref="borderref">
+            <border6 ref="borderref">
                   <template v-slot>
                       <humidity name="Electriccontrol" :title="t('messages.TemperatureHumidity')" ref="humidityref"></humidity>
                   </template>
-              </border3>
+              </border6>
           </div>
           <chart
             :title="ductOption.title"
@@ -31,11 +31,11 @@
           ></chart>
 
           <div>
-            <border3 ref="borderrefPM">
+            <border6 ref="borderrefPM">
               <template v-slot>
                 <pm name="Electriccontrol" title="PM2.5/PM10" ref="pmref"></pm>
               </template>
-            </border3>
+            </border6>
           </div>
         </div>
       </el-col>
diff --git a/src/views/PaintShopView/machiningView/top.vue b/src/views/PaintShopView/machiningView/top.vue
index e0ffd35..d579b4c 100644
--- a/src/views/PaintShopView/machiningView/top.vue
+++ b/src/views/PaintShopView/machiningView/top.vue
@@ -18,11 +18,11 @@
           <verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
           <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
           <div>
-            <border3 ref="borderref">
+            <border6 ref="borderref">
                   <template v-slot>
                       <humidity name="Electriccontrol" :title="t('messages.TemperatureHumidity')" ref="humidityref"></humidity>
                   </template>
-              </border3>
+              </border6>
           </div>
           <chart
             :title="ductOption.title"
@@ -30,11 +30,11 @@
             ref="ductref"
           ></chart>
           <div>
-            <border3 ref="borderrefPM">
+            <border6 ref="borderrefPM">
               <template v-slot>
                 <pm name="Electriccontrol" title="PM2.5/PM10" ref="pmref"></pm>
               </template>
-            </border3>
+            </border6>
           </div>
         </div>
       </el-col>
diff --git a/src/views/PaintShopView/stuffView/top.vue b/src/views/PaintShopView/stuffView/top.vue
index 4c741ee..100ccf2 100644
--- a/src/views/PaintShopView/stuffView/top.vue
+++ b/src/views/PaintShopView/stuffView/top.vue
@@ -18,19 +18,19 @@
           <verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
           <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
           <div>
-            <border3 ref="borderref">
+            <border6 ref="borderref">
               <template v-slot>
                 <humidity name="Electriccontrol" :title="t('messages.TemperatureHumidity')" ref="humidityref"></humidity>
               </template>
-            </border3>
+            </border6>
           </div>
           <chart :title="ductOption.title" :option="ductOption.option" ref="ductref"></chart>
           <div>
-            <border3 ref="borderrefPM">
+            <border6 ref="borderrefPM">
               <template v-slot>
                 <pm name="Electriccontrol" title="PM2.5/PM10" ref="pmref"></pm>
               </template>
-            </border3>
+            </border6>
           </div>
         </div>
       </el-col>
diff --git a/src/views/PaintShopView/weldView/top.vue b/src/views/PaintShopView/weldView/top.vue
index a0999f1..4206eed 100644
--- a/src/views/PaintShopView/weldView/top.vue
+++ b/src/views/PaintShopView/weldView/top.vue
@@ -18,19 +18,19 @@
           <verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
           <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
           <div>
-            <border3 ref="borderref">
+            <border6 ref="borderref">
               <template v-slot>
                 <humidity name="Electriccontrol" :title="t('messages.TemperatureHumidity')" ref="humidityref"></humidity>
               </template>
-            </border3>
+            </border6>
           </div>
           <chart :title="ductOption.title" :option="ductOption.option" ref="ductref"></chart>
           <div>
-            <border3 ref="borderrefPM">
+            <border6 ref="borderrefPM">
               <template v-slot>
                 <pm name="Electriccontrol" title="PM2.5/PM10" ref="pmref"></pm>
               </template>
-            </border3>
+            </border6>
           </div>
         </div>
       </el-col>
diff --git a/src/views/electronicControlAmbient/chart/humidity.vue b/src/views/electronicControlAmbient/chart/humidity.vue
index 41c8497..0687079 100644
--- a/src/views/electronicControlAmbient/chart/humidity.vue
+++ b/src/views/electronicControlAmbient/chart/humidity.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\electronicControlAmbient\chart\humidity.vue
+ * @FilePath: \gitscreenFront\src\views\electronicControlAmbient\chart\humidity.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-10 13:27:36
@@ -246,5 +246,6 @@ defineExpose({
 <style scope>
 .content-small {
   margin-right: 3px;
+  margin-top: 5px;
 }
 </style>
diff --git a/src/views/electronicControlAmbient/chart/verticalNum.vue b/src/views/electronicControlAmbient/chart/verticalNum.vue
index d4ad548..db28465 100644
--- a/src/views/electronicControlAmbient/chart/verticalNum.vue
+++ b/src/views/electronicControlAmbient/chart/verticalNum.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\electronicControlAmbient\chart\verticalNum.vue
+ * @FilePath: \gitscreenFront\src\views\electronicControlAmbient\chart\verticalNum.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 08:22:35
@@ -9,7 +9,7 @@
 -->
 <template>
   <div ref="numBox1" :style="{ height: boxSize.height, width: boxSize.width }">
-    <border3 ref="refborder3">
+    <border6 ref="refborder3">
       <template v-slot>
         <div class="box" ref="classBox1">
           <h2>{{ props.title }}</h2>
@@ -24,13 +24,13 @@
 
         </div>
       </template>
-    </border3>
+    </border6>
   </div>
 </template>
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, watch, computed, onUnmounted } from "vue";
-import border3 from "@/components/borderBox/border3.vue";
+import border6 from "@/components/borderBox/border6.vue";
 import { verticalNumPerson } from "@/type/realtimeSecurity";
 import { warningNot } from "@/utils/notification";
 
diff --git a/src/views/electronicControlAmbient/top.vue b/src/views/electronicControlAmbient/top.vue
index 064e5fb..733cbdb 100644
--- a/src/views/electronicControlAmbient/top.vue
+++ b/src/views/electronicControlAmbient/top.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\electronicControlAmbient\top.vue
+ * @FilePath: \gitscreenFront\src\views\electronicControlAmbient\top.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 14:43:28
@@ -21,11 +21,11 @@
           ></verticalNum>
           <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum> -->
           <div>
-            <border3 ref="borderref">
+            <border6 ref="borderref">
               <template v-slot>
                 <humidity name="Electriccontrol" :title="t('messages.TemperatureHumidity')" ref="humidityref"></humidity>
               </template>
-            </border3>
+            </border6>
           </div>
           <chart :title="ductOption.title" :option="ductOption.option" ref="ductref"></chart>
         </div>
diff --git a/src/views/realtimeSecurity/content/chart/pipe.vue b/src/views/realtimeSecurity/content/chart/pipe.vue
index 716d47d..bffd507 100644
--- a/src/views/realtimeSecurity/content/chart/pipe.vue
+++ b/src/views/realtimeSecurity/content/chart/pipe.vue
@@ -1,17 +1,18 @@
 <template>
   <div>
-    <border3 ref="refborder3">
+    <border6 ref="refborder3">
       <template v-slot>
-        <div ref="pipe"></div>
+        <div ref="pipe" class="pipebox"></div>
       </template>
-    </border3>
+    </border6>
   </div>
 </template>
 
 <script setup lang="ts">
 import { getCurrentInstance, nextTick, onMounted, reactive, ref } from "vue";
 import { EDataPerson, EDataPersonItem } from "@/type/realtimeSecurity";
-import border3 from "@/components/borderBox/border3.vue";
+// import border3 from "@/components/borderBox/border3.vue";
+import border6 from "@/components/borderBox/border6.vue";
 import { useI18n } from 'vue-i18n'
 let {t} = useI18n();
 const { proxy } = getCurrentInstance() as any;
@@ -364,4 +365,8 @@ defineExpose({
 });
 </script>
 
-<style scoped></style>
+<style scoped>
+.pipebox{
+  margin-top: 5px;
+}
+</style>
diff --git a/src/views/realtimeSecurity/content/chart/pressure.vue b/src/views/realtimeSecurity/content/chart/pressure.vue
index 607f6b1..a1ce309 100644
--- a/src/views/realtimeSecurity/content/chart/pressure.vue
+++ b/src/views/realtimeSecurity/content/chart/pressure.vue
@@ -1,17 +1,18 @@
 <template>
     <div style="width: 97%;">
-    <border3 ref="refborder3">
+    <border6 ref="refborder3">
         <template v-slot>
-            <div ref="Pressure"></div>
+            <div ref="Pressure" class="pressurebox"></div>
         </template>
-    </border3>
+    </border6>
     </div>
     </template>
     
     <script setup lang="ts">
     import {getCurrentInstance, onMounted, reactive, ref} from "vue"
     import {EDataPerson,EDataPersonItem} from '@/type/realtimeSecurity'
-    import border3 from "@/components/borderBox/border3.vue"
+    // import border3 from "@/components/borderBox/border3.vue"
+    import border6 from "@/components/borderBox/border6.vue";
     const { proxy } = getCurrentInstance() as any;
     let props=defineProps<{
         name:String,
@@ -239,6 +240,8 @@ defineExpose({
     </script>
     
     <style scoped>
-    
+    .pressurebox{
+      margin-top: 5px;
+    }
     </style>
     
\ No newline at end of file
diff --git a/src/views/realtimeSecurity/content/chart/toptip.vue b/src/views/realtimeSecurity/content/chart/toptip.vue
index 2ad1837..7cf4034 100644
--- a/src/views/realtimeSecurity/content/chart/toptip.vue
+++ b/src/views/realtimeSecurity/content/chart/toptip.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wang-vue-worke:\demo\daping\src\views\realtimeSecurity\content\chart\toptip.vue
+ * @FilePath: \gitscreenFront\src\views\realtimeSecurity\content\chart\toptip.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 10:25:47
@@ -8,19 +8,19 @@
  * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
 -->
 <template>
-      <border3 ref="refborder3">
+      <border6 ref="refborder3">
         <template v-slot>
             <div class="tipbox">
                 <h3>报警区：灰色代表无异常，红色代表出现异常</h3>
             </div>
         </template>
-    </border3>
+    </border6>
 </template>
 
 <script setup lang="ts">
 import {ref} from "vue"
-import border3 from "@/components/borderBox/border3.vue"
-
+// import border3 from "@/components/borderBox/border3.vue"
+import border6 from "@/components/borderBox/border6.vue";
 let refborder3=ref()
 
 function setchartWH(){   
diff --git a/src/views/realtimeSecurity/content/chart/verticalNum.vue b/src/views/realtimeSecurity/content/chart/verticalNum.vue
index d62fe05..70dd5fd 100644
--- a/src/views/realtimeSecurity/content/chart/verticalNum.vue
+++ b/src/views/realtimeSecurity/content/chart/verticalNum.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\realtimeSecurity\content\chart\verticalNum.vue
+ * @FilePath: \gitscreenFront\src\views\realtimeSecurity\content\chart\verticalNum.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 08:22:35
@@ -9,7 +9,7 @@
 -->
 <template>
   <div ref="numBox1" :key="keynum" :style="{ height: '100%', width: '97%' }">
-    <border3 ref="refborder3">
+    <border6 ref="refborder3">
       <template v-slot>
         <div class="box" ref="classBox1">
           <!-- <div class="contentbox"> -->
@@ -58,13 +58,14 @@
           <!-- </div> -->
         </div>
       </template>
-    </border3>
+    </border6>
   </div>
 </template>
 
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref, watch } from "vue";
-import border3 from "@/components/borderBox/border3.vue";
+// import border3 from "@/components/borderBox/border3.vue";
+import border6 from "@/components/borderBox/border6.vue";
 import { verticalNumPerson } from "@/type/realtimeSecurity";
 import { warningNot } from "@/utils/notification";
 import { useI18n } from 'vue-i18n'
diff --git a/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue b/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue
index b45d1ec..9e5f2d7 100644
--- a/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue
+++ b/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue
@@ -1,6 +1,6 @@
 <template>
   <div ref="numBox1" :key="keynum" :style="{ height: '100%', width: '97%' }">
-    <border3 ref="refborder3" >
+    <border6 ref="refborder3" >
       <template v-slot>
         <div class="box" ref="classBox1">
           <div class="icontip">
@@ -51,13 +51,14 @@
           <!-- </div> -->
         </div>
       </template>
-    </border3>
+    </border6>
   </div>
 </template>
 
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref, watch,onUnmounted } from "vue";
-import border3 from "@/components/borderBox/border3.vue";
+// import border3 from "@/components/borderBox/border3.vue";
+import border6 from "@/components/borderBox/border6.vue";
 import { useI18n } from 'vue-i18n'
 let {t} = useI18n();
 let i =ref(0)
diff --git a/src/views/realtimeSecurity/content/content.vue b/src/views/realtimeSecurity/content/content.vue
index a006a6d..258f0b7 100644
--- a/src/views/realtimeSecurity/content/content.vue
+++ b/src/views/realtimeSecurity/content/content.vue
@@ -84,7 +84,7 @@ const PressureBox=(width:any,height:any)=>{
 const pipeBox=(width:any,height:any)=>{
   let a=calcWH(height,width,3,2,0)
   //修改高度
-  pipe1.value.setchartWH(a.oWidth-50,a.oHeight*2)
+  // pipe1.value.setchartWH(a.oWidth-50,a.oHeight*2)
   pipe1.value.setchartWH(a.oWidth-50,a.oHeight*2)
 }
 
diff --git a/src/views/realtimeSecurity/index.vue b/src/views/realtimeSecurity/index.vue
index 4be6071..c524fb9 100644
--- a/src/views/realtimeSecurity/index.vue
+++ b/src/views/realtimeSecurity/index.vue
@@ -71,7 +71,7 @@ function WH(div: HTMLElement) {
 //
 function getWebsocket(val) {
   headerref.value.HeadergetWebsocket(val)
-  // try{
+  try{
   let data = JSON.parse(val);
 
   //精饰车间燃气监测
@@ -134,10 +134,11 @@ function getWebsocket(val) {
     store.changePipe(data.msg);
   }
 
-  // }catch(err){
-  //   console.log(err,"报错了大哥");
+  }catch(err){
+    console.log(err,"报错了大哥",console.log(val)
+    );
 
-  // }
+  }
 }
 function errWebsocket(val) {
   headerref.value?headerref.value.HeadererrWebsocket(val):''
diff --git a/src/views/realtimeSecurityJixiefenchang/content/chart/pipe.vue b/src/views/realtimeSecurityJixiefenchang/content/chart/pipe.vue
index 716d47d..ef58e1a 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/chart/pipe.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/chart/pipe.vue
@@ -1,17 +1,18 @@
 <template>
   <div>
-    <border3 ref="refborder3">
+    <border6 ref="refborder3">
       <template v-slot>
-        <div ref="pipe"></div>
+        <div ref="pipe" class="pipebox"></div>
       </template>
-    </border3>
+    </border6>
   </div>
 </template>
 
 <script setup lang="ts">
 import { getCurrentInstance, nextTick, onMounted, reactive, ref } from "vue";
 import { EDataPerson, EDataPersonItem } from "@/type/realtimeSecurity";
-import border3 from "@/components/borderBox/border3.vue";
+
+import border6 from "@/components/borderBox/border6.vue";
 import { useI18n } from 'vue-i18n'
 let {t} = useI18n();
 const { proxy } = getCurrentInstance() as any;
@@ -364,4 +365,7 @@ defineExpose({
 });
 </script>
 
-<style scoped></style>
+<style scoped>
+.pipebox{
+  margin-top: 5px;
+}</style>
diff --git a/src/views/realtimeSecurityJixiefenchang/content/chart/pressure.vue b/src/views/realtimeSecurityJixiefenchang/content/chart/pressure.vue
index 9cbf700..0291de4 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/chart/pressure.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/chart/pressure.vue
@@ -1,17 +1,17 @@
 <template>
     <div>
-    <border3 ref="refborder3">
+    <border6 ref="refborder3">
         <template v-slot>
             <div ref="Pressure"></div>
         </template>
-    </border3>
+    </border6>
     </div>
     </template>
     
     <script setup lang="ts">
     import {getCurrentInstance, onMounted, reactive, ref} from "vue"
     import {EDataPerson,EDataPersonItem} from '@/type/realtimeSecurity'
-    import border3 from "@/components/borderBox/border3.vue"
+    import border6 from "@/components/borderBox/border6.vue";
     const { proxy } = getCurrentInstance() as any;
     let props=defineProps<{
         name:String,
diff --git a/src/views/realtimeSecurityJixiefenchang/content/chart/toptip.vue b/src/views/realtimeSecurityJixiefenchang/content/chart/toptip.vue
index 2ad1837..5c72e57 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/chart/toptip.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/chart/toptip.vue
@@ -8,18 +8,19 @@
  * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
 -->
 <template>
-      <border3 ref="refborder3">
+      <border6 ref="refborder3">
         <template v-slot>
             <div class="tipbox">
                 <h3>报警区：灰色代表无异常，红色代表出现异常</h3>
             </div>
         </template>
-    </border3>
+    </border6>
 </template>
 
 <script setup lang="ts">
 import {ref} from "vue"
-import border3 from "@/components/borderBox/border3.vue"
+
+import border6 from "@/components/borderBox/border6.vue";
 
 let refborder3=ref()
 
diff --git a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue
index cc838b1..8a3c209 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue
@@ -9,7 +9,7 @@
 -->
 <template>
   <div ref="numBox1" :style="{height:boxSize.height,width:boxSize.width,marginBottom:'10px'}">
-    <border3 ref="refborder3">
+    <border6 ref="refborder3">
       <template v-slot>
         <div class="box" ref="classBox1">
           <div class="icontip">
@@ -57,13 +57,13 @@
 
         </div>
       </template>
-    </border3>
+    </border6>
   </div>
 </template>
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, watch,computed,onUnmounted } from "vue";
-import border3 from "@/components/borderBox/border3.vue";
+import border6 from "@/components/borderBox/border6.vue";
 import { verticalNumPerson } from "@/type/realtimeSecurity";
 import { warningNot } from "@/utils/notification";
 
diff --git a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue
index b69c6e8..96eaa38 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue
@@ -1,6 +1,6 @@
 <template>
   <div ref="numBox1" :key="keynum" :style="{ height: '100%', width: '97%' }">
-    <border3 ref="refborder3" >
+    <border6 ref="refborder3" >
       <template v-slot>
         <div class="box" ref="classBox1">
           <div class="icontip">
@@ -54,13 +54,13 @@
           <!-- </div> -->
         </div>
       </template>
-    </border3>
+    </border6>
   </div>
 </template>
 
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref, watch,onUnmounted } from "vue";
-import border3 from "@/components/borderBox/border3.vue";
+import border6 from "@/components/borderBox/border6.vue";
 import { verticalNumPerson } from "@/type/realtimeSecurity";
 import { warningNot } from "@/utils/notification";
 import { useI18n } from 'vue-i18n'