From 3a05fd672f3cf6fcd847e28d93ad3e3b9c01fea2 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 16 四月 2025 15:58:32 +0800
Subject: [PATCH] 网络分析仪
---
src/views/CNAS/resourceDemand/device/component/management.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 07ac2d6..649138e 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -387,7 +387,7 @@
</el-row>
</span>
</el-dialog>
- <dataAcquisitionConfig v-if="showData" :deviceId="deviceId" />
+ <dataAcquisitionConfig v-if="showData" :deviceId="deviceId" :deviceName="deviceName" />
</div>
</template>
@@ -423,6 +423,7 @@
uploadAction: process.env.VUE_APP_BASE_API + '/deviceScope/importDevice',
dateFormat: 'yyyy-MM-dd',
deviceId: '',
+ deviceName: '',
fileTypeOptions: [
{ label: 'csv', value: '.csv' },
{ label: 'db', value: '.db' },
@@ -490,10 +491,10 @@
{ label: "鎵�灞為儴闂�", prop: "laboratoryName" },
{ label: "妫�楠岄」鐩�", prop: "insProductItem" },
{ label: "鏍″噯鏈嶅姟鏈烘瀯", prop: "calibrationServices" },
- { label: "鏈�杩戞牎鍑嗘棩鏈�", prop: "lastCalibrationDateTwo" },
- { label: "鏈�杩戞牳鏌ユ棩鏈�", prop: "lastCalibrationDate" },
- { label: "涓嬫鏍″噯鏃ユ湡", prop: "nextCalibrationDateTwo" },
- { label: "涓嬫鏍告煡鏃ユ湡", prop: "nextCalibrationDate" },
+ { label: "鏈�杩戞牎鍑嗘棩鏈�", prop: "lastCalibrationDate" },
+ { label: "鏈�杩戞牳鏌ユ棩鏈�", prop: "lastCalibrationDateTwo" },
+ { label: "涓嬫鏍″噯鏃ユ湡", prop: "nextCalibrationDate" },
+ { label: "涓嬫鏍告煡鏃ユ湡", prop: "nextCalibrationDateTwo" },
{
label: "璁惧鍒嗙被", prop: "largeCategory", dataType: "tag",
formatData: (params) => {
@@ -819,7 +820,7 @@
delete this.formData.updateUser
const formData = this.HaveJson(this.formData)
formData.insProductIds = formData.insProductIds ? formData.insProductIds.join() : ''
- if (formData.authorizedPerson.length === 0) {
+ if (!formData.authorizedPerson || formData.authorizedPerson.length === 0) {
formData.authorizedPerson = ''
} else {
formData.authorizedPerson = JSON.stringify(formData.authorizedPerson)
@@ -868,7 +869,7 @@
}
const formData = this.HaveJson(this.formData2)
formData.insProductIds = formData.insProductIds ? formData.insProductIds.join() : ''
- if (formData.authorizedPerson.length === 0) {
+ if (!formData.authorizedPerson || formData.authorizedPerson.length === 0) {
formData.authorizedPerson = ''
} else {
formData.authorizedPerson = JSON.stringify(formData.authorizedPerson)
@@ -905,6 +906,7 @@
})
this.tableList = list2
this.deviceId = row.id
+ this.deviceName = row.deviceName
this.$nextTick(() => {
this.showData = true
})
--
Gitblit v1.9.3