From f4fb56d0a8701990081ad0e8baba766fb81ab634 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 15 四月 2025 10:22:01 +0800
Subject: [PATCH] 修改设备
---
src/views/CNAS/resourceDemand/device/component/management.vue | 4 ++--
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 38a545c..c01e5c5 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -12,9 +12,9 @@
</el-row>
</div>
<div class="table">
- <el-table :data="tableList.slice((page.current - 1) * page.size,page.current * page.size)"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- tooltip-effect="dark" height="100%" :span-method="spanMethod">
+ <el-table :data="tableList.slice((page.current - 1) * page.size, page.current * page.size)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border tooltip-effect="dark" height="100%"
+ :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>
@@ -52,7 +52,7 @@
<el-form :model="configForm" label-position="top" size="small" ref="configForm" label-width="100px"
class="demo-ruleForm">
<el-table :data="domains" style="width: 100%" height="300"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="80">
<template v-slot="scope">
{{ getIndexWithAlphabet(scope.$index) }}
@@ -535,7 +535,7 @@
inspectionItem: row.inspectionItem.trim(),
isDevice: true,
inspectionItemSubclass: row.inspectionItemSubclass.trim(),
- inspectionItemClass: row.inspectionItemClass.trim(),
+ inspectionItemClass: row.inspectionItemClass ? row.inspectionItemClass.trim() : '',
structureItemParameterId: row.structureItemParameterId
}).then(res => {
const data = res.data;
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 42ff186..61caf79 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -819,7 +819,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 +868,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)
--
Gitblit v1.9.3