From 7de73ebd2bc07a51f0f9db031d6f616bdcfe549c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 11 十月 2023 01:36:12 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
web_src/src/components/dialog/deviceEdit.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/web_src/src/components/dialog/deviceEdit.vue b/web_src/src/components/dialog/deviceEdit.vue
old mode 100644
new mode 100755
index 7597c10..7cd3579
--- a/web_src/src/components/dialog/deviceEdit.vue
+++ b/web_src/src/components/dialog/deviceEdit.vue
@@ -43,16 +43,13 @@
<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 v-if="this.isEdit" label="鐩綍璁㈤槄" title="0涓哄彇娑堣闃�" prop="subscribeCycleForCatalog" >
@@ -64,9 +61,16 @@
<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="涓诲瓙鐮佹祦寮�鍏�" prop="switchPrimarySubStream" >
+ <el-select v-model="form.switchPrimarySubStream" style="float: left; width: 100%" >
+ <el-option key="true" label="寮�鍚�" :value="true"></el-option>
+ <el-option key="false" label="鍏抽棴" :value="false"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="鍏朵粬閫夐」">
<el-checkbox label="SSRC鏍￠獙" v-model="form.ssrcCheck" style="float: left"></el-checkbox>
<el-checkbox label="浣滀负娑堟伅閫氶亾" v-model="form.asMessageChannel" style="float: left"></el-checkbox>
+ <el-checkbox label="鏀跺埌ACK鍚庡彂娴�" v-model="form.broadcastPushAfterAck" style="float: left"></el-checkbox>
</el-form-item>
<el-form-item>
<div style="float: right;">
--
Gitblit v1.8.0