接口文件冲突

licp

2024-12-31 dd929871969c4275eeb3246d7c5c0d6f35060b10

 src/assets/api/controller.js

@@ -73,6 +73,8 @@
    personPostAuthorizationRecord,
    deviceCheck,
    personCommunicationAbility,
    procurementSuppliesContents,
    procurementSuppliesStore,
  }
}

@@ -182,31 +184,28 @@
}

const deviceScope = {
  selectUserList: '/deviceScope/selectUserList', //获取用户列表
  selectDeviceParameter: '/deviceScope/selectDeviceParameter', //查询设备详情列表
  addDeviceParameter: '/deviceScope/addDeviceParameter', //添加设备详情参数
  delDeviceParameter: '/deviceScope/delDeviceParameter', //删除设备详情参数
  upDeviceParameter: '/deviceScope/upDeviceParameter', //修改设备详情参数
  selectDeviceByCategory: '/deviceScope/selectDeviceByCategory', //通过设备分类获取设备列表
  selectDeviceParameter: "/deviceScope/selectDeviceParameter", //查询设备详情列表
  addDeviceParameter: "/deviceScope/addDeviceParameter", //添加设备详情参数
  delDeviceParameter: "/deviceScope/delDeviceParameter", //删除设备详情参数
  upDeviceParameter: "/deviceScope/upDeviceParameter", //修改设备详情参数
  selectDeviceByCategory: "/deviceScope/selectDeviceByCategory", //通过设备分类获取设备列表
  authorizedPerson: "/user/getDeviceManager", //获取授权人
  selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //获取设备总览
  uploadFile: "/deviceScope/uploadFile", //上传图片
  selectDevicePrincipal: "/user/getDeviceManager", //获取设备负责人
  selectDeviceByCode: "/deviceScope/selectDeviceByCode", //通过设备编号获取设备列表
  getNumberCollect: "/deviceScope/getNumberCollect", //查询数采配置
  numberCollect: "/deviceScope/numberCollect", //维护数采配置
  saveDataAcquisitionConfiguration: "/deviceScope/saveDataAcquisitionConfiguration", // 维护数采配置
  queryDataAcquisitionConfiguration: "/deviceScope/queryDataAcquisitionConfiguration", // 查询数采配置
  deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 删除数采配置
  determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 判断该设备是否可以数采
  dataCollection: "/deviceScope/dataCollection", // 数采-数据采集
  treeDevice: "/deviceScope/treeDevice", // 设备树形
  temDataAcquisition: "/deviceScope/temDataAcquisition", // PK8000数采
  temDataAcquisition2: "/deviceScope/temDataAcquisition2", // PK8000数采--多条
  formulaCalculation: "/deviceScope/formulaCalculation", // 数采-公式计算
  deviceScopeSearch: "/deviceScope/search", //通过设备分类获取设备列表
  authorizedPerson: '/user/getDeviceManager', //获取授权人
  selectEquipmentOverview: '/deviceScope/selectEquipmentOverview', //获取设备总览
  uploadFile: '/deviceScope/uploadFile', //上传图片
  selectDevicePrincipal: '/user/getDeviceManager', //获取设备负责人
  selectDeviceByCode: '/deviceScope/selectDeviceByCode', //通过设备编号获取设备列表
  getNumberCollect: '/deviceScope/getNumberCollect', //查询数采配置
  numberCollect: '/deviceScope/numberCollect', //维护数采配置
  saveDataAcquisitionConfiguration: '/deviceScope/saveDataAcquisitionConfiguration', // 维护数采配置
  queryDataAcquisitionConfiguration: '/deviceScope/queryDataAcquisitionConfiguration', // 查询数采配置
  deleteDataAcquisitionConfiguration: '/deviceScope/deleteDataAcquisitionConfiguration', // 删除数采配置
  determineWhetherToCollectData: '/deviceScope/determineWhetherToCollectData', // 判断该设备是否可以数采
  dataCollection: '/deviceScope/dataCollection', // 数采-数据采集
  treeDevice: '/deviceScope/treeDevice', // 设备树形
  temDataAcquisition: '/deviceScope/temDataAcquisition', // PK8000数采
  temDataAcquisition2: '/deviceScope/temDataAcquisition2', // PK8000数采--多条
  formulaCalculation: '/deviceScope/formulaCalculation', // 数采-公式计算
  formulaCalculation2: '/deviceScope/export', //导出
  selectListBylargeCategory: '/deviceScope/largeCategory'
}

