From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 16 五月 2022 10:14:24 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
web_src/src/components/channelList.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 8d06542..9c7ab8e 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,14 +237,14 @@
that.initData();
}, 1000)
- } else {
- that.$message.error(res.data.msg);
}
}).catch(function (e) {
+ that.isLoging = false;
+ that.$message.error("璇锋眰瓒呮椂");
});
},
queryRecords: function (itemData) {
- var format = moment().format("YYYY-M-D");
+ var format = moment().format("yyyy-MM-DD");
let deviceId = this.deviceId;
let channelId = itemData.channelId;
this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date: format})
--
Gitblit v1.8.0