接口文件冲突

licp

2024-12-31 dd929871969c4275eeb3246d7c5c0d6f35060b10

 src/assets/api/controller.js

@@ -64,6 +64,17 @@
    processReport,
    processComplain,
    inconsistentDistribution,
    facilitiesAndEnvironment,
    internalWastes,
    foreignRegister,
    feCalibrationSchedule,
    feStandardSubstance,
    feStandardSubstanceRecord,
    personPostAuthorizationRecord,
    deviceCheck,
    personCommunicationAbility,
    procurementSuppliesContents,
    procurementSuppliesStore,
  }
}

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

const systemLog = {
@@ -516,13 +528,13 @@
}
// 8.4记录的控制--文件审批记录
const manageRecordCheck = {
  pageManageRecordCheck:'/manageRecordCheck/pageManageRecordCheck ',//列表
  addManageRecordCheck:'/manageRecordCheck/addManageRecordCheck ',//新增
  doManageRecordCheck:'/manageRecordCheck/doManageRecordCheck ',//编辑
  delManageRecordCheck:'/manageRecordCheck/delManageRecordCheck ',//删除
  checkManageRecordCheck:'/manageRecordCheck/checkManageRecordCheck ',//审核
  ratifyManageRecordCheck:'/manageRecordCheck/ratifyManageRecordCheck ',//批准
  exportOutManageRecordCheck:'/manageRecordCheck/exportOutManageRecordCheck ',//导出
  pageManageRecordCheck:'/manageRecordCheck/pageManageRecordCheck',//列表
  addManageRecordCheck:'/manageRecordCheck/addManageRecordCheck',//新增
  doManageRecordCheck:'/manageRecordCheck/doManageRecordCheck',//编辑
  delManageRecordCheck:'/manageRecordCheck/delManageRecordCheck',//删除
  checkManageRecordCheck:'/manageRecordCheck/checkManageRecordCheck',//审核
  ratifyManageRecordCheck:'/manageRecordCheck/ratifyManageRecordCheck',//批准
  exportOutManageRecordCheck:'/manageRecordCheck/exportOutManageRecordCheck',//导出
  exportInManageRecordCheck:'/manageRecordCheck/exportInManageRecordCheck',//导入
}

@@ -572,6 +584,7 @@
// 6.2 人员
const personnel = {
  selectCNSAPersonTree: '/personBasicInfo/selectCNSAPersonTree', // 查询CNAS人员侧边栏
  saveCNASFile: '/personBasicInfo/saveCNASFile', // 公共文件保存接口
}

// 8.3 客户满意度调查
@@ -803,7 +816,7 @@
  getPageResults: "/manageRiskAssessmentResults/getPageResults", // 危险因素辨识与风险评价结果一览 分页
  hazardIdentificationAndRiskApproval: "/manageRiskAssessmentResults/hazardIdentificationAndRiskApproval", // 危险因素辨识与风险评价结果一览 批准
  dangerousRiskApproval: "/manageRiskAssessmentResults/dangerousRiskApproval", // 危险因素辨识与风险评价结果一览 审批
  riskAssessmentImport: "manageRiskAssessmentResults/riskAssessmentImport", // 危险因素辨识与风险评价结果一览 导入
  riskAssessmentImport: "/manageRiskAssessmentResults/riskAssessmentImport", // 危险因素辨识与风险评价结果一览 导入
  addNewRiskFactors: "/manageRiskAssessmentResults/addNewRiskFactors", // 危险因素辨识与风险评价结果一览 新增
  removeRiskFactors: "/manageRiskAssessmentResults/removeRiskFactors", // 危险因素辨识与风险评价结果一览 删除
  exportHazardFactorIdentification: "/manageRiskAssessmentResults/exportHazardFactorIdentification", // 危险因素辨识与风险评价结果一览 导出
@@ -839,3 +852,154 @@
  delInconsistentDistribution:'/inconsistentDistribution/delInconsistentDistribution', // 不符合项的分布删除
  exportInconsistentDistribution:'/inconsistentDistribution/exportInconsistentDistribution', // 导出不符合项的分布
}

