[Mod 0000] 解决git冲突

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -664,6 +664,7 @@
     getMonitorComponent,
     vehicleFormConfig,
     noLocationArr,
+    haveHistoryEcharts
   } from './device.data';
   import mainPath from './modal/mainPath.vue';
   import { formConfig } from '../../../safetyMonitor/safety.data';