历史列表

public/js/config.js

@@ -3,8 +3,8 @@ const VUE_APP_URL = {
   webRtcUrl: '//192.168.183.216:8000' // rtsp服务器IP地址
 }
 const History_Type = {
-  // type: 'remote', // remote、vent
-  type: 'vent', // remote、vent
+  type: 'remote', // remote、vent
+  // type: 'vent', // remote、vent
   deviceType: []
 }
 

src/components/Form/src/BasicForm.vue

@@ -367,4 +367,9 @@
       }
     }
   }
+  :deep(.@{ventSpace}-select-dropdown) {
+    left: 0px !important;
+    top: 34px !important;
+    background: transparent !important;
+  }
 </style>

src/components/Table/src/BasicTable.vue

@@ -117,6 +117,7 @@
       });
 
       const { getLoading, setLoading } = useLoading(getProps);
+
       const { getPaginationInfo, getPagination, setPagination, setShowPagination, getShowPagination } = usePagination(getProps);
 
       const { getRowSelection, getRowSelectionRef, getSelectRows, clearSelectedRowKeys, getSelectRowKeys, deleteSelectRowByKey, setSelectedRowKeys } =
@@ -433,8 +434,5 @@
 </style>
 <style lang="less" scoped>
   @ventSpace: zxm;
-  :deep(.@{ventSpace}-select-dropdown) {
-    left: 0px !important;
-    top: 36px !important;
-  }
+  
 </style>

src/components/Table/src/hooks/usePagination.tsx

@@ -5,6 +5,7 @@ import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
 import { isBoolean } from '/@/utils/is';
 import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '../const';
 import { useI18n } from '/@/hooks/web/useI18n';
