aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-23 21:47:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/1078-newUI

Browse Source
This commit is contained in:
lin 2025-05-16 08:50:26 +08:00
commit 27d7f3cc6e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/api/server.js
View File

@ -24,13 +24,13 @@ export function getMediaServer(id) {
} }
export function checkMediaServer(params) { export function checkMediaServer(params) {
const { ip, port, secret, type } = params const { ip, httpPort, 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: port, port: httpPort,
secret: secret, secret: secret,
type: type type: type
} }

4
web/src/views/dialog/MediaServerEdit.vue
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({