// 6.3 设施和环境条件
const facilitiesAndEnvironment = {
  // 设施和环境条件要求-设施和环境条件要求-照度记录表
  addFeLightningProtection: "/feIllumination/addFeLightningProtection", // 设施和环境条件要求-照度记录表-检测区域 新增/修改
  deleteFeLightningProtection: "/feIllumination/deleteFeLightningProtection", // 设施和环境条件要求-照度记录表-检测区域 删除
  getFeLightningProtection: "/feIllumination/getFeLightningProtection", // 设施和环境条件要求-照度记录表-检测区域 查询
  deleteFeIlluminationDetectionArea: "/feIllumination/deleteFeIlluminationDetectionArea", // 照度记录表-检测区域 删除
  getFeIlluminationDetectionArea: "/feIllumination/getFeIlluminationDetectionArea", // 照度记录表-检测区域 根据照度记录查询
  exportFeIllumination: "/feIllumination/exportFeIllumination", // 照度记录表-检测区域 导出
  // 设施和环境条件-设施和环境条件要求-防雷检测
  addLightningProtectionDetection: "/feLightningProtection/addLightningProtectionDetection", // 设施和环境条件要求-防雷检测新增/修改
  deleteLightningProtectionDetection: "/feLightningProtection/deleteLightningProtectionDetection", // 设施和环境条件要求-防雷检测删除
  getLightningProtectionDetection: "/feLightningProtection/getLightningProtectionDetection", // 设施和环境条件要求-防雷检测查询
  exportOfLightningProtectionDetection: "/feLightningProtection/exportOfLightningProtectionDetection", // 设施和环境条件要求-防雷检测导出
  // 设施和环境条件-设施和环境条件要求-电源稳定性
  addLaboratoryFacilityPowerStable: "/fePowerStable/addLaboratoryFacilityPowerStable", // 设施和环境条件要求-电源稳定性新增/修改
  deleteLaboratoryFacilityPowerStable: "/fePowerStable/deleteLaboratoryFacilityPowerStable", // 设施和环境条件要求-电源稳定性删除
  getLaboratoryFacilityPowerStablePage: "/fePowerStable/getLaboratoryFacilityPowerStablePage", // 设施和环境条件要求-电源稳定性查询
  getCalibrationDate: "/fePowerStable/getCalibrationDate", // 设施和环境条件要求-电源稳定性 新增 选择设备后查询最新设备编号，校准日期
  deleteFeMeasuredQuantity: "/fePowerStable/deleteFeMeasuredQuantity", // 设施和环境条件-设施和环境条件要求-电源稳定性-测定量 删除
  getFeMeasuredQuantityService: "/fePowerStable/getFeMeasuredQuantityService", // 电源稳定性-测定量 根据电源稳定性查询
  exportFePowerStable: "/fePowerStable/exportFePowerStable", // 电源稳定性-测定量 导出
  // 设施和环境条件-设施和环境条件要求-温湿度记录
  addFeTempHumDate: "/feTempHumDate/addFeTempHumDate", // 试验区域-新增/修改
  deleteFeTempHumDate: "/feTempHumDate/deleteFeTempHumDate", // 试验区域-删除
  getFeTempHumDate: "/feTempHumDate/getFeTempHumDate", // 试验区域-查询"
  addFeTempHumRecord: "/feTempHumDate/addFeTempHumRecord", // 设施和环境条件要求-温湿度记录新增/修改
  deleteFeTempHumRecord: "/feTempHumDate/deleteFeTempHumRecord", // 设施和环境条件要求-温湿度记录删除
  getFeTempHumRecordPage: "/feTempHumDate/getFeTempHumRecordPage", // 设施和环境条件要求-温湿度记录查询
  exportTemperatureAndHumidityRecords: '/feTempHumDate/exportTemperatureAndHumidityRecords', // 设施和环境条件要求-温湿度记录 导出
}
// 6.3三废处理
const internalWastes = {
  pageInternalWastes: '/internalWastes/pageInternalWastes', // 安全内务三废处理分页查询
  getInternalWastesOne: '/internalWastes/getInternalWastesOne', // 安全内务三废处理查看详情
  addInternalWastes: '/internalWastes/addInternalWastes', // 安全内务三废处理新增
  updateInternalWastes: '/internalWastes/updateInternalWastes', // 安全内务三废处理分页修改
  delInternalWastes: '/internalWastes/delInternalWastes', // 安全内务三废处理删除
  exportInternalWastes: '/internalWastes/exportInternalWastes', // 导出三废处理
}
// 6.3进出人员登记
const foreignRegister = {
  pageForeignRegister: '/foreignRegister/pageForeignRegister', // 外来人员分页查询
  getForeignRegisterOne: '/foreignRegister/getForeignRegisterOne', // 外来人员查看详情
  addForeignRegister: '/foreignRegister/addForeignRegister', // 外来人员新增
  updateForeignRegister: '/foreignRegister/updateForeignRegister', // 外来人员修改
  delForeignRegister: '/foreignRegister/delForeignRegister', // 外来人员删除
  exportForeignRegister: '/foreignRegister/exportForeignRegister', // 导出外来人员
}

