浏览代码

1. 柳塔注氮、注浆添加视频
2. 视频添加场景查询接口
3. 新增主斜井监测页面

hongrunxia 8 月之前
父节点
当前提交
a9dffc825f
共有 22 个文件被更改,包括 1849 次插入1802 次删除
  1. 1517 1517
      src/components/Form/src/jeecg/components/MTreeSelect.vue
  2. 8 2
      src/hooks/system/useCamera.ts
  3. 1 1
      src/utils/threejs/useThree.ts
  4. 2 1
      src/views/vent/monitorManager/comment/MonitorTable.vue
  5. 3 2
      src/views/vent/monitorManager/compressor/components/nitrogenHome_lt.vue
  6. 4 0
      src/views/vent/monitorManager/compressor/nitrogen.data.ts
  7. 1 1
      src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts
  8. 37 42
      src/views/vent/monitorManager/deviceMonitor/components/device/index.vue
  9. 2 0
      src/views/vent/monitorManager/deviceMonitor/index.vue
  10. 3 8
      src/views/vent/monitorManager/fanLocalMonitor/index.vue
  11. 21 11
      src/views/vent/monitorManager/gateMonitor/index.vue
  12. 3 3
      src/views/vent/monitorManager/groutMonitor/components/groutHomelt.vue
  13. 1 0
      src/views/vent/monitorManager/groutMonitor/grout.data.ts
  14. 1 1
      src/views/vent/monitorManager/mainFanMonitor/index.vue
  15. 5 2
      src/views/vent/monitorManager/mainFanMonitor/main.threejs.ts
  16. 30 18
      src/views/vent/monitorManager/mainFanMonitor/mainWind.threejs.ts
  17. 26 14
      src/views/vent/monitorManager/mainFanMonitor/mainWind.xj.threejs.ts
  18. 1 2
      src/views/vent/monitorManager/safetyMonitor/safety.data.ts
  19. 15 7
      src/views/vent/monitorManager/windowMonitor/index.vue
  20. 1 1
      src/views/vent/monitorManager/workFaceMonitor/components/workFaceGasHome.vue
  21. 1 1
      src/views/vent/monitorManager/workFaceMonitor/index.vue
  22. 166 168
      src/views/vent/reportManager/reportManager.data.ts

+ 1517 - 1517
src/components/Form/src/jeecg/components/MTreeSelect.vue

@@ -114,1523 +114,1523 @@
           result = res;
         }
 
