From f0ad8f16c737aa4e7c804baa9f8716d0d502c7e9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 16 Sep 2022 14:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E5=8A=A1=E7=BD=91=E5=A4=96=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main-sidebar-sub-menu.vue           | 45 +++++++++++--------
 src/views/modules/shequ/cpts/people-more.vue  |  4 +-
 .../visual/basicinfo/cpts/people-more.vue     | 11 ++---
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/views/main-sidebar-sub-menu.vue b/src/views/main-sidebar-sub-menu.vue
index fe8298671..a4e93cd29 100644
--- a/src/views/main-sidebar-sub-menu.vue
+++ b/src/views/main-sidebar-sub-menu.vue
@@ -12,40 +12,49 @@
         </svg>
         <span>{{ menu.name }}</span>
       </template>
-      <sub-menu v-for="item in menu.children" :key="item.id" :menu="item"></sub-menu>
+      <sub-menu
+        v-for="item in menu.children"
+        :key="item.id"
+        :menu="item"
+      ></sub-menu>
     </el-submenu>
-    <el-menu-item v-else   :index="menu.id" @click="gotoRouteHandle(menu.id)">
-        <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
-          <use :xlink:href="`#${menu.icon}`" />
-        </svg>
-        <span>{{ menu.name }}</span>
+    <el-menu-item v-else :index="menu.id" @click="gotoRouteHandle(menu.id)">
+      <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
+        <use :xlink:href="`#${menu.icon}`" />
+      </svg>
+      <span>{{ menu.name }}</span>
     </el-menu-item>
   </div>
 </template>
 
 <script>
-import SubMenu from './main-sidebar-sub-menu'
+import SubMenu from "./main-sidebar-sub-menu";
 export default {
-  name: 'sub-menu',
+  name: "sub-menu",
   props: {
     menu: {
       type: Object,
-      required: true
-    }
+      required: true,
+    },
   },
   components: {
-    SubMenu
+    SubMenu,
   },
   methods: {
     // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
-    gotoRouteHandle (menuId) {
-      var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(
+    gotoRouteHandle(menuId) {
+      var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter(
         (item) => item.meta.menuId === menuId
-      )[0]
+      )[0];
       if (route) {
-        this.$router.push({ name: route.name })
+        console.log(route);
+        if (route.meta.iframeURL.endsWith("【blank】")) {
+          window.open(route.meta.iframeURL.slice(0, -7));
+        } else {
+          this.$router.push({ name: route.name })
+        }
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index e227e9a80..fc85b2c0d 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -634,8 +634,10 @@ export default {
               tableName: "ic_ym",
             },
           ];
+          this.groupList = [...this.groupList, ...arr];
+        } else {
+          this.groupList = [...arr, ...this.groupList];
         }
-        this.groupList = [...this.groupList, ...arr];
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue
index 55a420a7f..d6d14581a 100644
--- a/src/views/modules/visual/basicinfo/cpts/people-more.vue
+++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue
@@ -16,8 +16,7 @@
           v-for="(fieldSubList, index) in fieldList"
         >
           <div class="list">
-            <div class="item"
-                 v-if="index == 0 && gridName">
+            <div class="item" v-if="index == 0 && gridName">
               <span class="item-field">所属网格：</span>
               <span>{{ gridName }}</span>
             </div>
@@ -352,7 +351,7 @@ export default {
     isShundeju() {
       return this.$store.state.user.customerId == "1550309684576591874";
     },
-    
+
     xiaoquName() {
       const {
         xiaoquList,
@@ -569,7 +568,7 @@ export default {
             }
           });
         });
-        
+
         let arr = [
           {
             groupId: "hs123",
@@ -600,8 +599,10 @@ export default {
               tableName: "ic_ym",
             },
           ];
+          this.groupList = [...this.groupList, ...arr];
+        } else {
+          this.groupList = [...arr, ...this.groupList];
         }
-        this.groupList = [...this.groupList, ...arr];
       } else {
         this.$message.error(msg);
       }