From 29e963f98d2484f399e7b0539bf26c6359d3fcb1 Mon Sep 17 00:00:00 2001
From: liaozetao <1107136310@qq.com>
Date: Tue, 16 Apr 2024 14:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtab=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/room/RoomTabHomeView.vue |  1 +
 src/views/room/RoomTabView.vue     | 32 +++++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/views/room/RoomTabHomeView.vue b/src/views/room/RoomTabHomeView.vue
index 0ff74a2..7841f86 100644
--- a/src/views/room/RoomTabHomeView.vue
+++ b/src/views/room/RoomTabHomeView.vue
@@ -16,6 +16,7 @@
                         <div class="col-sm-2">
                             <input type="text" class="form-control" name="roomTitle" id="roomTitle" placeholder="">
                         </div>
+                        <label for="roomTitle" class="col-sm-2 control-label">地区:</label>
                         <div class="col-sm-2">
                             <select name="partitionId" id="partitionId" class="form-control"></select>
                         </div>
diff --git a/src/views/room/RoomTabView.vue b/src/views/room/RoomTabView.vue
index 2d8224d..6a0882b 100644
--- a/src/views/room/RoomTabView.vue
+++ b/src/views/room/RoomTabView.vue
@@ -184,7 +184,16 @@ export default {
                                 console.log(res);
                                 request.success({
                                     "rows": res.rows.map(i=>{
-                                        i.name = JSON.parse(i.name);
+                                        let name = i.name;
+                                        if (name.startsWith('{') && name.endsWith('}')) {
+                                            i.name = JSON.parse(i.name); 
+                                        } else {
+                                            i.name = {
+                                                zh: i.name,
+                                                ar: i.name,
+                                                en: i.name,
+                                            };
+                                        }
                                         return i;
                                     }),
                                     "total": res.total
@@ -287,12 +296,21 @@ export default {
                             if (ret.code == 200) {
                                 var json = ret.data.roomTab;
                                 $("#id").val(id);
-                                var jsonName = JSON.parse(json.name);
-                                $("#modal_name").val(jsonName.zh);
-                                // 阿语名称
-                                $("#ar_modal_name").val(jsonName.ar);
-                                // 英语名称
-                                $("#en_modal_name").val(jsonName.en);
+                                let name = json.name;
+                                if (name.startsWith('{') && name.endsWith('}')) {
+                                    var jsonName = JSON.parse(json.name);
+                                    $("#modal_name").val(jsonName.zh);
+                                    // 阿语名称
+                                    $("#ar_modal_name").val(jsonName.ar);
+                                    // 英语名称
+                                    $("#en_modal_name").val(jsonName.en);
+                                } else {
+                                    $("#modal_name").val(name);
+                                    // 阿语名称
+                                    $("#ar_modal_name").val(name);
+                                    // 英语名称
+                                    $("#en_modal_name").val(name);
+                                }
                                 $("#modal_seq").val(json.seq);
                                 if (json.status == 1) {
                                     $("#modal_status").val(1);