From c877cc7697f690210ca4b591291b028459e61520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Fri, 14 Oct 2022 13:29:17 +0800
Subject: [PATCH] up

---
 public/index.html                |  3 ---
 src/store/modules/permission.js  | 20 ++++++++++++++++++--
 src/views/rain/basic/account.vue |  3 +--
 src/views/rain/map.vue           | 16 ++++++++++++++++
 4 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 src/views/rain/map.vue

diff --git a/public/index.html b/public/index.html
index ed93ad2..3884e7c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -15,9 +15,6 @@
     </script>
     <script type="text/javascript" src='https://webapi.amap.com/maps?v=1.4.11&key=53919608dd142b8d4498b43bfdef0792&plugin=AMap.PlaceSearch'></script>
     <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
-
-    <!-- 天地图 -->
-    <script src="http://api.tianditu.gov.cn/api?v=4.0&tk=82526d64e8504a0341f775c087863825" type="text/javascript"></script>
     <!-- <script src="http://gisserver.tianditu.com/tiandituService/wms"></script> -->
     <link rel="stylesheet" href="https://js.arcgis.com/3.41/esri/css/esri.css">
     <script src="https://js.arcgis.com/3.41/"></script>
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 50b93d3..720661b 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -77,6 +77,22 @@ export function generaMenu(routes, data) {
           }
         }]
       })
+    } else if (item.url === "##") {
+       routes.push({
+         path: item.path,
+         component: Layout,
+         children: [{
+           path: item.path,
+           name: item.name,
+          component: () => import('@/views/rain/map'),
+           meta: {
+             title: item.name,
+             id: item.id,
+             roles: ['admin'],
+             icon: item.icon
+           }
+         }]
+       })
     } else {
       var path = item.url;
       if (item.path != "null" && item.path != null && item.path != "") {
@@ -126,8 +142,8 @@ const actions = {
 
         //console.log(JSON.stringify(data))
 
-        Object.assign(loadMenuData, data)
-        asyncRoutes.length=0;
+        Object.assign(loadMenuData, data)
+        asyncRoutes.length = 0;
         generaMenu(asyncRoutes, loadMenuData)
         let accessedRoutes
         if (roles.includes('admin')) {
diff --git a/src/views/rain/basic/account.vue b/src/views/rain/basic/account.vue
index af8aa84..10d4a7b 100644
--- a/src/views/rain/basic/account.vue
+++ b/src/views/rain/basic/account.vue
@@ -204,11 +204,10 @@
           group_id: "",
           allow_menu_ids: ""
         },
-
         rules: {
           name: [{
             required: true,
-            message: '请填写名字',
+            message: '请填写姓名',
             trigger: 'blur',
           }],
           username: [{
diff --git a/src/views/rain/map.vue b/src/views/rain/map.vue
new file mode 100644
index 0000000..6c28022
--- /dev/null
+++ b/src/views/rain/map.vue
@@ -0,0 +1,16 @@
+<template>
+  <div style="height: 100vh;">
+    <iframe name="iframeMap" id="iframeYuguanMap" src="http://192.168.60.22:8081/Html/Page/Index.html" width="100%"
+      height="100%" scrolling="auto" frameborder="0"></iframe>
+  </div>
+</template>
+
+<script>
+  export default {
+    mounted() {
+      this.$store.dispatch('app/toggleSideBar')
+    }
+  }
+</script>
+<style>
+</style>