From 8176c7367906605c4cff8192f2d104ea93d51e9d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 12 三月 2025 14:54:33 +0800
Subject: [PATCH] 设备搬迁-设备校准联调
---
src/views/CNAS/resourceDemand/device/component/calibration.vue | 66 ++++++---------------------------
1 files changed, 12 insertions(+), 54 deletions(-)
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