From f52be3039975b41f24f8df02b71b60911aa7c63a Mon Sep 17 00:00:00 2001
From: walkTtalk <irwenjing@gmail.com>
Date: 星期六, 26 二月 2022 00:01:35 +0800
Subject: [PATCH] Fix issue #347: 修改前端启动报错
---
web_src/src/components/channelList.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index f06abfc..3cd4bc9 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -54,6 +54,8 @@
</el-table-column>
<el-table-column prop="subCount" label="瀛愯妭鐐规暟">
</el-table-column>
+ <el-table-column prop="manufacture" label="鍘傚">
+ </el-table-column>
<el-table-column label="浣嶇疆淇℃伅" align="center">
<template slot-scope="scope">
<span>{{scope.row.longitude}},{{scope.row.latitude}}</span>
@@ -82,7 +84,7 @@
<!-- <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.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-s-open" type="primary" v-if="scope.row.subCount > 0" @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-group>
@@ -210,10 +212,10 @@
url: '/api/play/start/' + deviceId + '/' + channelId
}).then(function (res) {
that.isLoging = false;
- if (res.data.code == 0) {
+ if (res.data.code === 0) {
setTimeout(()=>{
- console.log("涓嬭浇鎴浘")
+
let snapId = deviceId + "_" + channelId;
that.loadSnap[snapId] = 0;
that.getSnapErrorEvent(snapId)
@@ -222,7 +224,10 @@
streamInfo: res.data.data,
hasAudio: itemData.hasAudio
});
- that.initData();
+ setTimeout(()=>{
+ that.initData();
+ },1000)
+
}else {
that.$message.error(res.data.msg);
}
--
Gitblit v1.8.0