From 04f938ef623eb1f69a0b08ba8910bb5639372316 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期五, 06 五月 2022 12:19:44 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
---
web_src/src/components/dialog/StreamProxyEdit.vue | 90 ++++++++++++++++++++-------------------------
1 files changed, 40 insertions(+), 50 deletions(-)
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index d5a9529..77ee1d8 100644
--- a/web_src/src/components/dialog/StreamProxyEdit.vue
+++ b/web_src/src/components/dialog/StreamProxyEdit.vue
@@ -131,6 +131,22 @@
computed: {},
created() {},
data() {
+ // var deviceGBIdRules = async (rule, value, callback) => {
+ // console.log(value);
+ // if (value === "") {
+ // callback(new Error("璇疯緭鍏ヨ澶囧浗鏍囩紪鍙�"));
+ // } else {
+ // var exit = await this.deviceGBIdExit(value);
+ // console.log(exit);
+ // console.log(exit == "true");
+ // console.log(exit === "true");
+ // if (exit) {
+ // callback(new Error("璁惧鍥芥爣缂栧彿宸插瓨鍦�"));
+ // } else {
+ // callback();
+ // }
+ // }
+ // };
return {
listChangeCallback: null,
showDialog: false,
@@ -169,7 +185,6 @@
timeout_ms: [{ required: true, message: "璇疯緭鍏Fmpeg鎺ㄦ祦鎴愬姛瓒呮椂鏃堕棿", trigger: "blur" }],
ffmpeg_cmd_key: [{ required: false, message: "璇疯緭鍏Fmpeg鍛戒护鍙傛暟妯℃澘锛堝彲閫夛級", trigger: "blur" }],
},
- isUpdate: false,
};
},
methods: {
@@ -177,14 +192,13 @@
this.showDialog = true;
this.listChangeCallback = callback;
if (proxyParam != null) {
- this.isUpdate=true
this.proxyParam = proxyParam;
}
let that = this;
this.$axios({
method: 'get',
- url:`/api/platform/query/100/1`
+ url:`/api/platform/query/10000/1`
}).then(function (res) {
that.platformList = res.data.list;
}).catch(function (error) {
@@ -193,6 +207,7 @@
this.mediaServer.getOnlineMediaServerList((data)=>{
this.mediaServerList = data.data;
this.proxyParam.mediaServerId = this.mediaServerList[0].id
+ this.mediaServerIdChange()
})
},
mediaServerIdChange:function (){
@@ -206,6 +221,7 @@
}
}).then(function (res) {
that.ffmpegCmdList = res.data.data;
+ that.proxyParam.ffmpeg_cmd_key = Object.keys(res.data.data)[0];
}).catch(function (error) {
console.log(error);
});
@@ -215,54 +231,28 @@
onSubmit: function () {
this.dialogLoading = true;
var that = this;
- if(this.isUpdate){
- that.$axios({
- method: 'post',
- url:`/api/proxy/update`,
- data: that.proxyParam
- }).then(function (res) {
- that.dialogLoading = false;
- if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
- that.$message({
- showClose: true,
- message: res.data.msg,
- type: "success",
- });
- that.showDialog = false;
- if (that.listChangeCallback != null) {
- that.listChangeCallback();
- that.dialogLoading = false;
- }
+ that.$axios({
+ method: 'post',
+ url:`/api/proxy/save`,
+ data: that.proxyParam
+ }).then(function (res) {
+ that.dialogLoading = false;
+ if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
+ that.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "success",
+ });
+ that.showDialog = false;
+ if (that.listChangeCallback != null) {
+ that.listChangeCallback();
+ that.dialogLoading = false;
}
- }).catch(function (error) {
- console.log(error);
- this.dialogLoading = false;
- });
- }else{
- that.$axios({
- method: 'post',
- url:`/api/proxy/save`,
- data: that.proxyParam
- }).then(function (res) {
- that.dialogLoading = false;
- if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
- that.$message({
- showClose: true,
- message: res.data.msg,
- type: "success",
- });
- that.showDialog = false;
- if (that.listChangeCallback != null) {
- that.listChangeCallback();
- that.dialogLoading = false;
- }
- }
- }).catch(function (error) {
- console.log(error);
- this.dialogLoading = false;
- });
- }
-
+ }
+ }).catch(function (error) {
+ console.log(error);
+ this.dialogLoading = false;
+ });
},
close: function () {
this.showDialog = false;
--
Gitblit v1.8.0