0017
/
gy-gateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(南向采集): 调整数据类型、添加PluginTCP协议

This commit is contained in:
fhysy 2024-12-20 15:38:59 +08:00
parent 3475218827
commit 2ab0ffeb51
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/views/gateway/southdirection.vue
View File

@ -367,34 +367,39 @@ import { getDeviceConf, getSerialPortDataList, setDeviceConf } from '/@/api/gate
const dataTypeArray = ref([ const dataTypeArray = ref([
{ type: 'bool', datalen: 1, show: false }, { type: 'bool', datalen: 1, show: false },
{ type: 'char', datalen: 1, show: false },
{ type: 'string', datalen: null, show: true },
{ type: 'int8', datalen: 1, show: false }, { type: 'int8', datalen: 1, show: false },
{ type: 'uint8', datalen: 1, show: false }, { type: 'uint8', datalen: 1, show: false },
{ type: 'int16', datalen: 2, show: false }, { type: 'int16', datalen: 2, show: false },
{ type: 'uint16', datalen: 2, show: false },
{ type: 'float', datalen: 4, show: false },
{ type: 'int32', datalen: 4, show: false },
{ type: 'uint32', datalen: 4, show: false },
{ type: 'int64', datalen: 8, show: false },
{ type: 'uint64', datalen: 8, show: false },
{ type: 'double', datalen: 8, show: false },
{ type: 'char', datalen: 1, show: false },
{ type: 'string', datalen: null, show: true },
{ type: 'int16_AB', datalen: 2, show: false }, { type: 'int16_AB', datalen: 2, show: false },
{ type: 'int16_BA', datalen: 2, show: false }, { type: 'int16_BA', datalen: 2, show: false },
{ type: 'uint16', datalen: 2, show: false },
{ type: 'uint16_AB', datalen: 2, show: false }, { type: 'uint16_AB', datalen: 2, show: false },
{ type: 'uint16_BA', datalen: 2, show: false }, { type: 'uint16_BA', datalen: 2, show: false },
{ type: 'float_ABCD', datalen: 4, show: false }, { type: 'float', datalen: 4, show: false },
{ type: 'float_BADC', datalen: 4, show: false }, { type: 'float32_ABCD', datalen: 4, show: false },
{ type: 'float_CDAB', datalen: 4, show: false }, { type: 'float32_BADC', datalen: 4, show: false },
{ type: 'float_DCBA', datalen: 4, show: false }, { type: 'float32_CDAB', datalen: 4, show: false },
{ type: 'float32_DCBA', datalen: 4, show: false },
{ type: 'float64_ABCD', datalen: 4, show: false },
{ type: 'float64_BADC', datalen: 4, show: false },
{ type: 'float64_CDAB', datalen: 4, show: false },
{ type: 'float64_DCBA', datalen: 4, show: false },
{ type: 'int32', datalen: 4, show: false },
{ type: 'int32_ABCD', datalen: 4, show: false }, { type: 'int32_ABCD', datalen: 4, show: false },
{ type: 'int32_BADC', datalen: 4, show: false }, { type: 'int32_BADC', datalen: 4, show: false },
{ type: 'int32_CDAB', datalen: 4, show: false }, { type: 'int32_CDAB', datalen: 4, show: false },
{ type: 'int32_DCBA', datalen: 4, show: false }, { type: 'int32_DCBA', datalen: 4, show: false },
{ type: 'uint32', datalen: 4, show: false },
{ type: 'uint32_ABCD', datalen: 4, show: false }, { type: 'uint32_ABCD', datalen: 4, show: false },
{ type: 'uint32_BADC', datalen: 4, show: false }, { type: 'uint32_BADC', datalen: 4, show: false },
{ type: 'uint32_CDAB', datalen: 4, show: false }, { type: 'uint32_CDAB', datalen: 4, show: false },
{ type: 'uint32_DCBA', datalen: 4, show: false }, { type: 'uint32_DCBA', datalen: 4, show: false },
{ type: 'int64', datalen: 8, show: false },
{ type: 'uint64', datalen: 8, show: false },
// { type: 'double', datalen: 8, show: false },
]); ]);
//上报策略 //上报策略
@ -423,6 +428,7 @@ const deviceConfigList = ref([]);
const protocolList = ref([ const protocolList = ref([
{ label: 'ModbusTCP', value: 'ModbusTCP' }, { label: 'ModbusTCP', value: 'ModbusTCP' },
{ label: 'PluginTCP', value: 'PluginTCP' },
{ label: 'DLT645_2007', value: 'DLT645_2007' }, { label: 'DLT645_2007', value: 'DLT645_2007' },
{ label: 'gycan', value: 'gycan' }, { label: 'gycan', value: 'gycan' },
]); ]);
@ -687,7 +693,7 @@ const openConnectModel = (row) => {
} }
// getSerialPortList() // getSerialPortList()
dlt645ModelShow.value = true; dlt645ModelShow.value = true;
} else if (row.protocol.libName === 'ModbusTCP') { } else if (row.protocol.libName === 'ModbusTCP' || row.protocol.libName === 'PluginTCP') {
tcpForm.value.link = row.interfaceParams.link; tcpForm.value.link = row.interfaceParams.link;
tcpModelShow.value = true; tcpModelShow.value = true;
} else { } else {
@ -731,7 +737,7 @@ const activeDeviceConfig = ref({
authority: 'RW', // 读写权限 authority: 'RW', // 读写权限
dataAddress: '', // 数据地址 dataAddress: '', // 数据地址
dataDesc: '', // 数据描述 dataDesc: '', // 数据描述
dataDisplay: 'int16', // 数据展示格式 dataDisplay: 'uint8', // 数据展示格式
dataName: '', // 数据名称 dataName: '', // 数据名称
dataUnit: '', // 数据单位 dataUnit: '', // 数据单位
driveFlag: { isConclude_R: true, isConclude_W: true }, // 驱动标志 driveFlag: { isConclude_R: true, isConclude_W: true }, // 驱动标志
@ -757,7 +763,7 @@ const addDeviceDataConfig = () => {
authority: 'RW', // 读写权限 authority: 'RW', // 读写权限
dataAddress: '', // 数据地址 dataAddress: '', // 数据地址
dataDesc: '', // 数据描述 dataDesc: '', // 数据描述
dataDisplay: 'int16', // 数据展示格式 dataDisplay: 'uint8', // 数据展示格式
datalen: 2, // 数据长度 datalen: 2, // 数据长度
datalenShow: false, // 数据长度是否可编辑 datalenShow: false, // 数据长度是否可编辑
dataName: '', // 数据名称 dataName: '', // 数据名称

3
vite.config.js
View File

@ -22,7 +22,8 @@ const viteConfig = defineConfig((mode) => {
})], })],
root: process.cwd(), root: process.cwd(),
resolve: { alias }, resolve: { alias },
base: mode.command === 'serve' ? '/gy-gateway' : '/gy-gateway', // base: mode.command === 'serve' ? '/gy-gateway' : '/gy-gateway',
base: mode.command === 'serve' ? '/gy-gateway' : '/',
optimizeDeps: { optimizeDeps: {
exclude: ['vue-demi'], exclude: ['vue-demi'],
}, },