From 013c4922a3296e95a54c1902c09b44d62a000eb2 Mon Sep 17 00:00:00 2001 From: ZZJ <10913410+zzj2100@user.noreply.gitee.com> Date: 星期三, 27 七月 2022 17:14:02 +0800 Subject: [PATCH] Merge branch 'shandong' of ssh://192.168.5.5:29418/web/saas-web into shandong --- src/views/hashrate/CameraManage/CameraRules/components/SceneRule.vue | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/views/hashrate/CameraManage/CameraRules/components/SceneRule.vue b/src/views/hashrate/CameraManage/CameraRules/components/SceneRule.vue index 02ba214..c31226f 100644 --- a/src/views/hashrate/CameraManage/CameraRules/components/SceneRule.vue +++ b/src/views/hashrate/CameraManage/CameraRules/components/SceneRule.vue @@ -301,7 +301,7 @@ if (res.success) { //_this.soundList = [{ id: "", name: "绌�", path: "" }].concat(res.data.list) _this.soundList = [{ id: "", name: "绌�", path: "" }].concat( - res.data + res.data.voices ); } }) -- Gitblit v1.8.0