gaoluyang
2025-03-12 8176c7367906605c4cff8192f2d104ea93d51e9d
设备搬迁-设备校准联调
已修改2个文件
658 ■■■■■ 文件已修改
src/api/cnas/resourceDemand/device.js 592 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/device/component/calibration.vue 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/cnas/resourceDemand/device.js
@@ -119,499 +119,6 @@
  });
}
//设备校准计划列表查询
export function pageDeviceCalibrationPlan(query) {
  return request({
    url: "/deviceCalibrationPlan/pageDeviceCalibrationPlan",
    method: "get",
    params: query,
  });
}
// 提交批准通知
export function submiatRatifyDeviceCalibrationPlan(data) {
  return request({
    url: "/deviceCalibrationPlan/submiatRatifyDeviceCalibrationPlan",
    method: "post",
    data: data,
  });
}
//设备校准计划导出
export function exportDeviceCalibrationPlanDetail(query) {
  return request({
    url: "/deviceCalibrationPlan/exportDeviceCalibrationPlanDetail",
    method: "get",
    responseType: "blob",
    params: query,
  });
}
// 设备校准 新增 更新
export function addOrUpdateDeviceMetricRecord(data) {
  return request({
    url: "/deviceMetricRecord/addOrUpdateDeviceMetricRecord",
    method: "post",
    data: data,
  });
}
//设备校准计划删除
export function delDeviceCalibrationPlan(query) {
  return request({
    url: "/deviceCalibrationPlan/delDeviceCalibrationPlan",
    method: "delete",
    params: query,
  });
}
//设备校准计划详情删除
export function delDeviceCalibrationPlanDetail(query) {
  return request({
    url: "/deviceCalibrationPlan/delDeviceCalibrationPlanDetail",
    method: "delete",
    params: query,
  });
}
//设备校准计划详情列表
export function pageDeviceCalibrationPlanDetail(query) {
  return request({
    url: "/deviceCalibrationPlan/pageDeviceCalibrationPlanDetail",
    method: "get",
    params: query,
  });
}
// 新增设备校准计划详情
export function addDeviceCalibrationPlanDetail(data) {
  return request({
    url: "/deviceCalibrationPlan/addDeviceCalibrationPlanDetail",
    method: "post",
    data: data,
  });
}
// 修改设备校准计划详情
export function updateDeviceCalibrationPlanDetail(data) {
  return request({
    url: "/deviceCalibrationPlan/updateDeviceCalibrationPlanDetail",
    method: "post",
    data: data,
  });
}
// 设备校准计划批准
export function ratifyDeviceCalibrationPlan(data) {
  return request({
    url: "/deviceCalibrationPlan/ratifyDeviceCalibrationPlan",
    method: "post",
    data: data,
  });
}
//查询设备校准计划详情
export function getDeviceCalibrationPlan(query) {
  return request({
    url: "/deviceCalibrationPlan/getDeviceCalibrationPlan",
    method: "get",
    params: query,
  });
}
// 新增设备校准计划
export function addDeviceCalibrationPlan(data) {
  return request({
    url: "/deviceCalibrationPlan/addDeviceCalibrationPlan",
    method: "post",
    data: data,
  });
}
// 修改设备校准计划
export function updateDeviceCalibrationPlan(data) {
  return request({
    url: "/deviceCalibrationPlan/updateDeviceCalibrationPlan",
    method: "post",
    data: data,
  });
}
//通过设备分类获取设备列表
export function deviceScopeSearch(query) {
  return request({
    url: "/deviceScope/search",
    method: "get",
    params: query,
  });
}
//查询设备核查计划详情
export function getDeviceExaminePlan(query) {
  return request({
    url: "/deviceExaminePlan/getDeviceExaminePlan",
    method: "get",
    params: query,
  });
}
// 添加设备核查计划
export function addDeviceExaminePlan(data) {
  return request({
    url: "/deviceExaminePlan/addDeviceExaminePlan",
    method: "post",
    data: data,
  });
}
// 设备核查计划批量编辑
export function updateDeviceExaminePlan(data) {
  return request({
    url: "/deviceExaminePlan/updateDeviceExaminePlan",
    method: "post",
    data: data,
  });
}
//设备核查计划删除
export function delDeviceExaminePlan(query) {
  return request({
    url: "/deviceExaminePlan/delDeviceExaminePlan",
    method: "delete",
    params: query,
  });
}
//设备核查计划列表
export function pageDeviceExaminePlan(query) {
  return request({
    url: "/deviceExaminePlan/pageDeviceExaminePlan",
    method: "get",
    params: query,
  });
}
// 设备核查计划提交批准通知
export function submitRatifyDeviceExaminePlan(data) {
  return request({
    url: "/deviceExaminePlan/submitRatifyDeviceExaminePlan",
    method: "post",
    data: data,
  });
}
//导出设备核查计划
export function exportDeviceExaminePlanDetail(query) {
  return request({
    url: "/deviceExaminePlan/exportDeviceExaminePlanDetail",
    method: "get",
    responseType: "blob",
    params: query,
  });
}
//删除设备核查计划详情
export function delDeviceExaminePlanDetail(query) {
  return request({
    url: "/deviceExaminePlan/delDeviceExaminePlanDetail",
    method: "delete",
    params: query,
  });
}
//设备核查计划详情列表
export function pageDeviceExaminePlanDetail(query) {
  return request({
    url: "/deviceExaminePlan/pageDeviceExaminePlanDetail",
    method: "get",
    params: query,
  });
}
// 新增设备核查计划详情
export function addDeviceExaminePlanDetail(data) {
  return request({
    url: "/deviceExaminePlan/addDeviceExaminePlanDetail",
    method: "post",
    data: data,
  });
}
// 修改设备核查计划详情
export function updateDeviceExaminePlanDetail(data) {
  return request({
    url: "/deviceExaminePlan/updateDeviceExaminePlanDetail",
    method: "post",
    data: data,
  });
}
// 设备核查计划批准
export function ratifyDeviceExaminePlan(data) {
  return request({
    url: "/deviceExaminePlan/ratifyDeviceExaminePlan",
    method: "post",
    data: data,
  });
}
//核查记录导出
export function exportReviewExamineRecordDetail(query) {
  return request({
    url: "/deviceExaminePlan/exportReviewExamineRecordDetail",
    method: "get",
    responseType: "blob",
    params: query,
  });
}
//核查对比导出
export function exportReviewExamineRecordContrast(query) {
  return request({
    url: "/deviceExaminePlan/exportReviewExamineRecordContrast",
    method: "get",
    responseType: "blob",
    params: query,
  });
}
//查询核查对比记录
export function getExamineRecordContrast(query) {
  return request({
    url: "/deviceExaminePlan/getExamineRecordContrast",
    method: "get",
    params: query,
  });
}
// 审核核查对比记录
export function reviewExamineRecordContrast(data) {
  return request({
    url: "/deviceExaminePlan/reviewExamineRecordContrast",
    method: "post",
    data: data,
  });
}
// 新增核查对比记录
export function addExamineRecordContrast(data) {
  return request({
    url: "/deviceExaminePlan/addExamineRecordContrast",
    method: "post",
    data: data,
  });
}
//查询核查记录
export function getExamineRecord(query) {
  return request({
    url: "/deviceExaminePlan/getExamineRecord",
    method: "get",
    params: query,
  });
}
// 新增核查记录
export function addExamineRecord(data) {
  return request({
    url: "/deviceExaminePlan/addExamineRecord",
    method: "post",
    data: data,
  });
}
// 复核核查记录
export function reviewExamineRecord(data) {
  return request({
    url: "/deviceExaminePlan/reviewExamineRecord",
    method: "post",
    data: data,
  });
}
//分页查询设备保养计划
export function selectDeviceMaintenancePlanByPage(query) {
  return request({
    url: "/deviceMaintenancePlan/selectDeviceMaintenancePlanByPage",
    method: "get",
    params: query,
  });
}
// 设备保养计划提交审核
export function submitReviewMaintenancePlanStatus(data) {
  return request({
    url: "/deviceMaintenancePlan/submitReviewMaintenancePlanStatus",
    method: "post",
    data: data,
  });
}
//查询设备保养计划详情
export function getMaintenancePlanDetail(query) {
  return request({
    url: "/deviceMaintenancePlan/getMaintenancePlanDetail",
    method: "get",
    params: query,
  });
}
// 新增设备保养计划
export function addMaintenancePlan(data) {
  return request({
    url: "/deviceMaintenancePlan/addMaintenancePlan",
    method: "post",
    data: data,
  });
}
// 修改设备保养计划
export function updateMaintenancePlan(data) {
  return request({
    url: "/deviceMaintenancePlan/updateMaintenancePlan",
    method: "post",
    data: data,
  });
}
//导出设备保养计划
export function exportDeviceMaintenancePlan(query) {
  return request({
    url: "/deviceMaintenancePlan/exportDeviceMaintenancePlan",
    method: "get",
    responseType: "blob",
    params: query,
  });
}
//删除设备保养计划
export function deleteMaintenancePlan(query) {
  return request({
    url: "/deviceMaintenancePlan/deleteMaintenancePlan",
    method: "delete",
    params: query,
  });
}
//分页查询量值溯源计划
export function selectDeviceTraceabilityManagementByPage(query) {
  return request({
    url: "/deviceTraceabilityManagement/selectDeviceTraceabilityManagementByPage",
    method: "get",
    params: query,
  });
}
// 量值溯源计划提交批准
export function submitReviewTraceabilityManagementStatus(data) {
  return request({
    url: "/deviceTraceabilityManagement/submitReviewTraceabilityManagementStatus",
    method: "post",
    data: data,
  });
}
//查询量值溯源计划详情
export function getTraceabilityManagementDetail(query) {
  return request({
    url: "/deviceTraceabilityManagement/getTraceabilityManagementDetail",
    method: "get",
    params: query,
  });
}
// 新增量值溯源计划
export function addTraceabilityManagement(data) {
  return request({
    url: "/deviceTraceabilityManagement/addTraceabilityManagement",
    method: "post",
    data: data,
  });
}
// 修改量值溯源计划
export function updateTraceabilityManagement(data) {
  return request({
    url: "/deviceTraceabilityManagement/updateTraceabilityManagement",
    method: "post",
    data: data,
  });
}
// 量值溯源计划审核状态修改
export function reviewTraceabilityManagementStatus(data) {
  return request({
    url: "/deviceTraceabilityManagement/reviewTraceabilityManagementStatus",
    method: "post",
    data: data,
  });
}
//导出量值溯源计划
export function exportDeviceTraceabilityManagement(query) {
  return request({
    url: "/deviceTraceabilityManagement/exportDeviceTraceabilityManagement",
    method: "get",
    responseType: "blob",
    params: query,
  });
}
//删除量值溯源计划
export function deleteTraceabilityManagement(query) {
  return request({
    url: "/deviceTraceabilityManagement/deleteTraceabilityManagement",
    method: "delete",
    params: query,
  });
}
//利用外部设备申请列表
export function pageDeviceExternalApply(query) {
  return request({
    url: "/deviceExternalApply/pageDeviceExternalApply",
    method: "get",
    params: query,
  });
}
//借用外部仪器-导出
export function exportDeviceExternalApply(query) {
  return request({
    url: "/deviceExternalApply/exportDeviceExternalApply",
    method: "get",
    responseType: "blob",
    params: query,
  });
}
//删除利用外部设备申请
export function delDeviceExternalApply(query) {
  return request({
    url: "/deviceExternalApply/delDeviceExternalApply",
    method: "delete",
    params: query,
  });
}
//查询利用外部设备申请
export function getDeviceExternalApply(query) {
  return request({
    url: "/deviceExternalApply/getDeviceExternalApply",
    method: "get",
    params: query,
  });
}
// 新增利用外部设备申请
export function addDeviceExternalApply(data) {
  return request({
    url: "/deviceExternalApply/addDeviceExternalApply",
    method: "post",
    data: data,
  });
}
//cnas设备使用记录分页查询
export function deviceRecordPage(query) {
  return request({
@@ -766,8 +273,15 @@
    params: query,
  });
}
//设备校准 新增 更新
// 设备校准 新增 更新-校准记录
export function addOrUpdateDeviceMetricRecord(data) {
  return request({
    url: "/deviceMetricRecord/addOrUpdateDeviceMetricRecord",
    method: "post",
    data: data,
  });
}
//设备校准 新增 更新-提交项目校准维护
export function saveOrUpdateDeviceMetric(data) {
  return request({
    url: "/deviceMetrics/saveOrUpdateDeviceMetric",
@@ -793,7 +307,6 @@
    params: query,
  });
}
//设备校准 导出
export function deviceMetricRecordExport(query) {
  return request({
@@ -801,6 +314,49 @@
    method: "get",
    responseType: "blob",
    params: query,
  });
}
//设备校准 设备维护表 查询
export function selectDeviceMetric(query) {
  return request({
    url: "/deviceMetrics/selectDeviceMetric",
    method: "get",
    params: query,
  });
}
//设备校准 删除
export function deleteDeviceMetrics(query) {
  return request({
    url: "/deviceMetrics/deleteDeviceMetrics",
    method: "delete",
    params: query,
  });
}
//删除 设备校准-附件
export function delDeviceCalibrationFile(query) {
  return request({
    url: "/personBasicInfo/delDeviceCalibrationFile",
    method: "delete",
    params: query,
  });
}
//设备校准查询-附件
export function getDeviceCalibrationFile(query) {
  return request({
    url: "/personBasicInfo/getDeviceCalibrationFile",
    method: "get",
    params: query,
  });
}
//设备校准导出-附件
export function downLoadDeviceCalibrationFile(query) {
  return request({
    url: "/personBasicInfo/downLoadDeviceCalibrationFile",
    method: "get",
    params: query,
    responseType: "blob"
  });
}
@@ -828,24 +384,6 @@
    url: "/deviceScope/exportDeviceFile",
    method: "get",
    responseType: "blob",
    params: query,
  });
}
//设备校准 设备维护表 查询
export function selectDeviceMetric(query) {
  return request({
    url: "/deviceMetrics/selectDeviceMetric",
    method: "get",
    params: query,
  });
}
//设备校准 删除
export function deleteDeviceMetrics(query) {
  return request({
    url: "/deviceMetrics/deleteDeviceMetrics",
    method: "delete",
    params: query,
  });
}
@@ -1366,36 +904,12 @@
    responseType: "blob"
  });
}
//设备校准导出
export function downLoadDeviceCalibrationFile(query) {
  return request({
    url: "/personBasicInfo/downLoadDeviceCalibrationFile",
    method: "get",
    params: query,
    responseType: "blob"
  });
}
//删除 设备故障
export function deleteDeviceFaultOne(query) {
  return request({
    url: "/deviceFaultOne/deleteDeviceFaultOne",
    method: "delete",
    params: query,
  });
}
//删除 设备校准
export function delDeviceCalibrationFile(query) {
  return request({
    url: "/personBasicInfo/delDeviceCalibrationFile",
    method: "delete",
    params: query,
  });
}
//设备校准查询
export function getDeviceCalibrationFile(query) {
  return request({
    url: "/personBasicInfo/getDeviceCalibrationFile",
    method: "get",
    params: query,
  });
}
src/views/CNAS/resourceDemand/device/component/calibration.vue
@@ -233,23 +233,6 @@
                </el-date-picker>
              </el-form-item>
            </el-col>
            <!-- <el-col :span="17">
              <el-form-item label="附件:" prop="fileName">
                <el-input v-model="calibrationRecord.fileName" :style="`width: ${operationType === 'add' ? '85%' : '100%'};}`" disabled
                          size="small">
                  <el-button v-if="operationType === 'add'" slot="append" icon="el-icon-delete-solid"
                             @click="deleteFile"></el-button>
                </el-input>
                <el-upload v-if="operationType === 'add'" ref="upload" :action="action" :before-upload="beforeUpload" :headers="headers"
                           :limit="1" :on-error="onError" :on-success="handleSuccessUp"
                           :show-file-list="false"
                           style="float: right;">
                  <el-button :loading="upLoading" size="small" style="position: relative; top: -4px;"
                             type="primary">附件上传
                  </el-button>
                </el-upload>
              </el-form-item>
            </el-col> -->
            <el-col :span="24">
              <el-form-item label="备注:">
                <el-input v-model="calibrationRecord.remark" :disabled="operationType === 'view'" :rows="3" size="small" style="width: 96%"
