648540858
2022-05-31 cf35daeb98b7dc6e20f8fdab8e8c0202c369c78a
web_src/src/components/common/DeviceTree.vue
@@ -84,22 +84,34 @@
            }else {
              resolve([])
            }
          }, (list)=>{
              console.log("设备加载完成")
          }, (error)=>{
          })
        }
        if (node.level === 1) {
          this.deviceService.getAllChannel(true, node.data.id, (catalogData) => {
            this.deviceService.getAllChannel(false, node.data.id, (channelData) => {
              let data = catalogData.concat(channelData)
              this.channelDataHandler(data, resolve)
          let channelArray = []
          this.deviceService.getAllChannel(true, true, node.data.id, catalogData =>{
            channelArray = channelArray.concat(catalogData)
            this.channelDataHandler(channelArray, resolve)
          },(endCatalogData) => {
            this.deviceService.getAllChannel(false, true, node.data.id, channelData => {
              channelArray = channelArray.concat(channelData)
              this.channelDataHandler(channelArray, resolve)
            }, endChannelList => {
            })
          })
        }else if (node.level > 1){
          let channelArray = []
          this.deviceService.getAllSubChannel(true, node.data.deviceId, node.data.id, (catalogData)=>{
            channelArray = channelArray.concat(catalogData)
            this.channelDataHandler(channelArray, resolve)
          }, (endCatalogData)=>{
            this.deviceService.getAllSubChannel(false, node.data.deviceId, node.data.id, (channelData)=>{
              let data = catalogData.concat(channelData)
              this.channelDataHandler(data, resolve)
              channelArray = channelArray.concat(channelData)
              this.channelDataHandler(channelArray, resolve)
            })
          })
        }
@@ -109,7 +121,7 @@
          let nodeList = []
          for (let i = 0; i < data.length; i++) {
            let type = 3;
            if (data[i].subCount > 0) {
            if (data[i].subCount > 0 || data[i].parental === 1) {
              type = 2;
            }else if (data[i].ptztype === 1 ) { // 1-球机;2-半球;3-固定枪机;4-遥控枪机
              type = 4;