+import { Select } from 'ant-design-vue';
 
 interface ItemRender {
   page: number;
@@ -41,7 +42,6 @@ export function usePagination(refProps: ComputedRef<BasicTableProps>) {
 
   const getPaginationInfo = computed((): PaginationProps | boolean => {
     const { pagination } = unref(refProps);
-
     if (!unref(show) || (isBoolean(pagination) && !pagination)) {
       return false;
     }
@@ -56,7 +56,7 @@ export function usePagination(refProps: ComputedRef<BasicTableProps>) {
       pageSizeOptions: PAGE_SIZE_OPTIONS,
       itemRender: itemRender,
       showQuickJumper: true,
-      ...(isBoolean(pagination) ? {} : pagination),
+      // ...(isBoolean(pagination) ? {} : pagination),
       ...unref(configRef),
     };
   });
@@ -65,10 +65,27 @@ export function usePagination(refProps: ComputedRef<BasicTableProps>) {
     const paginationInfo = unref(getPaginationInfo);
     configRef.value = {
       ...(!isBoolean(paginationInfo) ? paginationInfo : {}),
+      selectComponentClass: () => <Select
+        defaultValue = { () =>configRef.value.pageSize }
+        options={
+          [
+            {label: '10条每页', value: 10},
+            {label: '30条每页', value: 30},
+            {label: '50条每页', value: 50},
+            {label: '100条每页', value: 100},
+          ]
+        }
+        style='width: 100px; margin-right: 10px;'
+        onChange={ updataPageSize }
+      ></Select>,
       ...info,
     };
   }
 
+  function updataPageSize(size){
+    configRef.value.pageSize = size
+  }
+
   function getPagination() {
     return unref(getPaginationInfo);
   }

src/components/Table/src/types/pagination.ts

@@ -91,9 +91,12 @@ export interface PaginationProps {
    */
   simple?: boolean;
 
+  selectComponentClass?: any;
+
   /**
    * to customize item innerHTML
    * @type Function
    */
   itemRender?: (props: PaginationRenderProps) => VNodeChild | JSX.Element;
+
 }

src/components/jeecg/JVxeTable/src/hooks/usePagination.ts

@@ -7,7 +7,7 @@ export function usePagination(props: JVxeTableProps, methods: JVxeTableMethods)
   const innerPagination = reactive({
     current: 1,
     pageSize: 10,
-    pageSizeOptions: ['10', '20', '30'],
+    pageSizeOptions: ['10', '30', '50', '100'],
     showTotal: (total, range) => {
       return range[0] + '-' + range[1] + ' 共 ' + total + ' 条';
     },

src/components/jeecg/OnLine/hooks/usePopBiz.ts

@@ -75,7 +75,7 @@ export function usePopBiz(props, tableRef?) {
   const pagination = reactive({
     current: 1,
     pageSize: 10,
-    pageSizeOptions: ['10', '20', '30'],
+    pageSizeOptions: ['10', '30', '50', '100'],
     // showTotal: (total, range) => {
     //     return range[0] + '-' + range[1] + ' 共' + total + '条'
     // },

src/design/vent/index.less

@@ -44,6 +44,7 @@
 
 /* 表单 */
 .vent-form {
+  width: 100%;
   .@{ventSpace}-form {
     background-color: @vent-transparent !important;
     .@{ventSpace}-form-item-label > label {
@@ -72,6 +73,7 @@
         // background: #ffffff17 !important;
         border: 1px solid @vent-form-item-boder !important;
       }
+      
     }
     .@{ventSpace}-select-multiple {
       .@{ventSpace}-select-selection-item-content {
@@ -143,7 +145,7 @@
       // background: transparent !important;
       border: 1px solid #ececec66;
       background: #004362 !important;
-      left: 0px !important;
+      // left: 0px !important;
       backdrop-filter: blur(50px);
 
       .@{ventSpace}-select-item {

src/hooks/web/useWebColumns.ts

@@ -13,7 +13,7 @@ const arrToColumns = (tableHeaderColumns = []) => {
       dataIndex: item.dict ? `${item.monitorcode}_dictText` : item.monitorcode,
       width: item.width || 100,
       defaultHidden: !item.showflag,
-      sorter: item.sort ? true : false,
+      // sorter: item.sort ? true : false,
       customRender: ({ text }) => {
         return text != null ? text : '-';
       },

src/layouts/default/content/index.vue

@@ -79,9 +79,8 @@
               resetContent()  
             }, 500)
           })
-         
         }
-        return getShowFullHeaderRef.value && ((route.path.startsWith('/micro-')));
+        return getShowFullHeaderRef.value || ((route.path.startsWith('/micro-')));
       });
 
       onBeforeMount(() => {});

src/layouts/default/sider/bottomSideder.vue

@@ -63,6 +63,7 @@
   import { getMenus } from '/@/router/menus';
   import { useGo } from '/@/hooks/web/usePage';
   import { useRouter } from 'vue-router';
+  import { getActions } from '/@/qiankun/state';
 
   export default defineComponent({
     name: 'BottomSider',
@@ -71,7 +72,7 @@
       const isShowMenu = ref(0);
       let menuModules = ref<Menu[]>([]);
       const router = useRouter();
-
+      const actions = getActions();
       const currentParentRoute = ref<Menu>();
       const { currentRoute } = router;
       const route = unref(currentRoute);
@@ -83,18 +84,26 @@
       function handleMenuClick(path: Menu) {
         if (route.path.startsWith('/micro-')) { 
           if (route.path.startsWith('/micro-vent-3dModal/dashboard/analysis')){
-            const { href } = router.resolve(path.path)
-            window.open(href, '_blank')
+            if(!path.path.startsWith('/micro-vent-3dModal/dashboard/analysis')){
+              // window.open(href, '_blank')
+              router.replace(path.path)
+            }else{
+              const { query } = router.resolve(path.path)
+              if(query){
+                const { type, deviceType } = query
+                if(type && deviceType)actions.setGlobalState({ pageObj: { pageType: type, deviceType } });
+              }
+              go(path.path);
+            }
           }else {
-            history.pushState({}, '', path.path);
+            actions.setGlobalState({ pageObj: { pageType: 'home' } });
+            // history.pushState({}, '', path.path);
+            go(path.path);
           }
         } else {
           // micro-vent-3dModal 
-
           if(route.path.startsWith('/subSysmodal/')) {
             router.replace('/micro-vent-3dModal' + path.path)
-          }else if(path.path == '/dustMonitor'){
-            go('/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=dusting')
           }else{
             go(path.path);
           }

src/settings/componentSetting.ts

@@ -18,7 +18,7 @@ export default {
       totalField: 'total',
     },
     // 可选的分页选项
-    pageSizeOptions: ['10', '50', '80', '100'],
+    pageSizeOptions: ['10', '30', '50', '100'],
     // 表格默认尺寸
     defaultSize: 'middle',
     //默认每页显示多少条

src/utils/event/index.ts

@@ -55,22 +55,24 @@ export function setDivHeight(e: MouseEvent, minHeight, scroll, scrollClientMaxHe
       isMove = true;
       const distY = Math.abs(res.clientY - startY);
       if (res.clientY > startY) {
-        if (divHeight - distY >= minHeight) {
+        if (divHeight - distY > minHeight) {
           height = divHeight - distY;
-        } else if (divHeight - distY < minHeight) {
+        } else {
           height = minHeight;
         }
       }
       if (res.clientY < startY) {
         height = divHeight + distY;
       }
-      if (height > document.body.clientHeight - scrollClientMaxHeight) height = document.body.clientHeight - scrollClientMaxHeight;
+      if (height > document.body.clientHeight - scrollClientMaxHeight) {
+        height = document.body.clientHeight - scrollClientMaxHeight;
+      }
       divObject.style.height = height + 'px';
     };
     document.onmouseup = function () {
       document.onmousemove = null;
       if (isMove && scroll.y != height - scrollClientHeight) {
-        scroll.y = height - scrollClientHeight;
+        scroll.y = height - scrollClientHeight - 20;
       }
     };
   }

src/utils/ventutil.ts

@@ -42,7 +42,6 @@ export function formatNum(data) {
 export function cameraInit(dom, rtspUrl) {
   let webRtcServer = undefined;
   const ip = VUE_APP_URL.webRtcUrl;
-  debugger;
   // const ip = '//192.168.183.216:8000';
   webRtcServer = new window['WebRtcStreamer'](dom, location.protocol + ip);
 
@@ -51,7 +50,6 @@ export function cameraInit(dom, rtspUrl) {
 }
 
 export function deviceCameraInit(cameraAddrs, player: HTMLElement, webRtcServerList: any[] = []) {
-  debugger;
   console.log('webRtcServerList0--------->', webRtcServerList);
 
   const playerDoms: (HTMLVideoElement | undefined | null)[] = [];
@@ -147,7 +145,6 @@ export function deviceCameraInit(cameraAddrs, player: HTMLElement, webRtcServerL
     };
     playCamrea();
   }).then(() => {
-    debugger;
     videoParentDomList.forEach((videoParentDom) => {
       if (typeof videoParentDom[0] === 'string') {
         if (videoParentDom[0].startsWith('onPlayer')) {

src/views/demo/jeecg/Native/one/OneNativeList.vue

@@ -190,7 +190,7 @@
   const ipagination = ref<any>({
     current: 1,
     pageSize: 10,
-    pageSizeOptions: ['10', '20', '30'],
+    pageSizeOptions: ['10', '30', '50', '100'],
     showTotal: (total, range) => {
       return range[0] + '-' + range[1] + ' 共' + total + '条';
     },

src/views/system/role/role.data.ts

@@ -15,6 +15,7 @@ export const columns = [
     title: '创建时间',
     dataIndex: 'createTime',
     width: 100,
+    sorter: true,
   },
 ];
 /**

src/views/vent/comment/EditRowTable.vue

@@ -43,6 +43,10 @@
       isRadio: {
         type: Boolean,
       },
+      scroll: {
+        type: Object,
+        default: {}
+      },
     },
     emits: ['saveOrUpdate', 'deleteById', 'rowChange'],
     setup(props, { emit, expose }) {
@@ -51,6 +55,8 @@
       const dataList = ref<any[]>([])
       const refresh = ref(true)
 
+      const tableScroll = props.scroll.y ? ref({ y: props.scroll.y }) : ref({})
+
       const [registerTable, { insertTableDataRecord, reload, getSelectRows, getDataSource, setTableData, clearSelectedRowKeys }] = !props.list ?  useTable({
         title: '',
         dataSource: props.dataSource,
@@ -61,6 +67,7 @@
         showTableSetting: false,
         rowSelection: !props.isRadio ? undefined : { type: 'radio', onChange: rowChange },
         tableSetting: { fullScreen: true },
+        scroll: tableScroll,
         formConfig: {
           labelWidth: 120,
           schemas: props.searchFormSchema,
@@ -80,6 +87,7 @@
           columns: props.columns as BasicColumn[],
           showIndexColumn: false,
           showTableSetting: false,
+          scroll: tableScroll,
           rowSelection: !props.isRadio ? undefined : { type: 'radio', onChange: rowChange },
           tableSetting: { fullScreen: true },
           actionColumn: {

src/views/vent/deviceManager/comment/FormModal.vue

@@ -56,6 +56,7 @@
     bottom: 0px !important;
   }
   .vent-form {
+    // width: 100%;
     max-height: 700px; 
     overflow-y: auto;
     

src/views/vent/deviceManager/comment/pointTabel/WorkFacePointTable.vue

@@ -118,7 +118,6 @@
       }
 
       function handleDelete(record: EditRecordRow) {
-        debugger
         emit('delete', record.id, reload);
       }
       async function getOptions() {

src/views/vent/deviceManager/comment/warningTabel/index.vue

@@ -9,6 +9,7 @@
       @row-change="changeParentRow"
       :isAdd="true"
       :isRadio="true"
+      :scroll="{y: 200}"
     >
       <template #filterCell="{ column, record }">
         <template v-if="record.editable && column.dataIndex === 'monitorcode'">
@@ -29,6 +30,7 @@
         </template>
       </template>
     </EditRowTableVue>
+    <div style="color: #efefef; margin-top: 8px;">注: 请先选中监测参数才能添加报警等级</div>
     <EditRowTableVue
       v-if="refresh && warningProId !== ''"
       ref="RefChildComponent"
@@ -38,6 +40,7 @@
       @delete-by-id="childDeleteById"
       :isAdd="true"
       style="margin-top: 10px"
+      :scroll="{ y: 200 }"
     />
     <a-table v-else :dataSource="[]" :columns="levelColumns" style="margin-top: 10px" />
   </div>

src/views/vent/deviceManager/equipManager/component/normalBtnTable.vue

@@ -195,7 +195,7 @@
    * 删除事件
    */
   async function handleDelete(record) {
-    await props.deleteById({ id: record }, reload);
+    await props.deleteById({ id: record.id }, reload);
   }
 
   /**

src/views/vent/monitorManager/balancePressMonitor/components/balancePressHistory.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="history-box">
-    <HistoryTable :columns-type="`${deviceType}`" :device-type="deviceType" :sysId="deviceId" designScope="pressurefan_history" />
+    <HistoryTable :columns-type="`${deviceType}`" :device-type="deviceType" :sysId="deviceId" designScope="pressurefan_history" :scroll="{ y: 650 }"/>
   </div>
 </template>
 <script setup lang="ts">

src/views/vent/monitorManager/beltTunMonitor/components/beltTunHistory.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="history-box">
     <HistoryTable :columns-type="`${deviceType}`" :device-type="deviceType" :sysId="deviceId"
-      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pressurefan_history" />
+      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pressurefan_history" :scroll="{ y: 650 }"/>
   </div>
 </template>
 <script setup lang="ts">

src/views/vent/monitorManager/chamberMonitor/components/chamberHistory.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="history-box">
     <HistoryTable :columns-type="`${deviceType}`" :device-type="deviceType" :sysId="deviceId"
-      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pressurefan_history" />
+      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pressurefan_history" :scroll="{ y: 650 }"/>
   </div>
 </template>
 <script setup lang="ts">

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

@@ -128,7 +128,7 @@
       pagination: {
         current: 1,
         pageSize: 10,
-        pageSizeOptions: ['5', '10', '20'],
+        pageSizeOptions: ['10', '30', '50', '100'],
       },
       beforeFetch(params) {
         params.devicetype = props.deviceType + '*';

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

@@ -69,7 +69,6 @@
 
   /** 定义table Columns */
   function setColumns() {
-    debugger
     const isCheckColumn = {
       title: '',
       dataIndex: 'isCheck',
@@ -115,7 +114,6 @@
       return props.dataSource;
     },
     (newVal, oldVal) => {
-      debugger
       const list: unknown[] = [];
       newVal.forEach((item) => {
         const data: any = toRaw(item);

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

@@ -130,7 +130,7 @@
       pagination: {
         current: 1,
         pageSize: 10,
-        pageSizeOptions: ['5', '10', '20'],
+        pageSizeOptions: ['10', '30', '50', '100'],
       },
       beforeFetch(params) {
         params.devicetype = props.deviceType + '*';

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

@@ -1,14 +1,6 @@
 <template>
   <div class="history-table">
-    
-
-
-    <BasicTable v-if="globalConfig.History_Type == 'vent'" ref="historyTable" @register="registerTable" >
-      <template #bodyCell="{ column, record }">
-        <slot name="filterCell" v-bind="{ column, record }"></slot>
-      </template>
-    </BasicTable>
-    <BasicTable v-else ref="historyTable" @register="registerTable" >
+    <BasicTable ref="historyTable" @register="registerTable" >
       <template #bodyCell="{ column, record }">
         <slot name="filterCell" v-bind="{ column, record }"></slot>
       </template>
@@ -25,8 +17,10 @@
   import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
   import { defHttp } from '/@/utils/http/axios';
   import dayjs from 'dayjs';
-  const globalConfig = inject('globalConfig');
+  import { getAutoScrollContainer } from '/@/utils/common/compUtils';
 
+  const globalConfig = inject('globalConfig');
+  
   const historyTable = ref();
   const dataSource = ref([])
 
@@ -53,7 +47,6 @@
     },
     deviceListApi: {
       type: Function,
-      required: true,
     },
     designScope: {
       type: String,
@@ -109,6 +102,7 @@
     }
   })
 
+
   // 列表页面公共参数、方法
   const { tableContext } = useListPage(
     globalConfig.History_Type == 'vent' ? {
@@ -141,6 +135,9 @@
               field: 'tData',
               component: 'DatePicker',
               defaultValue: dayjs(),
+              colProps: {
+                span: 4,
+              },
               componentProps: {
                 valueFormat: 'YYYY-MM-DD',
               },
@@ -153,6 +150,9 @@
                 placeholder: ['开始时间', '结束时间'],
                 valueFormat: 'HH:mm:ss',
               },
+              colProps: {
+                span: 4,
+              },
             },
             {
               label: '查询设备',
@@ -166,6 +166,9 @@
                 valueField: 'id',
                 // numberToString: true,
               },
+              colProps: {
+                span: 4,
+              },
             },
             {
               label: '间隔时间',
@@ -195,18 +198,22 @@
                   },
                 ],
               },
+              colProps: {
+                span: 4,
+              },
             },
           ],
           fieldMapToTime: [['tickectDate', ['ttime_begin', 'ttime_end'], '']],
         },
         fetchSetting: {
-          listField: globalConfig.History_Type == 'iot'? 'records': globalConfig.History_Type == 'records'? '': 'datalist.records',
-          totalField: globalConfig.History_Type == 'iot' ? 'total' : globalConfig.History_Type == 'total' ? 'total' : 'datalist.total',
+          listField:  'datalist',
+          totalField: 'datalist.total',
         },
         pagination: {
           current: 1,
-          pageSize: 20,
-          pageSizeOptions: ['20', '50', '100'],
+          pageSize: 10,
+          pageSizeOptions: ['10', '30', '50', '100'],
+          showQuickJumper: false
         },
         beforeFetch(params) {
           params.strtype = props.deviceType + '*';
@@ -214,10 +221,12 @@
             params.sysId = props.sysId;
           }
         },
-        afterFetch(resultItems) {
+        afterFetch(result) {
+          const resultItems = result['records']
           resultItems.map((item) => {
             Object.assign(item, item['readData']);
           });
+          console.log('result---------------->', result)
           return resultItems;
         },
       },
@@ -247,12 +256,25 @@
         },
         schemas: props.formSchemas.length > 0 ? props.formSchemas : [
           {
-            label: '查询日期',
-            field: 'tData',
+            field: 'startTime',
+            label: '开始时间',
             component: 'DatePicker',
-            defaultValue: dayjs(),
+            required: true,
+            componentProps: {
+              showTime: true,
+              valueFormat: 'YYYY-MM-DD HH:mm:ss',
+              getPopupContainer: getAutoScrollContainer,
+            },
+          },
+          {
+            field: 'endTime',
+            label: '结束时间',
+            component: 'DatePicker',
+            required: true,
             componentProps: {
-              valueFormat: 'YYYY-MM-DD hh:mm:ss',
+              showTime: true,
+              valueFormat: 'YYYY-MM-DD HH:mm:ss',
+              getPopupContainer: getAutoScrollContainer,
             },
           },
           {
@@ -272,7 +294,7 @@
             label: '间隔时间',
             field: 'interval',
             component: 'Select',
-            defaultValue: 1,
+            defaultValue: '30s',
             componentProps: {
               options: [
                 {
@@ -311,12 +333,14 @@
             },
           },
         ],
-        fieldMapToTime: [['tData', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
       },
-      pagination: {
-        current: 1,
-        pageSize: 20,
-        pageSizeOptions: ['20', '50', '100'],
+      // pagination: false,
+      fetchSetting: {
+        totalField: 'total',
+         // 每页显示多少条
+        sizeField: 'pageSize',
+        // 请求结果列表字段  支持 a.b.c
+        pageField: 'pageNo'
       },
       beforeFetch(params) {
         params.strtype = props.deviceType + '*';
@@ -328,28 +352,14 @@
         }else{
           params.interval = '1m'
         }
-        if(props.deviceType.startsWith('location')){
-          params['isEmployee'] = false
-        }else if(props.deviceType.includes('cheliang')){
-          params['isEmployee'] = true
-        }
       },
       afterFetch(result) {
-        let dataSource = []
-        if(result['records'] && result['records'].length >0){
-           dataSource = result['records'].map((item) => {
-            Object.assign(item, result['deviceId'], result['deviceName'], result['devicePos'] );
-          })
-        }
-        
-        return dataSource;
+        return result;
       },
     },
     } 
   );
 
-
-
   //注册table数据
   const [registerTable, { getDataSource, reload, setLoading, getForm }] = tableContext;
 
@@ -403,5 +413,19 @@
         min-height: 0 !important;
       }
     }
+    .pagination-box{
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      .page-num{
+        border: 1px solid #0090D8;
+        padding: 4px 8px;
+        margin-right: 5px;
+        color: #0090D8;
+      }
+      .btn{
+        margin-right: 10px;
+      }
+    }
   }
 </style>

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

@@ -163,7 +163,7 @@
       pagination: props.isShowPagination ? {
         current: 1,
         pageSize: 5,
-        pageSizeOptions: ['5', '10', '20'],
+        pageSizeOptions: ['10', '30', '50', '100'],
       } : false,
       beforeFetch: (params) => {
         if(props.deviceType?.startsWith('safetymonitor')){
@@ -176,7 +176,7 @@
   });
 
   //注册table数据
-  const [registerTable, { reload, setLoading, setSelectedRowKeys, getSelectRowKeys }, { rowSelection, selectedRowKeys,  }] = tableContext;
+  const [registerTable, { reload, setLoading, setSelectedRowKeys, getSelectRowKeys, getForm }, { rowSelection, selectedRowKeys,  }] = tableContext;
   
   watch(
     selectedRowKeys,
@@ -195,7 +195,8 @@
     setSelectedRowKeys,
     getSelectRowKeys,
     setLoading,
-    reload
+    reload,
+    getForm
   });
 
   onMounted(() => {

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

@@ -113,7 +113,7 @@
       pagination: {
         current: 1,
         pageSize: 10,
-        pageSizeOptions: ['5', '10', '20'],
+        pageSizeOptions: ['10', '30', '50', '100'],
       },
       beforeFetch(params) {
         params.devicetype = props.deviceType + '*';

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

@@ -120,7 +120,7 @@
       pagination: {
         current: 1,
         pageSize: 10,
-        pageSizeOptions: ['5', '10', '20'],
+        pageSizeOptions: ['10', '30', '50', '100'],
       },
       beforeFetch(params) {
         params.devicetype = props.deviceType + '*';

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

@@ -69,26 +69,26 @@ async function getDataSource(t: NodeJS.Timer) {
         // console.log('综合监测返回数据------>', result, result1, result2)
         let res = result[0]
 
-        res = {
-          "createDt": null,
-          "monitDt": null,
-          "id": null,
-          "stationcode": null,
-          "devcode": "14010100313501MN0001053A10",
-          "devtypename": null,
-          "realvalue": Number(Math.random() * 100.68 + 12).toFixed(2),
-          "unit": "%CH4",
-          "adddate": "2023-09-08 16:54:19",
-          "devaddress": "五盘区一号回风巷瓦斯",
-          "uppervalue": null,
-          "lowervalue": null,
-          "uppervalueAlm": null,
-          "lowervalueAlm": null,
-          "dataType": "环境瓦斯",
-          "dataTypeCode": null,
-          "sigType": null,
-          "state": "正常"
-        }
+        // res = {
+        //   "createDt": null,
+        //   "monitDt": null,
+        //   "id": null,
+        //   "stationcode": null,
+        //   "devcode": "14010100313501MN0001053A10",
+        //   "devtypename": null,
+        //   "realvalue": Number(Math.random() * 100.68 + 12).toFixed(2),
+        //   "unit": "%CH4",
+        //   "adddate": "2023-09-08 16:54:19",
+        //   "devaddress": "五盘区一号回风巷瓦斯",
+        //   "uppervalue": null,
+        //   "lowervalue": null,
+        //   "uppervalueAlm": null,
+        //   "lowervalueAlm": null,
+        //   "dataType": "环境瓦斯",
+        //   "dataTypeCode": null,
+        //   "sigType": null,
+        //   "state": "正常"
+        // }
         if (res) {
           switch (item.code) {
             case '1_fs1':

src/views/vent/monitorManager/compressor/components/nitrogenAlarmHistory.vue

@@ -17,6 +17,6 @@
   .alarm-history{
     width: 100%;
     position: fixed;
-    top: 80px;
+    top: 100px;
   }
 </style>

src/views/vent/monitorManager/compressor/components/nitrogenHandleHistory.vue

@@ -17,6 +17,6 @@
   .handle-history{
     width: 100%;
     position: fixed;
-    top: 80px;
+    top: 100px;
   }
 </style>

src/views/vent/monitorManager/compressor/components/nitrogenHistory.vue

@@ -1,21 +1,26 @@
 <template>
   <div class="nitrogen-history">
-     <HistoryTable columns-type="nitrogen" device-type="nitrogen" :device-list-api="getTableList.bind(null, {devicekind :'nitrogen'})" designScope="nitrogen_auto_history" />
+     <HistoryTable columns-type="nitrogen" device-type="nitrogen" :sys-id="deviceId" 
+     designScope="nitrogen_auto_history" :device-list-api="getTableList.bind(null, { strtype: 'nitrogen', sysId: deviceId })" :scroll="{ y: 650 }"/>
   </div>
 </template>
 <script setup lang="ts">
   import HistoryTable from '../../comment/HistoryTable.vue';
   import { getTableList } from '../nitrogen.api'
   const props = defineProps({
+    deviceType: {
+      type: String,
+      required: true,
+    },
     deviceId: {
       type: String,
-      require: true
+      required: true,
     }
   })
 </script>
 <style lang="less" scoped>
   .nitrogen-history{
     position: fixed;
-    top: 80px;
+    top: 100px;
   }
 </style>

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

@@ -4,7 +4,7 @@
     <!-- <nitrogenHome v-if="activeKey == 'nitrogen_page' && optionValue && optionValue !='1702602347296399361'" :device-id="optionValue" :modal-type="modalType" /> -->
     <nitrogenHome1 v-if="activeKey == 'nitrogen_page' && optionValue" :device-id="optionValue" :modal-type="modalType" />
     <nitrogenEcharts v-if="activeKey == 'yfj_monitor_echarts'"/>
-    <nitrogenHistory ref="historyTable" v-if="activeKey == 'yfj_history'"/>
+    <nitrogenHistory ref="historyTable" :device-id="optionValue" :device-type="optionType" v-if="activeKey == 'yfj_history'"/>
     <nitrogenHandleHistory ref="alarmHistoryTable" v-if="activeKey == 'yfj_handler_history'"/>
     <nitrogenAlarmHistory ref="handlerHistoryTable" v-if="activeKey == 'yfj_faultRecord'"/>
     <BottomMenu :nav-list="navList" @change="changeActive"/>
@@ -41,6 +41,7 @@ const deviceType = ref('')
 
 const options = ref()
 const optionValue = ref('')
+const optionType = ref('')
 const modalType = ref('')
 const isRefresh = ref(true)
 
@@ -101,6 +102,8 @@ async function getSelectRow(deviceID) {
 
 // 获取模型类型
 function changeModalType(currentData) {
+  debugger
+  optionType.value = currentData['strtype']
   if (currentData['strsystype'] === '1') {
     // 地上
     modalType.value = 'nitrogen'

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

@@ -46,7 +46,7 @@
       </div>
     </div>
 
-    <div class="bottom-tabs-box" @mousedown="setDivHeight($event, 170, scroll, 125)" id="monitorBox">
+    <div class="bottom-tabs-box" @mousedown="setDivHeight($event, 230, scroll, 125)" id="monitorBox">
       <!-- <dv-border-box8 :dur="5"  :style="`padding: 5px; height: ${scroll.y + 100}px`" > -->
       <div :style="`padding: 5px; height: ${scroll.y + 100}px`">
         <div class="to-small" @click="toHome"></div>
@@ -58,6 +58,14 @@
             {{ treeNodeTitle }}详情
           </div>
         </div>
+        <div v-else-if="deviceType == 'forcFan'">
+          <div class="device-button-group">
+            <div class="enter-detail" @click="goDetail()">
+              <send-outlined />
+              {{ treeNodeTitle }}详情
+            </div>
+          </div>
+        </div>
 
         <a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange" id="tabsBox" v-if="isRefresh">
           <a-tab-pane key="1" tab="实时监测">
@@ -162,7 +170,7 @@
           </a-tab-pane>
           <a-tab-pane key="2" tab="历史数据">
             <div class="tab-item">
-              <HistoryTable ref="historyTable" v-if="activeKey == '2'" :sysId="systemID" :columns-type="`${deviceType}`"
+              <HistoryTable ref="historyTable" v-if="activeKey == '2'" :sysId="systemID" :columns-type="`${deviceType.startsWith('vehicle') ? 'location' : deviceType }`"
                 :device-type="deviceType"
                 :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, sysId: systemID })"
                 designScope="device-history" :scroll="scroll" />
@@ -922,9 +930,7 @@ onUnmounted(() => {
 }
 
 .bottom-tabs-box {
-
-  // position: relative;
-
+  position: relative;
   .tabs-box {
     width: calc(100% - 12px) !important;
     bottom: 3px !important;

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

@@ -6,7 +6,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onUnmounted, onMounted, nextTick } from 'vue';
+import { ref, onUnmounted, onMounted, nextTick, watch } from 'vue';
 import DeviceVue from './components/device/index.vue';
 import Network from './components/network/index.vue'
 import { getActions } from '/@/qiankun/state';
@@ -28,6 +28,16 @@ const changePageType = (pageType) => {
   actions.setGlobalState({ pageObj: { pageType: pageType } });
 }
 
+watch(() => route.fullPath, (fullPath) => {
+  debugger
+  // const { type, deviceType } = routeVal.query
+  // if (type === 'tunMonitor') {
+  //   pageData.value = { pageType: deviceType }
+  //   actions.setGlobalState({ pageObj: { pageType: deviceType } });
+  // }
+  console.log('fullPath------------------->', fullPath)
+})
+
 onMounted(() => {
   const {type, deviceType } = route.query
   if(type === 'network'){
@@ -35,12 +45,13 @@ onMounted(() => {
     actions.setGlobalState({ pageObj: { pageType: 'network' } });
   }else if(type === 'home'){
     actions.setGlobalState({ pageObj: { pageType: 'home' } });
-  }else if(type === 'tunMonitor') {
-    if(deviceType){
-      pageData.value = { pageType: deviceType }
-      actions.setGlobalState({ pageObj: { pageType: deviceType } });
-    }
   }
+  // else if(type === 'tunMonitor') {
+  //   if(deviceType){
+  //     pageData.value = { pageType: deviceType }
+  //     actions.setGlobalState({ pageObj: { pageType: deviceType } });
+  //   }
+  // }
   actions.onGlobalStateChange((newState) => {
     for (const key in newState) {
       if (key === 'pageObj') {
@@ -53,18 +64,13 @@ onMounted(() => {
             pageResult.value = pageObj.timesolution
           }
         }
-      } else if (key === 'isMounted' && newState[key]) {
-        if(deviceType){
-          console.log('qqqqqqqqqqqqqqqqq', newState)
-          // actions.setGlobalState({ pageObj: { pageType: 'tunMonitor', deviceType } });
-        }
       }
     }
   })
 })
 
 onUnmounted(() => {
-
+  // actions.setGlobalState({ pageObj: { pageType: 'home' } });
 })
 
 </script>

src/views/vent/monitorManager/gasPumpMonitor/components/gasPumpHistory.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="history-box">
     <HistoryTable :columns-type="`${deviceType}`" :device-type="deviceType" :sysId="deviceId"
-      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pressurefan_history" />
+      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pressurefan_history" :scroll="{ y: 650 }"/>
   </div>
 </template>
 <script setup lang="ts">
@@ -16,7 +16,6 @@ const props = defineProps({
   },
   deviceId: {
     type: String,
-    required: true,
   }
 })
 
@@ -24,5 +23,7 @@ const props = defineProps({
 <style lang="less" scoped>
 .history-box {
   pointer-events: auto;
+  position: absolute;
+  top: 90px;
 }
 </style>

src/views/vent/monitorManager/gasPumpMonitor/components/gasPumpHome.vue

@@ -1,7 +1,4 @@
 <template>
-  <!-- <a-spin tip="Loading..." :spinning="loading">
-    
-  </a-spin> -->
   <div id="FlowSensor" class="FlowSensor-box" style="position: absolute; z-index: -1;" v-if="selectData.FlowSensor_InputFlux">
     <div ref="elementContent" class="elementContent" >
       <p style="color: #50c8fc;"><span class="data-title">抽采泵流量(m³)：</span>{{ formatNum(selectData.FlowSensor_InputFlux) }}</p>

src/views/vent/monitorManager/gasPumpMonitor/gasPump.threejs.under.ts

@@ -48,6 +48,10 @@ class gasPumpUnder {
     }
   };
 
+  clearCssText = () => {
+    
+  }
+
   mountedThree() {
     return new Promise((resolve) => {
       this.model.setGLTFModel([this.modelName]).then((gltf) => {

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

@@ -2,7 +2,7 @@
   <div class="bg"
     style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center; overflow: hidden">
     <a-spin :spinning="loading" />
-    <div id="gas3DCSS" v-show="!loading" style="width: 100%; height: 100%; top:0; left: 0; position: absolute; overflow: hidden;">
+    <div id="gas3DCSS" v-if="activeKey == 'monitor'" v-show="!loading" style="width: 100%; height: 100%; top:0; left: 0; position: absolute; overflow: hidden;">
       
     </div>
     <div id="gasPump3D" v-if="activeKey == 'monitor'" style="width: 100%; height: 100%; position: absolute; overflow: hidden"> </div>
@@ -16,11 +16,9 @@
         <div class="device-button-group" v-if="deviceList.length > 0">
           <div class="device-button" :class="{ 'device-active': deviceActive == device.deviceType }" v-for="(device, index) in deviceList" :key="index" @click="deviceChange(index)">{{ device.deviceName }}</div>
         </div>
-        <div class="history-container">
-          <gasPumpHistory v-if="activeKey == 'monitor_history'" ref="historyTable" class="vent-margin-t-20" :deviceId = 'optionValue' :device-type="currentDeviceType"/>
-          <gasPumpHandleHistoryVue v-if="activeKey == 'handler_history'" ref="alarmHistoryTable" class="vent-margin-t-20" :deviceId = 'optionValue' :device-type="currentDeviceType" />
-          <gasPumpAlarmHistory v-if="activeKey == 'faultRecord'" ref="handlerHistoryTable" class="vent-margin-t-20" :deviceId = 'optionValue' :device-type="currentDeviceType"/>
-        </div>
+        <gasPumpHistory v-if="activeKey == 'monitor_history'" ref="historyTable" class="vent-margin-t-20"  :device-type="currentDeviceType"/>
+        <gasPumpHandleHistoryVue v-if="activeKey == 'handler_history'" ref="alarmHistoryTable" class="vent-margin-t-20" :deviceId = 'optionValue' :device-type="currentDeviceType" />
+        <gasPumpAlarmHistory v-if="activeKey == 'faultRecord'" ref="handlerHistoryTable" class="vent-margin-t-20" :deviceId = 'optionValue' :device-type="currentDeviceType"/>
       </div>      
     </div>
     <BottomMenu @change="changeActive"/>

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

@@ -450,7 +450,7 @@ function handleOK(passWord, handlerState) {
       }
       break;
   }
-  debugger
+  
   if (data.paramcode) {
     deviceControlApi(data)
       .then((res) => {

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

@@ -1,12 +1,22 @@
 <template>
   <div class="grout-history">
-    <HistoryTable columns-type="pulping" device-type="pulping"
-      :device-list-api="getTableList.bind(null, { devicekind: 'pulping' })" designScope="pulping_auto_history" />
+    <HistoryTable columns-type="pulping" :device-type="deviceType"
+      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pulping_auto_history" :scroll="{ y: 650 }"/>
   </div>
 </template>
 <script setup lang="ts">
 import HistoryTable from '../../comment/HistoryTable.vue';
 import { getTableList } from '../grout.api'
+const props = defineProps({
+  deviceType: {
+    type: String,
+    required: true,
+  },
+  deviceId: {
+    type: String,
+    required: true,
+  }
+})
 
 </script>
 <style lang="less" scoped>

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

@@ -22,7 +22,7 @@
       <groutHome v-if="activeKey == 'monitor'" :deviceId = 'optionValue' :device-type="currentDeviceType" />
       <div v-else class="history-group">
         <div class="history-container">
-          <groutHistory v-if="activeKey == 'monitor_history'" ref="historyTable" class="vent-margin-t-20"/>
+          <groutHistory v-if="activeKey == 'monitor_history'" :device-type="currentDeviceType" :device-id="optionValue" ref="historyTable" class="vent-margin-t-20"/>
           <groutHandleHistoryVue v-if="activeKey == 'handler_history'" ref="alarmHistoryTable" class="vent-margin-t-20"  />
           <groutAlarmHistory v-if="activeKey == 'faultRecord'" ref="handlerHistoryTable" class="vent-margin-t-20"/>
         </div> 

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

@@ -1,11 +1,10 @@
 <template>
   <div class="nitrogen-history">
-     <HistoryTable columns-type="forcFan" device-type="forcFan" :device-list-api="getTableList.bind(null, {devicekind :'forcFan'})" designScope="forcFan_history" />
+     <HistoryTable columns-type="forcFan" device-type="forcFan" designScope="forcFan_history" :scroll="{y: 650}" />
   </div>
 </template>
 <script setup lang="ts">
   import HistoryTable from '../../comment/HistoryTable.vue';
-  import { getTableList } from '../nitrogen.api'
 
 </script>
 <style lang="less" scoped>

src/views/vent/monitorManager/obfurage1Monitor/gate.threejs.two.ts

@@ -284,7 +284,6 @@ class Fm1 {
 
   /* 提取风门序列帧，初始化前后门动画 */
   initAnimation() {
-    debugger
     const fmGroup = this.group?.getObjectByName('quickObfurage-door');
     if (fmGroup) {
       const tracks = fmGroup.animations[0].tracks;

src/views/vent/monitorManager/obfurageMonitor/components/obfurageHistory.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="history-box">
     <HistoryTable :columns-type="`${deviceType}`" :device-type="deviceType" :sysId="deviceId"
-      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pressurefan_history" />
+      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pressurefan_history" :scroll="{ y: 650 }"/>
   </div>
 </template>
 <script setup lang="ts">

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

@@ -228,7 +228,8 @@ function getMonitor(flag?) {
 };
 
 async function getDataSource() {
-  const res = await list({ devicetype: deviceType.value, filterParams: { dataTypeName: '', strinstallpos: '' } })
+  const formData = monitorTable.value.getForm()
+  const res = await list({ devicetype: deviceType.value, filterParams: { ...formData.getFieldsValue() } })
   if (res.msgTxt.length > 0) {
     dataSource.value = res.msgTxt[0].datalist || [];
     dataSource.value.filter((data: any) => {

src/views/vent/monitorManager/tunFaceMonitor/components/tunFaceHistory.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="history-box">
     <HistoryTable :columns-type="`${deviceType}`" :device-type="deviceType" :sysId="deviceId"
-      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pressurefan_history" />
+      :device-list-api="getTableList.bind(null, { strtype: deviceType, sysId: deviceId })" designScope="pressurefan_history" :scroll="{ y: 650 }"/>
   </div>
 </template>
 <script setup lang="ts">

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

@@ -44,7 +44,6 @@
       <dv-border-box8 :dur="5"  :style="`padding: 5px; height: ${scroll.y + 100}px`" >
         <div class="tabs-button-group">
           <a-button class="tabs-button" type="primary" @click="openModel">一键测风</a-button>
-          <!-- <a-button class="tabs-button" type="primary" @click="exportExcel()">导出报表</a-button> -->
         </div>
         <a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange">
           <a-tab-pane key="1" tab="实时监测">
@@ -113,8 +112,8 @@
               <HandlerHistoryTable columns-type="operator_history" device-type="windrect" :device-list-api="baseList" designScope="operator_history" :scroll="scroll"/>
             </div>
           </a-tab-pane>
-          <a-tab-pane key="6" tab="测风结果" v-if="activeKey === '6'">
-            <ResultTable v-if="activeKey == 6" deviceType="windrect_list" :scroll="scroll"/>
+          <a-tab-pane key="6" tab="测风结果">
+            <ResultTable  deviceType="windrect_list" :scroll="scroll"/>
           </a-tab-pane>
         </a-tabs>
       </dv-border-box8>
@@ -155,8 +154,8 @@
   import HandlerHistoryTable from '../comment/HandlerHistoryTable.vue';
   import { deviceControlApi } from '/@/api/vent/index';
   import { mountedThree, destroy, addMonitorText, play, setModelType, playCamera, initCameraCanvas } from './windrect.threejs';
-  import { list, pathList, deviceList, testWind, cameraAddrList, cameraList } from './windrect.api';
-  import { list as baseList } from '../../deviceManager/windfindingTabel/windfinding.api';
+  import { list, pathList, deviceList, testWind, cameraAddrList, cameraList, exportXls } from './windrect.api';
+  import { list as baseList} from '../../deviceManager/windfindingTabel/windfinding.api';
   import { message, Progress } from 'ant-design-vue';
   import { chartsColumns } from './windrect.data';
   import { setDivHeight } from '/@/utils/event';
@@ -229,11 +228,9 @@
   // https获取监测数据
   let timer: null | NodeJS.Timeout = null;
   function getMonitor(flag?) {
-    debugger
     if (timer == null) {
       timer = setTimeout(() => {
         list({ devicetype: 'windrect', pagetype: 'normal' }).then((res) => {
-          debugger
           dataSource.value = res.msgTxt[0].datalist || [];
           if(dataSource.value.length > 0){
             dataSource.value.forEach((data: any) => {
@@ -250,7 +247,6 @@
             }
             const data: any = toRaw(dataSource.value[selectRowIndex.value]); //maxarea
             Object.assign(selectData, data);
-            debugger
             addMonitorText(selectData);
             
             palyAnimation(selectData)
@@ -634,7 +630,7 @@
   };
 
   function exportExcel(id) {
-    // exportXls({ testid: id })
+    exportXls({ testid: id })
   }
 
   /* 关闭一键测风弹窗 */
@@ -705,7 +701,6 @@
   onMounted(() => {
     loading.value = true;
     mountedThree().then(async () => {
-      debugger
       getMonitor(true);
       // loading.value = false;
     });

src/views/vent/monitorManager/windrectMonitor/windrect.api.ts

@@ -52,3 +52,5 @@ export const cameraAddrList = (params) => defHttp.post({ url: Api.cameraAddrList
 
 export const cameraList = (params) => defHttp.get({ url: Api.cameraList, params });
 
+export const exportXls = (params) => defHttp.post({ url: Api.importExcel, params });
+

src/views/vent/monitorManager/windrectMonitor/windrect.threejs.ts

@@ -67,7 +67,7 @@ const mouseEvent = (event) => {
 
 /* 添加监控数据 */
 export const addMonitorText = (selectData) => {
-  debugger
+
   if (windRectType === 'lmWindRect' && lmWindRectObj) {
     return lmWindRectObj.addMonitorText.call(lmWindRectObj, selectData);
   } else if (windRectType === 'zdWindRect' && zdWindRectObj) {

src/views/vent/monitorManager/workFaceMonitor/components/workFaceHistory.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="history-box">
     <HistoryTable :columns-type="`${deviceType}`" :device-type="deviceType" :sysId="deviceId"
-      :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, sysId: deviceId })" designScope="pressurefan_history" />
+      :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, sysId: deviceId })" designScope="pressurefan_history" :scroll="{ y: 650 }"/>
   </div>
 </template>
 <script setup lang="ts">

src/views/vent/performance/fileDetail/index.vue

@@ -436,7 +436,7 @@
   :deep(.@{ventSpace}-select-dropdown) {
     border: 1px solid #ececec66;
     background: #004362 !important;
-    left: 0px !important;
+    // left: 0px !important;
     backdrop-filter: blur(50px);
 
     .@{ventSpace}-select-item {