From 4ae5681e4a92c1cc98e811135098c71958c48a02 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 30 四月 2025 10:04:51 +0800
Subject: [PATCH] 可靠性计划优化检验项
---
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 74 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 32 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index e149b1b..dd18e33 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -17,12 +17,14 @@
:span-method="spanMethod">
<el-table-column type="index" label="搴忓彿" align="center" width="65"></el-table-column>
<el-table-column prop="deviceName" align="center" min-width="100" label="璁惧鍚嶇О"></el-table-column>
- <el-table-column prop="fileType" align="center" label="鏂囦欢鍚庣紑"></el-table-column>
- <el-table-column prop="collectUrl" align="center" min-width="100" show-overflow-tooltip
- label="閲囬泦鍦板潃"></el-table-column>
- <el-table-column prop="storageUrl" align="center" min-width="100" show-overflow-tooltip
- label="瀛樺偍鍦板潃"></el-table-column>
- <el-table-column prop="ip" align="center" label="IP鍦板潃" min-width="100"></el-table-column>
+ <el-table-column prop="fileType" align="center" label="鏂囦欢鍚庣紑"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="collectUrl" align="center" min-width="100" show-overflow-tooltip label="閲囬泦鍦板潃"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="storageUrl" align="center" min-width="100" show-overflow-tooltip label="瀛樺偍鍦板潃"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
+ <el-table-column prop="ip" align="center" label="IP鍦板潃" min-width="100"
+ v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')"></el-table-column>
<el-table-column prop="sample" align="center" label="妫�楠屽璞�" show-overflow-tooltip
min-width="150"></el-table-column>
<el-table-column prop="inspectionItemClass" align="center" label="妫�楠岄」鍒嗙被" min-width="120"></el-table-column>
@@ -146,7 +148,7 @@
</div>
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.collectUrl"></el-input>
</div>
- <div class="search_thing" style="margin-bottom: 14px;" v-if="deviceName && deviceName.includes('缃戠粶鍒嗘瀽')">
+ <!-- <div class="search_thing" style="margin-bottom: 14px;" v-if="deviceName && deviceName.includes('缃戠粶鍒嗘瀽')">
<div class="search_label" style="width: 130px;">
<span style="color:red;margin-right: 4px;">*</span>缃戝垎浠噰闆嗛�氶亾锛�
</div>
@@ -154,7 +156,7 @@
<el-option v-for="(item, index) in channelList" :key="index" :label="item" :value="item">
</el-option>
</el-select>
- </div>
+ </div> -->
<div class="search_thing" style="margin-bottom: 14px;" v-if="deviceName && !deviceName.includes('缃戠粶鍒嗘瀽')">
<div class="search_label">鍌ㄥ瓨鍦板潃锛�</div>
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.storageUrl"></el-input>
@@ -296,9 +298,13 @@
{ label: "db", value: ".db" },
{ label: "mdb", value: ".mdb" },
{ label: "word", value: ".docx" },
- { label: "excel", value: ".xlsx" },
+ // { label: "excel", value: ".xlsx" },
+ { label: "xlsx", value: ".xlsx" },
{ label: "txt", value: ".txt" },
- { label: "png", value: ".png" }
+ { label: "png", value: ".png" },
+ { label: "et", value: ".et" },
+ { label: "xls", value: ".xls" },
+ { label: "pdf", value: ".pdf" }
],
spanList: [],
specialSpanList: [],
@@ -349,6 +355,7 @@
channelList: [],
dialogVisible5: false,
upLoad5: false,
+ currentInfo: {}
};
},
// 鏂规硶闆嗗悎
@@ -449,9 +456,9 @@
this.tableList[0].fiberOpticRibbon
)
this.$set(this.configForm, "port", this.tableList[0].port);
- let arr = this.tableList[0].channel ? this.tableList[0].channel.split(',') : []
- this.$set(this.configForm, "channel", arr);
- this.channelList = arr
+ // let arr = this.tableList[0].channel ? this.tableList[0].channel.split(',') : []
+ // this.$set(this.configForm, "channel", arr);
+ // this.channelList = arr
}
},
init() {
@@ -508,18 +515,18 @@
"fiberOpticRibbon",
this.tableList[0].fiberOpticRibbon
)
- let arr = this.tableList[0].channel ? this.tableList[0].channel.split(',') : []
- this.$set(
- this.configForm,
- "channel",
- arr
- )
- this.$set(
- this.configForm,
- "port",
- this.tableList[0].port
- )
- this.channelList = arr;
+ // let arr = this.tableList[0].channel ? this.tableList[0].channel.split(',') : []
+ // this.$set(
+ // this.configForm,
+ // "channel",
+ // arr
+ // )
+ // this.$set(
+ // this.configForm,
+ // "port",
+ // this.tableList[0].port
+ // )
+ // this.channelList = arr;
}
// 涓�鑸殑鍚堝苟琛�
if (
@@ -576,15 +583,15 @@
dbFileName: this.configForm.dbFileName,
fiberOpticRibbon: this.configForm.fiberOpticRibbon,
port: this.configForm.port,
- channel: this.configForm.channel
+ // channel: this.configForm.channel
});
if (this.deviceName && this.deviceName.includes('缃戠粶鍒嗘瀽')) {
if (!this.configForm.port) {
return this.$message.error("璇峰～鍐欑鍙�");
}
- if (!this.configForm.channel || !this.configForm.channel.length) {
- return this.$message.error("璇峰～鍐欑綉鍒嗕华閲囬泦閫氶亾");
- }
+ // if (!this.configForm.channel || !this.configForm.channel.length) {
+ // return this.$message.error("璇峰～鍐欑綉鍒嗕华閲囬泦閫氶亾");
+ // }
}
this.upLoad4 = true;
saveDataAcquisitionConfiguration({ deviceId: this.deviceId, ...obj }).then(res => {
@@ -609,6 +616,7 @@
inspectionItemClass: row.inspectionItemClass,
};
if (this.deviceName && this.deviceName.includes('缃戠粶鍒嗘瀽')) {
+ this.currentInfo = row
this.dialogVisible5 = true;
this.$set(this.configForm, 'importedParts', row.importedParts ? row.importedParts : '')
this.$set(this.configForm, 'importedChannel', row.importedChannel ? row.importedChannel : '')
@@ -765,11 +773,13 @@
this.$refs.configForm.resetFields();
},
submitForm5() {
+ this.currentInfo.importedParts = this.configForm.importedParts
+ this.currentInfo.importedChannel = this.configForm.importedChannel
+ this.currentInfo.deviceId = this.deviceId
saveDataAcquisitionConfiguration({
deviceId: this.deviceId,
- isDevice: true,
- importedParts: this.configForm.importedParts,
- importedChannel: this.configForm.importedChannel,
+ isDevice: false,
+ dataConfigList: [{ ...this.currentInfo }],
}).then(res => {
this.dialogVisible5 = false;
this.init();
--
Gitblit v1.9.3