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 | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/web_src/src/components/dialog/deviceEdit.vue b/web_src/src/components/dialog/deviceEdit.vue
index 7e4b3b2..c9862d9 100644
--- a/web_src/src/components/dialog/deviceEdit.vue
+++ b/web_src/src/components/dialog/deviceEdit.vue
@@ -18,17 +18,17 @@
<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%" >
@@ -38,6 +38,18 @@
</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>
@@ -113,7 +125,7 @@
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