修正个别错误

Lawrence

2021-01-11 a47a7ccb5475d288e64939fce5a0f35e55a9de53

 web_src/src/components/channelList.vue

@@ -19,12 +19,12 @@
                    <el-option label="设备" value="false"></el-option>
                    <el-option label="子目录" value="true"></el-option>
                </el-select>
                在线状态: <el-select size="mini" @change="search" v-model="online" placeholder="请选择" default-first-option>
                在线状态: <el-select size="mini" style="margin-right: 1rem;" @change="search" v-model="online" placeholder="请选择" default-first-option>
                    <el-option label="全部" value=""></el-option>
                    <el-option label="在线" value="on"></el-option>
                    <el-option label="离线" value="off"></el-option>
                    <el-option label="在线" value="true"></el-option>
                    <el-option label="离线" value="false"></el-option>
                </el-select>

                <el-checkbox size="mini" style="margin-right: 1rem; float: right;" v-model="autoList" @change="autoListChange">自动刷新</el-checkbox>
            </div>
            <devicePlayer ref="devicePlayer" v-loading="isLoging"></devicePlayer>
            <!--设备列表-->
@@ -56,10 +56,10 @@
                        <el-button-group>
                            <!-- <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">播放</el-button> -->
                            <el-button size="mini" icon="el-icon-video-play" @click="sendDevicePush(scope.row)">播放</el-button>
                            <el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="scope.row.play" @click="stopDevicePush(scope.row)">停止</el-button>
                            <el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="!!scope.row.streamId" @click="stopDevicePush(scope.row)">停止</el-button>
                            <el-button size="mini" icon="el-icon-s-open" type="primary" v-if="scope.row.parental == 1" @click="changeSubchannel(scope.row)">查看</el-button>
                                              <el-button size="mini" icon="el-icon-video-camera" type="primary" @click="queryRecords(scope.row)">设备录象</el-button>
<!--                             <el-button size="mini" @click="sendDevicePush(scope.row)">录像查询</el-button> -->
                            <el-button size="mini" icon="el-icon-video-camera" type="primary" @click="queryRecords(scope.row)">设备录象</el-button>
                            <!--                             <el-button size="mini" @click="sendDevicePush(scope.row)">录像查询</el-button> -->
                        </el-button-group>
                    </template>
                </el-table-column>
@@ -98,13 +98,17 @@
            count: parseInt(this.$route.params.count),
            total: 0,
            beforeUrl: "/videoList",
            isLoging: false
            isLoging: false,
            autoList: false
        };
    },

    mounted() {
        this.initData();
        // this.updateLooper = setInterval(this.initData, 10000);
        if (this.autoList) {
            this.updateLooper = setInterval(this.initData, 1500);
        }
        
    },
    destroyed() {
        this.$destroy('videojs');
@@ -161,7 +165,7 @@
                .then(function (res) {
                    console.log(res);
                    that.total = res.data.total;
                    that.deviceChannelList = res.data.data;
                    that.deviceChannelList = res.data.list;
                    // 防止出现表格错位
                    that.$nextTick(() => {
                        that.$refs.channelListTable.doLayout();
@@ -173,44 +177,26 @@

        },

        //gb28181平台对接
        //刷新设备信息
        refDevice: function (itemData) {
            ///api/devices/{deviceId}/sync
            console.log("刷新对应设备:" + itemData.deviceId);
            this.$axios({
                method: 'post',
                url: '/api/devices/' + itemData.deviceId + '/sync'
            }).then(function (res) {
                // console.log("刷新设备结果："+JSON.stringify(res));
            }).catch(function (e) {
                that.$message({
                    showClose: true,
                    message: '请求成功',
                    type: 'success'
                });
            });
        },
        //通知设备上传媒体流
        sendDevicePush: function (itemData) {
            console.log(itemData)
            let deviceId = this.deviceId;
            this.isLoging = true;
            let channelId = itemData.channelId;
            console.log("通知设备推流1：" + deviceId + " : " + channelId);
            console.log("通知设备推流1：" + deviceId + " : " + channelId );
            let that = this;
            this.$axios({
                method: 'get',
                url: '/api/play/' + deviceId + '/' + channelId
            }).then(function (res) {
                console.log(res.data)
                let ssrc = res.data.ssrc;
                let streamId = res.data.streamId;
                that.isLoging = false;
                if (!!ssrc) {
                if (!!streamId) {
                    // that.$refs.devicePlayer.play(res.data, deviceId, channelId, itemData.hasAudio);
                    that.$refs.devicePlayer.openDialog("media", deviceId, channelId,{
                      streamInfo: res.data,
                      hasAudio: itemData.hasAudio
                    that.$refs.devicePlayer.openDialog("media", deviceId, channelId, {
                        streamInfo: res.data,
                        hasAudio: itemData.hasAudio
                    });
                    that.initData();
                } else {
@@ -219,20 +205,26 @@
            }).catch(function (e) {});
        },
        queryRecords: function (itemData) {
          var format = moment().format("YYYY-M-D");
          let deviceId = this.deviceId;
          let channelId = itemData.channelId;
          this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date:format})
            var format = moment().format("YYYY-M-D");
            let deviceId = this.deviceId;
            let channelId = itemData.channelId;
            this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date: format})
        },
        stopDevicePush: function (itemData) {
            console.log(itemData)
            var that = this;
            this.$axios({
                method: 'post',
                url: '/api/play/' + itemData.ssrc + '/stop'
                url: '/api/play/' + itemData.streamId + '/stop'
            }).then(function (res) {
                console.log(JSON.stringify(res));
                that.initData();
            }).catch(function (error) {
              if (error.response.status == 402) { // 已经停止过
                that.initData();
              }else {
                console.log(e)
              }
            });
        },

@@ -269,7 +261,7 @@
                })
                .then(function (res) {
                    that.total = res.data.total;
                    that.deviceChannelList = res.data.data;
                    that.deviceChannelList = res.data.list;
                    // 防止出现表格错位
                    that.$nextTick(() => {
                        that.$refs.channelListTable.doLayout();
@@ -294,6 +286,13 @@
            }).then(function (res) {
                console.log(JSON.stringify(res));
            });
        },
        autoListChange: function () {
            if (this.autoList) {
                this.updateLooper = setInterval(this.initData, 1500);
            }else{
                window.clearInterval(this.updateLooper);
            }
        }

    }