1078-优化点播以及通道表结构

web_src/src/components/JTChannelList.vue

@@ -52,7 +52,7 @@
               </el-button>
               <el-button size="medium" v-bind:disabled="device == null || device.online === 0"
                          icon="el-icon-switch-button"
-                         type="text" style="color: #f56c6c" v-if="!!scope.row.streamId"
+                         type="text" style="color: #f56c6c" v-if="!!scope.row.stream"
                          @click="stopDevicePush(scope.row)">停止
               </el-button>
               <el-divider direction="vertical"></el-divider>
@@ -162,8 +162,9 @@ export default {
       this.currentPage = 1;
       this.count = 15;
       this.deviceService.getDevice(this.deviceId, (result) => {
-        this.device = result;
-
+        if (result.code === 0) {
+          this.device = result.data;
+        }
       }, (error) => {
         console.log("获取设备信息失败")
         console.error(error)
@@ -180,6 +181,7 @@ export default {
     getDeviceChannelList: function () {
       if (typeof (this.deviceId) == "undefined") return;
       this.deviceService.getAllChannel(this.currentPage, this.count, this.searchSrt, this.deviceId, (data)=>{
+        console.log(data)
         if (data.code === 0) {
           this.total = data.data.total;
           this.deviceChannelList = data.data.list;
@@ -197,6 +199,7 @@ export default {
       this.isLoging = true;
       let channelId = itemData.channelId;
       console.log("通知设备推流1：" + deviceId + " : " + channelId);
+      console.log(this.device);
       let that = this;
       this.$axios({
         method: 'get',

web_src/src/components/dialog/jtChannelEdit.vue

@@ -69,7 +69,7 @@ export default {
         method: 'post',
         url:`/api/jt1078/terminal/channel/${this.isEdit?'update':'add'}/`,
         params: {
-          terminalId: this.deviceId,
+          terminalDbId: this.deviceId,
           name: this.form.name,
           channelId: this.form.channelId,
         }

web_src/src/components/service/JTDeviceService.js

@@ -30,6 +30,8 @@ class JTDeviceService{
         deviceId: deviceId
       },
     }).then((res) => {
+      console.log(11)
+      console.log(res)
       if (typeof (callback) == "function") callback(res.data)
     }).catch((error) => {
       console.log(error);
@@ -53,7 +55,7 @@ class JTDeviceService{
 
 
 
-  getAllChannel(currentPage, count, searchSrt, deviceId, callback, endCallback, errorCallback) {
+  getAllChannel(currentPage, count, searchSrt, deviceId, endCallback, errorCallback) {
     this.$axios({
       method: 'get',
       url: `/api/jt1078/terminal/channel/list`,