diff --git a/src/views/room/GameAdmin.vue b/src/views/room/GameAdmin.vue
index 620c989..38b895d 100644
--- a/src/views/room/GameAdmin.vue
+++ b/src/views/room/GameAdmin.vue
@@ -38,7 +38,15 @@
             ? "阿拉伯语区"
             : scope.row.partitionFlag == 4
             ? "华语区"
-            : "全部"
+            : scope.row.partitionFlag == 3
+            ? "英语区、阿拉伯语区"
+            : scope.row.partitionFlag == 5
+            ? "英语区、华语区"
+            : scope.row.partitionFlag == 6
+            ? "阿拉伯语区、华语区"
+            : scope.row.partitionFlag == 7 || scope.row.partitionFlag == 0
+            ? "英语区、阿拉伯语区、华语区"
+            : "无所属地区"
         }}</template>
       </el-table-column>
 
@@ -275,6 +283,7 @@ export default {
           },
         ],
         checkList2: [],
+        partitionFlag: null,
       },
       // 分页
       total: 10, //总页数
@@ -323,14 +332,25 @@ export default {
       var obj = this.editDiaData;
       this.ediObj.gameId = obj.mgIdStr;
       this.ediObj.gameNick = JSON.parse(obj.name).zh;
+      this.ediObj.partitionFlag = obj.partitionFlag;
       this.ediObj.checkList =
-        obj.partitionFlag == 0 || obj.partitionFlag == ""
-          ? ["华语区", "英语区", "阿拉伯语区"]
-          : obj.partitionFlag == 1
+        obj.partitionFlag == 1
           ? ["英语区"]
           : obj.partitionFlag == 2
-          ? ["阿拉伯区"]
-          : ["华语区"];
+          ? ["阿拉伯语区"]
+          : obj.partitionFlag == 4
+          ? ["华语区"]
+          : obj.partitionFlag == 3
+          ? ["英语区", "阿拉伯语区"]
+          : obj.partitionFlag == 5
+          ? ["英语区", "华语区"]
+          : obj.partitionFlag == 6
+          ? ["阿拉伯语区", "华语区"]
+          : scope.row.partitionFlag == 7 ||
+            scope.row.partitionFlag == 0 ||
+            scope.row.partitionFlag == ""
+          ? ["英语区", "阿拉伯语区", "华语区"]
+          : [];
       this.ediObj.value1 = obj.isShow == false ? 0 : 1;
       this.ediObj.value2 = obj.isAuthority;
       this.ediObj.checkList2 =
@@ -341,6 +361,7 @@ export default {
           : obj.roleFlag == 3
           ? ["房主", "管理员"]
           : [];
+      console.log(obj);
     },
     // 确认编辑按钮
     editDialogClick() {
@@ -373,6 +394,7 @@ export default {
     },
     // 计算数值
     districtFun(type) {
+      console.log("ssss", this.ediObj);
       var num = 0;
       var district;
       if (type == 1) {