Browse Source

[Feat 0000] 光力系统(智慧球)对接及监测详情开发/配置

houzekong 7 months ago
parent
commit
7b14765203

+ 3 - 3
src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -63,13 +63,13 @@ export function getMonitorComponent() {
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.bd.vue'));
   }
   const BundleModal = defineAsyncComponent(() => import('./modal/bundle.modal.vue'));
-  const FiremonNormalModal = defineAsyncComponent(() => import('./modal/firemonNormal.modal.vue'));
+  const FiremonModal = defineAsyncComponent(() => import('./modal/firemon.modal.vue'));
   const DustModal = defineAsyncComponent(() => import('./modal/dust.modal.vue'));
   const BallvalveModal = defineAsyncComponent(() => import('./modal/ballvalve.modal.vue'));
   const AtomizingModal = defineAsyncComponent(() => import('./modal/atomizing.modal.vue'));
   const GaspatrolModal = defineAsyncComponent(() => import('./modal/gaspatrol.modal.vue'));
 
-  return { FiberModal, FiremonNormalModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal };
+  return { FiberModal, FiremonModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal };
 }
 
 export const chartsColumnList = [
@@ -343,7 +343,7 @@ export const haveDetailArr = [
   'safetymonitor',
   'nitrogen',
   'atomizing',
-  'firemon_normal',
+  'firemon',
 ];
 
 export const locationFormConfig = {

+ 3 - 3
src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -479,7 +479,7 @@
   const glob = useGlobSetting();
   // import { BorderBox8 as DvBorderBox8 } from '@kjgl77/datav-vue3';
 
-  const { FiberModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal } = getMonitorComponent();
+  const { FiberModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal, FiremonModal } = getMonitorComponent();
   type DeviceType = { deviceType: string; deviceName: string; datalist: any[] };
 
   const props = defineProps({
@@ -839,8 +839,8 @@
         currentModal.value = BundleModal;
         // currentModal.value = BallvalveModal
         modalVisible.value = true;
-      } else if (deviceType.value.startsWith('firemon_normal')) {
-        currentModal.value = BundleModal;
+      } else if (deviceType.value.startsWith('firemon')) {
+        currentModal.value = FiremonModal;
         // currentModal.value = BallvalveModal
         modalVisible.value = true;
       } else if (deviceType.value.startsWith('ballvalve')) {

+ 1 - 1
src/views/vent/monitorManager/deviceMonitor/components/device/modal/firemonNormal.modal.vue → src/views/vent/monitorManager/deviceMonitor/components/device/modal/firemon.modal.vue

@@ -135,7 +135,7 @@
         },
       };
 
-      const chartsColumnArr = getTableHeaderColumns('firemon_normal_chart');
+      const chartsColumnArr = getTableHeaderColumns('firemon_chart');
       const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
       const xAxisPropType = ref('ttime');
       const [register, { setModalProps, closeModal }] = useModalInner();