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

src/views/vent/monitorManager/alarmMonitor/common/measurePoint.vue

@@ -67,10 +67,6 @@
   }>();
 
   const shown = ref('default');
-
-  function switchToDefault() {
-    shown.value = 'default';
-  }
   // const chartsConfig = ref<
   //   {
   //     label: string;
@@ -138,10 +134,6 @@
   //   },
   //   { immediate: true, deep: true }
   // );
-
-  defineExpose({
-    switchToDefault,
-  });
 </script>
 <style lang="less">
   @import '/@/design/theme.less';

src/views/vent/monitorManager/alarmMonitor/warn/gasWarn.vue

@@ -76,7 +76,7 @@
         </div>
 
         <div :class="topAreaListWs.length != 0 ? 'bot-area' : 'bot-area1'">
-          <MeasurePoint ref="measurePointRef" title="安全监控测点信息" :timeout="1000" :cards="cardListWs" :charts="chartListWs" />
+          <MeasurePoint title="安全监控测点信息" :timeout="1000" :cards="cardListWs" :charts="chartListWs" />
         </div>
       </div>
       <div style="width: 100%; height: 100%" v-else-if="isShow == 'yjzb'">
@@ -120,8 +120,6 @@
   let activeIndex = ref(0);
   let isShow = ref('yjjc');
 
-  const measurePointRef = ref<MeasurePoint>(null);
-
   // https获取监测数据
   let timer: null | NodeJS.Timeout = null;
   function getMonitor(deviceID, flag?) {
@@ -243,7 +241,6 @@
     activeIndex1.value = ind;
     chartListWs.length = 0;
     clearTimeout(timer);
-    measurePointRef.value?.switchToDefault();
     getMonitor(item.deviceID, true);
   }