From 2d7a20209679cfbac3e42bebfdbcdb20e511ca4f Mon Sep 17 00:00:00 2001
From: mk1990 <37614016+mk1990@users.noreply.github.com>
Date: 星期四, 12 五月 2022 16:16:55 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/channelList.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 8d06542..f7e4e40 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -93,7 +93,7 @@
<el-button size="mini" icon="el-icon-s-open" type="primary" v-if="scope.row.subCount > 0 || 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 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>
@@ -237,10 +237,10 @@
that.initData();
}, 1000)
- } else {
- that.$message.error(res.data.msg);
}
}).catch(function (e) {
+ that.isLoging = false;
+ that.$message.error("璇锋眰瓒呮椂");
});
},
queryRecords: function (itemData) {
--
Gitblit v1.8.0