From 8176c7367906605c4cff8192f2d104ea93d51e9d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 12 三月 2025 14:54:33 +0800
Subject: [PATCH] 设备搬迁-设备校准联调
---
src/api/cnas/resourceDemand/device.js | 592 ++++-------------------------------------------------
src/views/CNAS/resourceDemand/device/component/calibration.vue | 66 +----
2 files changed, 65 insertions(+), 593 deletions(-)
diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index 6a5786a..82376f5 100644
--- a/src/api/cnas/resourceDemand/device.js
+++ b/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,
});
}
diff --git a/src/views/CNAS/resourceDemand/device/component/calibration.vue b/src/views/CNAS/resourceDemand/device/component/calibration.vue
index c522343..5f4fd0e 100644
--- a/src/views/CNAS/resourceDemand/device/component/calibration.vue
+++ b/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)
--
Gitblit v1.9.3