// 6.5量值溯源计划
const feCalibrationSchedule = {
  getPageCalibrationSchedule:'/feCalibrationSchedule/getPageCalibrationSchedule',// 量值溯源计划查询
  addCalibrationSchedule:'/feCalibrationSchedule/addCalibrationSchedule',//量值溯源计划新增编辑
  removeCalibrationSchedule:'/feCalibrationSchedule/removeCalibrationSchedule',//删除量值溯源计划
  exportOfValueTraceabilityPlan: '/feCalibrationSchedule/exportOfValueTraceabilityPlan', // 量值溯源计划 导出
  importOfValueTraceabilityPlan: '/feCalibrationSchedule/importOfValueTraceabilityPlan', // 量值溯源计划 导入
}

// 6.5标准物质清单
const feStandardSubstance = {
  getPageStandardSubstance:'/feStandardSubstance/getPageStandardSubstance',// 标准物质清单查询
  addStandardSubstance:'/feStandardSubstance/addStandardSubstance',//标准物质清单新增编辑
  removeStandardSubstance:'/feStandardSubstance/removeStandardSubstance',//删除标准物质清单
  exportOfStandardSubstanceList: '/feStandardSubstance/exportOfStandardSubstanceList', // 标准物质清单 导出
}

// 6.5标准物质清单-领用借用归还
const feStandardSubstanceRecord = {
  getSubstanceRecord:'/feStandardSubstanceRecord/getSubstanceRecord',// 标准物质清单领用查询
  borrowSubstance:'/feStandardSubstanceRecord/borrowSubstance',//标准物质清单借用
  returnSubstance:'/feStandardSubstanceRecord/returnSubstance',//标准物质清单归还
  getPageSubstanceRecord: '/feStandardSubstanceRecord/getPageSubstanceRecord', // 分页查询
}

const personPostAuthorizationRecord = {
  exportPersonPostAuthorizationRecord:'/personPostAuthorizationRecord/exportPersonPostAuthorizationRecord',//传参id  人员的任职授权导出
  exportPersonBasicInfo:'/personBasicInfo/exportPersonBasicInfo',//本信息导出,传参类似分页
  exportPersonBasicInfoById:'/personBasicInfo/exportPersonBasicInfoById',//本信息导出,传参类似分页
  exportPersonJobResponsibilities:'/personJobResponsibilities/exportPersonJobResponsibilities',//导出人员职责,传参id
}

