From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001 From: mk1990 <153958232@qq.com> Date: 星期一, 16 五月 2022 10:14:24 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0 --- web_src/src/components/dialog/deviceEdit.vue | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/web_src/src/components/dialog/deviceEdit.vue b/web_src/src/components/dialog/deviceEdit.vue index 464de02..b4dd285 100644 --- a/web_src/src/components/dialog/deviceEdit.vue +++ b/web_src/src/components/dialog/deviceEdit.vue @@ -10,7 +10,7 @@ @close="close()" > <div id="shared" style="margin-top: 1rem;margin-right: 100px;"> - <el-form ref="form" :rules="rules" :model="form" label-width="140px" > + <el-form ref="form" :rules="rules" :model="form" label-width="200px" > <el-form-item label="璁惧缂栧彿" > <el-input v-model="form.deviceId" disabled></el-input> </el-form-item> @@ -35,6 +35,18 @@ <el-option key="GB2312" label="GB2312" value="gb2312"></el-option> <el-option key="UTF-8" label="UTF-8" value="utf-8"></el-option> </el-select> + </el-form-item> + <el-form-item label="鐩綍璁㈤槄" title="0涓哄彇娑堣闃�" prop="subscribeCycleForCatalog" > + <el-input v-model="form.subscribeCycleForCatalog" clearable ></el-input> + </el-form-item> + <el-form-item label="绉诲姩浣嶇疆璁㈤槄" title="0涓哄彇娑堣闃�" prop="subscribeCycleForCatalog" > + <el-input v-model="form.subscribeCycleForMobilePosition" clearable ></el-input> + </el-form-item> + <el-form-item v-if="form.subscribeCycleForMobilePosition > 0" label="绉诲姩浣嶇疆鎶ラ�侀棿闅�" prop="subscribeCycleForCatalog" > + <el-input v-model="form.mobilePositionSubmissionInterval" clearable ></el-input> + </el-form-item> + <el-form-item label="鍏朵粬閫夐」"> + <el-checkbox label="SSRC鏍¢獙" v-model="form.ssrcCheck" style="float: left"></el-checkbox> </el-form-item> <el-form-item> <div style="float: right;"> @@ -82,13 +94,16 @@ }, getMediaServerList: function (){ let that = this; - that.mediaServerObj.getMediaServerList((data)=>{ + that.mediaServerObj.getOnlineMediaServerList((data)=>{ that.mediaServerList = data.data; }) }, onSubmit: function () { console.log("onSubmit"); console.log(this.form); + this.form.subscribeCycleForCatalog = this.form.subscribeCycleForCatalog||0 + this.form.subscribeCycleForMobilePosition = this.form.subscribeCycleForMobilePosition||0 + this.form.mobilePositionSubmissionInterval = this.form.mobilePositionSubmissionInterval||0 this.$axios({ method: 'post', url:`/api/device/query/device/update/`, -- Gitblit v1.8.0