From ea32fa812270f0363fb78ac12cb236979ee43a15 Mon Sep 17 00:00:00 2001
From: heshengjie3333 <heshengjie0506@163.com>
Date: Wed, 20 Jul 2022 20:51:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=EF=BC=88?=
 =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98=E5=A4=A7=E6=AF=9B=E7=97=85=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json          | 96 ++++++++++++++++++--------------------
 package.json               |  2 +-
 src/components/Sidebar.vue | 31 +++++++++++-
 src/main.ts                | 12 ++++-
 src/router/index.ts        | 16 ++++---
 src/views/HomePage.vue     | 17 ++++---
 6 files changed, 106 insertions(+), 68 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9d32b8f..05f2a1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1432,6 +1432,11 @@
       "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
       "dev": true
     },
+    "@popperjs/core": {
+      "version": "npm:@sxzz/popperjs-es@2.11.7",
+      "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+    },
     "@sideway/address": {
       "version": "4.1.4",
       "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz",
@@ -2176,49 +2181,6 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
-      },
-      "dependencies": {
-        "@vue/vue-loader-v15": {
-          "version": "npm:vue-loader@15.10.0",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
-          "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
-          "dev": true,
-          "requires": {
-            "@vue/component-compiler-utils": "^3.1.0",
-            "hash-sum": "^1.0.2",
-            "loader-utils": "^1.1.0",
-            "vue-hot-reload-api": "^2.3.0",
-            "vue-style-loader": "^4.1.0"
-          },
-          "dependencies": {
-            "hash-sum": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-              "dev": true
-            }
-          }
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2471,6 +2433,47 @@
       "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.37.tgz",
       "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
     },
+    "@vue/vue-loader-v15": {
+      "version": "npm:vue-loader@15.10.0",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
+      "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
+      "dev": true,
+      "requires": {
+        "@vue/component-compiler-utils": "^3.1.0",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+          "dev": true
+        },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
+      }
+    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -4258,13 +4261,6 @@
         "lodash-unified": "^1.0.2",
         "memoize-one": "^6.0.0",
         "normalize-wheel-es": "^1.1.2"
-      },
-      "dependencies": {
-        "@popperjs/core": {
-          "version": "npm:@sxzz/popperjs-es@2.11.7",
-          "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
-          "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
-        }
       }
     },
     "emoji-regex": {
diff --git a/package.json b/package.json
index dec0169..d69e145 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,8 @@
     "axios": "^0.27.2",
     "core-js": "^3.8.3",
     "element-plus": "^2.2.9",
-    "sass": "^1.53.0",
     "node-sass": "^7.0.1",
+    "sass": "^1.53.0",
     "sass-loader": "^13.0.2",
     "vue": "^3.2.13",
     "vue-router": "^4.0.3"
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 01d4841..b414483 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -12,6 +12,9 @@
         </el-menu> -->
         <el-menu router :default-active="onRoutes" text-color="#000000">
             <el-menu-item v-for="i in data.array" :key="i.path" :index="i.path">
+                <el-icon>
+                    <component :is="i.meta.icon" />
+                </el-icon>
                 <span>{{i.meta.title}}</span>
             </el-menu-item>
             <el-menu-item>
@@ -23,11 +26,11 @@
 
 <script lang="ts">
 import { defineComponent, reactive } from 'vue'
-// import {Edit} from '@element-plus/icons-vue'
 import router from '@/router';
 import { useRouter } from 'vue-router';
 import{ listdata } from '@/type/sidebar'
 
+
 export default defineComponent({
     computed: {
         onRoutes() {
@@ -38,9 +41,26 @@ export default defineComponent({
     setup () {
         const data = reactive(new listdata())
         const router = useRouter() 
+        // console.log(router ,'456');
         data.array = router.getRoutes().filter((t)=>t.meta.isshow)
         console.log(data.array,111);
-        
+
+
+        // if (???==1||2||3){
+        //     if( 2||3){
+        //         if(3){
+        //             data.array = router.getRoutes().filter((t)=>{t.meta.???})
+        //         }else{
+        //             data.array = router.getRoutes().filter((t)=>{t.meta.???})
+        //         }
+        //     }else{
+        //         data.array = router.getRoutes().filter((t)=>{t.meta.???})
+        //     }
+        // }else{
+        //     data.array = router.getRoutes().filter((t)=>{t.meta.???})
+        // }
+
+
         return { data }
     }
 })
@@ -56,4 +76,11 @@ export default defineComponent({
 .el-menu-item.is-active{
     color: rgb(31, 160, 31);
 }
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
 </style>
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 6d935b4..9603c15 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,6 +3,16 @@ import App from './App.vue'
 import router from './router'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
 
+// import './assets/icon/iconfont.js'
 
-createApp(App).use(ElementPlus).use(router).mount('#app')
+// createApp(App).use(ElementPlus).use(router)
+
+const app = createApp(App)
+for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+  app.component(key, component)
+}
+
+
+app.use(ElementPlus).use(router).mount('#app')
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index b0ec1cd..cb7e50b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -22,7 +22,9 @@ const routes: Array<RouteRecordRaw> = [
         meta:{
           title:'发热信息登记',
           isshow:true,
-          icon:'',
+          // isshow:false,
+          rules:[1,2,3],
+          icon:'Menu',
         }
       },
     //发热信息
@@ -33,7 +35,7 @@ const routes: Array<RouteRecordRaw> = [
         meta:{
           title:'发热信息记录',
           isshow:true,
-          icon:'',
+          icon:'Document',
         }
       },
       //区县管理
@@ -44,7 +46,7 @@ const routes: Array<RouteRecordRaw> = [
         meta:{
           title:'区县管理',
           isshow:true,
-          icon:'',
+          icon:'Histogram',
         }
 
       },
@@ -56,7 +58,7 @@ const routes: Array<RouteRecordRaw> = [
         meta:{
           title:'医院管理',
           isshow:true,
-          icon:'',
+          icon:'FirstAidKit',
         }
       },
       //用户管理
@@ -67,7 +69,7 @@ const routes: Array<RouteRecordRaw> = [
         meta:{
           title:'用户管理',
           isshow:true,
-          icon:'',
+          icon:'Avatar',
         }
       },
       //修改个人信息
@@ -78,7 +80,7 @@ const routes: Array<RouteRecordRaw> = [
         meta:{
           title:'修改个人信息',
           isshow:true,
-          icon:'',
+          icon:'EditPen',
         }
       },
       //修改密码
@@ -89,7 +91,7 @@ const routes: Array<RouteRecordRaw> = [
         meta:{
           title:'修改密码',
           isshow:true,
-          icon:'',
+          icon:'EditPen',
         }
       },
       {
diff --git a/src/views/HomePage.vue b/src/views/HomePage.vue
index 7074ad9..7512dec 100644
--- a/src/views/HomePage.vue
+++ b/src/views/HomePage.vue
@@ -79,7 +79,7 @@
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSubmit">登记</el-button>
-                    <el-button>取消</el-button>
+                    <el-button  @click="cancel" >取消</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -89,19 +89,22 @@
 <script lang="ts">
 import { defineComponent, reactive,toRefs } from 'vue'
 import { datanorm } from '@/type/homepage'
+// import router from '@/router'
 
 export default defineComponent({
     setup () {
-        
         const data = reactive( new datanorm() )
-        console.log( data,111 );
-
+        // console.log( data,111 );
         const onSubmit = ()=>{
             console.log(1111);
-            
-        }
 
-        return { ...toRefs(data.datainfo),onSubmit }
+            //调接口
+        }
+        const cancel = ()=>{
+            // router.push('/homepage')
+            location.reload()
+        }
+        return { ...toRefs(data.datainfo),onSubmit,cancel }
     }
 })
 </script>
-- 
Gitee