ZaiZai vor 1 Jahr
Ursprung
Commit
d5f33a37bd

+ 1 - 1
package.json

@@ -22,7 +22,7 @@
         "dayjs": "^1.11.11",
         "echarts": "^5.5.1",
         "element-plus": "2.7.6",
-        "hc-vue3-ui": "^4.0.6",
+        "hc-vue3-ui": "^4.0.7",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.5.0",
         "js-md5": "^0.8.3",

+ 2 - 2
src/layout/index.vue

@@ -142,7 +142,7 @@ const cascaderSend = async ({ projectId, contractId }) => {
 }
 
 //获取未读消息数量
-const taskCount = ref(0)
+const taskCount = ref(10)
 const getUnreadMessage = async ({ projectId, contractId }) => {
     //如果退出登录了,清空轮询
     if (isNullES(getToken())) {
@@ -153,7 +153,7 @@ const getUnreadMessage = async ({ projectId, contractId }) => {
     const { isRes, data } = await messageApi.getUnreadMessage({
         projectId, contractId,
     })
-    taskCount.value = data ?? 0
+    //taskCount.value = data ?? 0
     if (isRes) {
         times.value = 10000
     } else {

+ 4 - 0
src/layout/modules/HcTopMenu.vue

@@ -96,5 +96,9 @@ const topMenuClick = (item) => {
     .item + .item {
         margin-left: 2px;
     }
+    .el-badge__content {
+        top: -13px;
+        right: -4px;
+    }
 }
 </style>

+ 7 - 0
src/layout/modules/MenuBar.vue

@@ -62,3 +62,10 @@ const MenuClick = (item) => {
     setMenuItem(item)
 }
 </script>
+
+<style lang="scss">
+.el-menu.hc-aside-menu .el-badge .el-badge__content {
+    top: 10px;
+    right: calc(-12px + var(--el-badge-size) / 2);
+}
+</style>

+ 12 - 3
src/layout/modules/MenuItem.vue

@@ -17,9 +17,18 @@
             <div class="hc-aside-menu-item">
                 <div class="menu---item">
                     <HcIcon v-if="item?.source" :name="item?.source" :fill="curKey === item?.code" class="hc-menu-icon" />
-                    <div v-if="isCollapse" class="name truncate">{{ item?.name.substring(0, 2) }}</div>
-                    <div v-else class="name truncate" :data-key="item?.code">{{ item?.name }}</div>
-                    <el-badge v-if="item?.code === 'tasks-message' && taskCounts > 0" :value="taskCounts" />
+                    <template v-if="isCollapse">
+                        <div class="name truncate">{{ item?.name.substring(0, 2) }}</div>
+                        <el-badge v-if="item?.code === 'tasks-message' && taskCounts > 0" :value="taskCounts" />
+                    </template>
+                    <template v-else>
+                        <div class="name truncate" :data-key="item?.code">
+                            <el-badge v-if="item?.code === 'tasks-message' && taskCounts > 0" :value="taskCounts">
+                                {{ item?.name }}
+                            </el-badge>
+                            <span v-else>{{ item?.name }}</span>
+                        </div>
+                    </template>
                 </div>
             </div>
         </el-menu-item>

+ 4 - 4
yarn.lock

@@ -1955,10 +1955,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^4.0.6:
-  version "4.0.6"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.0.6.tgz#090e94f4c63fe7c12574f037e02c30efe36526b7"
-  integrity sha512-5Ck0kSnoCuZgpWSfz69Lyq1lXNJcC67nO67hLYB1QkZpm5bGx+PYALGFtzjGUqgpBySzge56jdiQXbwmWwWCzA==
+hc-vue3-ui@^4.0.7:
+  version "4.0.7"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.0.7.tgz#11160f4f9599ca41d55aa958e85991ef18c11bd3"
+  integrity sha512-27bvvdDLDBPLeNhufnyT11X0K0lMii7MqyUoTxWtzCzmLg0ToJVATKunhw77J4e5Zmz3JBFH2DXyspoTQfVTmw==
   dependencies:
     axios "^1.7.2"
     dayjs "^1.11.11"