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

src/components/Container/src/Adaptive.vue

@@ -37,7 +37,6 @@
        */
       let dom, observer;
       const actions = getActions();
-      
 
       //设置初始值
       const initSize = () => {

src/hooks/web/useWebColumns.ts

@@ -16,7 +16,7 @@ const arrToColumns = (tableHeaderColumns = []) => {
       align: 'center',
       // sorter: item.sort ? true : false,
       customRender: ({ text }) => {
-        return (text == null || text == '' || text == undefined) ? '-' : text;
+        return text == null || text == '' || text == undefined ? '-' : text;
       },
     };
     columns.push(columnsItem);
@@ -25,7 +25,7 @@ const arrToColumns = (tableHeaderColumns = []) => {
 };
 
 const arrToChartColumns = (tableHeaderColumns = []) => {
-  const colors = ['#c23531', '#2f4554', '#61a0a8', '#d48265', '#91c7ae', '#749f83', '#ca8622', '#bda29a', '#6e7074', '#546570', '#c4ccd3'];
+  const colors = ['#FDB146', '#00FFA8', '#AE19FF', '#DA3914', '#03C2EC', '#749f83', '#ca8622', '#bda29a', '#6e7074', '#546570', '#c4ccd3'];
   const columns: BasicColumn[] = [];
   tableHeaderColumns.forEach((item: any, i) => {
     const columnsItem = {
@@ -58,7 +58,6 @@ export const getTableHeaderColumns = (webColumnsKey) => {
   return [];
 };
 
-
 export const getFormSchemaColumns = (webColumnsKey) => {
   const key = webColumnsKey;
   const allTableHeaderColumnArr = ventStore.getAllTableHeaderColumns;

src/layouts/default/header/index.vue

@@ -46,7 +46,7 @@
     <!-- action  -->
     <div :class="`${prefixCls}-action`">
       <div class="right-position">
-        <UserDropDown :theme="getHeaderTheme" />
+        <UserDropDown v-if="showUserDropdown" :theme="getHeaderTheme" />
       </div>
     </div>
   </Header>
@@ -56,7 +56,7 @@
     style="position: fixed; top: 30px; right: 20px; z-index: 999"
   >
     <div class="right-position">
-      <UserDropDown :theme="getHeaderTheme" />
+      <UserDropDown v-if="showUserDropdown" :theme="getHeaderTheme" />
     </div>
   </div>
   <LoginSelect ref="loginSelectRef" @success="loginSelectOk" />
@@ -209,6 +209,12 @@
         console.log('成功。。。。。');
       }
 
+      // 用户下拉框应该在以下情况中隐藏：
+      // 1. 本页面是由其他页面的 iframe 嵌入的页面
+      const showUserDropdown = computed(() => {
+        return window.self === window.top;
+      });
+
       onMounted(() => {
         showLoginSelect();
       });
@@ -243,6 +249,7 @@
         title,
         getShowFullHeader,
         noHeadeLink,
+        showUserDropdown,
       };
     },
   });

src/layouts/default/sider/bottomSideder.vue

@@ -52,7 +52,6 @@
   <div v-else-if="isShowMenu == 0" class="menu-show-icon">
     <div class="icon" @click="openMenu"></div>
   </div>
-  <div v-else>4343434</div>
 </template>
 
 <script lang="ts">
@@ -66,14 +65,12 @@
   import { getActions } from '/@/qiankun/state';
   import { PageEnum } from '/@/enums/pageEnum';
   import { useGlobSetting } from '/@/hooks/setting';
-  import { router } from '/@/router';
   import { unmountMicroApps } from '/@/qiankun';
 
   export default defineComponent({
     name: 'BottomSider',
     components: { FourBorderBg, SvgIcon },
     setup() {
-      const isShowMenu = ref(0);
       let menuModules = ref<Menu[]>([]);
       const actions = getActions();
       const currentParentRoute = ref<Menu>();
@@ -81,6 +78,7 @@
       const route = unref(currentRoute);
       const go = useGo();
       const glob = useGlobSetting();
+      const isShowMenu = ref(route.path.startsWith('/cad-viewer') ? 1 : 0);
 
       function selectMenu(e: Event, programMenu) {
         e.stopPropagation();

src/layouts/default/sider/bottomSideder1.vue

@@ -28,14 +28,13 @@
   <div v-else-if="isShowMenu == 0" class="menu-show-icon">
     <div class="icon" @click="openMenu"></div>
   </div>
-  <div v-else>4343434</div>
 </template>
 
 <script lang="ts">
   import { defineComponent, onMounted, ref } from 'vue';
   import type { Menu } from '/@/router/types';
   import FourBorderBg from '/@/components/vent/fourBorderBg.vue';
-  import { Icon as SvgIcon  } from '/@/components/Icon';
+  import { Icon as SvgIcon } from '/@/components/Icon';
   import { getMenus } from '/@/router/menus';
   import { useGo } from '/@/hooks/web/usePage';
 

src/router/guard/permissionGuard.ts

@@ -15,7 +15,6 @@ import { OAUTH2_THIRD_LOGIN_TENANT_ID } from '/@/enums/cacheEnum';
 import { useGlobSetting } from '/@/hooks/setting';
 
 import _ from 'lodash';
-import { mountMicroApp } from '/@/qiankun';
 import { AUTO_LOGIN_URL_QUERY } from '../constant';
 
 const LOGIN_PATH = PageEnum.BASE_LOGIN;

src/store/modules/user.ts

@@ -360,9 +360,7 @@ export const useUserStore = defineStore({
         const loginParams = {
           username: 'autoAdmin',
           password: 'autoAdmin123',
-          captcha: '1234',
           checkKey: new Date().getTime(),
-          remember_me: true,
         };
         const data = await loginApi(loginParams);
         const { token } = data;

src/utils/threejs/main.worker.ts

@@ -60,9 +60,10 @@ export function initModalWorker() {
     // 'fire/workFace_2023-06-29.glb',
     'fire/tunFace_2023-07-14.glb',
     'fire/nitrogen_2023-06-02.glb',
-    'fire/nitrogenUnderground_2023-09-15.glb',
+    // 'fire/nitrogenUnderground_2023-09-15.glb',
+    'fire/nitrogenUnderground_2024-04-09.glb',
     'fire/grout_2023-06-02.glb',
-    'fire/Bertai_2024-04-09.glb',
+    'fire/Bertai_2023-11-29.glb',
     'fire/balancePress_2024-03-14.glb',
     'yafeng/compressor_2023-07-10.glb',
     'gas/gasPump_2024-03-04.glb',

src/views/sys/iframe/index.vue

@@ -13,14 +13,17 @@
   import { propTypes } from '/@/utils/propTypes';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useLayoutHeight } from '/@/layouts/default/content/useContentViewHeight';
+  import { useAppStore } from '/@/store/modules/app';
 
   defineProps({
     frameSrc: propTypes.string.def(''),
   });
-
+  const appStore = useAppStore();
   const loading = ref(true);
   const topRef = ref(50);
-  const heightRef = ref(window.innerHeight);
+  debugger;
+  const heightRef = ref(window.innerHeight / appStore.getHeightScale);
+
   const frameRef = ref<HTMLFrameElement>();
   const { headerHeightRef } = useLayoutHeight();
 
@@ -40,9 +43,11 @@
     }
     const top = headerHeightRef.value;
     topRef.value = top;
-    heightRef.value = window.innerHeight - top;
-    const clientHeight = document.documentElement.clientHeight - top;
+    heightRef.value = window.innerHeight / appStore.getHeightScale - top;
+    const clientHeight = document.documentElement.clientHeight / appStore.getHeightScale - top;
+    const clientWidth = document.documentElement.clientWidth / appStore.getWidthScale;
     iframe.style.height = `${clientHeight}px`;
+    iframe.style.width = `${clientWidth}px`;
   }
 
   function hideLoading() {

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

@@ -50,6 +50,8 @@
       default: (params) => defHttp.get({ url: '/safety/ventanalyAlarmLog/list', params }),
     },
   });
+
+  const getDeviceListApi = (params) => defHttp.post({ url: '/ventanaly-device/monitor/device', params });
   const globalConfig = inject('globalConfig');
   const alarmHistory = ref();
   const columns = ref([]);
@@ -60,22 +62,37 @@
   async function getDeviceList() {
     if (props.deviceType.split('_')[1] && props.deviceType.split('_')[1] === 'history') return;
     let result;
-    if (globalConfig.History_Type == 'vent') {
-      if (props.deviceListApi && !props.sysId) {
+    if (!props.sysId) {
+      if (props.deviceListApi) {
         const res = await props.deviceListApi();
-        if (res['records'] && res['records'].length > 0) result = res['records'];
+        if (props.deviceType.startsWith('modelsensor')) {
+          if (res['msgTxt'] && res['msgTxt'][0] && res['msgTxt'][0]['datalist']) {
+            result = res['msgTxt'][0]['datalist'];
+          }
+        } else {
+          if (res['records'] && res['records'].length > 0) result = res['records'];
+        }
       } else {
-        result = await defHttp.get({
-          url: '/safety/ventanalyManageSystem/linkdevicelist',
-          params: { sysId: props.sysId, deviceType: props.deviceType, pageSize: 9999 },
-        });
+        const res = await getDeviceListApi({ devicetype: props.deviceType, pageSize: 10000 });
+        if (res['records'] && res['records'].length > 0) {
+          result = res['records'];
+        } else if (res['msgTxt'] && res['msgTxt'][0] && res['msgTxt'][0]['datalist']) {
+          result = res['msgTxt'][0]['datalist'];
+        }
       }
     } else {
-      result = await defHttp.get({
-        url: '/safety/ventanalyManageSystem/linkdevicelist',
-        params: { sysId: props.sysId, deviceType: props.deviceType.startsWith('vehicle') ? 'location_normal' : props.deviceType },
+      const res = await getDeviceListApi({
+        sysId: props.sysId,
+        devicetype: props.deviceType.startsWith('vehicle') ? 'location_normal' : props.deviceType,
+        pageSize: 10000,
       });
+      if (res['records'] && res['records'].length > 0) {
+        result = res['records'];
+      } else if (res['msgTxt'] && res['msgTxt'][0] && res['msgTxt'][0]['datalist']) {
+        result = res['msgTxt'][0]['datalist'];
+      }
     }
+
     deviceOptions.value = [];
     if (result) {
       deviceOptions.value = result.map((item) => {

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

@@ -64,7 +64,8 @@
       default: () => [],
     },
   });
-  const deviceListApi = (params) => defHttp.get({ url: '/safety/ventanalyDeviceInfo/list', params });
+
+  const getDeviceListApi = (params) => defHttp.post({ url: '/ventanaly-device/monitor/device', params });
   const historyTable = ref();
   const loading = ref(false);
   const stationType = ref('plc');
@@ -174,7 +175,7 @@
           if (res['records'] && res['records'].length > 0) result = res['records'];
         }
       } else {
-        const res = await deviceListApi({ devicekind: props.deviceType, pageSize: 10000 });
+        const res = await getDeviceListApi({ devicetype: props.deviceType, pageSize: 10000 });
         if (res['records'] && res['records'].length > 0) {
           result = res['records'];
         } else if (res['msgTxt'] && res['msgTxt'][0] && res['msgTxt'][0]['datalist']) {
@@ -182,16 +183,26 @@
         }
       }
     } else {
-      if (globalConfig.History_Type == 'vent') {
-        result = await defHttp.get({
-          url: '/safety/ventanalyManageSystem/linkdevicelist',
-          params: { sysId: props.sysId, deviceType: props.deviceType, pageSize: 9999 },
-        });
-      } else {
-        result = await defHttp.get({
-          url: '/safety/ventanalyManageSystem/linkdevicelist',
-          params: { sysId: props.sysId, deviceType: props.deviceType.startsWith('vehicle') ? 'location_normal' : props.deviceType, pageSize: 9999 },
-        });
+      // if (globalConfig.History_Type == 'vent') {
+      //   result = await defHttp.get({
+      //     url: '/safety/ventanalyManageSystem/linkdevicelist',
+      //     params: { sysId: props.sysId, deviceType: props.deviceType, pageSize: 9999 },
+      //   });
+      // } else {
+      //   result = await defHttp.get({
+      //     url: '/safety/ventanalyManageSystem/linkdevicelist',
+      //     params: { sysId: props.sysId, deviceType: props.deviceType.startsWith('vehicle') ? 'location_normal' : props.deviceType, pageSize: 9999 },
+      //   });
+      // }
+      const res = await getDeviceListApi({
+        sysId: props.sysId,
+        devicetype: props.deviceType.startsWith('vehicle') ? 'location_normal' : props.deviceType,
+        pageSize: 10000,
+      });
+      if (res['records'] && res['records'].length > 0) {
+        result = res['records'];
+      } else if (res['msgTxt'] && res['msgTxt'][0] && res['msgTxt'][0]['datalist']) {
+        result = res['msgTxt'][0]['datalist'];
       }
     }
 

src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -1,12 +1,9 @@
 import { defineAsyncComponent } from 'vue';
 import { BasicColumn } from '/@/components/Table';
 import { useGlobSetting } from '/@/hooks/setting';
+import dayjs from 'dayjs';
+import { FormSchema } from '/@/components/Form';
 
-export const chartsColumns = (deviceType) => {
-  if (deviceType === '') {
-    return [];
-  }
-};
 export const locationList = [
   {
     title: '风门',
@@ -72,66 +69,81 @@ export function getMonitorComponent() {
   return { FiberModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal };
 }
 
-// export const searchFormSchema: FormSchema[] = [
-//   {
-//     label: '查询日期',
-//     field: 'tData',
-//     component: 'DatePicker',
-//     defaultValue: dayjs(),
-//     componentProps: {
-//       valueFormat: 'YYYY-MM-DD',
-//     },
-//   },
-//   {
-//     label: '时间区间',
-//     field: 'tickectDate',
-//     component: 'TimeRangePicker',
-//     componentProps: {
-//       placeholder: ['开始时间', '结束时间'],
-//       valueFormat: 'HH:mm:ss',
-//     },
-//   },
-//   {
-//     label: '设备类型',
-//     field: 'gdeviceid',
-//     component: 'ApiSelect',
-//     componentProps: {
-//       api: props.deviceListApi,
-//       resultField: 'records',
-//       labelField: 'strname',
-//       valueField: 'id',
-//     },
-//   },
-//   {
-//     label: '间隔时间',
-//     field: 'skip',
-//     component: 'Select',
-//     componentProps: {
-//       options: [
-//         {
-//           label: '5秒',
-//           value: '1',
-//         },
-//         {
-//           label: '10秒',
-//           value: '2',
-//         },
-//         {
-//           label: '1分钟',
-//           value: '3',
-//         },
-//         {
-//           label: '5分钟',
-//           value: '4',
-//         },
-//         {
-//           label: '10分钟',
-//           value: '5',
-//         },
-//       ],
-//     },
-//   },
-// ];
+export const chartsColumnList = [
+  {
+    legend: '一氧化碳',
+    seriesName: '(ppm)',
+    ymax: 10,
+    yname: 'ppm',
+    linetype: 'line',
+    yaxispos: 'left',
+    color: '#FDB146',
+    sort: 1,
+    xRotate: 0,
+    dataIndex: 'coval',
+  },
+  {
+    legend: '乙炔',
+    seriesName: '',
+    ymax: 10,
+    yname: 'ppm',
+    linetype: 'line',
+    yaxispos: 'left',
+    color: '#00FFA8',
+    sort: 1,
+    xRotate: 0,
+    dataIndex: 'chval',
+  },
+  {
+    legend: '乙烯',
+    seriesName: '',
+    ymax: 10,
+    yname: 'ppm',
+    linetype: 'line',
+    yaxispos: 'left',
+    color: '#AE19FF',
+    sort: 1,
+    xRotate: 0,
+    dataIndex: 'ch2val',
+  },
+  {
+    legend: '二氧化碳',
+    seriesName: '(%)',
+    ymax: 20,
+    yname: '%',
+    linetype: 'line',
+    yaxispos: 'right',
+    color: '#9C83D9',
+    sort: 2,
+    xRotate: 0,
+    dataIndex: 'co2val',
+  },
+  {
+    legend: '甲烷',
+    seriesName: '',
+    ymax: 20,
+    yname: '%',
+    linetype: 'line',
+    yaxispos: 'right',
+    color: '#DA3914',
+    sort: 2,
+    xRotate: 0,
+    dataIndex: 'gasval',
+  },
+  {
+    legend: '氧气',
+    seriesName: '(氧气%)',
+    ymax: 30,
+    yname: '%',
+    linetype: 'line',
+    yaxispos: 'right',
+    color: '#03C2EC',
+    sort: 3,
+    xRotate: 0,
+    dataIndex: 'o2val',
+  },
+];
+
 export const majorColumns: BasicColumn[] = [
   {
     title: '序号',

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

@@ -195,11 +195,12 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import BarAndLine from '/@/components/chart/BarAndLine.vue';
   import { SvgIcon } from '/@/components/Icon';
-  import { Decoration7 as DvDecoration7, ScrollBoard as DvScrollBoard } from '@kjgl77/datav-vue3';
   import dayjs from 'dayjs';
+  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+  import { chartsColumnList } from '../device.data';
 
   export default defineComponent({
-    components: { BasicModal, BarAndLine, SvgIcon, DvScrollBoard, DvDecoration7 },
+    components: { BasicModal, BarAndLine, SvgIcon },
     props: {
       dataSource: { type: Array },
       activeID: { type: String },
@@ -227,32 +228,8 @@
         },
       };
 
-      const chartsColumns = [
-        {
-          legend: '巷道温度',
-          seriesName: '(℃)',
-          ymax: 5,
-          yname: '℃',
-          linetype: 'line',
-          yaxispos: 'left',
-          color: '#EE6666',
-          sort: 1,
-          xRotate: 0,
-          dataIndex: 'temp',
-        },
-        {
-          legend: '巷道湿度',
-          seriesName: '(%)',
-          ymax: 5,
-          yname: '%',
-          linetype: 'line',
-          yaxispos: 'right',
-          color: '#FDB146',
-          sort: 2,
-          xRotate: 0,
-          dataIndex: 'humidity',
-        },
-      ];
+      const chartsColumnArr = getTableHeaderColumns('atomizing_chart');
+      const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
 
       const columns = [
         {
@@ -287,24 +264,6 @@
         },
       ];
 
-      const warningConfig = reactive({
-        data: [
-          ['测点6', '318℃', '严重报警'],
-          ['测点43', '142℃', '一般预警'],
-          ['测点23', '167℃', '一般预警'],
-          ['测点6', '198℃', '超高预警'],
-          ['测点65', '197℃', '超高预警'],
-          ['测点78', '154℃', '一般预警'],
-          ['测点61', '104℃', '一般预警'],
-          ['测点87', '150℃', '一般信息'],
-        ],
-        index: false,
-        columnWidth: [150],
-        oddRowBGC: '#009acd10',
-        evenRowBGC: '#009acd05',
-        align: ['center', 'center', 'center'],
-      });
-
       const [register, { setModalProps }] = useModalInner();
 
       function handleVisibleChange(visible) {
@@ -366,7 +325,6 @@
         posList,
         chartsColumns,
         columns,
-        warningConfig,
       };
     },
   });

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

@@ -118,11 +118,12 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import BarAndLine from '/@/components/chart/BarAndLine.vue';
   import { SvgIcon } from '/@/components/Icon';
-  import { Decoration7 as DvDecoration7, ScrollBoard as DvScrollBoard } from '@kjgl77/datav-vue3';
   import dayjs from 'dayjs';
+  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+  import { chartsColumnList } from '../device.data';
 
   export default defineComponent({
-    components: { BasicModal, BarAndLine, SvgIcon, DvScrollBoard, DvDecoration7 },
+    components: { BasicModal, BarAndLine, SvgIcon },
     props: {
       dataSource: { type: Array },
       activeID: { type: String },
@@ -140,7 +141,7 @@
       const echatsOption = {
         grid: {
           top: '25%',
-          left: '30',
+          left: '5',
           right: '45',
           bottom: '3%',
           containLabel: true,
@@ -150,80 +151,9 @@
         },
       };
 
-      const chartsColumns = [
-        {
-          legend: '一氧化碳',
-          seriesName: '(ppm)',
-          ymax: 10,
-          yname: 'ppm',
-          linetype: 'line',
-          yaxispos: 'left',
-          color: '#FDB146',
-          sort: 1,
-          xRotate: 0,
-          dataIndex: 'coval',
-        },
-        {
-          legend: '乙炔',
-          seriesName: '',
-          ymax: 10,
-          yname: 'ppm',
-          linetype: 'line',
-          yaxispos: 'left',
-          color: '#00FFA8',
-          sort: 1,
-          xRotate: 0,
-          dataIndex: 'chval',
-        },
-        {
-          legend: '乙烯',
-          seriesName: '',
-          ymax: 10,
-          yname: 'ppm',
-          linetype: 'line',
-          yaxispos: 'left',
-          color: '#AE19FF',
-          sort: 1,
-          xRotate: 0,
-          dataIndex: 'ch2val',
-        },
-        {
-          legend: '二氧化碳',
-          seriesName: '(%)',
-          ymax: 20,
-          yname: '%',
-          linetype: 'line',
-          yaxispos: 'right',
-          color: '#9C83D9',
-          sort: 2,
-          xRotate: 0,
-          dataIndex: 'co2val',
-        },
-        {
-          legend: '甲烷',
-          seriesName: '',
-          ymax: 20,
-          yname: '%',
-          linetype: 'line',
-          yaxispos: 'right',
-          color: '#DA3914',
-          sort: 2,
-          xRotate: 0,
-          dataIndex: 'gasval',
-        },
-        {
-          legend: '氧气',
-          seriesName: '(氧气%)',
-          ymax: 30,
-          yname: '%',
-          linetype: 'line',
-          yaxispos: 'right',
-          color: '#03C2EC',
-          sort: 3,
-          xRotate: 0,
-          dataIndex: 'o2val',
-        },
-      ];
+      const chartsColumnArr = getTableHeaderColumns('bundletube_chart');
+      const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
+
       const [register, { setModalProps, closeModal }] = useModalInner();
 
       function handleVisibleChange(visible) {

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

@@ -60,23 +60,27 @@
           </div>
           <div class="top-item">
             <div class="icon">
-              <SvgIcon class="icon-style"  name="max-temperature" style="width: 76px; height: 42px" />
+              <SvgIcon class="icon-style" name="max-temperature" style="width: 76px; height: 42px" />
             </div>
             <div class="item-container">
               <div class="title">温度</div>
-              <div class="value">{{ posMonitor.temperature !== undefined && posMonitor.temperature !== null ? posMonitor.temperature : '-' }} <span>℃</span></div>
+              <div class="value"
+                >{{ posMonitor.temperature !== undefined && posMonitor.temperature !== null ? posMonitor.temperature : '-' }} <span>℃</span></div
+              >
             </div>
           </div>
           <div class="top-item">
             <div class="icon">
-              <SvgIcon class="icon-style"  name="max-temperature" style="width: 76px; height: 42px" />
+              <SvgIcon class="icon-style" name="max-temperature" style="width: 76px; height: 42px" />
             </div>
             <div class="item-container">
               <div class="title">湿度</div>
-              <div class="value">{{ posMonitor.humidity !== undefined && posMonitor.humidity !== null ? posMonitor.humidity : '-' }} <span>%</span></div>
+              <div class="value"
+                >{{ posMonitor.humidity !== undefined && posMonitor.humidity !== null ? posMonitor.humidity : '-' }} <span>%</span></div
+              >
             </div>
           </div>
-         
+
           <div class="top-item warning-box">
             <div class="icon">
               <SvgIcon class="icon-style" size="42" name="link" style="margin-top: 5px" />
@@ -121,6 +125,8 @@
   import { SvgIcon } from '/@/components/Icon';
   import { Decoration7 as DvDecoration7, ScrollBoard as DvScrollBoard } from '@kjgl77/datav-vue3';
   import dayjs from 'dayjs';
+  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+  import { chartsColumnList } from '../device.data';
 
   export default defineComponent({
     components: { BasicModal, BarAndLine, SvgIcon, DvScrollBoard, DvDecoration7 },
@@ -150,57 +156,9 @@
           feature: {},
         },
       };
+      const chartsColumnArr = getTableHeaderColumns('gaspatrol_chart');
+      const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
 
-      const chartsColumns = [
-      {
-          legend: '氧气',
-          seriesName: '',
-          ymax: 10,
-          yname: '%',
-          linetype: 'line',
-          yaxispos: 'left',
-          color: '#00FFA8',
-          sort: 1,
-          xRotate: 0,
-          dataIndex: 'o2',
-        },
-        {
-          legend: '一氧化碳',
-          seriesName: '(ppm)',
-          ymax: 10,
-          yname: 'ppm',
-          linetype: 'line',
-          yaxispos: 'left',
-          color: '#FDB146',
-          sort: 1,
-          xRotate: 0,
-          dataIndex: 'co',
-        },
-        {
-          legend: '二氧化碳',
-          seriesName: '(%)',
-          ymax: 20,
-          yname: '%',
-          linetype: 'line',
-          yaxispos: 'right',
-          color: '#9C83D9',
-          sort: 2,
-          xRotate: 0,
-          dataIndex: 'co2',
-        },
-        {
-          legend: '甲烷',
-          seriesName: '',
-          ymax: 20,
-          yname: '%',
-          linetype: 'line',
-          yaxispos: 'right',
-          color: '#DA3914',
-          sort: 2,
-          xRotate: 0,
-          dataIndex: 'ch4',
-        },
-      ];
       const [register, { setModalProps, closeModal }] = useModalInner();
 
       function handleVisibleChange(visible) {

src/views/vent/monitorManager/gasPumpMonitor/gasPump.dataCc2_2.ts

@@ -268,32 +268,12 @@ export const detailCtrl = [
 
 export const modelMonitor = [
   {
-    title: '泵站内温度(℃)',
-    code: 'TemperatureSensor_Temp',
+    title: '抽放管道甲烷正压侧1(%)',
+    code: 'gas1',
   },
   {
-    title: '水仓液位(m)',
-    code: 'LiquidLevelSensor_Level',
-  },
-  {
-    title: '泵站温度低报警',
-    code: 'TemperatureSensor_TemperatureLowAlarm',
-    type: 'warning',
-  },
-  {
-    title: '泵站温度高报警',
-    code: 'TemperatureSensor_TemperatureHighAlarm',
-    type: 'warning',
-  },
-  {
-    title: '水仓液位低报警',
-    code: 'LiquidLevelSensor_LowWaterAlarm',
-    type: 'warning',
-  },
-  {
-    title: '水仓液位高报警',
-    code: 'LiquidLevelSensor_HighWaterAlarm',
-    type: 'warning',
+    title: '抽放管道甲烷负压侧1(%)',
+    code: 'gas2',
   },
   {
     title: '1#瓦斯泵A相绕组温度(℃)',

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

@@ -171,7 +171,7 @@
       Object.assign(selectData, currentData);
       if (currentDeviceType.value == 'pump_over') {
         setModelType('gasPump');
-      } else if (currentDeviceType.value == 'pump_under') {
+      } else if (currentDeviceType.value.startsWith('pump_under')) {
         setModelType('gasPumpUnder');
       }
     }

src/views/vent/monitorManager/gateMonitor/gate.threejs.ts

@@ -13,9 +13,9 @@ import { useGlobSetting } from '/@/hooks/setting';
 let model,
   fm1, //液压风门
   fm2, //三道风门
-  fm3: Fm3, //气动风门
+  fm3, //气动风门
   fmXr: FmXR, //行人风门
-  fmTwoSs: FmTwoSs, //
+  fmTwoSs, //
   group: THREE.Object3D,
   fmType = '';
 
@@ -144,10 +144,13 @@ export const setModelType = (type) => {
         fm2.clipActionArr.frontDoor.time = 0.5;
         fm2.clipActionArr.backDoor.reset();
         fm2.clipActionArr.backDoor.time = 0.5;
+
         fm2.clipActionArr.centerDoor.reset();
         fm2.clipActionArr.centerDoor.time = 0.5;
+
         fm2.clipActionArr.frontDoor.stop();
         fm2.clipActionArr.backDoor.stop();
+
         fm2.clipActionArr.centerDoor.stop();
       }
 
@@ -297,10 +300,21 @@ export const mountedThree = (playerDom) => {
         const FmYj = await import('./gate.threejs.yj');
         if (FmYj) fm3 = new FmYj.default(model);
         if (fm3) fm3.mountedThree(playerDom);
+
+        const FmTwoYj = await import('./gate.threejs.two.yj');
+        if (FmTwoYj) fmTwoSs = new FmTwoYj.default(model);
+        fmTwoSs.mountedThree(playerDom);
+
+        // if (FmTwoYj) fm2 = new FmTwoYj.default(model);
+        // fm2.mountedThree(playerDom);
         break;
       default:
         fm3 = new Fm3(model);
         fm3.mountedThree(playerDom);
+        fmTwoSs = new FmTwoSs(model);
+        fmTwoSs.mountedThree(playerDom);
+        fm2 = new Fm2(model);
+        fm2.mountedThree(playerDom);
         break;
     }
 
@@ -308,10 +322,7 @@ export const mountedThree = (playerDom) => {
     fmXr.mountedThree(playerDom);
     fm1 = new Fm1(model);
     fm1.mountedThree(playerDom);
-    fm2 = new Fm2(model);
-    fm2.mountedThree(playerDom);
-    fmTwoSs = new FmTwoSs(model);
-    fmTwoSs.mountedThree(playerDom);
+
     resolve(null);
 
     model.animate();

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

@@ -76,12 +76,12 @@
         </a-tab-pane>
         <a-tab-pane key="3" tab="报警历史">
           <div class="tab-item box-bg" v-if="activeKey == '3'">
-            <AlarmHistoryTable columns-type="alarm" device-type="modelsensor" :device-list-api="baseList" designScope="alarm-history" />
+            <AlarmHistoryTable columns-type="alarm" device-type="modelsensor" designScope="alarm-history" />
           </div>
         </a-tab-pane>
         <a-tab-pane key="4" tab="操作历史">
           <div class="tab-item box-bg">
-            <HandlerHistoryTable columns-type="operator_history" device-type="modelsensor" :device-list-api="baseList" designScope="alarm-history" />
+            <HandlerHistoryTable columns-type="operator_history" device-type="modelsensor" designScope="alarm-history" />
           </div>
         </a-tab-pane>
       </a-tabs>