1. 修改滚动条的宽度

src/design/public.less

@@ -9,7 +9,7 @@
 // =================================
 
 ::-webkit-scrollbar {
-  width: 7px !important;
+  width: 10px !important;
   height: 4px;
 }
 

src/hooks/system/useCamera.ts

@@ -10,7 +10,6 @@ import ZH from 'xgplayer/es/lang/zh-cn';
 I18N.use(ZH);
 
 export function useCamera() {
-  const newCameraList = (params) => defHttp.get({ url: '/safety/ventanalyCamera/listNew', params }); ///safety/ventanalyCamera/listNew?devKind=pulpin
   const cameraList = (params) => defHttp.get({ url: '/safety/ventanalyCamera/list', params });
   const cameraAddrList = (params) => defHttp.post({ url: '/ventanaly-device/camera/info', params });
   const cameraAddr = (params) => defHttp.get({ url: '/ventanaly-device/camera/queryByCameraCode', params });
@@ -30,7 +29,7 @@ export function useCamera() {
     if (!devKind) {
       res = await cameraList({ deviceid });
     } else {
-      res = await newCameraList({ devKind });
+      res = await cameraList({ sysId: deviceid, devKind });
     }
     const cameras: [] = res.records || [];
     // const cameras: [] = [

src/views/vent/monitorManager/comment/HistoryTable.vue

@@ -20,7 +20,7 @@
 
 <script lang="ts" setup>
   //ts语法
-  import { watchEffect, ref, watch, defineExpose, inject, nextTick } from 'vue';
+  import { watchEffect, ref, watch, defineExpose, inject, nextTick, onMounted } from 'vue';
   import { FormSchema } from '/@/components/Form/index';
   import { BasicTable } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
@@ -28,7 +28,6 @@
   import { defHttp } from '/@/utils/http/axios';
   import dayjs from 'dayjs';
   import { getAutoScrollContainer } from '/@/utils/common/compUtils';
-  import { onMounted } from 'vue';
 
   const globalConfig = inject('globalConfig');
   const props = defineProps({

src/views/vent/monitorManager/groutMonitor/components/groutHomeHjt.vue

@@ -99,7 +99,7 @@
     () => props.deviceId,
     async (deviceId) => {
       if (deviceId) {
-        await getCamera(deviceId, playerRef.value);
+        await getCamera(deviceId, playerRef.value, 'pulping');
       }
     }
   );

src/views/vent/monitorManager/groutMonitor/components/groutHomeJj.vue

@@ -108,7 +108,7 @@
       loading.value = false;
       timer = null;
       getMonitor(true)?.then(async () => {
-        if (props.deviceId) await getCamera(props.deviceId, playerRef.value);
+        if (props.deviceId) await getCamera(props.deviceId, playerRef.value, 'pulping');
       });
     });
   });

src/views/vent/monitorManager/nitrogen/components/nitrogenHome.vue

@@ -340,7 +340,7 @@
       mountedThree(monitorDataGroupArr).then(async () => {
         setMonitorGroupNum(1);
         getMonitor(true).then(async () => {
-          if (monitorData.value && monitorData.value['deviceID']) await getCamera(monitorData.value['deviceID'], playerRef.value);
+          if (monitorData.value && monitorData.value['deviceID']) await getCamera(monitorData.value['deviceID'], playerRef.value, 'forcFan');
         });
       });
     }, 0);

src/views/vent/monitorManager/safetyMonitor/index.vue

@@ -154,7 +154,6 @@
             :columns-type="`${deviceType}`"
             :device-type="deviceType"
             designScope="device-history"
-            @change="changeHis"
           />
         </div>
         <!-- 图表 -->
@@ -209,7 +208,7 @@
   import BarAndLine from '/@/components/chart/BarAndLine.vue';
   import { list, getDeviceList } from './safety.api';
   import AlarmHistoryTable from '../comment/AlarmHistoryTable.vue';
-  import HistoryTable from '../comment/HistoryTable.vue';
+  import HistoryTable from './HistoryTable.vue';
   import HandlerHistoryTable from '../comment/HandlerHistoryTable.vue';
   import MonitorTable from '../comment/MonitorTable.vue';
   import GroupMonitorTable from '../comment/GroupMonitorTable.vue';