Compare commits

..

No commits in common. "c981e7f470a2e8fc85165ef7ebd78b8c55e3377b" and "bb5018c7f480b3a6c9b225e009e5259ac3b7eb10" have entirely different histories.

3 changed files with 6 additions and 6 deletions

View File

@ -24,13 +24,13 @@ export function getMediaServer(id) {
} }
export function checkMediaServer(params) { export function checkMediaServer(params) {
const { ip, httpPort, secret, type } = params const { ip, port, secret, type } = params
return request({ return request({
method: 'get', method: 'get',
url: `/api/server/media_server/check`, url: `/api/server/media_server/check`,
params: { params: {
ip: ip, ip: ip,
port: httpPort, port: port,
secret: secret, secret: secret,
type: type type: type
} }

View File

@ -208,15 +208,15 @@ export default {
unPause: function() { unPause: function() {
if (h265webPlayer[this._uid]) { if (h265webPlayer[this._uid]) {
h265webPlayer[this._uid].play() h265webPlayer[this._uid].play()
this.playing = h265webPlayer[this._uid].isPlaying()
} }
this.playing = h265webPlayer[this._uid].isPlaying()
this.err = '' this.err = ''
}, },
pause: function() { pause: function() {
if (h265webPlayer[this._uid]) { if (h265webPlayer[this._uid]) {
h265webPlayer[this._uid].pause() h265webPlayer[this._uid].pause()
this.playing = h265webPlayer[this._uid].isPlaying()
} }
this.playing = h265webPlayer[this._uid].isPlaying()
this.err = '' this.err = ''
}, },
mute: function() { mute: function() {

View File

@ -11,7 +11,7 @@
@close="close()" @close="close()"
> >
<div id="formStep" style="margin-top: 1rem; margin-right: 20px;"> <div id="formStep" style="margin-top: 1rem; margin-right: 20px;">
<el-form v-if="currentStep === 1" ref="mediaServerForm" :rules="rules" :model="mediaServerForm" label-width="140px"> <el-form v-if="currentStep == 1" ref="mediaServerForm" :rules="rules" :model="mediaServerForm" label-width="140px">
<el-form-item label="IP" prop="ip"> <el-form-item label="IP" prop="ip">
<el-input v-model="mediaServerForm.ip" placeholder="媒体服务IP" clearable :disabled="mediaServerForm.defaultServer" /> <el-input v-model="mediaServerForm.ip" placeholder="媒体服务IP" clearable :disabled="mediaServerForm.defaultServer" />
</el-form-item> </el-form-item>
@ -237,7 +237,7 @@ export default {
}, },
checkServer: function() { checkServer: function() {
this.serverCheck = 0 this.serverCheck = 0
this.$store.dispatch('server/checkMediaServer', this.mediaServerForm) this.$store.dispatch("server/checkMediaServer", this.mediaServerForm)
.then(data => { .then(data => {
if (parseInt(this.mediaServerForm.httpPort) !== parseInt(data.httpPort)) { if (parseInt(this.mediaServerForm.httpPort) !== parseInt(data.httpPort)) {
this.$message({ this.$message({