const insOrder = {
@@ -269,7 +268,8 @@
  getInsOrderUserList: "/insOrderPlan/getInsOrderUserList", // 查看检验历史列表
  preview: "/insOrderPlan/preview", // csv文件预览
  outInsOrderState: "/insOrderPlan/outInsOrderState", // 检验任务扫码出库
  cancelSubmitPlan: "/insOrderPlan/cancelSubmitPlan", // 检验任务提交后撤销提交
  // insOrderPlan.cancelSubmitPlan
  cancelSubmitPlan: "/insOrderPlan/cancelSubmitPlan", // 检验任务撤销
}

const systemLog = {
@@ -584,55 +584,7 @@
// 6.2 人员
const personnel = {
  selectCNSAPersonTree: '/personBasicInfo/selectCNSAPersonTree', // 查询CNAS人员侧边栏
  getAnnex: '/personBasicInfo/getAnnex', // 获取附件
  basicInformationOfPersonnelSelectPage: 'personBasicInfo/basicInformationOfPersonnelSelectPage', // 获取人员列表
  getAnnexByUserId: '/personBasicInfo/getAnnexByUserId',
  addAnnex: '/personBasicInfo/addAnnex', // 添加附件
  deleteAnnex: '/personBasicInfo/deleteAnnex', // 删除附件
  updateAnnex: '/personBasicInfo/updateAnnex', // 更新附件
  getCNASFile: '/personBasicInfo/getCNASFile', // 获取图片
  getCNASInformation: '/personBasicInfo/getCNASInformation', // 查询CNAS人员信息
  updateCNASInformation: '/personBasicInfo/updateCNASInformation', // 更新CNAS人员信息
  getCNASPersonnelInfo: '/personBasicInfo/getCNASPersonnelInfo', // 人员基本信息查询
  saveCNASPersonnelInfo: '/personBasicInfo/saveCNASPersonnelInfo', // 人员基本信息保存
  saveCNASFile: '/personBasicInfo/saveCNASFile', // 公共文件保存接口
  deleteCNASFile: '/personBasicInfo/deleteCNASFile', // 删除文件
  personTrainingSelect: '/personTraining/personTrainingSelect', // 查询人员培训
  personTrainingDelete: '/personTraining/personTrainingDelete', // 删除人员培训信息
  approveAnnualPersonnelTraining: '/personTraining/approveAnnualPersonnelTraining', // 批准 年度人员培训
  reviewAnnualPersonnelTraining: '/personTraining/reviewAnnualPersonnelTraining', // 审核 年度人员培训
  personTrainingImport: '/personTraining/personTrainingImport', // 导入 人员培训
  exportPersonTraining: "/personTraining/exportPersonTraining", // 导出/人员培训
  queryTheAnnualPlanDetailsTable: '/personTraining/queryTheAnnualPlanDetailsTable', // 查询培训计划年度计划明细表
  addOrUpdatePersonTrainingDetailed: '/personTraining/addOrUpdatePersonTrainingDetailed', // 新增培训计划年度计划明细表
  deleteAnnualPlanDetailTable: '/personTraining/deleteAnnualPlanDetailTable', // 批量删除 年度计划明细表
  trainingAndAssessmentRecordsPage: '/personTraining/trainingAndAssessmentRecordsPage', // 培训与考核记录 查询
  deleteTrainingAndAssessmentRecords: '/personTraining/deleteTrainingAndAssessmentRecords', // 培训与考核记录 批量删除
  trainingAndAssessmentRecordsAdded: '/personTraining/trainingAndAssessmentRecordsAdded', // 培训与考核记录 提交
  personJobResponsibilitiesSave: '/personJobResponsibilities/personJobResponsibilitiesSave', // 新增岗位职责
  personJobResponsibilitiesDelete: '/personJobResponsibilities/personJobResponsibilitiesDelete', // 删除岗位职责
  personJobResponsibilitiesUpdate: '/personJobResponsibilities/personJobResponsibilitiesUpdate', // 更新岗位职责
  personJobResponsibilitiesSelect: '/personJobResponsibilities/personJobResponsibilitiesSelect', // 分页查询岗位职责
  personJobResponsibilitiesExport: '/personJobResponsibilities/personJobResponsibilitiesExport', // 导出岗位职责
  personTrackRecordSave: '/personTrackRecord/personTrackRecordSave', // 新增工作履历
  personTrackRecordDelete: '/personTrackRecord/personTrackRecordDelete', // 删除工作履历
  personTrackRecordUpdate: '/personTrackRecord/personTrackRecordUpdate', // 更新工作履历
  personTrackRecordSelect: '/personTrackRecord/personTrackRecordSelect', // 查询工作履历
  personTrackRecordExport: '/personTrackRecord/personTrackRecordExport', // 导出工作履历
  personTrainingRecordSelect: '/personTrainingRecord/personTrainingRecordSelect', // 查询培训记录
  personTrainingRecordExport: '/personTrainingRecord/personTrainingRecordExport', // 工作培训记录
  personPersonnelCapacityPage: '/personPersonnelCapacity/personPersonnelCapacityPage', // 查询人员能力
  deletePersonPersonnelCapacity: '/personPersonnelCapacity/deletePersonPersonnelCapacity', // 删除人员能力
  addOrUpdatePersonPersonnelCapacity: '/personPersonnelCapacity/addOrUpdatePersonPersonnelCapacity', // 新增编辑人员能力
  exportPersonnelCapacity: '/personPersonnelCapacity/exportPersonnelCapacity', // 导出人员能力
  newPersonnelAddedToTrainingRecords: "/personTraining/newPersonnelAddedToTrainingRecords", // 培训与考核 新增人员
  outOfFocusPreservation: "/personTraining/outOfFocusPreservation", // 培训与考核 失焦更新
  trainingSelectTrainingRecord: "/personTrainingRecord/trainingSelectTrainingRecord", // 查询人员 培训记录
  queryPersonnelDetails: "/personTrainingRecord/queryPersonnelDetails", // 查询人员明细 培训记录
  claimOfTrainingAndAssessmentRecords: "/personTraining/claimOfTrainingAndAssessmentRecords", // 认领/取消认领
  exportPersonTrainingRecord: "/personTraining/exportPersonTrainingRecord", // 导出人员培训与考核记录
  exportTrainingRecord: "/personTrainingRecord/exportTrainingRecord", // 导出培训记录
  confirmPersonnelCapability: "/personPersonnelCapacity/confirmPersonnelCapability", // 确认人员能力
}

// 8.3 客户满意度调查
@@ -793,7 +745,6 @@
  getVerifyMethodFileList:'/processMethodVerify/getVerifyMethodFileList', // 原始记录列表
  delVerifyMethodFileList:'/processMethodVerify/delVerifyMethodFileList', // 删除验证原始记录列表
  delMethodVerify:'/processMethodVerify/delMethodVerify', // 删除标准方法更新验证
  exportMethodVerify:'/processMethodVerify/exportMethodVerify', // 导出标准方法更新验证
}

