Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/monitorManager/deviceMonitor/components/device/modal/blastDelta.vue

@@ -18,7 +18,7 @@
         <div :style="{ height: '20px', width: `${lengY}px`, color: '#fff' }" v-for="(ite, ind) in 15" :key="ind">{{ ind
           == 14 ? maxX : '' }}</div>
       </div>
-      <div class="line-AB" :style="{ width: 'calc(100% - 15px)', height: 'calc(100% - 10px)' }">
+      <div class="line-AB" :style="{ width: 'calc(100% - 10px)', height: 'calc(100% - 10px)' }">
         <canvas id="myCanvas" :width="canvasSize.width" :height="canvasSize.height"></canvas>
       </div>
       <!-- <div class="line-legend">
@@ -50,7 +50,7 @@ let props = defineProps({
   canvasSize: {
     type: Object,
     default: () => {
-      return { width: 364, height: 245 };
+      return { width: 348, height: 245 };
     },
   },
 });
@@ -416,20 +416,21 @@ onMounted(() => {
     left: 50%;
     top: 20px;
     width: 75%;
-    height: 25px;
+    height: 20px;
     transform: translate(-50%, 0);
     display: flex;
     justify-content: space-around;
 
     .legend-box {
       display: flex;
-      flex: 1;
+     
       height: 100%;
       justify-content: center;
       align-items: center;
       font-size: 12px;
 
       &:nth-child(1) {
+        flex: 1;
         .legend-icon {
           width: 10px;
           height: 10px;
@@ -439,6 +440,7 @@ onMounted(() => {
       }
 
       &:nth-child(2) {
+        flex: 1.5;
         .legend-icon {
           width: 10px;
           height: 10px;
@@ -448,6 +450,7 @@ onMounted(() => {
       }
 
       &:nth-child(3) {
+        flex:1;
         .legend-icon {
           width: 10px;
           height: 10px;
@@ -457,6 +460,7 @@ onMounted(() => {
       }
 
       &:nth-child(4) {
+        flex:1;
         .legend-icon {
           width: 10px;
           height: 10px;
@@ -472,11 +476,11 @@ onMounted(() => {
     position: absolute;
     left: 50%;
     top: 50%;
-    width: 80%;
+    width: 90%;
     height: 80%;
     border-left: 1px solid #006c9d;
     border-bottom: 1px solid #006c9d;
-    transform: translate(-50%, -46%);
+    transform: translate(-45%, -46%);
 
     .coord-lineY {
       position: absolute;

src/views/vent/monitorManager/deviceMonitor/components/device/modal/bundle.modal.vue

@@ -511,7 +511,7 @@ export default defineComponent({
     }
 
     .right-bottom {
-      width: 50%;
+      width: 58%;
       margin-top: 10px;
 
       .echarts-box {
@@ -529,7 +529,7 @@ export default defineComponent({
     }
 
     .right-bottom1 {
-      width: 50%;
+      width: 42%;
       margin-top: 10px;
       .echarts-box {
         width: 100%;

src/views/vent/safetyList/index.vue

@@ -59,7 +59,7 @@
                     item.substring(0, item.indexOf(':') + 1) }}</span>
                 <span  v-if="item.substring(item.indexOf(':') + 1) && !isNaN(parseFloat(item.substring(item.indexOf(':') + 1)))"
                   style="display: inline-block; width:50%;text-align: left; color:#fff">{{
-                    item.substring(item.indexOf(':') + 1) }} </span>
+                    item.substring(item.indexOf(':') + 1)==='1' ? '正风' :   item.substring(item.indexOf(':') + 1)==='2' ? '反风' :  item.substring(item.indexOf(':') + 1) }} </span>
               </div>
             </template>
 
@@ -195,7 +195,7 @@ async function getStationList() {
       v.linkstatus = v.linkId
       v.linkstatusC = v.linkstatus == '0' ? '待启用' : v.linkstatus == '1' ? '连接' : '断开'
       v.updateTime = v.time
-      v.valueJc = `风向:${v.forward || ''},风量:${v.m3 || ''}m³/min,风速:${v.windSpeed || ''}m/s,气压:${v.pa || ''}kPa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡`
+      v.valueJc = `风向:${v.forward || ''},风量:${v.m3 || ''}m³/min,风速:${v.windSpeed || ''}m/s,气压:${v.difPress || ''}Pa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡`
 
     })
   })