-        result = {
-          '1': {
-            leader: '',
-            parentDepartment: '',
-            departmentTypeId: '0',
-            parentId: '0',
-            number: '75',
-            path: ',1,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '布尔台煤矿',
-            departmentTypeName: '其他部门',
-            id: '1',
-            position: '1',
-            companyUnitId: '1',
-          },
-          '2': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '21224',
-            path: ',1,2,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '行政办',
-            departmentTypeName: '其他部门',
-            id: '2',
-            position: '10',
-            companyUnitId: '1',
-          },
-          '3': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,3,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '矿领导',
-            departmentTypeName: '其他部门',
-            id: '3',
-            position: '2',
-            companyUnitId: '1',
-          },
-          '5': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '86',
-            path: ',1,5,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '经营办',
-            departmentTypeName: '其他部门',
-            id: '5',
-            position: '9',
-            companyUnitId: '1',
-          },
-          '6': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,6,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '安全监察管理办公室',
-            departmentTypeName: '其他部门',
-            id: '6',
-            position: '5',
-            companyUnitId: '1',
-          },
-          '7': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '81',
-            path: ',1,7,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '生产办',
-            departmentTypeName: '其他部门',
-            id: '7',
-            position: '8',
-            companyUnitId: '1',
-          },
-          '8': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,8,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '调度指挥中心',
-            departmentTypeName: '其他部门',
-            id: '8',
-            position: '4',
-            companyUnitId: '1',
-          },
-          '9': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '87',
-            path: ',1,9,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '综采一队',
-            departmentTypeName: '其他部门',
-            id: '9',
-            position: '13',
-            companyUnitId: '1',
-          },
-          '10': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '82',
-            path: ',1,10,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '机电办',
-            departmentTypeName: '其他部门',
-            id: '10',
-            position: '11',
-            companyUnitId: '1',
-          },
-          '11': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '88',
-            path: ',1,11,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '综采二队',
-            departmentTypeName: '其他部门',
-            id: '11',
-            position: '14',
-            companyUnitId: '1',
-          },
-          '12': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '10220',
-            path: ',1,12,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '综采三队',
-            departmentTypeName: '其他部门',
-            id: '12',
-            position: '15',
-            companyUnitId: '1',
-          },
-          '13': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '89',
-            path: ',1,13,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '掘锚一队',
-            departmentTypeName: '其他部门',
-            id: '13',
-            position: '16',
-            companyUnitId: '1',
-          },
-          '14': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '10213',
-            path: ',1,14,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '掘锚二队',
-            departmentTypeName: '其他部门',
-            id: '14',
-            position: '17',
-            companyUnitId: '1',
-          },
-          '15': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '10317',
-            path: ',1,15,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '掘锚三队',
-            departmentTypeName: '其他部门',
-            id: '15',
-            position: '18',
-            companyUnitId: '1',
-          },
-          '16': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '10302',
-            path: ',1,16,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '掘锚六队',
-            departmentTypeName: '其他部门',
-            id: '16',
-            position: '20',
-            companyUnitId: '1',
-          },
-          '18': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '10217',
-            path: ',1,18,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '通风队',
-            departmentTypeName: '其他部门',
-            id: '18',
-            position: '27',
-            companyUnitId: '1',
-          },
-          '19': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '10214',
-            path: ',1,19,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '运转一队',
-            departmentTypeName: '其他部门',
-            id: '19',
-            position: '22',
-            companyUnitId: '1',
-          },
-          '20': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '10215',
-            path: ',1,20,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '运转二队',
-            departmentTypeName: '其他部门',
-            id: '20',
-            position: '23',
-            companyUnitId: '1',
-          },
-          '21': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '10216',
-            path: ',1,21,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '机电一队',
-            departmentTypeName: '其他部门',
-            id: '21',
-            position: '24',
-            companyUnitId: '1',
-          },
-          '24': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '84',
-            path: ',1,24,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '车队',
-            departmentTypeName: '其他部门',
-            id: '24',
-            position: '30',
-            companyUnitId: '1',
-          },
-          '25': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '10352',
-            path: ',1,25,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '砼底板队',
-            departmentTypeName: '其他部门',
-            id: '25',
-            position: '31',
-            companyUnitId: '1',
-          },
-          '26': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '21228',
-            path: ',1,26,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '准备二队',
-            departmentTypeName: '其他部门',
-            id: '26',
-            position: '32',
-            companyUnitId: '1',
-          },
-          '28': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '21044',
-            path: ',1,28,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '掘锚五队',
-            departmentTypeName: '其他部门',
-            id: '28',
-            position: '19',
-            companyUnitId: '1',
-          },
-          '29': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '25539',
-            path: ',1,29,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '党委办',
-            departmentTypeName: '其他部门',
-            id: '29',
-            position: '33',
-            companyUnitId: '1',
-          },
-          '30': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '24829',
-            path: ',1,30,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '工程队',
-            departmentTypeName: '其他部门',
-            id: '30',
-            position: '37',
-            companyUnitId: '1',
-          },
-          '31': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '24823',
-            path: ',1,31,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '安装队',
-            departmentTypeName: '其他部门',
-            id: '31',
-            position: '29',
-            companyUnitId: '1',
-          },
-          '32': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '24824',
-            path: ',1,32,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '钻探准备队',
-            departmentTypeName: '其他部门',
-            id: '32',
-            position: '39',
-            companyUnitId: '1',
-          },
-          '34': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '25824',
-            path: ',1,34,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '机电二队',
-            departmentTypeName: '其他部门',
-            id: '34',
-            position: '25',
-            companyUnitId: '1',
-          },
-          '35': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,35,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '掘锚七队',
-            departmentTypeName: '其他部门',
-            id: '35',
-            position: '21',
-            companyUnitId: '1',
-          },
-          '162': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '9305',
-            path: ',311,162,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]安管办',
-            departmentTypeName: '其他部门',
-            id: '162',
-            position: '194',
-            companyUnitId: '1',
-          },
-          '164': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '9306',
-            path: ',311,164,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]钻探队',
-            departmentTypeName: '其他部门',
-            id: '164',
-            position: '195',
-            companyUnitId: '1',
-          },
-          '167': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '20903',
-            path: ',311,167,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]物探队',
-            departmentTypeName: '其他部门',
-            id: '167',
-            position: '196',
-            companyUnitId: '1',
-          },
-          '169': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '21896',
-            path: ',311,169,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]大柳塔站',
-            departmentTypeName: '其他部门',
-            id: '169',
-            position: '197',
-            companyUnitId: '1',
-          },
-          '170': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '21897',
-            path: ',311,170,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]补连塔站',
-            departmentTypeName: '其他部门',
-            id: '170',
-            position: '198',
-            companyUnitId: '1',
-          },
-          '171': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '21898',
-            path: ',311,171,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]上湾站',
-            departmentTypeName: '其他部门',
-            id: '171',
-            position: '199',
-            companyUnitId: '1',
-          },
-          '172': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '21899',
-            path: ',311,172,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]哈拉沟站',
-            departmentTypeName: '其他部门',
-            id: '172',
-            position: '200',
-            companyUnitId: '1',
-          },
-          '173': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '21900',
-            path: ',311,173,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]石圪台站',
-            departmentTypeName: '其他部门',
-            id: '173',
-            position: '201',
-            companyUnitId: '1',
-          },
-          '175': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '21902',
-            path: ',311,175,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]锦界站',
-            departmentTypeName: '其他部门',
-            id: '175',
-            position: '202',
-            companyUnitId: '1',
-          },
-          '185': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '21912',
-            path: ',311,185,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]榆家梁站',
-            departmentTypeName: '其他部门',
-            id: '185',
-            position: '203',
-            companyUnitId: '1',
-          },
-          '276': {
-            leader: '',
-            parentDepartment: '',
-            departmentTypeId: '0',
-            parentId: '0',
-            number: '0',
-            path: ',276,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '贵宾',
-            departmentTypeName: '其他部门',
-            id: '276',
-            position: '298',
-            companyUnitId: '1',
-          },
-          '284': {
-            leader: '李政15',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,284,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '智能运维队',
-            departmentTypeName: '其他部门',
-            id: '284',
-            position: '28',
-            companyUnitId: '1',
-          },
-          '285': {
-            leader: '',
-            parentDepartment: '',
-            departmentTypeId: '0',
-            parentId: '0',
-            number: '0',
-            path: ',285,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '本矿车辆',
-            departmentTypeName: '其他部门',
-            id: '285',
-            position: '294',
-            companyUnitId: '1',
-          },
-          '288': {
-            leader: '',
-            parentDepartment: '',
-            departmentTypeId: '0',
-            parentId: '0',
-            number: '0',
-            path: ',288,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '外委车辆',
-            departmentTypeName: '其他部门',
-            id: '288',
-            position: '295',
-            companyUnitId: '1',
-          },
-          '311': {
-            leader: '',
-            parentDepartment: '',
-            departmentTypeId: '0',
-            parentId: '0',
-            number: '0',
-            path: ',311,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司',
-            departmentTypeName: '其他部门',
-            id: '311',
-            position: '163',
-            companyUnitId: '1',
-          },
-          '380': {
-            leader: '白国勇',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,380,',
-            companyUnit: '本矿',
-            telphone: '18047388802',
-            name: '车辆管理组',
-            departmentTypeName: '其他部门',
-            id: '380',
-            position: '12',
-            companyUnitId: '1',
-          },
-          '393': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '15011',
-            path: ',311,393,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-[地]布尔台站',
-            departmentTypeName: '其他部门',
-            id: '393',
-            position: '193',
-            companyUnitId: '1',
-          },
-          '399': {
-            leader: '高平',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,399,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地质防治水办',
-            departmentTypeName: '其他部门',
-            id: '399',
-            position: '3',
-            companyUnitId: '1',
-          },
-          '400': {
-            leader: '任建慧33',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,400,',
-            companyUnit: '本矿',
-            telphone: '18047388848',
-            name: '矿压办',
-            departmentTypeName: '其他部门',
-            id: '400',
-            position: '7',
-            companyUnitId: '1',
-          },
-          '402': {
-            leader: '潘吉成',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,402,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '通风办',
-            departmentTypeName: '其他部门',
-            id: '402',
-            position: '6',
-            companyUnitId: '1',
-          },
-          '405': {
-            leader: '',
-            parentDepartment: '',
-            departmentTypeId: '0',
-            parentId: '0',
-            number: '0',
-            path: ',405,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心',
-            departmentTypeName: '其他部门',
-            id: '405',
-            position: '277',
-            companyUnitId: '1',
-          },
-          '406': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '100',
-            path: ',405,406,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-中心领导',
-            departmentTypeName: '其他部门',
-            id: '406',
-            position: '289',
-            companyUnitId: '1',
-          },
-          '412': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '100',
-            path: ',405,412,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-寸草塔二矿',
-            departmentTypeName: '其他部门',
-            id: '412',
-            position: '288',
-            companyUnitId: '1',
-          },
-          '413': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '101',
-            path: ',405,413,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-寸草塔二矿财务科',
-            departmentTypeName: '其他部门',
-            id: '413',
-            position: '287',
-            companyUnitId: '1',
-          },
-          '414': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '102',
-            path: ',405,414,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-大柳塔煤矿财务科',
-            departmentTypeName: '其他部门',
-            id: '414',
-            position: '286',
-            companyUnitId: '1',
-          },
-          '415': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '103',
-            path: ',405,415,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-哈拉沟煤矿财务科',
-            departmentTypeName: '其他部门',
-            id: '415',
-            position: '285',
-            companyUnitId: '1',
-          },
-          '416': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '104',
-            path: ',405,416,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-锦界煤矿管理处财务科',
-            departmentTypeName: '其他部门',
-            id: '416',
-            position: '284',
-            companyUnitId: '1',
-          },
-          '417': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '105',
-            path: ',405,417,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-上湾煤矿财务科',
-            departmentTypeName: '其他部门',
-            id: '417',
-            position: '283',
-            companyUnitId: '1',
-          },
-          '418': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '106',
-            path: ',405,418,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-神东露天煤矿财务科',
-            departmentTypeName: '其他部门',
-            id: '418',
-            position: '282',
-            companyUnitId: '1',
-          },
-          '419': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '107',
-            path: ',405,419,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-乌兰木伦矿财务科',
-            departmentTypeName: '其他部门',
-            id: '419',
-            position: '281',
-            companyUnitId: '1',
-          },
-          '420': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '108',
-            path: ',405,420,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-驻大柳塔煤矿财务科',
-            departmentTypeName: '其他部门',
-            id: '420',
-            position: '280',
-            companyUnitId: '1',
-          },
-          '467': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '0',
-            path: ',405,467,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心-补连塔财务科',
-            departmentTypeName: '其他部门',
-            id: '467',
-            position: '279',
-            companyUnitId: '1',
-          },
-          '469': {
-            leader: '',
-            parentDepartment: '核算中心',
-            departmentTypeId: '0',
-            parentId: '405',
-            number: '0',
-            path: ',405,469,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '核算中心--驻布尔台矿财务科',
-            departmentTypeName: '其他部门',
-            id: '469',
-            position: '278',
-            companyUnitId: '1',
-          },
-          '470': {
-            leader: '张新祯25',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,470,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '巷道维修队',
-            departmentTypeName: '其他部门',
-            id: '470',
-            position: '34',
-            companyUnitId: '1',
-          },
-          '471': {
-            leader: '',
-            parentDepartment: '',
-            departmentTypeId: '0',
-            parentId: '0',
-            number: '0',
-            path: ',471,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '生产服务中心车队',
-            departmentTypeName: '其他部门',
-            id: '471',
-            position: '291',
-            companyUnitId: '1',
-          },
-          '489': {
-            leader: '',
-            parentDepartment: '',
-            departmentTypeId: '0',
-            parentId: '0',
-            number: '0',
-            path: ',489,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '布尔台煤矿-[地]布尔台站',
-            departmentTypeName: '其他部门',
-            id: '489',
-            position: '297',
-            companyUnitId: '1',
-          },
-          '499': {
-            leader: '姚涛',
-            parentDepartment: '开拓准备中心',
-            departmentTypeId: '0',
-            parentId: '310',
-            number: '0',
-            path: ',310,499,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '综掘六队',
-            departmentTypeName: '作业部门',
-            id: '499',
-            position: '42',
-            companyUnitId: '1',
-          },
-          '501': {
-            leader: '郝斌',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,501,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '机电三队',
-            departmentTypeName: '作业部门',
-            id: '501',
-            position: '26',
-            companyUnitId: '1',
-          },
-          '503': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,503,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '中铁十一局',
-            departmentTypeName: '其他部门',
-            id: '503',
-            position: '40',
-            companyUnitId: '1',
-          },
-          '524': {
-            leader: '',
-            parentDepartment: '',
-            departmentTypeId: '0',
-            parentId: '0',
-            number: '0',
-            path: ',524,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '专业化单位',
-            departmentTypeName: '作业部门',
-            id: '524',
-            position: '301',
-            companyUnitId: '1',
-          },
-          '525': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,525,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '准备三队',
-            departmentTypeName: '其他部门',
-            id: '525',
-            position: '35',
-            companyUnitId: '1',
-          },
-          '536': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200111',
-            path: ',311,536,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-地测领导',
-            departmentTypeName: '其他部门',
-            id: '536',
-            position: '192',
-            companyUnitId: '1',
-          },
-          '537': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200112',
-            path: ',311,537,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-党委办公室?(行政办公室)',
-            departmentTypeName: '其他部门',
-            id: '537',
-            position: '191',
-            companyUnitId: '1',
-          },
-          '538': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200113',
-            path: ',311,538,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-经营办公室',
-            departmentTypeName: '其他部门',
-            id: '538',
-            position: '190',
-            companyUnitId: '1',
-          },
-          '539': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200114',
-            path: ',311,539,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-生产技术办公室',
-            departmentTypeName: '其他部门',
-            id: '539',
-            position: '189',
-            companyUnitId: '1',
-          },
-          '540': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200115',
-            path: ',311,540,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-安全监察管理办公室',
-            departmentTypeName: '其他部门',
-            id: '540',
-            position: '188',
-            companyUnitId: '1',
-          },
-          '541': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200116',
-            path: ',311,541,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-设备管理办公室',
-            departmentTypeName: '其他部门',
-            id: '541',
-            position: '187',
-            companyUnitId: '1',
-          },
-          '542': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200117',
-            path: ',311,542,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-大柳塔地测站',
-            departmentTypeName: '其他部门',
-            id: '542',
-            position: '186',
-            companyUnitId: '1',
-          },
-          '543': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200119',
-            path: ',311,543,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-补连塔地测站',
-            departmentTypeName: '其他部门',
-            id: '543',
-            position: '185',
-            companyUnitId: '1',
-          },
-          '544': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200120',
-            path: ',311,544,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-布尔台地测站',
-            departmentTypeName: '其他部门',
-            id: '544',
-            position: '184',
-            companyUnitId: '1',
-          },
-          '545': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200121',
-            path: ',311,545,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-锦界地测站',
-            departmentTypeName: '其他部门',
-            id: '545',
-            position: '183',
-            companyUnitId: '1',
-          },
-          '546': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200122',
-            path: ',311,546,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-哈拉沟地测站',
-            departmentTypeName: '其他部门',
-            id: '546',
-            position: '182',
-            companyUnitId: '1',
-          },
-          '547': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200124',
-            path: ',311,547,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-石圪台地测站',
-            departmentTypeName: '其他部门',
-            id: '547',
-            position: '181',
-            companyUnitId: '1',
-          },
-          '548': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200125',
-            path: ',311,548,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-上湾地测站',
-            departmentTypeName: '其他部门',
-            id: '548',
-            position: '180',
-            companyUnitId: '1',
-          },
-          '549': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200126',
-            path: ',311,549,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-榆家梁地测站',
-            departmentTypeName: '其他部门',
-            id: '549',
-            position: '179',
-            companyUnitId: '1',
-          },
-          '550': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200123',
-            path: ',311,550,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-乌兰木伦地测站',
-            departmentTypeName: '其他部门',
-            id: '550',
-            position: '178',
-            companyUnitId: '1',
-          },
-          '551': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200128',
-            path: ',311,551,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-柳塔地测站',
-            departmentTypeName: '其他部门',
-            id: '551',
-            position: '177',
-            companyUnitId: '1',
-          },
-          '552': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200129',
-            path: ',311,552,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-寸草塔地测站',
-            departmentTypeName: '其他部门',
-            id: '552',
-            position: '176',
-            companyUnitId: '1',
-          },
-          '553': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200130',
-            path: ',311,553,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-寸草塔二矿地测站',
-            departmentTypeName: '其他部门',
-            id: '553',
-            position: '175',
-            companyUnitId: '1',
-          },
-          '554': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200131',
-            path: ',311,554,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-地方煤矿监测站',
-            departmentTypeName: '其他部门',
-            id: '554',
-            position: '174',
-            companyUnitId: '1',
-          },
-          '555': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200132',
-            path: ',311,555,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-大柳塔三盘区管理处地测站',
-            departmentTypeName: '其他部门',
-            id: '555',
-            position: '173',
-            companyUnitId: '1',
-          },
-          '556': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200133',
-            path: ',311,556,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-测量队',
-            departmentTypeName: '其他部门',
-            id: '556',
-            position: '172',
-            companyUnitId: '1',
-          },
-          '557': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200134',
-            path: ',311,557,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-勘探队',
-            departmentTypeName: '其他部门',
-            id: '557',
-            position: '171',
-            companyUnitId: '1',
-          },
-          '558': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200135',
-            path: ',311,558,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-物探队',
-            departmentTypeName: '其他部门',
-            id: '558',
-            position: '170',
-            companyUnitId: '1',
-          },
-          '559': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200136',
-            path: ',311,559,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-地测探放水一队',
-            departmentTypeName: '其他部门',
-            id: '559',
-            position: '169',
-            companyUnitId: '1',
-          },
-          '560': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200137',
-            path: ',311,560,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-地测探放水二队',
-            departmentTypeName: '其他部门',
-            id: '560',
-            position: '168',
-            companyUnitId: '1',
-          },
-          '561': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200138',
-            path: ',311,561,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-维修队',
-            departmentTypeName: '其他部门',
-            id: '561',
-            position: '167',
-            companyUnitId: '1',
-          },
-          '562': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200139',
-            path: ',311,562,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-防灭火队',
-            departmentTypeName: '其他部门',
-            id: '562',
-            position: '166',
-            companyUnitId: '1',
-          },
-          '563': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200140',
-            path: ',311,563,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-大龄转岗人员',
-            departmentTypeName: '其他部门',
-            id: '563',
-            position: '165',
-            companyUnitId: '1',
-          },
-          '564': {
-            leader: '',
-            parentDepartment: '地测公司',
-            departmentTypeId: '0',
-            parentId: '311',
-            number: '200110',
-            path: ',311,564,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '地测公司-党委办公室',
-            departmentTypeName: '其他部门',
-            id: '564',
-            position: '164',
-            companyUnitId: '1',
-          },
-          '565': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,565,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '安装二队',
-            departmentTypeName: '其他部门',
-            id: '565',
-            position: '38',
-            companyUnitId: '1',
-          },
-          '566': {
-            leader: '',
-            parentDepartment: '布尔台煤矿',
-            departmentTypeId: '0',
-            parentId: '1',
-            number: '0',
-            path: ',1,566,',
-            companyUnit: '本矿',
-            telphone: '',
-            name: '砼底板二队',
-            departmentTypeName: '其他部门',
-            id: '566',
-            position: '36',
-            companyUnitId: '1',
-          },
-        };
+        // result = {
+        //   '1': {
+        //     leader: '',
+        //     parentDepartment: '',
+        //     departmentTypeId: '0',
+        //     parentId: '0',
+        //     number: '75',
+        //     path: ',1,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '布尔台煤矿',
+        //     departmentTypeName: '其他部门',
+        //     id: '1',
+        //     position: '1',
+        //     companyUnitId: '1',
+        //   },
+        //   '2': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '21224',
+        //     path: ',1,2,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '行政办',
+        //     departmentTypeName: '其他部门',
+        //     id: '2',
+        //     position: '10',
+        //     companyUnitId: '1',
+        //   },
+        //   '3': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,3,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '矿领导',
+        //     departmentTypeName: '其他部门',
+        //     id: '3',
+        //     position: '2',
+        //     companyUnitId: '1',
+        //   },
+        //   '5': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '86',
+        //     path: ',1,5,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '经营办',
+        //     departmentTypeName: '其他部门',
+        //     id: '5',
+        //     position: '9',
+        //     companyUnitId: '1',
+        //   },
+        //   '6': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,6,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '安全监察管理办公室',
+        //     departmentTypeName: '其他部门',
+        //     id: '6',
+        //     position: '5',
+        //     companyUnitId: '1',
+        //   },
+        //   '7': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '81',
+        //     path: ',1,7,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '生产办',
+        //     departmentTypeName: '其他部门',
+        //     id: '7',
+        //     position: '8',
+        //     companyUnitId: '1',
+        //   },
+        //   '8': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,8,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '调度指挥中心',
+        //     departmentTypeName: '其他部门',
+        //     id: '8',
+        //     position: '4',
+        //     companyUnitId: '1',
+        //   },
+        //   '9': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '87',
+        //     path: ',1,9,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '综采一队',
+        //     departmentTypeName: '其他部门',
+        //     id: '9',
+        //     position: '13',
+        //     companyUnitId: '1',
+        //   },
+        //   '10': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '82',
+        //     path: ',1,10,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '机电办',
+        //     departmentTypeName: '其他部门',
+        //     id: '10',
+        //     position: '11',
+        //     companyUnitId: '1',
+        //   },
+        //   '11': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '88',
+        //     path: ',1,11,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '综采二队',
+        //     departmentTypeName: '其他部门',
+        //     id: '11',
+        //     position: '14',
+        //     companyUnitId: '1',
+        //   },
+        //   '12': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '10220',
+        //     path: ',1,12,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '综采三队',
+        //     departmentTypeName: '其他部门',
+        //     id: '12',
+        //     position: '15',
+        //     companyUnitId: '1',
+        //   },
+        //   '13': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '89',
+        //     path: ',1,13,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '掘锚一队',
+        //     departmentTypeName: '其他部门',
+        //     id: '13',
+        //     position: '16',
+        //     companyUnitId: '1',
+        //   },
+        //   '14': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '10213',
+        //     path: ',1,14,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '掘锚二队',
+        //     departmentTypeName: '其他部门',
+        //     id: '14',
+        //     position: '17',
+        //     companyUnitId: '1',
+        //   },
+        //   '15': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '10317',
+        //     path: ',1,15,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '掘锚三队',
+        //     departmentTypeName: '其他部门',
+        //     id: '15',
+        //     position: '18',
+        //     companyUnitId: '1',
+        //   },
+        //   '16': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '10302',
+        //     path: ',1,16,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '掘锚六队',
+        //     departmentTypeName: '其他部门',
+        //     id: '16',
+        //     position: '20',
+        //     companyUnitId: '1',
+        //   },
+        //   '18': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '10217',
+        //     path: ',1,18,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '通风队',
+        //     departmentTypeName: '其他部门',
+        //     id: '18',
+        //     position: '27',
+        //     companyUnitId: '1',
+        //   },
+        //   '19': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '10214',
+        //     path: ',1,19,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '运转一队',
+        //     departmentTypeName: '其他部门',
+        //     id: '19',
+        //     position: '22',
+        //     companyUnitId: '1',
+        //   },
+        //   '20': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '10215',
+        //     path: ',1,20,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '运转二队',
+        //     departmentTypeName: '其他部门',
+        //     id: '20',
+        //     position: '23',
+        //     companyUnitId: '1',
+        //   },
+        //   '21': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '10216',
+        //     path: ',1,21,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '机电一队',
+        //     departmentTypeName: '其他部门',
+        //     id: '21',
+        //     position: '24',
+        //     companyUnitId: '1',
+        //   },
+        //   '24': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '84',
+        //     path: ',1,24,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '车队',
+        //     departmentTypeName: '其他部门',
+        //     id: '24',
+        //     position: '30',
+        //     companyUnitId: '1',
+        //   },
+        //   '25': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '10352',
+        //     path: ',1,25,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '砼底板队',
+        //     departmentTypeName: '其他部门',
+        //     id: '25',
+        //     position: '31',
+        //     companyUnitId: '1',
+        //   },
+        //   '26': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '21228',
+        //     path: ',1,26,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '准备二队',
+        //     departmentTypeName: '其他部门',
+        //     id: '26',
+        //     position: '32',
+        //     companyUnitId: '1',
+        //   },
+        //   '28': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '21044',
+        //     path: ',1,28,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '掘锚五队',
+        //     departmentTypeName: '其他部门',
+        //     id: '28',
+        //     position: '19',
+        //     companyUnitId: '1',
+        //   },
+        //   '29': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '25539',
+        //     path: ',1,29,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '党委办',
+        //     departmentTypeName: '其他部门',
+        //     id: '29',
+        //     position: '33',
+        //     companyUnitId: '1',
+        //   },
+        //   '30': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '24829',
+        //     path: ',1,30,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '工程队',
+        //     departmentTypeName: '其他部门',
+        //     id: '30',
+        //     position: '37',
+        //     companyUnitId: '1',
+        //   },
+        //   '31': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '24823',
+        //     path: ',1,31,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '安装队',
+        //     departmentTypeName: '其他部门',
+        //     id: '31',
+        //     position: '29',
+        //     companyUnitId: '1',
+        //   },
+        //   '32': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '24824',
+        //     path: ',1,32,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '钻探准备队',
+        //     departmentTypeName: '其他部门',
+        //     id: '32',
+        //     position: '39',
+        //     companyUnitId: '1',
+        //   },
+        //   '34': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '25824',
+        //     path: ',1,34,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '机电二队',
+        //     departmentTypeName: '其他部门',
+        //     id: '34',
+        //     position: '25',
+        //     companyUnitId: '1',
+        //   },
+        //   '35': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,35,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '掘锚七队',
+        //     departmentTypeName: '其他部门',
+        //     id: '35',
+        //     position: '21',
+        //     companyUnitId: '1',
+        //   },
+        //   '162': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '9305',
+        //     path: ',311,162,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]安管办',
+        //     departmentTypeName: '其他部门',
+        //     id: '162',
+        //     position: '194',
+        //     companyUnitId: '1',
+        //   },
+        //   '164': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '9306',
+        //     path: ',311,164,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]钻探队',
+        //     departmentTypeName: '其他部门',
+        //     id: '164',
+        //     position: '195',
+        //     companyUnitId: '1',
+        //   },
+        //   '167': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '20903',
+        //     path: ',311,167,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]物探队',
+        //     departmentTypeName: '其他部门',
+        //     id: '167',
+        //     position: '196',
+        //     companyUnitId: '1',
+        //   },
+        //   '169': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '21896',
+        //     path: ',311,169,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]大柳塔站',
+        //     departmentTypeName: '其他部门',
+        //     id: '169',
+        //     position: '197',
+        //     companyUnitId: '1',
+        //   },
+        //   '170': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '21897',
+        //     path: ',311,170,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]补连塔站',
+        //     departmentTypeName: '其他部门',
+        //     id: '170',
+        //     position: '198',
+        //     companyUnitId: '1',
+        //   },
+        //   '171': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '21898',
+        //     path: ',311,171,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]上湾站',
+        //     departmentTypeName: '其他部门',
+        //     id: '171',
+        //     position: '199',
+        //     companyUnitId: '1',
+        //   },
+        //   '172': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '21899',
+        //     path: ',311,172,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]哈拉沟站',
+        //     departmentTypeName: '其他部门',
+        //     id: '172',
+        //     position: '200',
+        //     companyUnitId: '1',
+        //   },
+        //   '173': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '21900',
+        //     path: ',311,173,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]石圪台站',
+        //     departmentTypeName: '其他部门',
+        //     id: '173',
+        //     position: '201',
+        //     companyUnitId: '1',
+        //   },
+        //   '175': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '21902',
+        //     path: ',311,175,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]锦界站',
+        //     departmentTypeName: '其他部门',
+        //     id: '175',
+        //     position: '202',
+        //     companyUnitId: '1',
+        //   },
+        //   '185': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '21912',
+        //     path: ',311,185,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]榆家梁站',
+        //     departmentTypeName: '其他部门',
+        //     id: '185',
+        //     position: '203',
+        //     companyUnitId: '1',
+        //   },
+        //   '276': {
+        //     leader: '',
+        //     parentDepartment: '',
+        //     departmentTypeId: '0',
+        //     parentId: '0',
+        //     number: '0',
+        //     path: ',276,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '贵宾',
+        //     departmentTypeName: '其他部门',
+        //     id: '276',
+        //     position: '298',
+        //     companyUnitId: '1',
+        //   },
+        //   '284': {
+        //     leader: '李政15',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,284,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '智能运维队',
+        //     departmentTypeName: '其他部门',
+        //     id: '284',
+        //     position: '28',
+        //     companyUnitId: '1',
+        //   },
+        //   '285': {
+        //     leader: '',
+        //     parentDepartment: '',
+        //     departmentTypeId: '0',
+        //     parentId: '0',
+        //     number: '0',
+        //     path: ',285,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '本矿车辆',
+        //     departmentTypeName: '其他部门',
+        //     id: '285',
+        //     position: '294',
+        //     companyUnitId: '1',
+        //   },
+        //   '288': {
+        //     leader: '',
+        //     parentDepartment: '',
+        //     departmentTypeId: '0',
+        //     parentId: '0',
+        //     number: '0',
+        //     path: ',288,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '外委车辆',
+        //     departmentTypeName: '其他部门',
+        //     id: '288',
+        //     position: '295',
+        //     companyUnitId: '1',
+        //   },
+        //   '311': {
+        //     leader: '',
+        //     parentDepartment: '',
+        //     departmentTypeId: '0',
+        //     parentId: '0',
+        //     number: '0',
+        //     path: ',311,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司',
+        //     departmentTypeName: '其他部门',
+        //     id: '311',
+        //     position: '163',
+        //     companyUnitId: '1',
+        //   },
+        //   '380': {
+        //     leader: '白国勇',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,380,',
+        //     companyUnit: '本矿',
+        //     telphone: '18047388802',
+        //     name: '车辆管理组',
+        //     departmentTypeName: '其他部门',
+        //     id: '380',
+        //     position: '12',
+        //     companyUnitId: '1',
+        //   },
+        //   '393': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '15011',
+        //     path: ',311,393,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-[地]布尔台站',
+        //     departmentTypeName: '其他部门',
+        //     id: '393',
+        //     position: '193',
+        //     companyUnitId: '1',
+        //   },
+        //   '399': {
+        //     leader: '高平',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,399,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地质防治水办',
+        //     departmentTypeName: '其他部门',
+        //     id: '399',
+        //     position: '3',
+        //     companyUnitId: '1',
+        //   },
+        //   '400': {
+        //     leader: '任建慧33',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,400,',
+        //     companyUnit: '本矿',
+        //     telphone: '18047388848',
+        //     name: '矿压办',
+        //     departmentTypeName: '其他部门',
+        //     id: '400',
+        //     position: '7',
+        //     companyUnitId: '1',
+        //   },
+        //   '402': {
+        //     leader: '潘吉成',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,402,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '通风办',
+        //     departmentTypeName: '其他部门',
+        //     id: '402',
+        //     position: '6',
+        //     companyUnitId: '1',
+        //   },
+        //   '405': {
+        //     leader: '',
+        //     parentDepartment: '',
+        //     departmentTypeId: '0',
+        //     parentId: '0',
+        //     number: '0',
+        //     path: ',405,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心',
+        //     departmentTypeName: '其他部门',
+        //     id: '405',
+        //     position: '277',
+        //     companyUnitId: '1',
+        //   },
+        //   '406': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '100',
+        //     path: ',405,406,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-中心领导',
+        //     departmentTypeName: '其他部门',
+        //     id: '406',
+        //     position: '289',
+        //     companyUnitId: '1',
+        //   },
+        //   '412': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '100',
+        //     path: ',405,412,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-寸草塔二矿',
+        //     departmentTypeName: '其他部门',
+        //     id: '412',
+        //     position: '288',
+        //     companyUnitId: '1',
+        //   },
+        //   '413': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '101',
+        //     path: ',405,413,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-寸草塔二矿财务科',
+        //     departmentTypeName: '其他部门',
+        //     id: '413',
+        //     position: '287',
+        //     companyUnitId: '1',
+        //   },
+        //   '414': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '102',
+        //     path: ',405,414,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-大柳塔煤矿财务科',
+        //     departmentTypeName: '其他部门',
+        //     id: '414',
+        //     position: '286',
+        //     companyUnitId: '1',
+        //   },
+        //   '415': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '103',
+        //     path: ',405,415,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-哈拉沟煤矿财务科',
+        //     departmentTypeName: '其他部门',
+        //     id: '415',
+        //     position: '285',
+        //     companyUnitId: '1',
+        //   },
+        //   '416': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '104',
+        //     path: ',405,416,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-锦界煤矿管理处财务科',
+        //     departmentTypeName: '其他部门',
+        //     id: '416',
+        //     position: '284',
+        //     companyUnitId: '1',
+        //   },
+        //   '417': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '105',
+        //     path: ',405,417,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-上湾煤矿财务科',
+        //     departmentTypeName: '其他部门',
+        //     id: '417',
+        //     position: '283',
+        //     companyUnitId: '1',
+        //   },
+        //   '418': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '106',
+        //     path: ',405,418,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-神东露天煤矿财务科',
+        //     departmentTypeName: '其他部门',
+        //     id: '418',
+        //     position: '282',
+        //     companyUnitId: '1',
+        //   },
+        //   '419': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '107',
+        //     path: ',405,419,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-乌兰木伦矿财务科',
+        //     departmentTypeName: '其他部门',
+        //     id: '419',
+        //     position: '281',
+        //     companyUnitId: '1',
+        //   },
+        //   '420': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '108',
+        //     path: ',405,420,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-驻大柳塔煤矿财务科',
+        //     departmentTypeName: '其他部门',
+        //     id: '420',
+        //     position: '280',
+        //     companyUnitId: '1',
+        //   },
+        //   '467': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '0',
+        //     path: ',405,467,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心-补连塔财务科',
+        //     departmentTypeName: '其他部门',
+        //     id: '467',
+        //     position: '279',
+        //     companyUnitId: '1',
+        //   },
+        //   '469': {
+        //     leader: '',
+        //     parentDepartment: '核算中心',
+        //     departmentTypeId: '0',
+        //     parentId: '405',
+        //     number: '0',
+        //     path: ',405,469,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '核算中心--驻布尔台矿财务科',
+        //     departmentTypeName: '其他部门',
+        //     id: '469',
+        //     position: '278',
+        //     companyUnitId: '1',
+        //   },
+        //   '470': {
+        //     leader: '张新祯25',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,470,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '巷道维修队',
+        //     departmentTypeName: '其他部门',
+        //     id: '470',
+        //     position: '34',
+        //     companyUnitId: '1',
+        //   },
+        //   '471': {
+        //     leader: '',
+        //     parentDepartment: '',
+        //     departmentTypeId: '0',
+        //     parentId: '0',
+        //     number: '0',
+        //     path: ',471,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '生产服务中心车队',
+        //     departmentTypeName: '其他部门',
+        //     id: '471',
+        //     position: '291',
+        //     companyUnitId: '1',
+        //   },
+        //   '489': {
+        //     leader: '',
+        //     parentDepartment: '',
+        //     departmentTypeId: '0',
+        //     parentId: '0',
+        //     number: '0',
+        //     path: ',489,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '布尔台煤矿-[地]布尔台站',
+        //     departmentTypeName: '其他部门',
+        //     id: '489',
+        //     position: '297',
+        //     companyUnitId: '1',
+        //   },
+        //   '499': {
+        //     leader: '姚涛',
+        //     parentDepartment: '开拓准备中心',
+        //     departmentTypeId: '0',
+        //     parentId: '310',
+        //     number: '0',
+        //     path: ',310,499,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '综掘六队',
+        //     departmentTypeName: '作业部门',
+        //     id: '499',
+        //     position: '42',
+        //     companyUnitId: '1',
+        //   },
+        //   '501': {
+        //     leader: '郝斌',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,501,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '机电三队',
+        //     departmentTypeName: '作业部门',
+        //     id: '501',
+        //     position: '26',
+        //     companyUnitId: '1',
+        //   },
+        //   '503': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,503,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '中铁十一局',
+        //     departmentTypeName: '其他部门',
+        //     id: '503',
+        //     position: '40',
+        //     companyUnitId: '1',
+        //   },
+        //   '524': {
+        //     leader: '',
+        //     parentDepartment: '',
+        //     departmentTypeId: '0',
+        //     parentId: '0',
+        //     number: '0',
+        //     path: ',524,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '专业化单位',
+        //     departmentTypeName: '作业部门',
+        //     id: '524',
+        //     position: '301',
+        //     companyUnitId: '1',
+        //   },
+        //   '525': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,525,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '准备三队',
+        //     departmentTypeName: '其他部门',
+        //     id: '525',
+        //     position: '35',
+        //     companyUnitId: '1',
+        //   },
+        //   '536': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200111',
+        //     path: ',311,536,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-地测领导',
+        //     departmentTypeName: '其他部门',
+        //     id: '536',
+        //     position: '192',
+        //     companyUnitId: '1',
+        //   },
+        //   '537': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200112',
+        //     path: ',311,537,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-党委办公室?(行政办公室)',
+        //     departmentTypeName: '其他部门',
+        //     id: '537',
+        //     position: '191',
+        //     companyUnitId: '1',
+        //   },
+        //   '538': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200113',
+        //     path: ',311,538,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-经营办公室',
+        //     departmentTypeName: '其他部门',
+        //     id: '538',
+        //     position: '190',
+        //     companyUnitId: '1',
+        //   },
+        //   '539': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200114',
+        //     path: ',311,539,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-生产技术办公室',
+        //     departmentTypeName: '其他部门',
+        //     id: '539',
+        //     position: '189',
+        //     companyUnitId: '1',
+        //   },
+        //   '540': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200115',
+        //     path: ',311,540,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-安全监察管理办公室',
+        //     departmentTypeName: '其他部门',
+        //     id: '540',
+        //     position: '188',
+        //     companyUnitId: '1',
+        //   },
+        //   '541': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200116',
+        //     path: ',311,541,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-设备管理办公室',
+        //     departmentTypeName: '其他部门',
+        //     id: '541',
+        //     position: '187',
+        //     companyUnitId: '1',
+        //   },
+        //   '542': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200117',
+        //     path: ',311,542,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-大柳塔地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '542',
+        //     position: '186',
+        //     companyUnitId: '1',
+        //   },
+        //   '543': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200119',
+        //     path: ',311,543,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-补连塔地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '543',
+        //     position: '185',
+        //     companyUnitId: '1',
+        //   },
+        //   '544': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200120',
+        //     path: ',311,544,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-布尔台地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '544',
+        //     position: '184',
+        //     companyUnitId: '1',
+        //   },
+        //   '545': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200121',
+        //     path: ',311,545,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-锦界地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '545',
+        //     position: '183',
+        //     companyUnitId: '1',
+        //   },
+        //   '546': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200122',
+        //     path: ',311,546,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-哈拉沟地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '546',
+        //     position: '182',
+        //     companyUnitId: '1',
+        //   },
+        //   '547': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200124',
+        //     path: ',311,547,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-石圪台地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '547',
+        //     position: '181',
+        //     companyUnitId: '1',
+        //   },
+        //   '548': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200125',
+        //     path: ',311,548,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-上湾地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '548',
+        //     position: '180',
+        //     companyUnitId: '1',
+        //   },
+        //   '549': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200126',
+        //     path: ',311,549,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-榆家梁地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '549',
+        //     position: '179',
+        //     companyUnitId: '1',
+        //   },
+        //   '550': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200123',
+        //     path: ',311,550,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-乌兰木伦地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '550',
+        //     position: '178',
+        //     companyUnitId: '1',
+        //   },
+        //   '551': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200128',
+        //     path: ',311,551,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-柳塔地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '551',
+        //     position: '177',
+        //     companyUnitId: '1',
+        //   },
+        //   '552': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200129',
+        //     path: ',311,552,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-寸草塔地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '552',
+        //     position: '176',
+        //     companyUnitId: '1',
+        //   },
+        //   '553': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200130',
+        //     path: ',311,553,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-寸草塔二矿地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '553',
+        //     position: '175',
+        //     companyUnitId: '1',
+        //   },
+        //   '554': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200131',
+        //     path: ',311,554,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-地方煤矿监测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '554',
+        //     position: '174',
+        //     companyUnitId: '1',
+        //   },
+        //   '555': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200132',
+        //     path: ',311,555,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-大柳塔三盘区管理处地测站',
+        //     departmentTypeName: '其他部门',
+        //     id: '555',
+        //     position: '173',
+        //     companyUnitId: '1',
+        //   },
+        //   '556': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200133',
+        //     path: ',311,556,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-测量队',
+        //     departmentTypeName: '其他部门',
+        //     id: '556',
+        //     position: '172',
+        //     companyUnitId: '1',
+        //   },
+        //   '557': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200134',
+        //     path: ',311,557,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-勘探队',
+        //     departmentTypeName: '其他部门',
+        //     id: '557',
+        //     position: '171',
+        //     companyUnitId: '1',
+        //   },
+        //   '558': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200135',
+        //     path: ',311,558,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-物探队',
+        //     departmentTypeName: '其他部门',
+        //     id: '558',
+        //     position: '170',
+        //     companyUnitId: '1',
+        //   },
+        //   '559': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200136',
+        //     path: ',311,559,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-地测探放水一队',
+        //     departmentTypeName: '其他部门',
+        //     id: '559',
+        //     position: '169',
+        //     companyUnitId: '1',
+        //   },
+        //   '560': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200137',
+        //     path: ',311,560,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-地测探放水二队',
+        //     departmentTypeName: '其他部门',
+        //     id: '560',
+        //     position: '168',
+        //     companyUnitId: '1',
+        //   },
+        //   '561': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200138',
+        //     path: ',311,561,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-维修队',
+        //     departmentTypeName: '其他部门',
+        //     id: '561',
+        //     position: '167',
+        //     companyUnitId: '1',
+        //   },
+        //   '562': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200139',
+        //     path: ',311,562,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-防灭火队',
+        //     departmentTypeName: '其他部门',
+        //     id: '562',
+        //     position: '166',
+        //     companyUnitId: '1',
+        //   },
+        //   '563': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200140',
+        //     path: ',311,563,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-大龄转岗人员',
+        //     departmentTypeName: '其他部门',
+        //     id: '563',
+        //     position: '165',
+        //     companyUnitId: '1',
+        //   },
+        //   '564': {
+        //     leader: '',
+        //     parentDepartment: '地测公司',
+        //     departmentTypeId: '0',
+        //     parentId: '311',
+        //     number: '200110',
+        //     path: ',311,564,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '地测公司-党委办公室',
+        //     departmentTypeName: '其他部门',
+        //     id: '564',
+        //     position: '164',
+        //     companyUnitId: '1',
+        //   },
+        //   '565': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,565,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '安装二队',
+        //     departmentTypeName: '其他部门',
+        //     id: '565',
+        //     position: '38',
+        //     companyUnitId: '1',
+        //   },
+        //   '566': {
+        //     leader: '',
+        //     parentDepartment: '布尔台煤矿',
+        //     departmentTypeId: '0',
+        //     parentId: '1',
+        //     number: '0',
+        //     path: ',1,566,',
+        //     companyUnit: '本矿',
+        //     telphone: '',
+        //     name: '砼底板二队',
+        //     departmentTypeName: '其他部门',
+        //     id: '566',
+        //     position: '36',
+        //     companyUnitId: '1',
+        //   },
+        // };
 
         if (result && JSON.stringify(result) !== '{}') {
           const datas: any[] = [];

+ 8 - 2
src/hooks/system/useCamera.ts

@@ -10,6 +10,7 @@ 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 });
@@ -19,13 +20,18 @@ export function useCamera() {
   const playerDoms = <(HTMLVideoElement | undefined | null)[]>[];
   const videoParentDomList: (HTMLElement | [string, { name: string; addr: string }])[] = [];
 
-  async function getCamera(deviceid, parentPlayerDom?) {
+  async function getCamera(deviceid, parentPlayerDom?, devKind?) {
     removeCamera();
     if (!parentPlayerDom) {
       parentPlayerDom = document.createElement('div');
       parentPlayerDom.setAttribute('style', `top:0px; left: 0px; width: 100%; height: 100%; position: fixed; z-index: 999;`);
     }
-    const res = await cameraList({ deviceid });
+    let res;
+    if (!devKind) {
+      res = await cameraList({ deviceid });
+    } else {
+      res = await newCameraList({ devKind });
+    }
     const cameras: [] = res.records || [];
     // const cameras: [] = [
     //   {

+ 1 - 1
src/utils/threejs/useThree.ts

@@ -430,9 +430,9 @@ class UseThree {
     this.orbitControls?.update();
     this.camera?.updateMatrixWorld();
     // this.composer?.render();
+    this.renderer?.render(this.scene as THREE.Object3D, this.camera as THREE.Camera);
     this.css3dRender?.render(this.scene as THREE.Scene, this.camera as THREE.PerspectiveCamera);
     this.css2dRender?.render(this.scene as THREE.Scene, this.camera as THREE.PerspectiveCamera);
-    this.renderer?.render(this.scene as THREE.Object3D, this.camera as THREE.Camera);
   }
 
   timeRender() {

+ 2 - 1
src/views/vent/monitorManager/comment/MonitorTable.vue

@@ -154,8 +154,9 @@
     },
     (newVal) => {
       console.log(newVal,'val-----')
+      debugger;
       if(!newVal) return
-      const column =  getTableHeaderColumns(newVal)
+      const column =  getTableHeaderColumns(newVal.endsWith('_monitor') ? newVal : newVal+'_monitor')
       console.log('监测列表表头000------------>', newVal)
       if(column && column.length < 1){
         const arr = newVal.split('_')

+ 3 - 2
src/views/vent/monitorManager/compressor/components/nitrogenHome_lt.vue

@@ -82,9 +82,9 @@
               />
             </template>
           </ventBox1>
-          <div ref="playerRef" style="height: auto; width: 100%; margin-top: 10px"></div>
         </div>
       </div>
+      <div ref="playerRef" style="position: absolute; height: auto; width: 100%; left: 1600px; top: 480px; z-index: 9999"></div>
     </div>
   </div>
 </template>
@@ -219,7 +219,7 @@
     await mountedThree().then(() => {
       loading.value = false;
     });
-    await getCamera(props.deviceId, playerRef.value);
+    await getCamera(props.deviceId, playerRef.value, 'nitrogen');
   });
 
   onUnmounted(() => {
@@ -274,6 +274,7 @@
       display: flex;
       justify-content: space-between;
       margin-bottom: 100px;
+      position: relative;
 
       .device-state {
         width: 100%;

+ 4 - 0
src/views/vent/monitorManager/compressor/nitrogen.data.ts

@@ -217,6 +217,7 @@ export function getMonitorComponent() {
     case 'sdmtjtdltmk': //dltj
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_dltj.vue'));
       return nitrogenHome;
+    case 'sdmtjtsgtmk': // 石圪台
     case 'sdmtjtbetmk': // bet
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_bet.vue'));
       return nitrogenHome;
@@ -231,6 +232,9 @@ export function getMonitorComponent() {
     case 'sdmtjtcctmk': // 寸草塔
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_blt.vue'));
       return nitrogenHome;
+    case 'sdmtjtltmk': // 柳塔
+      nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_lt.vue'));
+      return nitrogenHome;
     case 'lahgjtlnmy': // 潞宁
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_ln.vue'));
       return nitrogenHome;

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

@@ -154,7 +154,7 @@ export const majorColumns: BasicColumn[] = [
     width: 60,
     align: 'center',
     customRender: ({ index }) => {
-      return `${index}`;
+      return `${index + 1}`;
     },
   },
   {

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

@@ -244,9 +244,10 @@
                         v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 1 && record.rearGateClose == 0"
                         color="default">打开</a-tag>
                     </template>
-                    <template v-if="column.dataIndex === 'ndoortype'">
-                      <span v-if="record.ndoortype == 0" color="red">行车风门</span>
-                      <span v-else color="default">行人风门</span>
+                    <template v-if="column.dataIndex === 'doorUse'">
+                      <span v-if="record.doorUse == 1" color="default">行车风门</span>
+                      <span v-else-if="record.doorUse == 2">行人风门</span>
+                      <span v-else-if="record.doorUse == 3">短路风门</span>
                     </template>
                   </template>
                   <template v-else-if="deviceType.startsWith('windrect')">
@@ -704,16 +705,16 @@ function goDetail(record?) {
       currentModal.value = GaspatrolModal
       modalVisible.value = true;
     } else if (deviceType.value.indexOf("gate") != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-gate', query: { id: activeID.value } })
+      const newPage = router.resolve({ path: '/monitorChannel/monitor-gate', query: { id: activeID.value, deviceType: deviceType.value } })
       window.open(newPage.href, '_blank')
     } else if (deviceType.value.indexOf("window") != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-window', query: { id: activeID.value } })
+      const newPage = router.resolve({ path: '/monitorChannel/monitor-window', query: { id: activeID.value, deviceType: deviceType.value  } })
       window.open(newPage.href, '_blank')
     } else if (deviceType.value.indexOf("windrect") != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-windrect', query: { id: activeID.value } })
+      const newPage = router.resolve({ path: '/monitorChannel/monitor-windrect', query: { id: activeID.value, deviceType: deviceType.value  } })
       window.open(newPage.href, '_blank')
     } else if (deviceType.value.indexOf("fanmain") != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-fanmain', query: { id: activeID.value } })
+      const newPage = router.resolve({ path: '/monitorChannel/monitor-fanmain', query: { id: activeID.value, deviceType: deviceType.value  } })
       window.open(newPage.href, '_blank')
     } else if (deviceType.value.indexOf("fanlocal") != -1) {
       const newPage = router.resolve({ path: '/monitorChannel/monitor-fanlocal', query: { id: activeID.value, deviceType: deviceType.value } })
@@ -796,53 +797,47 @@ function toHide() {
 
 async function findTreeDataValue(obj) {
   ;
-  const findDeviceType = (data: [], obj) => {
-    let type = ''
-    if (obj.deviceid) {
-      type = obj.deviceid
-    } else {
-      type = obj.deviceType
-    }
-    data.find((item: any) => {
+  const findDeviceType = (data: any[], obj, flag = true) => {
+    return data.find((item: any) => {
       if (item.children.length > 0) {
         findDeviceType(item.children, obj)
       }
-      debugger;
-      if (item.type == type) {
-        if(obj.deviceid && deviceType.value != 'sys'){
+      if(obj.deviceType.startsWith('sys_')){
+        if(item.type == obj.deviceid) {
           deviceType.value = 'sys'
-        }else if(!obj.deviceid && deviceType.value !== item.type){
-          deviceType.value = item.type
-        }
-        if (type.startsWith('sys_') && item.children[0]) {
-          systemID.value = item.children[0]['type']
-          selectedKeys.value = [item.children[0]['key']]
-          expandedKeys.value = [item.children[0]['key']]
-          treeNodeTitle.value = item.children[0]['title']
-          if(deviceType.value !== type.substring(4)) deviceType.value = type.substring(4)
-        } else {
-          if (obj.deviceid) systemID.value = obj.deviceid
+          systemID.value = obj.deviceid
           selectedKeys.value = [item.key]
           expandedKeys.value = [item.key]
           treeNodeTitle.value = item.title
         }
-        // const setKey = (item) => {
-        //   if(item.parentKey){
-        //     selectedKeys.value.push(item.parentKey)
-        //     expandedKeys.value.push(item.parentKey)
-        //   }
-        //   selectedKeys.value.push(item.key)
-        //   expandedKeys.value.push(item.key)
-        // }
-        // setKey(item)
-        return true
+      }else{
+        if(!flag){
+          if(item.type.startsWith(obj.deviceType)) {
+            deviceType.value = item.type
+            selectedKeys.value = [item.key]
+            expandedKeys.value = [item.key]
+            treeNodeTitle.value = item.title
+            return true
+          }
+          return false
+        }else{
+          if (item.type == obj.deviceType) {
+            deviceType.value = item.type
+            selectedKeys.value = [item.key]
+            expandedKeys.value = [item.key]
+            treeNodeTitle.value = item.title
+            return true
+          }
+          return false
+        }
       }
       return false
     })
   }
-
-  findDeviceType(treeData.value, obj)
-
+  const flag = findDeviceType(treeData.value, obj)
+  if(!flag){
+    findDeviceType(treeData.value, obj, false)
+  }
   // 无类型时
   if (!treeNodeTitle.value && treeData.value && treeData.value[0] && treeData.value[0]['children']) {
     const defaultData = treeData.value[0]['children'][0]

+ 2 - 0
src/views/vent/monitorManager/deviceMonitor/index.vue

@@ -39,6 +39,7 @@
   watch(
     () => route.fullPath,
     () => {
+      debugger;
       const { type, deviceType, deviceid } = route.query;
       if (type === 'tunMonitor') {
         pageResult.value = {};
@@ -65,6 +66,7 @@
   );
 
   onMounted(() => {
+    debugger;
     const { type, deviceType, topage } = route.query;
     deviceKind.value = deviceType as string;
     if (!topage) {

+ 3 - 8
src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -744,7 +744,6 @@
     loading.value = true;
     selectRowIndex.value = -1;
     nextTick(() => {
-      // selectRowIndex.value = 0
       selectData = lodash.cloneDeep(initData);
       loading.value = false;
       if (selectData.deviceID) MonitorDataTable.value.setSelectedRowKeys([selectData.deviceID]);
@@ -801,7 +800,8 @@
   //
   async function getDataSource() {
     if (devicekide.value) {
-      const res = await list({ devicetype: devicekide.value, pagetype: 'normal' });
+      // const res = await list({ devicetype: devicekide.value, pagetype: 'normal' });
+      const res = await list({ devicetype: 'fanlocal', pagetype: 'normal' });
       if (res.msgTxt && res.msgTxt[0] && res.msgTxt[0].datalist && res.msgTxt[0].datalist.length > 0) {
         const dataArr = res.msgTxt[0].datalist || [];
         dataSource.value = [];
@@ -819,11 +819,6 @@
           // }
           dataSource.value.push(data);
         });
-        if (MonitorDataTable.value && selectRowIndex.value == -1) {
-          MonitorDataTable.value.setSelectedRowKeys([dataSource.value[0]['deviceID']]);
-        }
-        const data: any = toRaw(dataSource.value[selectRowIndex.value]); //maxarea
-        return data;
       } else {
         return (dataSource.value = []);
       }
@@ -842,7 +837,7 @@
           await getDataSource();
           if (dataSource.value.length > 0 && selectRowIndex.value == -1 && MonitorDataTable.value) {
             // 初始打开页面
-            if (currentRoute.value && currentRoute.value['query'] && currentRoute.value['query']['id']) {
+            if (flag && currentRoute.value && currentRoute.value['query'] && currentRoute.value['query']['id']) {
               MonitorDataTable.value.setSelectedRowKeys(currentRoute.value['query']['id']);
             } else {
               MonitorDataTable.value.setSelectedRowKeys(dataSource.value[0]['deviceID']);

+ 21 - 11
src/views/vent/monitorManager/gateMonitor/index.vue

@@ -73,7 +73,7 @@
               v-if="activeKey === '1'"
               ref="MonitorDataTable"
               class="monitor-table"
-              columnsType="gate_monitor"
+              :columnsType="deviceType"
               :isShowActionColumn="true"
               :dataSource="dataSource"
               design-scope="gate-monitor"
@@ -124,8 +124,9 @@
                   <span v-else color="default">液压风门</span>
                 </template>
                 <template v-if="column.dataIndex === 'doorUse'">
-                  <span v-if="record.doorUse == 2">行人风门</span>
-                  <span v-else color="default">行车风门</span>
+                  <span v-if="record.doorUse == 1" color="default">行车风门</span>
+                  <span v-else-if="record.doorUse == 2">行人风门</span>
+                  <span v-else-if="record.doorUse == 3">短路风门</span>
                 </template>
                 <template v-else-if="column.dataIndex === 'warnLevel'">
                   <a-tag v-if="record.warnLevel == '101'" color="green">低风险</a-tag>
@@ -158,7 +159,7 @@
           </a-tab-pane> -->
           <a-tab-pane key="3" tab="历史数据">
             <div class="tab-item" v-if="activeKey === '3'">
-              <HistoryTable columns-type="gate" device-type="gate" designScope="gate-history" :scroll="scroll">
+              <HistoryTable :columnsType="deviceType" :device-type="deviceType" designScope="gate-history" :scroll="scroll">
                 <template #filterCell="{ column, record }">
                   <a-tag v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '0' && record.frontGateClose == '0'" color="red"
                     >正在运行</a-tag
@@ -205,8 +206,9 @@
                     <span v-else color="default">液压风门</span>
                   </template>
                   <template v-if="column.dataIndex === 'doorUse'">
-                    <span v-if="record.doorUse == 2">行人风门</span>
-                    <span v-else color="default">行车风门</span>
+                    <span v-if="record.doorUse == 1" color="default">行车风门</span>
+                    <span v-else-if="record.doorUse == 2">行人风门</span>
+                    <span v-else-if="record.doorUse == 3">短路风门</span>
                   </template>
                   <template v-else-if="column.dataIndex === 'warnLevel'">
                     <a-tag v-if="record.warnLevel == '101'" color="green">低风险</a-tag>
@@ -230,7 +232,13 @@
           </a-tab-pane>
           <a-tab-pane key="4" tab="报警历史">
             <div class="tab-item" v-if="activeKey === '4'">
-              <AlarmHistoryTable columns-type="alarm" device-type="gate" :device-list-api="getTableList" designScope="alarm-history" :scroll="scroll">
+              <AlarmHistoryTable
+                :columnsType="deviceType"
+                :device-type="deviceType"
+                :device-list-api="getTableList"
+                designScope="alarm-history"
+                :scroll="scroll"
+              >
                 <template #filterCell="{ column, record }">
                   <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == '0' ? 'green' : record.warnFlag == 1 ? '#FF5812' : 'gray'">
                     {{ record.warnFlag == '0' ? '正常' : record.warnFlag == 1 ? '报警' : record.warnFlag == 2 ? '断开' : '未监测' }}</a-tag
@@ -246,7 +254,7 @@
             <div class="tab-item" v-if="activeKey === '5'">
               <HandlerHistoryTable
                 columns-type="operator_history"
-                device-type="gate"
+                :device-type="deviceType"
                 :device-list-api="getTableList"
                 designScope="alarm-history"
                 :scroll="scroll"
@@ -280,7 +288,7 @@
 </template>
 
 <script setup lang="ts">
-  import { onBeforeUnmount, onUnmounted, onMounted, ref, reactive, nextTick, inject } from 'vue';
+  import { onBeforeUnmount, onUnmounted, onMounted, ref, reactive, nextTick, inject, unref } from 'vue';
   import MonitorTable from '../comment/MonitorTable.vue';
   import HistoryTable from '../comment/HistoryTable.vue';
   import AlarmHistoryTable from '../comment/AlarmHistoryTable.vue';
@@ -309,7 +317,7 @@
   const MonitorDataTable = ref();
   let contrlValue = '';
   const playerRef = ref();
-
+  const deviceType = ref('gate');
   const activeKey = ref('1'); // tab
   const loading = ref(false);
 
@@ -392,7 +400,7 @@
     if (Object.prototype.toString.call(timer) === '[object Null]') {
       timer = await setTimeout(
         async () => {
-          const res = await list({ devicetype: 'gate', pagetype: 'normal' });
+          const res = await list({ devicetype: deviceType.value, pagetype: 'normal' });
           if (res.msgTxt && res.msgTxt[0]) {
             dataSource.value = res.msgTxt[0].datalist || [];
             dataSource.value.forEach((data: any) => {
@@ -873,6 +881,8 @@
   // }
 
   onMounted(async () => {
+    const { query } = unref(currentRoute);
+    if (query['deviceType']) deviceType.value = query['deviceType'] as string;
     modelList.value = await getDictItems('gateModel');
     loading.value = true;
     const playerDom = document.getElementById('fm-player1')?.getElementsByClassName('vjs-tech')[0];

+ 3 - 3
src/views/vent/monitorManager/groutMonitor/components/groutHomelt.vue

@@ -90,7 +90,7 @@
       </div>
     </div>
 
-    <div ref="playerRef" style="z-index: 999; position: absolute; top: 100px; right: 15px; height: 100%; margin: auto; pointer-events: none"> </div>
+    <div ref="playerRef" style="z-index: 9999; position: absolute; top: 550px; right: 15px; height: 100%; margin: auto; pointer-events: none"> </div>
   </div>
 </template>
 
@@ -162,14 +162,14 @@
     () => props.deviceId,
     async (deviceId) => {
       if (deviceId) {
-        await getCamera(deviceId, playerRef.value);
+        await getCamera(deviceId, playerRef.value, 'pulping');
       }
     }
   );
 
   onMounted(() => {
     getMonitor(true)?.then(async () => {
-      if (props.deviceId) await getCamera(props.deviceId, playerRef.value);
+      if (props.deviceId) await getCamera(props.deviceId, playerRef.value, 'pulping');
     });
     loading.value = true;
     mountedThree().then(async () => {

+ 1 - 0
src/views/vent/monitorManager/groutMonitor/grout.data.ts

@@ -643,6 +643,7 @@ export const deviceMonitorList = [
 
 export function getMonitorComponent() {
   const { sysOrgCode } = useGlobSetting();
+  // const sysOrgCode = 'sdmtjtltmk';
   let groutHome;
   switch (sysOrgCode) {
     case 'sdmtjtbetmk': // 布尔台

+ 1 - 1
src/views/vent/monitorManager/mainFanMonitor/index.vue

@@ -6,7 +6,7 @@
       class="threejs-Object-CSS"
       style="width: 100%; height: 100%; position: absolute; pointer-events: none; overflow: hidden; z-index: 1; top: 0"
     >
-      <div style="position: relative">
+      <div style="position: relative" v-if="selectData['modalTyoe']">
         <div class="elementTag" id="inputBox">
           <div class="elementContent elementContent-r" v-if="selectData.DataPa && backMonitorIsShow">
             <!-- <div class="element-item"><span class="data-title">风机气压(Pa):</span><span>{{ selectData.DataPa ? selectData.DataPa : '-' }}</span></div> -->

+ 5 - 2
src/views/vent/monitorManager/mainFanMonitor/main.threejs.ts

@@ -308,19 +308,21 @@ export const setModelType = (type) => {
     // 停止气流动画
     mainWindObj?.stopSmoke();
     mainXjWindObj?.stopSmoke();
+
     if (group) model?.scene?.remove(group);
     if (modalType === 'mainWindRect' && mainWindObj && mainWindObj.group) {
+      mainXjWindObj?.clearCssText();
       (<UseThree>model).startAnimation = mainWindObj.render.bind(mainWindObj);
       group = mainWindObj.group;
       setTimeout(async () => {
         resolve(null);
         // const position = mainWindObj.group.position;
-        const position = new THREE.Vector3(-0.45, 0.84, -10.35);
+        const position = new THREE.Vector3(-1.0127, -3.4717, -7.864);
         const oldCameraPosition = { x: -332.39, y: 283.47, z: 438.61 };
         await animateCamera(
           oldCameraPosition,
           { x: -3.41, y: -29.01, z: 8.84 },
-          { x: -1.23, y: 75.15, z: 118.36 },
+          { x: -1.7927, y: 70.8399, z: 120.8451 },
           { x: position.x, y: position.y, z: position.z },
           model,
           0.8
@@ -329,6 +331,7 @@ export const setModelType = (type) => {
       }, 300);
     }
     if (modalType === 'mainXjWindRect' && mainXjWindObj && mainXjWindObj.group) {
+      mainWindObj?.clearCssText();
       (<UseThree>model).startAnimation = mainXjWindObj.render.bind(mainXjWindObj);
       group = mainXjWindObj.group;
       setTimeout(async () => {

+ 30 - 18
src/views/vent/monitorManager/mainFanMonitor/mainWind.threejs.ts

@@ -56,30 +56,33 @@ class mainWindRect {
       const worldPosition = new THREE.Vector3();
       ztfjGroup?.getObjectByName('Cylinder1042')?.getWorldPosition(worldPosition);
       const element = document.getElementById('inputBox') as HTMLElement;
-      const mainCSS3D = new CSS3DObject(element);
-      mainCSS3D.name = 'monitorText1';
-      mainCSS3D.scale.set(0.07, 0.07, 0.07);
-      // mainCSS3D.position.set(23.78, 18.18, -6.85);
-      mainCSS3D.position.set(worldPosition.x + 12, worldPosition.y - 10, worldPosition.z - 20);
-      mainCSS3D.lookAt(worldPosition.x + 12, worldPosition.y - 0, worldPosition.z + 2);
-      // mainCSS3D.lookAt(23.78, 20, -2.85);
-      this.group.add(mainCSS3D);
+      if (element) {
+        const mainCSS3D = new CSS3DObject(element);
+        mainCSS3D.name = 'monitorText1';
+        mainCSS3D.scale.set(0.09, 0.09, 0.09);
+        // mainCSS3D.position.set(23.78, 18.18, -6.85);
+        mainCSS3D.position.set(worldPosition.x + 12, worldPosition.y - 10, worldPosition.z - 20);
+        mainCSS3D.lookAt(worldPosition.x + 12, worldPosition.y - 0, worldPosition.z + 2);
+        this.group.add(mainCSS3D);
+      }
     }
     if (!this.group.getObjectByName('monitorText2')) {
       const worldPosition = new THREE.Vector3();
       ztfjGroup?.getObjectByName('Cylinder396')?.getWorldPosition(worldPosition);
       const element = document.getElementById('inputBox1') as HTMLElement;
-      const mainCSS3D = new CSS3DObject(element);
-      mainCSS3D.name = 'monitorText2';
-      mainCSS3D.scale.set(0.07, 0.07, 0.07);
-      // mainCSS3D.position.set(23.78, 18.18, 16.82);
-      mainCSS3D.position.set(worldPosition.x + 12, worldPosition.y - 10, worldPosition.z - 20);
-      mainCSS3D.lookAt(worldPosition.x + 12, worldPosition.y - 0, worldPosition.z + 2);
-      // mainCSS3D.lookAt(23.78, 20, 20.82);
-      this.group.add(mainCSS3D);
+      if (element) {
+        const mainCSS3D = new CSS3DObject(element);
+        mainCSS3D.name = 'monitorText2';
+        mainCSS3D.scale.set(0.09, 0.09, 0.09);
+        // mainCSS3D.position.set(23.78, 18.18, 16.82);
+        mainCSS3D.position.set(worldPosition.x + 12, worldPosition.y - 10, worldPosition.z - 20);
+        mainCSS3D.lookAt(worldPosition.x + 12, worldPosition.y - 0, worldPosition.z + 2);
+        // mainCSS3D.lookAt(23.78, 20, 20.82);
+        this.group.add(mainCSS3D);
+      }
     }
 
-    if (!this.group.getObjectByName('monitorText3')) {
+    if (!this.group.getObjectByName('monitorText4')) {
       const worldPosition = new THREE.Vector3();
       const fbmGroup = this.group?.getObjectByName('fbm') as THREE.Group;
       if (fbmGroup) {
@@ -87,7 +90,7 @@ class mainWindRect {
         const element = document.getElementById('fbm') as HTMLElement;
         if (element) {
           const mainCSS3D = new CSS3DObject(element);
-          mainCSS3D.name = 'monitorText3';
+          mainCSS3D.name = 'monitorText4';
           mainCSS3D.scale.set(0.07, 0.07, 0.07);
           mainCSS3D.position.set(worldPosition.x + 20, worldPosition.y - 8, worldPosition.z - 20);
           mainCSS3D.lookAt(worldPosition.x + 20, worldPosition.y - 0, worldPosition.z + 2);
@@ -97,6 +100,15 @@ class mainWindRect {
     }
   }
 
+  clearCssText() {
+    if (this.group) {
+      const mainCSS3D1 = this.group.getObjectByName('monitorText1');
+      const mainCSS3D2 = this.group.getObjectByName('monitorText2');
+      if (mainCSS3D1) this.group.remove(mainCSS3D1);
+      if (mainCSS3D2) this.group.remove(mainCSS3D2);
+    }
+  }
+
   addEcharts() {
     const echartsBox = document.getElementById('fan-echarts');
     if (echartsBox) {

+ 26 - 14
src/views/vent/monitorManager/mainFanMonitor/mainWind.xj.threejs.ts

@@ -56,26 +56,30 @@ class mainXjWindRect {
       const worldPosition = new THREE.Vector3();
       ztfjGroup?.getObjectByName('FengJiWaiKe_1')?.getWorldPosition(worldPosition);
       const element = document.getElementById('inputBox') as HTMLElement;
-      const mainCSS3D = new CSS3DObject(element);
-      mainCSS3D.name = 'monitorText1';
-      mainCSS3D.scale.set(0.09, 0.09, 0.09);
-      mainCSS3D.position.set(worldPosition.x + 34, worldPosition.y - 5, worldPosition.z - 35);
-      mainCSS3D.lookAt(worldPosition.x + 34, worldPosition.y + 5, worldPosition.z + 2);
-      this.group.add(mainCSS3D);
+      if (element) {
+        const mainCSS3D = new CSS3DObject(element);
+        mainCSS3D.name = 'monitorText1';
+        mainCSS3D.scale.set(0.09, 0.09, 0.09);
+        mainCSS3D.position.set(worldPosition.x + 34, worldPosition.y - 5, worldPosition.z - 35);
+        mainCSS3D.lookAt(worldPosition.x + 34, worldPosition.y + 5, worldPosition.z + 2);
+        this.group.add(mainCSS3D);
+      }
     }
     if (!this.group.getObjectByName('monitorText2')) {
       const worldPosition = new THREE.Vector3();
       ztfjGroup?.getObjectByName('FengJiWaiKe_2')?.getWorldPosition(worldPosition);
       const element = document.getElementById('inputBox1') as HTMLElement;
-      const mainCSS3D = new CSS3DObject(element);
-      mainCSS3D.name = 'monitorText2';
-      mainCSS3D.scale.set(0.09, 0.09, 0.09);
-      mainCSS3D.position.set(worldPosition.x + 34, worldPosition.y - 5, worldPosition.z - 20);
-      mainCSS3D.lookAt(worldPosition.x + 34, worldPosition.y + 5, worldPosition.z + 2);
-      this.group.add(mainCSS3D);
+      if (element) {
+        const mainCSS3D = new CSS3DObject(element);
+        mainCSS3D.name = 'monitorText2';
+        mainCSS3D.scale.set(0.09, 0.09, 0.09);
+        mainCSS3D.position.set(worldPosition.x + 34, worldPosition.y - 5, worldPosition.z - 20);
+        mainCSS3D.lookAt(worldPosition.x + 34, worldPosition.y + 5, worldPosition.z + 2);
+        this.group.add(mainCSS3D);
+      }
     }
 
-    if (!this.group.getObjectByName('monitorText3')) {
+    if (!this.group.getObjectByName('monitorText4')) {
       const worldPosition = new THREE.Vector3();
       const fbmGroup = this.group?.getObjectByName('fbm') as THREE.Group;
       if (fbmGroup) {
@@ -83,7 +87,7 @@ class mainXjWindRect {
         const element = document.getElementById('fbm') as HTMLElement;
         if (element) {
           const mainCSS3D = new CSS3DObject(element);
-          mainCSS3D.name = 'monitorText3';
+          mainCSS3D.name = 'monitorText4';
           mainCSS3D.scale.set(0.07, 0.07, 0.07);
           mainCSS3D.position.set(worldPosition.x + 20, worldPosition.y - 8, worldPosition.z - 20);
           mainCSS3D.lookAt(worldPosition.x + 20, worldPosition.y - 0, worldPosition.z + 2);
@@ -92,6 +96,14 @@ class mainXjWindRect {
       }
     }
   }
+  clearCssText() {
+    if (this.group) {
+      const mainCSS3D1 = this.group.getObjectByName('monitorText2');
+      const mainCSS3D2 = this.group.getObjectByName('monitorText3');
+      if (mainCSS3D1) this.group.remove(mainCSS3D1);
+      if (mainCSS3D2) this.group.remove(mainCSS3D2);
+    }
+  }
 
   addEcharts() {
     const echartsBox = document.getElementById('fan-echarts');

+ 1 - 2
src/views/vent/monitorManager/safetyMonitor/safety.data.ts

@@ -1,6 +1,4 @@
-import { FormSchema } from '/@/components/Table';
 import { safetyDeviceList } from './safety.api';
-import dayjs from 'dayjs';
 
 export const chartsColumns = (deviceType) => {
   if (deviceType === '') {
@@ -86,6 +84,7 @@ export const chartsColumnsFan = [
     dataIndex: 'windQuantity2',
   },
 ];
+
 //主风
 export const chartsColumnsMain = [
   {

+ 15 - 7
src/views/vent/monitorManager/windowMonitor/index.vue

@@ -62,7 +62,7 @@
             <MonitorTable
               v-if="activeKey === '1'"
               ref="MonitorDataTable"
-              columnsType="window_monitor"
+              :columnsType="deviceType"
               :dataSource="dataSource"
               @selectRow="getSelectRow"
               design-scope="window-monitor"
@@ -101,7 +101,7 @@
           </a-tab-pane> -->
           <a-tab-pane key="3" tab="历史数据">
             <div class="tab-item" v-if="activeKey === '3'">
-              <HistoryTable columns-type="window" device-type="window" designScope="window-history" :scroll="scroll">
+              <HistoryTable :columns-type="deviceType" :device-type="deviceType" designScope="window-history" :scroll="scroll">
                 <template #filterCell="{ column, record }">
                   <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == '0' ? 'green' : 'red'">{{
                     record.warnFlag == '0' ? '正常' : '报警'
@@ -116,14 +116,20 @@
           </a-tab-pane>
           <a-tab-pane key="4" tab="报警历史">
             <div class="tab-item" v-if="activeKey === '4'">
-              <AlarmHistoryTable columns-type="alarm" device-type="window" :device-list-api="baseList" designScope="alarm-history" :scroll="scroll" />
+              <AlarmHistoryTable
+                columns-type="alarm"
+                :device-type="deviceType"
+                :device-list-api="baseList"
+                designScope="alarm-history"
+                :scroll="scroll"
+              />
             </div>
           </a-tab-pane>
           <a-tab-pane key="5" tab="操作历史">
             <div class="tab-item" v-if="activeKey === '5'">
               <HandlerHistoryTable
                 columns-type="operator_history"
-                device-type="window"
+                :device-type="deviceType"
                 :device-list-api="baseList"
                 designScope="alarm-history"
                 :scroll="scroll"
@@ -154,7 +160,7 @@
 <script setup lang="ts">
   import { message } from 'ant-design-vue';
   import DeviceEcharts from '../comment/DeviceEcharts.vue';
-  import { onBeforeMount, ref, onMounted, onUnmounted, reactive, toRaw, watch, nextTick, inject } from 'vue';
+  import { onBeforeMount, ref, onMounted, onUnmounted, reactive, toRaw, watch, nextTick, inject, unref } from 'vue';
   import MonitorTable from '../comment/MonitorTable.vue';
   import HistoryTable from '../comment/HistoryTable.vue';
   import AlarmHistoryTable from '../comment/AlarmHistoryTable.vue';
@@ -190,7 +196,7 @@
   const modalIsShow = ref<boolean>(false); // 是否显示模态框
   const modalTitle = ref(''); // 模态框标题显示内容,根据设备操作类型决定
   const modalType = ref(''); // 模态框内容显示类型,设备操作类型
-
+  const deviceType = ref('window');
   const deviceBaseList = ref([]);
   const activeKey = ref('1');
   const loading = ref(false);
@@ -267,7 +273,7 @@
   };
 
   const getDataSource = async () => {
-    const res = await list({ devicetype: 'window', pagetype: 'normal' });
+    const res = await list({ devicetype: deviceType.value, pagetype: 'normal' });
     dataSource.value = res.msgTxt[0].datalist || [];
     dataSource.value.forEach((data: any) => {
       const readData = data.readData;
@@ -370,6 +376,8 @@
   });
 
   onMounted(() => {
+    const { query } = unref(currentRoute);
+    if (query['deviceType']) deviceType.value = query['deviceType'] as string;
     loading.value = true;
     const playerDom = document.getElementById('fc-player1')?.getElementsByClassName('vjs-tech')[0];
     mountedThree(playerDom).then(async () => {

+ 1 - 1
src/views/vent/monitorManager/workFaceMonitor/components/workFaceGasHome.vue

@@ -1,6 +1,6 @@
 <template>
   <a-spin tip="Loading..." :spinning="loading">
-    <div id="gasUnitBox" class="modal-monitor vent-flex-row">
+    <div id="gasUnitBox" class="modal-monitor vent-flex-row" style="display: none;">
       <div v-for="groupNum in monitorDataGroupNum" :key="groupNum" style="margin: 0 5px;">
         <FourBorderBg class="four-border-bg">
           <div class="title">抽采单元{{ groupNum }}</div>

+ 1 - 1
src/views/vent/monitorManager/workFaceMonitor/index.vue

@@ -9,7 +9,7 @@
     <div
           id="workFace3DCSS"
           class="threejs-Object-CSS"
-          v-show="!loading"
+          v-show="monitorActive == 4"
           style="width: 100%; height: 100%; position: absolute; pointer-events: none; overflow: hidden; z-index: 1; top: 0"
         >
       </div>

+ 166 - 168
src/views/vent/reportManager/reportManager.data.ts

@@ -3,174 +3,172 @@ import { FormSchema } from '/@/components/Table';
 import { render } from '/@/utils/common/renderUtils';
 
 export const columns: BasicColumn[] = [
-    {
-      title: '主键',
-      dataIndex: 'id',
-      ifShow: false,
-    },
-    {
-      title: '创建人',
-      dataIndex: 'createBy',
-       width: 100,
-    },
-    {
-      title: '创建日期',
-      dataIndex: 'createTime',
-      width: 160,
-      // sorter:true,
-    },
-  
-    {
-      title: '文件名称',
-      dataIndex: 'fileName',
-      width: 160,
-    },
-    // {
-    //   title: '文件路径',
-    //   dataIndex: 'filePath',
-    //   width: 160,
-    // },
-   
-    // {
-    //   title: '所属部门',
-    //   dataIndex: 'orgCode',
-    //   width: 160,
-    // },
-    {
-      title: '报表类型',
-      dataIndex: 'reportType',
-      width: 160,
-      customRender: ({ text }) => {
-        return render.renderDict(text, 'reportType');
-      },
-    },
-    
-    {
-      title: '报表版本',
-      dataIndex: 'reportVersion',
-      width: 100,
-    },
-    // {
-    //   title: '所属矿编号',
-    //   dataIndex: 'sysOrgCode',
-    //   width: 100,
-    // },
-  ];
+  {
+    title: '主键',
+    dataIndex: 'id',
+    ifShow: false,
+  },
+  {
+    title: '创建人',
+    dataIndex: 'createBy',
+    width: 100,
+  },
+  {
+    title: '创建日期',
+    dataIndex: 'createTime',
+    width: 160,
+    // sorter:true,
+  },
+
+  {
+    title: '文件名称',
+    dataIndex: 'fileName',
+    width: 160,
+  },
+  // {
+  //   title: '文件路径',
+  //   dataIndex: 'filePath',
+  //   width: 160,
+  // },
 
-  // export const searchFormSchema: FormSchema[] = [
-  //   {
-  //       label: '报表类型',
-  //       field: 'reportType',
-  //       component: 'JDictSelectTag',
-  //       componentProps: {
-  //         dictCode: 'reportType',
-  //         placeholder: '请选择报表类型',
-  //       },
-  //       colProps: { span: 6 },
-  //     },
-  // ];
+  // {
+  //   title: '所属部门',
+  //   dataIndex: 'orgCode',
+  //   width: 160,
+  // },
+  {
+    title: '报表类型',
+    dataIndex: 'reportType',
+    width: 160,
+    customRender: ({ text }) => {
+      return render.renderDict(text, 'reportType');
+    },
+  },
+
+  {
+    title: '报表版本',
+    dataIndex: 'reportVersion',
+    width: 100,
+  },
+  // {
+  //   title: '所属矿编号',
+  //   dataIndex: 'sysOrgCode',
+  //   width: 100,
+  // },
+];
+
+// export const searchFormSchema: FormSchema[] = [
+//   {
+//       label: '报表类型',
+//       field: 'reportType',
+//       component: 'JDictSelectTag',
+//       componentProps: {
+//         dictCode: 'reportType',
+//         placeholder: '请选择报表类型',
+//       },
+//       colProps: { span: 6 },
+//     },
+// ];
 //报表历史记录
-  export const columnsHis: BasicColumn[] = [
-    {
-      title: '主键',
-      dataIndex: 'id',
-      ifShow: false,
-    },
-    {
-      title: '创建人',
-      dataIndex: 'createBy',
-       width: 100,
-    },
-    {
-      title: '创建日期',
-      dataIndex: 'createTime',
-      width: 160,
-    },
-  
-    {
-      title: '文件名称',
-      dataIndex: 'fileName',
-      width: 160,
-    },
-    // {
-    //   title: '文件路径',
-    //   dataIndex: 'filePath',
-    //   width: 160,
-    // },
-    {
-      title: '报表类型',
-      dataIndex: 'reportType',
-      width: 100,
-    },
-    {
-      title: '报表版本',
-      dataIndex: 'reportVersion',
-      width: 100,
-    },
-  ];
+export const columnsHis: BasicColumn[] = [
+  {
+    title: '主键',
+    dataIndex: 'id',
+    ifShow: false,
+  },
+  {
+    title: '创建人',
+    dataIndex: 'createBy',
+    width: 100,
+  },
+  {
+    title: '创建日期',
+    dataIndex: 'createTime',
+    width: 160,
+  },
 
-  //数据映射报表
-  export const columnsMap: BasicColumn[] = [
-    {
-      title: '序号',
-      width: 60,
-      align: 'center',
-      customRender: ({ index }: { index: number }) => `${index + 1}`
-    },
-    {
-      title: '所属矿名称',
-      dataIndex: 'sysOrgName',
-      align:'center',
-      width:120
-    },
-  
-    {
-      title: '数据名称',
-      dataIndex: 'name',
-      align:'center',
-     
-    },
-    {
-      title: '矿报表单元格',
-      dataIndex: 'mineCells',
-      align:'center',
-   
-    },
-    {
-      title: '集团报表单元格所在列',
-      dataIndex: 'groupCol',
-      align:'center',
-      width:120
-    },
-    {
-      title: '集团报表单元格所在行',
-      dataIndex: 'groupRow',
-      align:'center',
-      width:120
-    },
-    {
-      title: '集团报表单元格所在sheet页',
-      dataIndex: 'groupSheet',
-      align:'center',
-      width:120
-    },
-    {
-      title: '是否计算',
-      dataIndex: 'isCompute',
-      align:'center',
-      width:120
-    },
-    {
-      title: '	计算公式',
-      dataIndex: 'formula',
-      align:'center',
-      width:120
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      width: 200,
-      align: 'center',
-      slots: { customRender: 'action' },
-    },
-  ];
+  {
+    title: '文件名称',
+    dataIndex: 'fileName',
+    width: 160,
+  },
+  // {
+  //   title: '文件路径',
+  //   dataIndex: 'filePath',
+  //   width: 160,
+  // },
+  {
+    title: '报表类型',
+    dataIndex: 'reportType',
+    width: 100,
+  },
+  {
+    title: '报表版本',
+    dataIndex: 'reportVersion',
+    width: 100,
+  },
+];
+
+//数据映射报表
+export const columnsMap: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: '所属矿名称',
+    dataIndex: 'sysOrgName',
+    align: 'center',
+    width: 120,
+  },
+
+  {
+    title: '数据名称',
+    dataIndex: 'name',
+    align: 'center',
+  },
+  {
+    title: '矿报表单元格',
+    dataIndex: 'mineCells',
+    align: 'center',
+  },
+  {
+    title: '集团报表单元格所在列',
+    dataIndex: 'groupCol',
+    align: 'center',
+    width: 120,
+  },
+  {
+    title: '集团报表单元格所在行',
+    dataIndex: 'groupRow',
+    align: 'center',
+    width: 120,
+  },
+  {
+    title: '集团报表单元格所在sheet页',
+    dataIndex: 'groupSheet',
+    align: 'center',
+    width: 120,
+  },
+  {
+    title: '是否计算',
+    dataIndex: 'isCompute',
+    align: 'center',
+    width: 120,
+  },
+  {
+    title: '	计算公式',
+    dataIndex: 'formula',
+    align: 'center',
+    width: 120,
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 200,
+    align: 'center',
+    slots: { customRender: 'action' },
+  },
+];