// 7.4检测或校准物品的处置-样品接收
@@ -851,9 +802,7 @@
  ratifyQualityMonitor:'/qualityMonitor/ratifyQualityMonitor', // 监控计划批准
  delQualitySupervise:'/qualityMonitor/delQualitySupervise', // 监控计划批准
  importQualityMonitor:'/qualityMonitor/importQualityMonitor', // 导入监控计划
  exportQualityMonitorDetail:'/qualityMonitor/exportQualityMonitorDetail',
  exportQualityMonitorRatify:'/qualityMonitor/exportQualityMonitorRatify', // 质量监控实施计划导出
  exportQualityMonitorEvaluate:'/qualityMonitor/exportQualityMonitorEvaluate', // 质量监控评价导出
  exportQualityMonitorDetail:'/qualityMonitor/exportQualityMonitorDetail', // 导出监控计划
}

// 8.5 应对风险和机遇的措施
@@ -1033,3 +982,24 @@
const personCommunicationAbility = {
  exportPersonCommunicationAbility:'/personCommunicationAbility/exportPersonCommunicationAbility',//导出
}

const procurementSuppliesContents = {
  directoryListing: "/procurementSuppliesContents/directoryListing", // 采购物资目录列表
  selectById: "/procurementSuppliesContents/selectProcurementSuppliesContentById", // 采购物资目录详情
  add: "/procurementSuppliesContents/addProcurementSuppliesContents", // 采购物资目录新增
  update: "/procurementSuppliesContents/updateProcurementSuppliesContents", // 采购物资目录修改
  deleteById: "/procurementSuppliesContents/deleteProcurementSuppliesContentById", // 采购物资目录删除
  getUserList: "/procurementSuppliesContents/getUserList", // 采购物资目录获取用户列表
  getNodeNames: "/procurementSuppliesContents/getNodeNames", // 采购物资目录获取节点名称
  selectSuppliersDirectoryContentsById:'/suppliersDirectoryContents/selectSuppliersDirectoryContentsById',//供应商目录详情
}

const procurementSuppliesStore = {
  storeList: '/procurementSuppliesStore/storeList', // 耗材入库列表
  addStore: '/procurementSuppliesStore/addStore', // 耗材入库新增
  deleteStore: '/procurementSuppliesStore/deleteStore', // 耗材入库删除
  updateStore: '/procurementSuppliesStore/updateStore', // 耗材入库修改
  selectStoreById: '/procurementSuppliesStore/selectStoreById', // 根据id查询耗材入库
  exportExcel: '/procurementSuppliesStore/exportExcel', // 耗材入库导出
  updateStore: '/procurementSuppliesStore/updateStore', // 耗材入库修改
}