1078-临时提交

web_src/src/components/JTChannelList.vue

@@ -129,15 +129,11 @@ export default {
       deviceService: new JTDeviceService(),
       device: null,
       deviceId: this.$route.params.deviceId,
-      parentChannelId: this.$route.params.parentChannelId,
       deviceChannelList: [],
-      videoComponentList: [],
-      currentPlayerInfo: {}, //当前播放对象
       updateLooper: 0, //数据刷新轮训标志
       searchSrt: "",
       channelType: "",
       online: "",
-      subStream: "",
       winHeight: window.innerHeight - 200,
       currentPage: 1,
       count: 15,
@@ -145,26 +141,11 @@ export default {
       beforeUrl: "/jtDeviceList",
       isLoging: false,
       loadSnap: {},
-      ptzTypes: {
-        0: "未知",
-        1: "球机",
-        2: "半球",
-        3: "固定枪机",
-        4: "遥控枪机"
-      }
     };
   },
 
   mounted() {
-    if (this.deviceId) {
+    this.initParam();
-      this.deviceService.getDevice(this.deviceId, (result) => {
-        this.device = result;
-
-      }, (error) => {
-        console.log("获取设备信息失败")
-        console.error(error)
-      })
-    }
     this.initData();
 
   },
@@ -178,13 +159,15 @@ export default {
     },
     initParam: function () {
       this.deviceId = this.$route.params.deviceId;
-      this.parentChannelId = this.$route.params.parentChannelId;
       this.currentPage = 1;
       this.count = 15;
-      if (this.parentChannelId == "" || this.parentChannelId == 0) {
+      this.deviceService.getDevice(this.deviceId, (result) => {
-        this.beforeUrl = "/deviceList"
+        this.device = result;
-      }
 
+      }, (error) => {
+        console.log("获取设备信息失败")
+        console.error(error)
+      })
     },
     currentChange: function (val) {
       this.currentPage = val;
@@ -195,30 +178,17 @@ export default {
       this.getDeviceChannelList();
     },
     getDeviceChannelList: function () {
-      let that = this;
+      if (typeof (this.deviceId) == "undefined") return;
-      if (typeof (this.$route.params.deviceId) == "undefined") return;
+      this.deviceService.getAllChannel(this.currentPage, this.count, this.searchSrt, this.deviceId, (data)=>{
-      this.$axios({
+        if (data.code === 0) {
-        method: 'get',
+          this.total = data.data.total;
-        url: `/api/jt1078/terminal/channel/list`,
+          this.deviceChannelList = data.data.list;
-        params: {
-          page: that.currentPage,
-          count: that.count,
-          query: that.searchSrt,
-          deviceId: this.$route.params.deviceId,
-        }
-      }).then(function (res) {
-        if (res.data.code === 0) {
-          that.total = res.data.data.total;
-          that.deviceChannelList = res.data.data.list;
           // 防止出现表格错位
-          that.$nextTick(() => {
+          this.$nextTick(() => {
-            that.$refs.channelListTable.doLayout();
+            this.$refs.channelListTable.doLayout();
           })
         }
-
+      })
-      }).catch(function (error) {
-        console.log(error);
-      });
     },
 
     //通知设备上传媒体流
@@ -230,9 +200,9 @@ export default {
       let that = this;
       this.$axios({
         method: 'get',
-        url: '/api/jt1078/live/start' + deviceId + '/' + channelId,
+        url: '/api/jt1078/live/start',
         params: {
-          phoneNumber: deviceId,
+          phoneNumber: this.device.phoneNumber,
           channelId: channelId,
           type: 0,
         }

web_src/src/components/service/JTDeviceService.js

@@ -53,120 +53,22 @@ class JTDeviceService{
 
 
 
-  getAllChannel(isCatalog, catalogUnderDevice, deviceId, callback, endCallback, errorCallback) {
+  getAllChannel(currentPage, count, searchSrt, deviceId, callback, endCallback, errorCallback) {
-    let currentPage = 1;
-    let count = 100;
-    let catalogList = []
-    this.getAllChannelIteration(isCatalog, catalogUnderDevice, deviceId, catalogList, currentPage, count, callback, endCallback, errorCallback)
-  }
-
-  getAllChannelIteration(isCatalog, catalogUnderDevice, deviceId, catalogList, currentPage, count, callback, endCallback, errorCallback) {
-    this.getChanel(isCatalog, catalogUnderDevice, deviceId, currentPage, count, (data) => {
-      if (data.list) {
-        if (typeof (callback) == "function") callback(data.list)
-        catalogList = catalogList.concat(data.list);
-        if (catalogList.length < data.total) {
-          currentPage ++
-          this.getAllChannelIteration(isCatalog,catalogUnderDevice, deviceId, catalogList, currentPage, count, callback, errorCallback)
-        }else {
-          console.log(1)
-          if (typeof (endCallback) == "function") endCallback(catalogList)
-        }
-      }
-    }, errorCallback)
-  }
-  getChanel(isCatalog, catalogUnderDevice, deviceId, currentPage, count, callback, errorCallback) {
     this.$axios({
       method: 'get',
-      url: `/api/device/query/devices/${deviceId}/channels`,
+      url: `/api/jt1078/terminal/channel/list`,
-      params:{
+      params: {
         page: currentPage,
         count: count,
-        query: "",
+        query: searchSrt,
-        online: "",
+        deviceId: deviceId,
-        channelType: isCatalog,
-        catalogUnderDevice: catalogUnderDevice
       }
-    }).then((res) =>{
+    }).then(function (res) {
-      if (typeof (callback) == "function") callback(res.data)
+      if (typeof (endCallback) == "function") endCallback(res.data)
-    }).catch(errorCallback);
+    }).catch(function (error) {
-  }
+      console.log(error);
-
+      if (typeof (errorCallback) == "function") errorCallback(error)
-
+    });
-  getAllSubChannel(isCatalog, deviceId, channelId, callback, endCallback, errorCallback) {
-    let currentPage = 1;
-    let count = 100;
-    let catalogList = []
-    this.getAllSubChannelIteration(isCatalog, deviceId, channelId, catalogList, currentPage, count, callback, endCallback, errorCallback)
-  }
-
-  getAllSubChannelIteration(isCatalog, deviceId,channelId, catalogList, currentPage, count, callback, endCallback, errorCallback) {
-    this.getSubChannel(isCatalog, deviceId, channelId, currentPage, count, (data) => {
-      if (data.list) {
-        if (typeof (callback) == "function") callback(data.list)
-        catalogList = catalogList.concat(data.list);
-        if (catalogList.length < data.total) {
-          currentPage ++
-          this.getAllSubChannelIteration(isCatalog, deviceId, channelId, catalogList, currentPage, count, callback, endCallback, errorCallback)
-        }else {
-          if (typeof (endCallback) == "function") endCallback(catalogList)
-        }
-      }
-    }, errorCallback)
-  }
-  getSubChannel(isCatalog, deviceId, channelId, currentPage, count, callback, errorCallback) {
-    this.$axios({
-      method: 'get',
-      url: `/api/device/query/sub_channels/${deviceId}/${channelId}/channels`,
-      params:{
-        page: currentPage,
-        count: count,
-        query: "",
-        online: "",
-        channelType: isCatalog
-      }
-    }).then((res) =>{
-      if (typeof (callback) == "function") callback(res.data)
-    }).catch(errorCallback);
-  }
-
-  getTree(deviceId, parentId, onlyCatalog, callback, endCallback, errorCallback) {
-    let currentPage = 1;
-    let count = 100;
-    let catalogList = []
-    this.getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback)
-  }
-
-  getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback) {
-    this.getTreeInfo(deviceId, parentId, onlyCatalog, currentPage, count, (data) => {
-      if (data.code === 0 && data.data.list) {
-        if (typeof (callback) == "function") callback(data.data.list)
-        catalogList = catalogList.concat(data.data.list);
-        if (catalogList.length < data.data.total) {
-          currentPage ++
-          this.getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback)
-        }else {
-          if (typeof (endCallback) == "function") endCallback(catalogList)
-        }
-      }
-    }, errorCallback)
-  }
-  getTreeInfo(deviceId, parentId, onlyCatalog, currentPage, count, callback, errorCallback) {
-    if (onlyCatalog == null || typeof onlyCatalog === "undefined") {
-      onlyCatalog = false;
-    }
-    this.$axios({
-      method: 'get',
-      url: `/api/device/query/tree/${deviceId}`,
-      params:{
-        page: currentPage,
-        count: count,
-        parentId: parentId,
-        onlyCatalog: onlyCatalog
-      }
-    }).then((res) =>{
-      if (typeof (callback) == "function") callback(res.data)
-    }).catch(errorCallback);
   }
 }