//设备接口
const deviceCheck = {
  list: '/device-alt',
  edit: '/device-alt/edit',
  saveIncidentReportData: '/incident-report/saveIncidentReportData', // 设备验收 保存，提交，驳回，通过接口
  incidentReportPage: '/incident-report/incidentReportPage', // 打开新增弹框，获取设备的基础信息
  deleteIncidentReport: '/incident-report/deleteIncidentReport', // 删除设备验收数据
  getShowIncidentReport: '/incident-report/getShowIncidentReport', // 设备验收 点击查看获取数据
  deleteIncidentReportAll: '/incident-report/deleteIncidentReportAll', // 设备验收中四个table表格的删除功能
  incidentReportExport: '/incident-report/incidentReportExport', // 设备验收导出
  deviceRecordPage: '/deviceRecord/deviceRecordPage', // cnas设备使用记录分页查询
  saveDeviceRecord: '/deviceRecord/saveDeviceRecord', // 设备使用记录保存
  deleteDeviceRecord: '/deviceRecord/deleteDeviceRecord', // 删除设备使用记录
  deviceRecordExport: '/deviceRecord/deviceRecordExport', // 设备使用记录删除
  getDeviceMaintenancePage: '/device-maintain/getDeviceMaintenancePage', // 设备维护分页查询
  deviceMaintenanceExport: '/device-maintain/deviceMaintenanceExport', // 设备维护导出
  deviceMaintenanceDelete: '/device-maintain/delete', // 设备维护删除
  deviceMaintainAdd: '/device-maintain', // 设备维护新增
  saveDeviceState: '/deviceState/saveDeviceState', // 设备启用/停用 保存，提交，驳回，通过接口
  getDeviceStatePage: '/deviceState/getDeviceStatePage', // 设备启用/停用 分页
  deleteDeviceState: '/deviceState/deleteDeviceState', // 设备启用/停用 删除
  deviceFaultOnePage: '/deviceFaultOne/deviceFaultOnePage', // 设备故障表 分页查询
  addOrUpdateDeviceFaultOne: '/deviceFaultOne/addOrUpdateDeviceFaultOne',
  deleteDeviceFaultOne: '/deviceFaultOne/deleteDeviceFaultOne', // 删除 设备故障
  deviceMetricRecordPage: '/deviceMetricRecord/deviceMetricRecordPage', // 设备校准 分页查询
  addOrUpdateDeviceMetricRecord: '/deviceMetricRecord/addOrUpdateDeviceMetricRecord', // 设备校准 新增 更新
  deleteDeviceMetricRecord: '/deviceMetricRecord/deleteDeviceMetricRecord', // 设备校准 删除
  showDeviceMetricsCopy: '/deviceMetricRecord/showDeviceMetricsCopy', // 设备校准 查询校准条目
  selectDeviceMetric: '/deviceMetrics/selectDeviceMetric', // 设备校准 设备维护表 查询
  saveOrUpdateDeviceMetric: '/deviceMetrics/saveOrUpdateDeviceMetric', // 设备校准 新增 更新
  deleteDeviceMetrics: '/deviceMetrics/deleteDeviceMetrics', // 设备校准 删除
  rewardPunishmentExport: '/personRewardPunishmentRecord/rewardPunishmentExport', // 奖惩记录 导出
  exportRewardAndPunishmentRecords: '/deviceFaultOne/exportRewardAndPunishmentRecords', // 奖惩记录导出
  deviceStateExport: "/deviceState/deviceStateExport", // 设备状态
  newHomeworkGuidebookAdded: "/instruction/newHomeworkGuidebookAdded", // 作业指导书新增
  pageByPageQueryOfHomeworkInstructions: "/instruction/pageByPageQueryOfHomeworkInstructions", // 作业指导书 查询
  homeworkGuidebookEditor: "/instruction/homeworkGuidebookEditor", // 作业指导书 编辑查询
  deleteHomeworkGuidebook: "/instruction/deleteHomeworkGuidebook", // 作业指导书受控文件删除
  homeworkGuidebook: "/instruction/homeworkGuidebook", // 作业指导书 删除
  approvalOfHomeworkInstructionManual: "/instruction/approvalOfHomeworkInstructionManual", // 作业指导书 审批
  deviceMetricRecordExport: '/deviceMetricRecord/deviceMetricRecordExport', // 设备校准 导出
};

// 沟通记录
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', // 耗材入库修改
}