From 0b737708e696c45720499759b5c31aced87fdbb6 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 07 七月 2021 14:10:03 +0800
Subject: [PATCH] merge master
---
src/pages/maintain/views/generalSettings.vue | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/pages/maintain/views/generalSettings.vue b/src/pages/maintain/views/generalSettings.vue
index 7507fbc..b4aaf7c 100644
--- a/src/pages/maintain/views/generalSettings.vue
+++ b/src/pages/maintain/views/generalSettings.vue
@@ -94,7 +94,7 @@
class="upload-demo"
drag
action="https://jsonplaceholder.typicode.com/posts/"
- multiple
+ :http-request="uploadSound"
v-show="showUpload"
>
<i class="el-icon-upload"></i>
@@ -118,7 +118,7 @@
<script>
import { saveAlarmConfig } from "@/api/system";
-
+import { uploadSound,getSoundList } from "@/api/event";
import cloudNode from "../components/CloudNode";
import ipInput from "@/components/subComponents/IPInput";
import { isIPv4 } from "@/scripts/validate";
@@ -165,8 +165,7 @@
{ name: "鑻辨枃", desc: "fesF" },
{ name: "绻佷綋涓枃锛堥娓級", desc: "fesF" },
],
- soundList: [{ name: "2.mp3" }, { name: "3.mp3" }],
-
+ soundList: [],
wireFormRules: {},
activePage: "basic",
rules: {
@@ -174,20 +173,6 @@
{ required: true, message: "璇疯緭鍏ヨ澶囧悕绉�", trigger: "change" },
],
},
- ipv4Form: {},
- ipv6Form: {},
- ipv4FormRules: {},
- ipv6FormRules: {},
- options: [
- {
- value: "閫夐」1",
- label: "鎵嬪姩",
- },
- {
- value: "閫夐」2",
- label: "鑷姩",
- },
- ],
value: "",
};
},
@@ -196,12 +181,38 @@
ipInput,
switchBar,
},
- mounted() {},
+ mounted() {
+ debugger
+ // this.getSounds()
+ },
beforeDestroy() {},
props: ["barName"],
methods: {
+ getSounds() {
+ getSoundList().then(res => {
+ if (res.success) {
+ this.soundList = res.data.list
+ debugger
+ }
+ }).catch(
+ e => console.log(e)
+ )
+ },
+ uploadSound(params){
+ let param = new FormData();
+ debugger
+ param.append("file", params.file);
+ uploadSound(param).then((res) => {
+ debugger
+ console.log(res.data);
+ });
+ },
openRight(typ) {
this.activePage = typ;
+ debugger
+ if (typ=="sound") {
+ this.getSounds()
+ }
},
wifiControl(val) {},
checkWifi() {
--
Gitblit v1.8.0