Merge branch 'dev_KT' of http://114.132.189.42:9002/r/product-inventory-APP...

spring

昨天 ec00255aab24865cd785e181704e502354b9c8f6

 src/pages/index.vue

@@ -327,10 +327,10 @@
      icon: "/static/images/icon/caigoutaizhang@2x.png",
      label: "危险作业审批",
    },
    {
      icon: "/static/images/icon/guzhangfenxi@2x.png",
      label: "隐患排查上报",
    },
    // {
    //   icon: "/static/images/icon/guzhangfenxi@2x.png",
    //   label: "隐患排查上报",
    // },
    {
      icon: "/static/images/icon/guzhangfenxi@2x.png",
      label: "危险物料管控",
@@ -339,14 +339,14 @@
      icon: "/static/images/icon/guzhangfenxi@2x.png",
      label: "应急预案查阅",
    },
    {
      icon: "/static/images/icon/guzhangfenxi@2x.png",
      label: "事故上报记录",
    },
    {
      icon: "/static/images/icon/guzhangfenxi@2x.png",
      label: "安全培训考核",
    },
    // {
    //   icon: "/static/images/icon/guzhangfenxi@2x.png",
    //   label: "事故上报记录",
    // },
    // {
    //   icon: "/static/images/icon/guzhangfenxi@2x.png",
    //   label: "安全培训考核",
    // },
  ]);
  // 协同办公功能数据
  const collaborationItems = reactive([
@@ -354,10 +354,10 @@
      icon: "/static/images/icon/baoxiaoguanli.png",
      label: "协同审批",
    },
    {
      icon: "/static/images/icon/huiyiliebiao@2x.png",
      label: "会议管理",
    },
    // {
    //   icon: "/static/images/icon/huiyiliebiao@2x.png",
    //   label: "会议管理",
    // },
    {
      icon: "/static/images/icon/tongzhigonggao@2x.png",
      label: "通知公告",
@@ -366,18 +366,18 @@
      icon: "/static/images/icon/zhishiku@2x.png",
      label: "知识库",
    },
    {
      icon: "/static/images/icon/yongyinguanli@2x.png",
      label: "用印管理",
    },
    // {
    //   icon: "/static/images/icon/yongyinguanli@2x.png",
    //   label: "用印管理",
    // },
    {
      icon: "/static/images/icon/guizhangzhidu@2x.png",
      label: "规章制度",
    },
    {
      icon: "/static/images/icon/kehubaifang@2x.png",
      label: "客户拜访",
    },
    // {
    //   icon: "/static/images/icon/kehubaifang@2x.png",
    //   label: "客户拜访",
    // },
  ]);

  // 生产管控功能数据
@@ -397,10 +397,14 @@
    //   label: "工序排产",
    //   bgColor: "#E91E63",
    // },
    // {
    //   icon: "/static/images/icon/shengchanbaogong@2x.png",
    //   label: "生产报工",
    //   bgColor: "#673AB7",
    // },
    {
      icon: "/static/images/icon/shengchanbaogong@2x.png",
      icon: "/static/images/icon/caigoutaizhang@2x.png",
      label: "生产报工",
      bgColor: "#673AB7",
    },
    // {
    //   icon: "/static/images/icon/shengchanhesuan@2x.png",
@@ -431,6 +435,10 @@
      icon: "/static/images/icon/xunjianshangchuan@2x.png",
      label: "巡检管理",
    },
    {
      icon: "/static/images/icon/xunjianshangchuan@2x.png",
      label: "巡检任务管理",
    }
  ]);

  // 处理常用功能点击
@@ -617,8 +625,13 @@
          url: "/pages/productionManagement/processScheduling/index",
        });
        break;
      // case "生产报工":
      //   getcode();
      //   break;
      case "生产报工":
        getcode();
        uni.navigateTo({
          url: "/pages/productionManagement/workOrder/index",
        });
        break;
      case "生产核算":
        uni.navigateTo({
@@ -648,6 +661,11 @@
      case "巡检管理":
        uni.navigateTo({
          url: "/pages/inspectionUpload/index",
        });
        break;
      case "巡检任务管理":
        uni.navigateTo({
          url: "/pages/inspectionManagement/index",
        });
        break;
      case "分析追溯":
@@ -1003,10 +1021,14 @@

    // 过滤生产管控菜单
    const originalProduction = [
      // {
      //   icon: "/static/images/icon/shengchanbaogong@2x.png",
      //   label: "生产报工",
      //   bgColor: "#673AB7",
      // },
      {
        icon: "/static/images/icon/shengchanbaogong@2x.png",
        icon: "/static/images/icon/caigoutaizhang@2x.png",
        label: "生产报工",
        bgColor: "#673AB7",
      },
    ];
    const filteredProduction = originalProduction.filter(item => {
@@ -1020,10 +1042,17 @@
      { icon: "/static/images/icon/shbeibaoxiu@2x.png", label: "设备报修" },
      { icon: "/static/images/icon/shbeibaoyang@2x.png", label: "设备保养" },
      { icon: "/static/images/icon/xunjianshangchuan@2x.png", label: "巡检管理" },
      { icon: "/static/images/icon/xunjianshangchuan@2x.png", label: "巡检任务管理" },
    ];
    const filteredEquipment = originalEquipment.filter(item => {
      return allowedMenuTitles.has(item.label);
    });
    if (filteredEquipment.some(i => i.label === "巡检管理")) {
      const task = originalEquipment.find(i => i.label === "巡检任务管理");
      if (task && !filteredEquipment.some(i => i.label === "巡检任务管理")) {
        filteredEquipment.push(task);
      }
    }
    equipmentItems.splice(0, equipmentItems.length, ...filteredEquipment);
  };

@@ -1783,4 +1812,4 @@
      box-shadow: 0 0.375rem 1.25rem rgba(0, 0, 0, 0.4);
    }
  }
</style>
</style>