ly преди 3 години
родител
ревизия
739bba2b5c
променени са 3 файла, в които са добавени 15 реда и са изтрити 9 реда
  1. 0 1
      ui/src/assets/icons/svg/notice.svg
  2. 4 0
      ui/src/assets/styles/element-ui.scss
  3. 11 8
      ui/src/layout/components/Navbar.vue

+ 0 - 1
ui/src/assets/icons/svg/notice.svg

@@ -1 +0,0 @@
-<svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"  width="200" height="200"><path d="M590.334 878.222c16.512 0 29.897 13.381 29.897 29.889 0 16.271-13.006 29.506-29.191 29.88l-0.706 0.009H411.17c-16.512 0-29.897-13.382-29.897-29.89 0-16.27 13.006-29.505 29.191-29.88l0.706-0.008h179.163zM503.163 108c16.276 0 29.514 13.002 29.889 29.184l0.008 0.705 0.003 47.633c156.339 16.105 278.272 148.186 278.272 308.738v269.003h99.768c16.512 0 29.897 13.382 29.897 29.89 0 16.27-13.006 29.506-29.192 29.88l-0.705 0.009H92.897C76.385 823.042 63 809.66 63 793.152c0-16.271 13.006-29.506 29.192-29.88l0.705-0.009h97.493V494.26c0-162.123 124.333-295.216 282.873-309.178l0.003-47.193c0-16.507 13.385-29.889 29.897-29.889z m-2.3 135.651c-137.06 0-248.43 109.969-250.644 246.465l-0.034 4.144v266.704h501.356V494.26c0-137.023-110-248.362-246.533-250.575l-4.145-0.034z" fill="#ffffff" ></path></svg>

+ 4 - 0
ui/src/assets/styles/element-ui.scss

@@ -82,3 +82,7 @@
 .el-range-separator {
   box-sizing: content-box;
 }
+//角标位置
+.el-badge__content {
+  top: 10px !important;
+}

+ 11 - 8
ui/src/layout/components/Navbar.vue

@@ -7,15 +7,13 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
 
-<!--        http://localhost/cpms/index.html#/sems/notice-->
-<!--        cpms/index.html#/sems/notice-->
-        <router-link to="/notice/details">
-          <svg-icon icon-class="notice" class="svgStyle" ></svg-icon>
-<!--          <i class="el-icon-bell" style="color: #FFFFFF ; margin-bottom: 5px"></i>-->
-        </router-link>
-
         <search id="header-search" class="right-menu-item" />
 
+        <router-link class="right-menu-item" to="/notice/details">
+          <el-badge  is-dot style="">
+            <i class="el-icon-bell" style=" font-size:20px;"></i>
+          </el-badge>
+        </router-link>
 <!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
 <!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
 <!--        </el-tooltip>-->
@@ -94,6 +92,12 @@ export default {
       }
     }
   },
+  mounted() {
+    //定时器
+    const timer = setInterval(() => {
+        console.log("111")
+    }, 100000)
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
@@ -202,7 +206,6 @@ export default {
     margin-right: 6px;
     height: 25.5px;
     width: 25.5px;
-
   }
 }
 </style>