@@ -299,20 +282,6 @@
            </template>
          </el-table-column>
        </el-table>
        <!-- 操作日志 -->
        <!--        <h4>-->
        <!--          <div style="display: flex;-->
        <!--      align-items: center;">-->
        <!--            <span class="line"></span><span>本记录状态和操作日志</span>-->
        <!--          </div>-->
        <!--        </h4>-->
        <!--        <el-table :data="tableDataOperate" style="width: 100%">-->
        <!--          <el-table-column type="index" label="序号" width="100"></el-table-column>-->
        <!--          <el-table-column prop="operator" label="操作人" width="120"></el-table-column>-->
        <!--          <el-table-column prop="operationTime" label="操作时间" width="180"></el-table-column>-->
        <!--          <el-table-column prop="operationType" label="操作类型" width="120"></el-table-column>-->
        <!--          <el-table-column prop="operationContent" label="操作内容"></el-table-column>-->
        <!--        </el-table>-->
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button v-if="operationType === 'add'" @click="dialogVisible1 = false">取 消</el-button>
@@ -423,7 +392,7 @@
  computed: {
    ...mapGetters(["nickName"]),
    action() {
      return this.javaApi + '/personBasicInfo/saveCNASFile'
      return this.javaApi + '/personBasicInfo/saveDeviceCalibrationFile'
    }
  },
  mounted() {
@@ -530,7 +499,7 @@
      this.dialogVisible1 = true
      this.getXmsg()
    },
    // 查看详情
    // 查看编辑详情
    handleViewClick(type, row) {
      showDeviceMetricsCopy({ id: row.id, type: 'calibrate' }).then(res => {
        this.calibrateParams = res.data
@@ -569,27 +538,6 @@
        this.$download.saveAs(blob, '设备校准.xlsx')
      })
    },
    deleteFile() {
      this.$confirm('此操作将永久删除文件, 是否继续?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        deleteCNASFile({ fileName: this.calibrationRecord.systemFileName }).then(res => {
          this.calibrationRecord.fileName = ''
          this.$refs.upload.clearFiles()
          if (res.code == 200) {
            this.$message.success('删除成功!')
          }
        })
      }).catch((err) => {
        console.log('err----', err)
        this.$message({
          type: 'info',
          message: '已取消删除'
        });
      });
    },
    // 校准项目维护
    calibrationMaintenance() {
      this.dialogVisible0 = true
@@ -627,6 +575,7 @@
        this.$message.info('已取消删除');
      })
    },
    // 提交项目校准维护
    addCalibrate() {
      this.$refs['form0'].validate((valid) => {
        if (valid) {
@@ -644,6 +593,8 @@
            }
            this.calibrateParamsLoading = false
            this.addCalibrateLoading = false
          }).catch(() => {
            this.addCalibrateLoading = false
          })
        } else {
          this.addCalibrateLoading = false
@@ -651,6 +602,7 @@
        }
      })
    },
    // 提交校准记录
    addRecord() {
      this.$refs['calibrationRecord'].validate((valid) => {
        if (valid) {
@@ -668,6 +620,10 @@
            this.calibrationRecord.createUser = this.nickName
            this.calibrationRecord.type = 'calibrate'
            this.calibrationRecord.deviceMetricsCopyList = this.calibrateParams
            this.calibrationRecord.deviceMetricsCopyList.forEach(m => {
              delete m.creationTime
            })
            delete this.calibrationRecord.createTime
            addOrUpdateDeviceMetricRecord(this.calibrationRecord).then(res => {
              if (res.code == 200) {
                this.$message.success('添加成功')
@@ -675,6 +631,8 @@
                this.getTableList(this.clickNodeVal.value)
              }
              this.addRecordLoading = false
            }).catch((err) => {
              this.addRecordLoading = false
            })
          } catch (e) {
            console.log('addRecord---', e)