From 6bfd48776d72bdc450aa367b490327710f306304 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 12:45:56 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/deviceEdit.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/web_src/src/components/dialog/deviceEdit.vue b/web_src/src/components/dialog/deviceEdit.vue
index 798e6f7..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%" >
--
Gitblit v1.8.0