Browse Source

1. 解决左侧菜单闪没
2. 经济运行二级菜单更换图标

wsy 3 years ago
parent
commit
5c4f856492

+ 7 - 1
src/App.vue

@@ -201,6 +201,7 @@ export default {
       // 当前子系统
       root: "",
       isLogined: true,
+      memuCloseTimeout: null,
     };
   },
 
@@ -242,9 +243,14 @@ export default {
     },
     showMenu() {
       this.isShowMenu = true;
+      this.memuCloseTimeout && clearTimeout(this.memuCloseTimeout);
     },
     hideMenu() {
-      this.isShowMenu = false;
+      const that = this;
+      this.memuCloseTimeout = setTimeout(function(){
+        that.isShowMenu = false;
+      }, 500 )
+      
     },
     login(params) {
       if (params.username && params.password) this.isLogined = true;

File diff suppressed because it is too large
+ 11 - 0
src/assets/icon/svg/menu/dbgl.svg


+ 11 - 0
src/assets/icon/svg/menu/dlyc.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="150px" height="150px" viewBox="0 0 150 150" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
+    <title>电量 (1)-01-01</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="电量-(1)-01-01" fill="#2C2C2C" fill-rule="nonzero">
+            <path d="M75,0 C33.6,0 0,33.6 0,75 C0,116.4 33.6,150 75,150 C116.4,150 150,116.4 150,75 C150,33.6 116.4,0 75,0 Z M71.9,119 L78.4,85.8 L41.7,85.8 L78.3,31 L71.8,66.9 L108.3,66.9 L71.9,119 Z" id="形状"></path>
+        </g>
+    </g>
+</svg>

File diff suppressed because it is too large
+ 11 - 0
src/assets/icon/svg/menu/fjfx.svg


+ 11 - 0
src/assets/icon/svg/menu/jjyx.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="151px" height="136px" viewBox="0 0 151 136" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
+    <title>经济运行</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="经济运行" fill="#2C2C2C" fill-rule="nonzero">
+            <path d="M142,0 C147,0 151,4.1 151,9 L151,9 L151,126.8 C151,131.8 146.9,135.8 142,135.8 L9,135.8 C4,135.8 0,131.7 0,126.8 L0,86.6 L35.3,56.9 L75.1,66 L102.5,44.2 L112.5,55 L128.1,10.2 L82.4,22.6 L92.2,33.2 L71.4,49.7 L31.3,40.5 L0,66.9 L0,9 C0,4 4.1,0 9,0 L9,0 L142,0 L142,0 Z M45.3,83 L30.3,83 L30.3,113.3 L45.4,113.3 L45.4,83 L45.3,83 Z M83,83 L68,83 L68,113.3 L83,113.3 L83,83 Z M120.8,68 L105.7,68 L105.7,113.3 L120.8,113.3 L120.8,68 Z" id="形状"></path>
+        </g>
+    </g>
+</svg>

File diff suppressed because it is too large
+ 11 - 0
src/assets/icon/svg/menu/phb.svg


File diff suppressed because it is too large
+ 11 - 0
src/assets/icon/svg/menu/qxfx.svg


+ 11 - 0
src/assets/icon/svg/menu/slgl.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="166px" height="172px" viewBox="0 0 166 172" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
+    <title>三率</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="三率" fill="#2C2C2C" fill-rule="nonzero">
+            <path d="M107.4,122.9 C93.9,122.9 82.9,133.9 82.9,147.4 C82.9,160.9 93.9,171.9 107.4,171.9 C120.9,171.9 131.9,160.9 131.9,147.4 C131.9,133.8 120.9,122.9 107.4,122.9 Z M35.3,84.2 C15.8,84.2 0,100 0,119.4 C0,138.9 15.8,154.7 35.3,154.7 C54.8,154.7 70.6,138.9 70.6,119.4 C70.6,100 54.8,84.2 35.3,84.2 Z M119.8,0 C94.4,0 73.9,20.6 73.9,45.9 C73.9,71.3 94.5,91.8 119.8,91.8 C145.2,91.8 165.700363,71.2 165.700363,45.9 C165.8,20.6 145.2,0 119.8,0 Z" id="形状"></path>
+        </g>
+    </g>
+</svg>

+ 13 - 0
src/assets/icon/svg/menu/ztfx.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="180px" height="180px" viewBox="0 0 180 180" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
+    <title>专题 </title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="专题-" transform="translate(0.109375, -0.085938)" fill="#000000" fill-rule="nonzero">
+            <path d="M71.2239584,86.4192709 L7.5572916,54.4192709 C-2.4427084,49.4192709 -2.4427084,41.4192709 7.5572916,36.4192709 L71.2239584,4.08593745 C82.890625,-1.2473959 96.2239584,-1.2473959 107.890625,4.08593745 L171.890625,36.4192709 C181.890625,41.4192709 181.890625,49.4192709 171.890625,54.4192709 L107.890625,86.4192709 C96.2239584,91.4192709 82.890625,91.4192709 71.2239584,86.4192709 Z" id="路径"></path>
+            <path d="M171.890625,81.0859375 L153.223958,71.0859375 L107.890625,93.7526041 C96.2239584,99.0859375 82.890625,99.0859375 71.2239584,93.7526041 L26.5572916,71.4192709 L7.890625,81.4192709 C-2.109375,86.4192709 -2.109375,94.4192709 7.890625,99.4192709 L71.2239584,131.419271 C82.890625,136.752604 96.2239584,136.752604 107.890625,131.419271 L171.890625,99.0859375 C181.223958,94.0859375 181.223958,86.0859375 171.890625,81.0859375 Z" id="路径"></path>
+            <path d="M171.890625,126.085938 L153.223958,116.085938 L107.890625,138.419271 C96.2239584,143.752604 82.890625,143.752604 71.2239584,138.419271 L26.5572916,116.085938 L7.890625,126.085938 C-2.109375,131.085938 -2.109375,139.085938 7.890625,144.085938 L71.2239584,176.085938 C82.890625,181.419271 96.2239584,181.419271 107.890625,176.085938 L171.890625,143.752604 C181.223958,139.085938 181.223958,130.752604 171.890625,126.085938 L171.890625,126.085938 Z" id="路径"></path>
+        </g>
+    </g>
+</svg>

File diff suppressed because it is too large
+ 461 - 481
src/views/layout/Menu.vue