From 82fd369ce554467f794c9aa66e453adecefc73a9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 16:56:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/deviceEdit.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/web_src/src/components/dialog/deviceEdit.vue b/web_src/src/components/dialog/deviceEdit.vue
index 464de02..c9862d9 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>
@@ -18,23 +18,50 @@
<el-form-item label="璁惧鍚嶇О" prop="name">
<el-input v-model="form.name" clearable></el-input>
</el-form-item>
-<!-- <el-form-item label="娴佸獟浣揑D" prop="mediaServerId">-->
-<!-- <el-select v-model="form.mediaServerId" style="float: left; width: 100%" >-->
-<!-- <el-option key="auto" label="鑷姩璐熻浇鏈�灏�" value="null"></el-option>-->
-<!-- <el-option-->
-<!-- v-for="item in mediaServerList"-->
-<!-- :key="item.id"-->
-<!-- :label="item.id"-->
-<!-- :value="item.id">-->
-<!-- </el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
+ <el-form-item label="娴佸獟浣揑D" prop="mediaServerId">
+ <el-select v-model="form.mediaServerId" style="float: left; width: 100%" >
+ <el-option key="auto" label="鑷姩璐熻浇鏈�灏�" value="auto"></el-option>
+ <el-option
+ v-for="item in mediaServerList"
+ :key="item.id"
+ :label="item.id"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="瀛楃闆�" prop="charset" >
<el-select v-model="form.charset" style="float: left; width: 100%" >
<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="璇煶鍙戦�侀�氶亾" prop="name">
+ <el-input v-model="form.audioChannelForReceive" clearable></el-input>
+ </el-form-item>
+ <el-form-item label="鍦扮悊鍧愭爣绯�" prop="geoCoordSys" >
+ <el-select v-model="form.geoCoordSys" style="float: left; width: 100%" >
+ <el-option key="WGS84" label="WGS84" value="WGS84"></el-option>
+ <el-option key="GCJ02" label="GCJ02" value="GCJ02"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐩綍缁撴瀯" prop="treeType" >
+ <el-select v-model="form.treeType" style="float: left; width: 100%" >
+ <el-option key="WGS84" label="琛屾斂鍖哄垝" value="CivilCode"></el-option>
+ <el-option key="GCJ02" label="涓氬姟鍒嗙粍" value="BusinessGroup"></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,20 +109,23 @@
},
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/`,
params: this.form
}).then((res) => {
console.log(res.data)
- if (res.data.code == 0) {
+ if (res.data.code === 0) {
this.listChangeCallback()
}else {
this.$message({
--
Gitblit v1.8.0