bug修复

src/components/home/SearchInput.vue

@@ -200,11 +200,12 @@ const upModelValue = (value = '') => {
             align-items: center;
             justify-content: center;
             border-radius: 0 40px 40px 0;
-            background-color: var(--el-color-primary);
             cursor: pointer;
-            transition: 0.2s;
+            background: linear-gradient(to right, var(--el-color-primary-light-5), var(--el-color-primary), var(--el-color-primary-dark-2));
+            background-size: 200%;
+            transition: background-position .5s;
             &:hover {
-                background-color: var(--el-color-primary-dark-2);
+                background-position: 100% 0;
             }
         }
     }

src/global/components/hc-new-switch/index.vue

@@ -58,7 +58,7 @@ const switchClick = (item) => {
         justify-content: center;
         &.dots {
             color: #ffffff;
-            background: var(--el-color-primary);
+            background: linear-gradient(90deg,var(--el-color-primary-light-5), var(--el-color-primary) 100%);
             box-shadow: 4px 4px 8px 0 rgba(54,92,167,0.15), -3px -2px 8px 0 #ffffff;
             transition: background 0.3s;
         }

src/layout/modules/MenuBar.vue

@@ -200,8 +200,8 @@ const MenuClick = (item) => {
             }
             .el-badge {
                 position: absolute;
-                top: -12px;
-                right: -10px;
+                top: -20px;
+                right: -24px;
             }
         }
     }
@@ -224,7 +224,7 @@ const MenuClick = (item) => {
     .el-menu-item.is-active, .el-sub-menu.is-active {
         .hc-aside-menu-item {
             color: #ffffff !important;
-            background-color: var(--el-color-primary);
+            background: linear-gradient(90deg,var(--el-color-primary-light-5), var(--el-color-primary) 100%);
             box-shadow: 0 2px 8px 0 var(--hc-shadow-color-5);
             &::before, &::after {
                 content: '';

src/layout/modules/MenuItem.vue

@@ -63,7 +63,3 @@ const MenuClick = (item) => {
     emit('change', item)
 }
 </script>
-
-<style lang="scss" scoped>
-
-</style>

src/styles/app/element.scss

@@ -80,7 +80,12 @@
     border: 1px solid #f1f5f8;
     box-shadow: var(--hc-shadow);
     &.el-button--primary {
-        background: linear-gradient(90deg,var(--el-color-primary-light-5), var(--el-color-primary) 100%);
+        background: linear-gradient(to right, var(--el-color-primary-light-5), var(--el-color-primary), var(--el-color-primary-dark-2));
+        background-size: 200%;
+        transition: background-position .5s;
+        &:hover {
+            background-position: 100% 0;
+        }
     }
     &.is-loading:not([class*='el-button--']) {
         --el-button-bg-color: #f3f3f3;
@@ -106,6 +111,13 @@
         --el-button-active-text-color: var(--el-color-primary);
         --el-button-active-bg-color: var(--el-color-primary-light-7);
     }
+    &.is-disabled, &.is-disabled:focus, &.is-disabled:hover {
+        color: var(--el-button-disabled-text-color);
+        cursor: not-allowed;
+        background-image: none;
+        background-color: var(--el-button-disabled-bg-color);
+        border-color: var(--el-button-disabled-border-color);
+    }
 }
 
 //表单

src/views/data-fill/components/WbsTree.vue

@@ -11,7 +11,7 @@
                 <!--树组件，操作菜单-->
                 <div class="menu-icon" :class="node.showTreeMenu?'show':''" v-if="node.level !== 1 && menusData.length > 0">
                     <div class="cu-tree-node-popover-menu-icon" @click.prevent.stop="ElTreeLabelContextMenu($event,data,node)">
-                        <HcIcon name="menu" ui="text-2xl"/>
+                        <HcIcon name="apps" ui="text-2xl"/>
                     </div>
                 </div>
                 <!--树组件，操作菜单 END-->
@@ -19,7 +19,7 @@
         </template>
     </ElTree>
     <!--右键菜单-->
-    <HcContextMenu ref="contextMenuRef" :datas="menusData" @item-click="handleMenuSelect" v-if="menusData.length > 0">
+    <HcContextMenu ref="contextMenuRef" :datas="menusData" @item-click="handleMenuSelect" v-if="menusData.length > 0" @closed="handleMenuClosed">
         <template #mark="{item}">
             <HcIcon :name="item.icon" :fill="treeRefData?.isFirst" class="menu-item-icon"/>
             <span class="menu-item-name">{{treeRefData?.isFirst ? '取消标记为首件' : '标记为首件'}}</span>
@@ -34,7 +34,7 @@
 <script setup>
 import {ref,nextTick,watch} from "vue";
 import dataFillQuery from '~api/data-fill/query';
-import {isItem,getArrValue,getObjValue} from "vue-utils-plus"
+import {isItem,getArrValue,getObjValue,isValueNull} from "vue-utils-plus"
 
 //参数
 const props = defineProps({
@@ -206,6 +206,7 @@ const ElTreeLabelContextMenu = (e,data,node) => {
         e.preventDefault();
         treeRefNode.value = node;
         treeRefData.value = data;
+        node.showTreeMenu = true
         //展开菜单
         contextMenuRef.value?.showMenu(e)
     }
@@ -227,6 +228,13 @@ const handleMenuSelect = ({key}) => {
     }
 }
 
+const handleMenuClosed = () => {
+    const node = treeRefNode.value;
+    if (!isValueNull(node)) {
+        treeRefNode.value['showTreeMenu'] = false
+    }
+}
+
 //设置树菜单的标记数据
 const setElTreeMenuMark = (keys,isFirst) => {
     keys.forEach(item => {

src/views/other/first-item.vue

@@ -531,10 +531,9 @@ const bussPdfInfo = () => {
 
 //预览PDF请求
 const getBussPdfInfo = async (pkeyId) => {
-    const liunkIds = rowsToId(tableFileData.value)
+    //const liunkIds = rowsToId(tableFileData.value)
     const { error, code, data } = await firstApi.getFirstBussPdfInfo({
-        pkeyId: pkeyId,
-        liunkIds: liunkIds
+        firstId: pkeyId
     })
     //判断状态
     const res = isString(data)? data ?? '': ''