菜单调整

2026-01-26 19:41:32 +08:00 · 2026-01-26 19:41:32 +08:00 · b7597e8f8a
parent c8de8e973d
commit b7597e8f8a
26 changed files with 115 additions and 3124 deletions
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@ -60,7 +60,7 @@ export default {
  props: {
    columns: {
      type: Array,
-      required: true,
+      default: () => [],
    },
    gutter: {
      type: Number,
@ -94,9 +94,10 @@ export default {
      immediate: true,
      deep: true,
      handler(val) {
-        // 复用你原来 transfer 逻辑的“本地副本”思想
-        this.innerColumns = val.map((c) => ({ ...c }))
-        this.backupColumns = val.map((c) => ({ ...c }))
+        const safeCols = Array.isArray(val) ? val : []
+
+        this.innerColumns = safeCols.map((c) => ({ ...c }))
+        this.backupColumns = safeCols.map((c) => ({ ...c }))
      },
    },
  },
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@ -2,7 +2,12 @@
  <div>
    <div class="navbar">
      <div class="app-title">
-        <img src="@/assets/images/logo-home.png" style="width: 135px; height: 27px" alt="" />
+        <img
+          src="@/assets/images/logo-home.png"
+          style="width: 135px; height: 27px; cursor: pointer"
+          alt=""
+          @click="goHome"
+        />
      </div>

      <div class="menus" @mouseleave="handleMenuLeave">
@ -47,7 +52,7 @@
            />
          </div>

-          <div class="right-menu-item hover-effect bar-item" @click="goCollection">
+          <div class="right-menu-item hover-effect bar-item">
            <span class="bar-text">收藏</span>
          </div>

@ -182,54 +187,49 @@
          <!-- 列表区域 -->
          <div class="user-list">
            <div class="user-item">
-              <!-- <i class="el-icon-mobile-phone" style="font-size: 19px; color: #000"></i> -->
-              <img src="../../assets/images/sysIcon/phone.png" style="width: 23px; height: 23px; margin-right: 4px;" alt=""/>
+              <i class="el-icon-mobile-phone" style="font-size: 19px; color: #000"></i>
              <span>手机号</span>
              <span class="right">138****8251</span>
            </div>
            <div class="user-item">
-              <!-- <i class="el-icon-lock" style="font-size: 19px; color: #000"></i> -->
-              <img src="../../assets/images/sysIcon/changePwd.png" style="width: 23px; height: 23px; margin-right: 4px;" alt=""/>
+              <i class="el-icon-lock" style="font-size: 19px; color: #000"></i>
              <span>修改密码</span>
            </div>
            <div class="user-item">
-              <!-- <i class="el-icon-house" style="font-size: 19px; color: #000"></i> -->
-              <img src="../../assets/images/sysIcon/setHome.png" style="width: 23px; height: 23px; margin-right: 4px;" alt=""/>
+              <i class="el-icon-house" style="font-size: 19px; color: #000"></i>
              <span>设置默认首页</span>
            </div>
            <div class="user-item" @click="downloadUserManual">
-              <!-- <i class="el-icon-download" style="font-size: 19px; color: #000"></i> -->
-              <img src="../../assets/images/sysIcon/download.png" style="width: 23px; height: 23px; margin-right: 4px;" alt=""/>
+              <i class="el-icon-download" style="font-size: 19px; color: #000"></i>
              <span>操作手册下载</span>
            </div>
            <div class="user-item">
-              <!-- <i class="el-icon-t-shirt" style="font-size: 19px; color: #000"></i> -->
-              <img src="../../assets/images/sysIcon/changeSkin.png" style="width: 23px; height: 23px; margin-right: 4px;" alt=""/>
+              <i class="el-icon-t-shirt" style="font-size: 19px; color: #000"></i>
              <span>一键换肤</span>
            </div>
            <div class="user-item" @click="clearCacheSimple">
-              <!-- <i class="el-icon-delete" style="font-size: 19px; color: #000"></i> -->
-              <img src="../../assets/images/sysIcon/claer.png" style="width: 23px; height: 23px; margin-right: 4px;" alt=""/>
+              <i class="el-icon-delete" style="font-size: 19px; color: #000"></i>
              <span>清除缓存</span>
            </div>
            <div class="user-item">
-              <!-- <i class="el-icon-data-analysis" style="font-size: 19px; color: #000"></i> -->
-              <img src="../../assets/images/sysIcon/testSpeed.png" style="width: 23px; height: 23px; margin-right: 4px;" alt=""/>
+              <i class="el-icon-data-analysis" style="font-size: 19px; color: #000"></i>
              <span>测试网络速度</span>
            </div>
            <div class="user-item" @click="gotoFeedback">
-              <!-- <i class="el-icon-edit-outline" style="font-size: 19px; color: #000"></i> -->
-              <img src="../../assets/images/sysIcon/feedback.png" style="width: 23px; height: 23px; margin-right: 4px;" alt=""/>
+              <i class="el-icon-edit-outline" style="font-size: 19px; color: #000"></i>
              <span>意见反馈/闭环</span>
            </div>
            <div class="user-item" @click="showContactDialog">
-              <!-- <i class="el-icon-phone-outline" style="font-size: 19px; color: #000"></i> -->
-              <img src="../../assets/images/sysIcon/contact.png" style="width: 23px; height: 23px; margin-right: 4px;" alt=""/>
+              <i class="el-icon-phone-outline" style="font-size: 19px; color: #000"></i>
              <span>联系我们</span>
            </div>
            <div class="user-item logout" @click="logout">
              <!-- <i class="el-icon-refresh-left" style="font-size: 19px; color: #000;"></i> -->
-              <img src="../../assets/images/sysIcon/loginOutIcon.png" style="width: 23px; height: 23px; margin-right: 4px;" alt=""/>
+              <img
+                src="../../assets/images/loginOutIcon.png"
+                style="width: 16px; height: 16px; margin-right: 10px"
+                alt=""
+              />
              <span>退出</span>
            </div>
          </div>
@ -254,13 +254,14 @@
    <div class="menu-box" v-show="showMenuBox" @mouseenter="handleBoxEnter">
      <div class="menu-warp" @mouseleave="handleBoxLeave">
        <div class="menu-list">
-          <div class="list-box">
+          <div class="list-box" v-for="(item, i) in currentMenu.children || []" :key="i" v-if="!item.hidden">
            <div class="menu-title-top" v-if="currentMenu && currentMenu.meta">
              <div class="title-tip"></div>
-              <span class="title-text">{{ currentMenu.meta.title }}</span>
+              <span class="title-text">{{ item.meta.title }}</span>
            </div>

-            <div v-for="(child, i) in currentMenu.children || []" :key="i" class="sub-menu-item" v-if="!child.hidden">
+            <!-- <div v-for="(child, i) in currentMenu.children || []" :key="i" class="sub-menu-item" v-if="!child.hidden"> -->
+            <div class="sub-menu-item" v-for="(child, i) in item.children" :key="i" v-if="!child.hidden">
              <div v-if="child.children && child.children.length">
                <div class="menu-title" @click="toggleLevel1(child)">
                  <div class="children-title-tip"></div>
@ -273,7 +274,7 @@
                    />
                    <img v-else src="@/assets/images/down.png" style="width: 14px; height: 14px" />
                  </span>
-                  <span class="menu-star">
+                  <span class="menu-star" v-if="!child.children.length">
                    <img src="@/assets/images/star.png" style="width: 10px; height: 9px" />
                  </span>
                </div>
@ -330,48 +331,7 @@
        </div>
      </div>
    </div>
-    <!-- 收藏菜单 -->
-    <el-drawer :withHeader="false" size="20%" :show-close="false" :visible.sync="drawerShow" :direction="rtl" class="custom-drawer">
-      <div class="myCollect-box">
-        <div class="myCollect-box-title">
-          <div style="font-size: 20px;color: #333943;font-weight: 600;">我的收藏</div>
-          <div style="color: #666;cursor: pointer;font-size: 16px;" v-if="!isEdit" @click="isEdit=true">编辑</div>
-          <div style="color: #33c2ac;cursor: pointer;font-size: 16px;font-weight: 600;" v-if="isEdit" @click="isEdit=false">确定</div>
-        </div>
-        <div class="myCollect-box-zhineng">
-          <div class="myCollect-box-zhineng-title">职能菜单</div>
-          <div style="width: 100%;overflow-y: auto;max-height: 340px;">
-            <div v-for="(item,index) in zhinengList" :key="index" class="myCollect-box-zhineng-item" :class="{ itemActive: isHover==index }" @mouseover="isHover=index" @mouseleave="isHover = -1">
-              <div style="display: flex;align-items: center;" @click="gotoPage(item)"><img src="../../assets/images/catchIcon.png" style="width: 16px;height: 16px;margin-right: 5px;" alt=""> <span>{{ item.name }}</span> </div>
-              <div style="color: #33c2ac;" v-show="isEdit==true">取消</div>
-            </div>
-            <div style="width: 100%;display: flex;align-items: center;justify-content: center;" v-if="zhinengList.length==0">
-              <div>
-                <img src="../../assets/images/noData.png" style="width: 170px;height: 170px;" alt="">
-                <div style="width: 100%;text-align: center;font-size: 18px;color: #999;">暂无数据</div>
-              </div> 
-            </div>
-          </div>
-        </div>
-        <div class="myCollect-box-zhineng">
-          <div class="myCollect-box-zhineng-title">项目菜单</div>
-          <div style="width: 100%;overflow-y: auto;max-height: 340px;">
-            <div v-for="(item,index) in xiangmuList" :key="index" class="myCollect-box-zhineng-item" :class="{ itemActive: isHover2==index }" @mouseover="isHover2=index" @mouseleave="isHover2 = -1">
-              <div style="display: flex;align-items: center;"><img src="../../assets/images/catchIcon.png" style="width: 16px;height: 16px;margin-right: 5px;" alt=""> <span>{{ item.name }}</span> </div>
-              <div style="color: #33c2ac;" v-show="isEdit==true">取消</div>
-            </div>
-            <div style="width: 100%;display: flex;align-items: center;justify-content: center;" v-if="xiangmuList.length==0">
-              <div>
-                <img src="../../assets/images/noData.png" style="width: 170px;height: 170px;" alt="">
-                <div style="width: 100%;text-align: center;font-size: 18px;color: #999;">暂无数据</div>
-              </div> 
-            </div>
-          </div>
-        </div>

-      </div> 
-    </el-drawer>
-    
    <el-dialog
      :visible.sync="contactDialogVisible"
      width="400px"
@ -404,7 +364,6 @@
 import { mapGetters } from 'vuex'
 import Search from '@/components/HeaderSearch'
 import { getUserProfile } from '@/api/system/user'
-import { color } from 'echarts';

 export default {
  components: { Search },
@ -457,14 +416,8 @@ export default {
          desc: '您有5条待办事项未处理，预计截止时间2026-01-30',
        },
      ],
-      contactDialogVisible: false,  // 控制联系我们弹窗显示
+      contactDialogVisible: false, // 控制联系我们弹窗显示
      contactPhone: '田经理15212781264，刘经理19855530627', // 联系电话
-      drawerShow:false,
-      isEdit:false,
-      isHover:-1,
-      isHover2:-1,
-      zhinengList:[],//{name:"入库申请",url:'/all/stockManagement/entryApply'},{name:"出库申请",url:'/all/business/outbound/addApply'}
-      xiangmuList:[],
    }
  },
  computed: {
@ -488,6 +441,9 @@ export default {
    console.log('🚀 ~ this.menuList:', this.menuList)
  },
  methods: {
+    goHome() {
+      this.$router.push({ path: '/' })
+    },
    goWarningDetail(item) {
      this.$refs.warningPopover.doClose() // 关闭弹窗
      // this.$router.push({ path: '/warning/detail', query: { id: item.id } });
@ -501,15 +457,6 @@ export default {
    goTodo() {
      // this.$router.push({ path: '/todo' }) // 替换为实际的待办页路由
    },
-    goCollection(){
-      this.isEdit=false
-      this.drawerShow=true
-    },
-    gotoPage(item){
-      this.drawerShow=false
-      this.isEdit=false
-      this.$router.push({ path: item.url })
-    },
    goMessageDetail(item) {
      this.$refs.messagePopover.doClose() // 关闭消息弹窗
      // this.$router.push({ path: '/message/detail', query: { id: item.id } }); // 跳消息详情
@ -596,12 +543,19 @@ export default {
      const level1 = []
      const level2 = []

-      children.forEach((l1) => {
-        if (l1.children && l1.children.length) {
-          level1.push(l1.path)
-          l1.children.forEach((l2) => {
-            if (l2.children && l2.children.length) {
-              level2.push(l2.path)
+      children.forEach((item) => {
+        if (item.children && item.children.length) {
+          // 👉 child 这一层（控制 openLevel1）
+          item.children.forEach((child) => {
+            if (child.children && child.children.length) {
+              level1.push(child.path)
+
+              // 👉 c2 这一层（控制 openLevel2）
+              child.children.forEach((c2) => {
+                if (c2.children && c2.children.length) {
+                  level2.push(c2.path)
+                }
+              })
            }
          })
        }
@ -638,47 +592,6 @@ export default {
  },
 }
 </script>
-<style lang="scss" scoped>
-.custom-drawer{
-  ::v-deep.el-drawer.rtl{
-    border-top-left-radius: 10px;
-    border-bottom-left-radius: 10px;
-  } 
-}
-.myCollect-box{
-  width: 100%;height: 100%;background: #FAFAFA;overflow-y: auto;
-}
-.myCollect-box-title{
-  width: 100%;height: 66px;display: flex;align-items: center;padding:0 20px;justify-content: space-between;background: #FFF;margin-bottom: 10px;
-}
-.myCollect-box-zhineng{
-    padding: 16px;
-    margin-bottom: 10px;
-    background-color: #fff; 
-}
-.myCollect-box-zhineng-title{
-    font-size: 18px;
-    color: #333;
-    font-weight: 600;
-    text-align: left;
-    margin-bottom: 10px;
-}
-.myCollect-box-zhineng-item{
-  padding: 8px 5px;
-  cursor: pointer;
-  display: flex;
-  border-radius: 5px;
-  justify-content: space-between;
-  color: #000;
-  font-size: 12px;
-}
-.itemActive{
-  background-color: #e8f8f6;
-  color: #33c2ac;
-}
-
-</style>
-

 <style lang="scss" scoped>
 .navbar {
@ -849,21 +762,29 @@ export default {
    min-height: 287px;
    background: #f8fdfc;
    border-radius: 16px;
-    // font-family: Microsoft YaHei, Microsoft YaHei;
-    font-weight: 400;
-    font-size: 16px;
-    color: #095a4d;
-    line-height: 30px;
+
+    display: grid;
+
+    /* 关键：一行 6 等分，自动沾满容器 */
+    grid-template-columns: repeat(6, 1fr);
+
+    /* 横向 & 纵向间距完全一致 */
+    column-gap: 16px;
+    row-gap: 16px;

    .list-box {
+      /* Grid 下不需要再算宽度 */
+      width: 100%;
+      min-width: 0;
+
      padding: 16px;
-      width: 290px;
      height: 100%;
-      // background: linear-gradient(0deg, rgba(44, 186, 178, 0) 0%, rgba(44, 186, 178, 0.1) 100%);
+
      background: linear-gradient(180deg, #e6ffff, rgba(233, 255, 255, 0) 90px);
      border-radius: 12px;
    }
  }
+
  .menu-title-top {
    width: 100%;
    display: flex;
--- a/src/views/EquipmentLedger/components/equ-store.vue
+++ b/src/views/EquipmentLedger/components/equ-store.vue
@ -474,14 +474,14 @@ export default {
                if (approvalRes && approvalRes.data) {
                  this.$modal.msgSuccess('申请已提交，请等待审批')
                  this.$router.push({
-                    path: '/equipment/equipment-ledger'
+                    path: '/equipment/manage/equipment-ledger'
                  })
                }
              } catch (error) {
                console.error('查询审批实例失败:', error)
                this.$modal.msgSuccess('申请已提交，请等待审批')
                this.$router.push({
-                  path: '/equipment/equipment-ledger'
+                  path: '/equipment/manage/equipment-ledger'
                })
              }
            } else {
--- a/src/views/EquipmentRetireApply/audit-detail.vue
+++ b/src/views/EquipmentRetireApply/audit-detail.vue
@ -301,7 +301,7 @@ export default {
  },
  methods: {
    goBack() {
-      this.$router.push({ path: '/business/EquipmentRetireApply/EquipmentRetireApply' })
+      this.$router.push({ path: '/all/business/EquipmentRetireApply/EquipmentRetireApply' })
    },
    async getAuditDetail() {
      const id = this.$route.query.id
--- a/src/views/EquipmentRetireApply/detail.vue
+++ b/src/views/EquipmentRetireApply/detail.vue
@ -175,7 +175,7 @@ export default {
  },
  methods: {
    goBack() {
-      this.$router.push({ path: '/business/EquipmentRetireApply/equipment/retire-apply' })
+      this.$router.push({ path: '/all/business/EquipmentRetireApply/equipment/retire-apply' })
    },
    async getInfo() {
      try {
--- a/src/views/EquipmentSharedLease/order/sharedOutList.vue
+++ b/src/views/EquipmentSharedLease/order/sharedOutList.vue
@ -444,7 +444,7 @@ export default {
    },

    handleBack() {
-      this.$router.push({ path: '/business/outbound/index' })
+      this.$router.push({ path: '/all/business/outbound/index' })
    },

    handleOutAll() {
--- a/src/views/business/apply/addApply.vue
+++ b/src/views/business/apply/addApply.vue
@ -476,7 +476,7 @@ export default {
  },
  methods: {
    goBack() {
-      this.$router.push({ path: '/business/outbound/applyList' })
+      this.$router.push({ path: '/all/business/outbound/addApply' })
    },
    // 获取使用项目的下拉选
    async getUseProjectList() {
--- a/src/views/business/audit/addAudit.vue
+++ b/src/views/business/audit/addAudit.vue
@ -369,7 +369,7 @@ export default {
  },
  methods: {
    goBack() {
-      this.$router.push({ path: '/business/outbound/auditList' })
+      this.$router.push({ path: '/all/business/outbound/auditList' })
    },
    // 获取使用项目的下拉选
    async getUseProjectList() {
--- a/src/views/business/outbound/details.vue
+++ b/src/views/business/outbound/details.vue
@ -284,7 +284,7 @@ export default {
  },
  methods: {
    goBack() {
-      this.$router.push({ path: '/business/outbound/index' })
+      this.$router.push({ path: '/all/business/outbound/index' })
    },
    // 输入出库数量时校验（实时拦截超限）
    handleOutNumInput(row) {
@ -439,7 +439,7 @@ export default {
    },

    handleBack() {
-      this.$router.push({ path: '/business/outbound/index' })
+      this.$router.push({ path: '/all/business/outbound/index' })
    },

    handleOutAll() {
--- a/src/views/business/warehouse/auditDetails.vue
+++ b/src/views/business/warehouse/auditDetails.vue
@ -375,7 +375,7 @@ export default {
  },
  methods: {
    goBack() {
-      this.$router.push({ path: '/business/warehouse/auditList' })
+      this.$router.push({ path: '/all/business/warehouse/auditList' })
    },
    // 获取使用项目的下拉选
    async getUseProjectList() {
@ -520,7 +520,7 @@ export default {
    },

    handleBack() {
-      this.$router.push({ path: '/business/warehouse/auditList' })
+      this.$router.push({ path: '/all/business/warehouse/auditList' })
    },

    handleCancel() {
--- a/src/views/business/warehouse/details.vue
+++ b/src/views/business/warehouse/details.vue
@ -317,7 +317,7 @@ export default {
  },
  methods: {
    goBack() {
-      this.$router.push({ path: '/business/warehouse/index' })
+      this.$router.push({ path: '/all/business/warehouse/index' })
    },
    getDeptTreeSelect() {
      deptTreeSelect().then((res) => {
--- a/src/views/equipmentRepair/repairApply/addRepair.vue
+++ b/src/views/equipmentRepair/repairApply/addRepair.vue
@ -290,7 +290,7 @@ export default {
  },
  methods: {
  goBack() {
-    this.$router.push({ path: '/equipmentRepair/repairList' })
+    this.$router.push({ path: '/all/equipmentRepair/repairList' })
  },
    // 判断退役数量字段是否禁用
 // 判断退役数量字段是否禁用
--- a/src/views/equipmentRepair/repairAudit/repairApprovalDetail.vue
+++ b/src/views/equipmentRepair/repairAudit/repairApprovalDetail.vue
@ -264,7 +264,7 @@ export default {
  },
  methods: {
    goBack() {
-      this.$router.push({ path: '/equipmentRepair/repairAuditList' })
+      this.$router.push({ path: '/all/equipmentRepair/repairAuditList' })
    },
    async loadApprovalInfo() {
      try {
--- a/src/views/home/components/ProvincialCompany.vue
+++ b/src/views/home/components/ProvincialCompany.vue
@ -248,7 +248,7 @@ export default {
          equipTotal: rowData.maNum
        });
        this.$router.push({
-          path: '/equipment/equipment-ledger',
+          path: '/equipment/manage/equipment-ledger',
          // query: { company: rowData.companyName, total: rowData.maNum },
          query: { parentId: rowData.parentId, deptId: rowData.companyId }
        });
@ -257,12 +257,12 @@ export default {
          toolTotal: rowData.toolNum
        });
        this.$router.push({
-          path: '/equipment/codeToolsLedger',
+          path: '/equipment/manage/tools/codeToolsLedger',
          query: { parentId: rowData.parentId, deptId: rowData.companyId }
        });
      } else if (type === 'toolNum') {
        this.$router.push({
-          path: '/equipment/toolsLedger',
+          path: '/equipment/manage/tools/toolsLedger',
          query: { parentId: rowData.parentId, deptId: rowData.companyId }
        });
      }
--- a/src/views/home/components/provincial/Top2.vue
+++ b/src/views/home/components/provincial/Top2.vue
@ -366,7 +366,7 @@ export default {
        console.log('🚀 ~ initChart ~ params.data-->>:', params.data)
        if (!params.data) return
        this.$router.push({
-          path: '/equipment/equipment-ledger',
+          path: '/equipment/manage/equipment-ledger',
          query: {
            parentId: params.data.parentId,
            deptId: params.data.deptId,
--- a/src/views/index-1218.vue
+++ b/src/views/index-1218.vue
--- a/src/views/index.vue
+++ b/src/views/index.vue
@ -2655,83 +2655,79 @@ export default {
      // 对于有多个出线的节点，默认高亮第一条线
      if (nodeId === 'equipmentLedger') {
        // 装备台账
-        this.$router.push({ path: '/equipment/equipment-ledger' })
-      } else if (nodeId === 'equipmentShelf') {
-        this.$router.push({ path: '/equipment/equipment-ledger' })
+        this.$router.push({ path: '/equipment/manage/equipment-ledger' })
      } else if (nodeId === 'equipmentRepair') {
        // 维修申请
-        this.$router.push({ path: '/equipmentRepair/repairList' })
+        this.$router.push({ path: '/all/equipmentRepair/repairList' })
      } else if (nodeId === 'equipmentEntry') {
        // 装备录入
        this.$router.push({ path: '/equipment/equipment-entry-apply' })
      } else if (nodeId === 'entryAudit') {
        // 装备录入审核
        this.$router.push({ path: '/equipment/equipment-entry-approval' })
-      } else if (nodeId === 'equipmentOffShelf') {
-        this.$router.push({ path: '/equipment/equipment-ledger' })
      } else if (nodeId === 'selfUseOut') {
        this.$router.push({ path: '/equipment/euq-out' })
      } else if (nodeId === 'retire-apply') {
        // 退役申请
-        this.$router.push({ path: '/business/EquipmentRetireApply/equipment/retire-apply' })
+        this.$router.push({ path: '/all/business/EquipmentRetireApply/equipment/retire-apply' })
      } else if (nodeId === 'equipmentReturn' || nodeId === 'shareReturn') {
        this.$router.push({ path: '/equipment/equ-repair' })
      } else if (nodeId === 'rentalHall') {
        // 共享大厅
-        this.$router.push({ path: '/equipmentShared/MallIframe' })
+        this.$router.push({ path: '/equipmentShared/app/MallIframe' })
      } else if (nodeId === 'shareOut') {
        // 共享出库
-        this.$router.push({ path: '/equipmentShared/order/equipment-shared-lessor' })
+        this.$router.push({ path: '/equipmentShared/app/order/equipment-shared-lessor' })
      } else if (nodeId === 'equStore') {
        this.$router.push({ path: '/equipment/equStore' })
      } else if (nodeId === 'sharedLessor') {
        // 共享订单
-        this.$router.push({ path: '/equipmentShared/order/equipment-shared-order' })
+        this.$router.push({ path: '/equipmentShared/app/order/equipment-shared-order' })
      } else if (nodeId === 'warehouse') {
        // 退库申请
-        this.$router.push({ path: '/business/warehouse/index' })
+        this.$router.push({ path: '/all/business/warehouse/index' })
      } else if (nodeId === 'outbound') {
        // 自用出库
-        this.$router.push({ path: '/business/outbound/index' })
+        this.$router.push({ path: '/all/business/outbound/index' })
      } else if (nodeId === 'toolsLedger') {
        // 工具台账
-        this.$router.push({ path: '/equipment/toolsLedger' })
+        this.$router.push({ path: '/equipment/manage/tools/toolsLedger' })
      } else if (nodeId === 'equipmen') {
        // 装备上架
-        this.$router.push({ path: '/equipmentShared/euqipmentUpOrDown/equipmen' })
+        this.$router.push({ path: '/equipmentShared/shareManage/euqipmentUpOrDown/equipmen' })
      } else if (nodeId === 'tool') {
        // 工具上架
-        this.$router.push({ path: '/equipmentShared/euqipmentUpOrDown/tool' })
+        this.$router.push({ path: '/equipmentShared/shareManage/euqipmentUpOrDown/tool' })
      } else if (nodeId === 'auditList') {
        // 自用审核
-        this.$router.push({ path: '/business/outbound/auditList' })
+        this.$router.push({ path: '/all/business/outbound/auditList' })
      } else if (nodeId === 'applyList') {
        // 自用申请
-        this.$router.push({ path: '/business/outbound/applyList' })
+        this.$router.push({ path: '/all/business/outbound/addApply' })
      } else if (nodeId === 'approveList') {
        // 工具录入审核
        this.$router.push({ path: '/toolsManage/approveList' })
      } else if (nodeId === 'EquipmentRetireApply') {
        // 退役审核
-        this.$router.push({ path: '/business/EquipmentRetireApply/EquipmentRetireApply' })
+        this.$router.push({ path: '/all/business/EquipmentRetireApply/EquipmentRetireApply' })
      } else if (nodeId === 'repairAuditList') {
        // 维修审核
-        this.$router.push({ path: '/equipmentRepair/repairAuditList' })
+        this.$router.push({ path: '/all/equipmentRepair/repairAuditList' })
      } else if (nodeId === 'warehouse-auditList') {
        // 退库审核
-        this.$router.push({ path: '/business/warehouse/auditList' })
+        this.$router.push({ path: '/all/business/warehouse/auditList' })
      } else if (nodeId === 'applicantList') {
        // 工具录入申请
        this.$router.push({ path: '/toolsManage/applicantList' })
      } else if (nodeId === 'codeToolsLedger') {
        // 编码工具台账
-        this.$router.push({ path: '/equipment/codeToolsLedger'})
+        this.$router.push({ path: '/equipment/manage/tools/codeToolsLedger'})
      } else if (nodeId === 'inventoryAudit') {
        // 入库审核
-        this.$router.push({ path: '/stockManagement/inventoryAudit' })
+        this.$router.push({ path: '/all/stockManagement/inventoryAudit' })
      } else if (nodeId == 'entryApply') {
        // 入库申请
-        this.$router.push({ path: '/stockManagement/entryApply'})
+        this.$router.push({ path: '/all/stockManagement/entryApply'})
      }
    },
  },
--- a/src/views/screen/wsScreen/components/center/index-ah.vue
+++ b/src/views/screen/wsScreen/components/center/index-ah.vue
@ -416,7 +416,7 @@ export default {
        console.log('🚀 ~ initChart ~ params.data-->>:', params.data)
        if (!params.data) return
        this.$router.push({
-          path: '/equipment/equipment-ledger',
+          path: '/equipment/manage/equipment-ledger',
          query: {
            parentId: params.data.parentId,
            deptId: params.data.deptId,
--- a/src/views/screen/wsScreen/components/center/index.vue
+++ b/src/views/screen/wsScreen/components/center/index.vue
@ -423,7 +423,7 @@ export default {
        console.log('🚀 ~ initChart ~ params.data-->>:', params.data)
        if (!params.data) return
        this.$router.push({
-          path: '/equipment/equipment-ledger',
+          path: '/equipment/manage/equipment-ledger',
          query: {
            parentId: params.data.parentId,
            deptId: params.data.deptId,
--- a/src/views/screen/wsScreenWidescreen/components/center/index-ah.vue
+++ b/src/views/screen/wsScreenWidescreen/components/center/index-ah.vue
@ -416,7 +416,7 @@ export default {
        console.log('🚀 ~ initChart ~ params.data-->>:', params.data)
        if (!params.data) return
        this.$router.push({
-          path: '/equipment/equipment-ledger',
+          path: '/equipment/manage/equipment-ledger',
          query: {
            parentId: params.data.parentId,
            deptId: params.data.deptId,
--- a/src/views/screen/wsScreenWidescreen/components/center/index.vue
+++ b/src/views/screen/wsScreenWidescreen/components/center/index.vue
@ -423,7 +423,7 @@ export default {
        console.log('🚀 ~ initChart ~ params.data-->>:', params.data)
        if (!params.data) return
        this.$router.push({
-          path: '/equipment/equipment-ledger',
+          path: '/equipment/manage/equipment-ledger',
          query: {
            parentId: params.data.parentId,
            deptId: params.data.deptId,
--- a/src/views/stockManagement/entryApply/apply.vue
+++ b/src/views/stockManagement/entryApply/apply.vue
@ -48,7 +48,7 @@ export default {
  },
  methods: {
    goBack() {
-      this.$router.push({ path: '/stockManagement/entryApply' }).then(() => {
+      this.$router.push({ path: '/all/stockManagement/entryApply' }).then(() => {
        this.$tab.closePage({ path: '/stockManagement/entryApply/apply' })
      })
    },
--- a/src/views/stockManagement/entryApply/components/EquipmentAdd.vue
+++ b/src/views/stockManagement/entryApply/components/EquipmentAdd.vue
@ -93,21 +93,21 @@
          </el-button>
          <el-dropdown size="mini" placement="bottom-start" v-show="!isAddVisible" trigger="click" @visible-change="handleVisibleChange" @command="(command) => handleCommand(command)">
            <el-button plain size="mini" class="el-dropdown-link">
-              导入 <i class="el-icon-arrow-up el-icon--right" :class="{ 'rotate': isDropdownOpen }"></i>
+              导入 <i class="el-icon-arrow-up el-icon--right" :class="{ 'rotate': isDropdownOpen }"></i> 
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item command="handleDownload">下载导入模板</el-dropdown-item>
-              <el-dropdown-item command="handleImport">导入</el-dropdown-item>
+              <el-dropdown-item command="handleImport">导入</el-dropdown-item> 
            </el-dropdown-menu>
          </el-dropdown>
          <!-- <el-dropdown size="mini" v-show="!isAddVisible" :disabled="tableData.length == 0" trigger="click" @visible-change="handleVisibleChange2" @command="(command) => handleCommand2(command)">
            <el-button plain size="mini" class="el-dropdown-link">
              导入文件
-              <i class="el-icon-arrow-up el-icon--right" :class="{ 'rotate': isDropdownOpen2 }"></i>
+              <i class="el-icon-arrow-up el-icon--right" :class="{ 'rotate': isDropdownOpen2 }"></i> 
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item command="handleDownload">下载导入模板</el-dropdown-item>
-              <el-dropdown-item command="handleImport">导入文件</el-dropdown-item>
+              <el-dropdown-item command="handleImport">导入文件</el-dropdown-item> 
            </el-dropdown-menu>
          </el-dropdown> -->
          <!-- <el-button type="primary" size="mini" @click="handleImport" v-show="!isAddVisible" style="background: #2CBAB2;"> 批量导入</el-button> -->
@ -836,7 +836,7 @@ export default {
        { key: 42, label: `特征项9`, prop: 'featureItem9', visible: true },
        { key: 43, label: `特征值9`, prop: 'featureValue9', visible: true }
      ],
-      fieldVoList:[],
+      fieldVoList:[], 
      dialogVisible: false,
      dialogTitle: '',
      dialogList: [],
@ -1051,7 +1051,7 @@ export default {
    // 返回上一页
    goBack() {
      // this.$router.go(-1)
-      this.$router.push({ path: '/stockManagement/entryApply' })
+      this.$router.push({ path: '/all/stockManagement/entryApply' })
    },
    async approval(row, status) {
      equipmentPassAndRejectApiNew({ devIds: row.maId, status: status, id: this.orderId }).then((res) => {
--- a/src/views/stockManagement/entryApply/index.vue
+++ b/src/views/stockManagement/entryApply/index.vue
@ -223,7 +223,7 @@ export default {
          query: { isAddVisible: false, isApprovalVisible: false }
        })
        .then(() => {
-          this.$tab.closePage({ path: '/stockManagement/entryApply' })
+          this.$tab.closePage({ path: '/all/stockManagement/entryApply' })
        })
    },
    // 编辑
@ -241,7 +241,7 @@ export default {
          }
        })
        .then(() => {
-          this.$tab.closePage({ path: '/stockManagement/entryApply' })
+          this.$tab.closePage({ path: '/all/stockManagement/entryApply' })
        })
    },
    // 删除
--- a/src/views/stockManagement/inventoryAudit/index.vue
+++ b/src/views/stockManagement/inventoryAudit/index.vue
@ -217,7 +217,7 @@ export default {
          },
        })
        .then(() => {
-          this.$tab.closePage({ path: '/stockManagement/entryApply' })
+          this.$tab.closePage({ path: '/all/stockManagement/entryApply' })
        })
    },
    // 提交
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@ -33,7 +33,7 @@
    <el-row :gutter="10" class="mb8" style="padding: 10px 20px;margin-bottom: 15px;border-bottom: 1px solid #F0F0F0;">
      <el-col :span="6" style="display: flex;align-items: center;">
        <span style="font-size: 20px; font-weight: 800;margin-right: 48px;">菜单管理列表</span>
-        <span style="font-size: 16px;color: #808080;">共{{total}}条记录</span>
+        <!-- <span style="font-size: 16px;color: #808080;">共{{total}}条记录</span> -->
      </el-col>
      <el-col :span="18" style="display: flex; justify-content: flex-end">
        <div class="action-bar">