From 0885aa811a94cae8d7473c9b2957a447110c9b1d Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 18 四月 2025 11:17:08 +0800
Subject: [PATCH] 网分仪数采20%
---
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 142 ++++++++++++++++++++++++++++++++---------------
1 files changed, 96 insertions(+), 46 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 5c1b33e..e149b1b 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -28,13 +28,24 @@
<el-table-column prop="inspectionItemClass" align="center" label="妫�楠岄」鍒嗙被" min-width="120"></el-table-column>
<el-table-column prop="inspectionItem" align="center" label="妫�楠岄」" min-width="100"></el-table-column>
<el-table-column prop="inspectionItemSubclass" align="center" label="妫�楠屽瓙椤�" min-width="100"></el-table-column>
- <el-table-column prop="referx" align="center" label="鍙傜収X" min-width="100"></el-table-column>
- <el-table-column prop="x" align="center" label="X"></el-table-column>
- <el-table-column prop="refery" align="center" label="鍙傜収Y" min-width="100"></el-table-column>
- <el-table-column prop="y" align="center" label="Y"></el-table-column>
- <el-table-column prop="anotherName" align="center" label="鍒悕" min-width="100"></el-table-column>
- <el-table-column prop="matchingName" align="center" label="鍖归厤鍚嶇О" min-width="100"></el-table-column>
- <el-table-column prop="formula" align="center" label="鍏紡"></el-table-column>
+ <el-table-column prop="importedParts" align="center" label="閮ㄤ綅" min-width="100"
+ v-if="deviceName && deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="importedChannel" align="center" label="閫氶亾" min-width="100"
+ v-if="deviceName && deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="referx" align="center" label="鍙傜収X" min-width="100"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="x" align="center" label="X"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="refery" align="center" label="鍙傜収Y" min-width="100"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="y" align="center" label="Y"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="anotherName" align="center" label="鍒悕" min-width="100"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="matchingName" align="center" label="鍖归厤鍚嶇О" min-width="100"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="formula" align="center" label="鍏紡"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="120" align="center">
<template slot-scope="scope">
<el-button type="text" @click="dataConfig(scope.row)">鏁伴噰閰嶇疆</el-button>
@@ -127,7 +138,7 @@
<div class="search_thing" style="margin-bottom: 14px;" v-if="deviceName && deviceName.includes('缃戠粶鍒嗘瀽')">
<div class="search_label"><span style="color:red;margin-right: 4px;">*</span>绔彛锛�
</div>
- <el-input size="small" placeholder="璇疯緭鍏�(缃戠粶鍒嗘瀽浠繀濉�)" clearable v-model="configForm.port"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.port"></el-input>
</div>
<div class="search_thing" style="margin-bottom: 14px;" v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')">
<div class="search_label">
@@ -173,6 +184,25 @@
<el-row>
<el-button @click="dialogVisible4 = false">鍙� 娑�</el-button>
<el-button type="primary" @click="submitForm4" :loading="upLoad4">纭� 瀹�</el-button>
+ </el-row>
+ </span>
+ </el-dialog>
+ <el-dialog title="鏁伴噰閰嶇疆" :visible.sync="dialogVisible5" width="400px">
+ <div class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label">
+ <span style="color:red;margin-right: 4px;">*</span>閮ㄤ綅锛�
+ </div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.importedParts"></el-input>
+ </div>
+ <div class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>閫氶亾锛�
+ </div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.importedChannel"></el-input>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="dialogVisible5 = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm5" :loading="upLoad5">纭� 瀹�</el-button>
</el-row>
</span>
</el-dialog>
@@ -316,7 +346,9 @@
}
},
deleteList: [],
- channelList: []
+ channelList: [],
+ dialogVisible5: false,
+ upLoad5: false,
};
},
// 鏂规硶闆嗗悎
@@ -576,46 +608,52 @@
structureItemParameterId: row.structureItemParameterId,
inspectionItemClass: row.inspectionItemClass,
};
- this.dialogVisible3 = true;
- queryDataAcquisitionConfiguration({
- deviceId: this.deviceId,
- inspectionItem: row.inspectionItem.trim(),
- isDevice: true,
- inspectionItemSubclass: row.inspectionItemSubclass.trim(),
- inspectionItemClass: row.inspectionItemClass ? row.inspectionItemClass.trim() : '',
- structureItemParameterId: row.structureItemParameterId
- }).then(res => {
- const data = res.data;
- if (data[0]) {
- this.domains.splice(0, 1);
- let formula = data[0].formula
- let isIncludes = false
- if (formula && formula != "") {
- for (let key in this.formulas) {
- if (formula.includes(this.formulas[key].label)) {
- isIncludes = true
+ if (this.deviceName && this.deviceName.includes('缃戠粶鍒嗘瀽')) {
+ this.dialogVisible5 = true;
+ this.$set(this.configForm, 'importedParts', row.importedParts ? row.importedParts : '')
+ this.$set(this.configForm, 'importedChannel', row.importedChannel ? row.importedChannel : '')
+ } else {
+ this.dialogVisible3 = true;
+ queryDataAcquisitionConfiguration({
+ deviceId: this.deviceId,
+ inspectionItem: row.inspectionItem.trim(),
+ isDevice: true,
+ inspectionItemSubclass: row.inspectionItemSubclass.trim(),
+ inspectionItemClass: row.inspectionItemClass ? row.inspectionItemClass.trim() : '',
+ structureItemParameterId: row.structureItemParameterId
+ }).then(res => {
+ const data = res.data;
+ if (data[0]) {
+ this.domains.splice(0, 1);
+ let formula = data[0].formula
+ let isIncludes = false
+ if (formula && formula != "") {
+ for (let key in this.formulas) {
+ if (formula.includes(this.formulas[key].label)) {
+ isIncludes = true
+ }
}
}
- }
- if (!isIncludes && formula) {
- let formulaValue = formula.slice(1, -1)
- this.$set(this.configForm, "formula", formulaValue);
- } else {
- this.$set(this.configForm, "formula", data[0].formula);
- }
- data.forEach(i => {
- this.domains.push({
- referx: i.referx,
- refery: i.refery,
- x: i.x,
- y: i.y,
- anotherName: i.anotherName,
- matchingName: i.matchingName,
- id: i.id
+ if (!isIncludes && formula) {
+ let formulaValue = formula.slice(1, -1)
+ this.$set(this.configForm, "formula", formulaValue);
+ } else {
+ this.$set(this.configForm, "formula", data[0].formula);
+ }
+ data.forEach(i => {
+ this.domains.push({
+ referx: i.referx,
+ refery: i.refery,
+ x: i.x,
+ y: i.y,
+ anotherName: i.anotherName,
+ matchingName: i.matchingName,
+ id: i.id
+ });
});
- });
- }
- });
+ }
+ });
+ }
},
submitForm3() {
this.$refs.configForm.validate(valid => {
@@ -725,6 +763,18 @@
];
this.dialogVisible3 = false;
this.$refs.configForm.resetFields();
+ },
+ submitForm5() {
+ saveDataAcquisitionConfiguration({
+ deviceId: this.deviceId,
+ isDevice: true,
+ importedParts: this.configForm.importedParts,
+ importedChannel: this.configForm.importedChannel,
+ }).then(res => {
+ this.dialogVisible5 = false;
+ this.init();
+ this.$message.success("娣诲姞鎴愬姛");
+ });
}
}
};
--
Gitblit v1.9.3