From df559fa4353e312782841302d0281c7c98a81edb Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 22 四月 2025 15:47:58 +0800
Subject: [PATCH] 修改检验任务
---
src/views/business/inspectionTask/components/InspectionWord.vue | 3 +++
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 42 +++++++++++++++++++++---------------------
src/views/business/inspectionTask/inspection.vue | 5 ++++-
src/views/business/inspectionTask/components/NetworkAnalyzerDataAcquisition.vue | 8 +++++---
4 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 62249bb..eb3fe36 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -148,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>
@@ -156,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>
@@ -455,9 +455,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() {
@@ -514,18 +514,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 (
@@ -582,15 +582,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 => {
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 217d493..e938b4c 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -1403,6 +1403,9 @@
// 瀹氫箟涓�涓嚱鏁版潵楠岃瘉鍒嗘暟鏄惁鏈夋晥
if (typeof n.v.v == 'string') {
function isValidFraction(fraction) {
+ if (typeof fraction == 'number') {
+ return true
+ }
const [numerator, denominator] = fraction.split('/'); // 鍒嗗瓙鍜屽垎姣�
return !(!denominator || !numerator);
}
diff --git a/src/views/business/inspectionTask/components/NetworkAnalyzerDataAcquisition.vue b/src/views/business/inspectionTask/components/NetworkAnalyzerDataAcquisition.vue
index 486c731..02477a9 100644
--- a/src/views/business/inspectionTask/components/NetworkAnalyzerDataAcquisition.vue
+++ b/src/views/business/inspectionTask/components/NetworkAnalyzerDataAcquisition.vue
@@ -12,7 +12,8 @@
</el-form-item>
<el-form-item label="閫氶亾" prop="memoryDir">
<el-select v-model="form.memoryDir" placeholder="璇烽�夋嫨">
- <el-option :label="item" :value="item" v-for="(item, index) in channel" :key="index"></el-option>
+ <el-option v-for="(a, ai) in dict.type.domestic_network_analyzers" :key="ai" :label="a.label"
+ :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-form>
@@ -32,6 +33,7 @@
getTCPValuesNew
} from "@/api/business/inspectionTask.js";
export default {
+ dicts: ['domestic_network_analyzers'],
props: ['itemList', 'param', 'equipOptions'],
data() {
return {
@@ -39,7 +41,7 @@
itemListNew: [],
dialogVisible: false,
form: {},
- channel: [],
+ // channel: [],
rules: {
memoryDir: [
{ required: true, message: '璇烽�夋嫨閫氶亾', trigger: 'change' }
@@ -87,7 +89,7 @@
serverPort: equip.port,
memoryDir: null
}
- this.channel = equip.channel ? equip.channel.split(',') : []
+ // this.channel = equip.channel ? equip.channel.split(',') : []
this.dialogVisible = true
}
},
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index aef7565..f31cae6 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -290,7 +290,7 @@
state == 1
"><span :style="`font-family:${n.v.ff} !important;`">{{
toFixed(n.v.v, n.v.ct)
- }}</span></template>
+ }}</span></template>
<template v-else-if="
n.v.ps != undefined &&
n.v.ps.value === '鏈�缁堝��' &&
@@ -2277,6 +2277,9 @@
// 瀹氫箟涓�涓嚱鏁版潵楠岃瘉鍒嗘暟鏄惁鏈夋晥
if (typeof n.v.v == "string") {
function isValidFraction(fraction) {
+ if (typeof fraction == 'number') {
+ return true
+ }
const [numerator, denominator] = fraction.split("/"); // 鍒嗗瓙鍜屽垎姣�
return !(!denominator || !numerator);
}
--
Gitblit v1.9.3