diff --git a/public/images/DataCollect/IEC104.png b/public/images/DataCollect/IEC104.png new file mode 100644 index 00000000..fd8b1454 Binary files /dev/null and b/public/images/DataCollect/IEC104.png differ diff --git a/src/utils/consts.ts b/src/utils/consts.ts index c87d2cae..ac738daf 100644 --- a/src/utils/consts.ts +++ b/src/utils/consts.ts @@ -58,4 +58,5 @@ export const protocolList = [ { label: 'MODBUS_TCP', value: 'MODBUS_TCP', alias: 'Modbus/TCP' }, { label: 'COLLECTOR_GATEWAY', value: 'COLLECTOR_GATEWAY', alias: 'GATEWAY' }, { label: 'S7', value: 'snap7', alias: 'snap7' }, + { label: 'IEC104', value: 'iec104', alias: 'IEC104' } ] diff --git a/src/views/DataCollect/Channel/Save/index.vue b/src/views/DataCollect/Channel/Save/index.vue index 42ee9a87..b9cfda66 100644 --- a/src/views/DataCollect/Channel/Save/index.vue +++ b/src/views/DataCollect/Channel/Save/index.vue @@ -249,6 +249,8 @@ const handleOk = async () => { params.configuration={ connect : false } + } else { + params.configuration = {} } params.circuitBreaker = { @@ -316,7 +318,7 @@ const getProvidersList = async () => { if (resp.status === 200) { const arr = resp.result .filter( - (item: any) => ['GATEWAY', 'Modbus/TCP', 'opc-ua','snap7'].includes(item.name), + (item: any) => ['GATEWAY', 'Modbus/TCP', 'opc-ua','snap7', 'IEC104'].includes(item.name), ) .map((it: any) => it.name); const providers: any = protocolList.filter((item: any) => diff --git a/src/views/DataCollect/Channel/index.vue b/src/views/DataCollect/Channel/index.vue index 0ec2378e..7229d70c 100644 --- a/src/views/DataCollect/Channel/index.vue +++ b/src/views/DataCollect/Channel/index.vue @@ -67,9 +67,9 @@
- {{ slotProps.provider }} + {{ protocolList.find(item => item.value === slotProps.provider)?.label }}
@@ -103,9 +103,11 @@
说明
-
- {{slotProps.description}} -
+ +
+ {{slotProps.description}} +
+
@@ -161,10 +163,12 @@ const opcImage = getImage('/DataCollect/device-opcua.png'); const modbusImage = getImage('/DataCollect/device-modbus.png'); const s7Image = getImage('/DataCollect/s7.png') const gatewayImage = getImage('/DataCollect/gateway.png') +const iecImage = getImage('/DataCollect/IEC104.png') const ImageMap = new Map() ImageMap.set('OPC_UA',opcImage) ImageMap.set('MODBUS_TCP',modbusImage) ImageMap.set('snap7',s7Image) +ImageMap.set('iec104',iecImage) ImageMap.set('COLLECTOR_GATEWAY',gatewayImage) @@ -367,6 +371,9 @@ const handleSearch = (e: any) => { text-overflow: ellipsis; //溢出用省略号显示 white-space: nowrap; //溢出不换行 } + .explain { + margin-top: 10px; + } } .details-text { font-weight: 700; diff --git a/src/views/DataCollect/Collector/Point/Save/SaveIEC104.vue b/src/views/DataCollect/Collector/Point/Save/SaveIEC104.vue new file mode 100644 index 00000000..ea569dca --- /dev/null +++ b/src/views/DataCollect/Collector/Point/Save/SaveIEC104.vue @@ -0,0 +1,263 @@ + + diff --git a/src/views/DataCollect/Collector/Point/Save/SaveS7.vue b/src/views/DataCollect/Collector/Point/Save/SaveS7.vue index c64080f3..dcc7f498 100644 --- a/src/views/DataCollect/Collector/Point/Save/SaveS7.vue +++ b/src/views/DataCollect/Collector/Point/Save/SaveS7.vue @@ -97,20 +97,14 @@

采集频率采集频率为0时不执行轮询任务

- - - 3000ms - 6000ms - 9000ms - - {{ - ![3000, 6000, 9000].includes(form.configuration.interval) - ? form.configuration.interval + 'ms' - : '自定义' - }} - - - + @@ -121,17 +115,6 @@ - - - - - - - -