0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-dictionary

This commit is contained in:
XieYongHong 2023-11-15 14:05:14 +08:00
parent 8294b83437 884e8918e8
commit 697c13f713
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/DataCollect/Collector/Point/Save/SaveS7.vue
View File

@ -46,7 +46,7 @@
placeholder="请输入字符串长度" :precision="0" :controls="false" :maxlength="64" :disabled="disabled" />
</j-form-item>
<j-form-item v-if="form.type == 'Bool'" label="位偏移量（bit）" :name="['configuration', 'bits']" :rules="{
<j-form-item v-if="form.configuration.type == 'Bool'" label="位偏移量（bit）" :name="['configuration', 'bits']" :rules="{
required: true,
message: '请输入0~7之间的正整数',
trigger: 'blur',
@ -189,6 +189,7 @@ const form = ref<any>({
type: undefined,
interval: 3000,
areaNumber: undefined,
bytes:undefined,
terms: []
},
accessModes: [],
@ -267,10 +268,14 @@ const handleCancelInterval = () => {
const handleOk = async () => {
const res = await formRef.value?.validate();
const res:any = await formRef.value?.validate();
const params = {
...res,
configuration:{
...res.configuration,
bytes:res.configuration.bytes || form.value.configuration.bytes
},
inheritBreaker: true,
pointKey: props.data.pointKey || randomString(9),
provider:props.data.provider,

2
src/views/DataCollect/Collector/Tree/Save/index.vue
View File

@ -45,7 +45,7 @@
<j-input v-model:value="formData.configuration.host" autocomplete="off" placeholder="请输入通道IP" :disabled="false"/>
</j-form-item>
<j-form-item v-if="provider === 'snap7'" label="端口" :name="['configuration', 'port']" :rules="LeftTreeRules.port">
<j-input-number style="width: 100%" v-model:value="formData.configuration.port" autocomplete="off" placeholder="请输入通道端口"/>
<j-input-number style="width: 100%" v-model:value="formData.configuration.port" :precision="0" autocomplete="off" placeholder="请输入通道端口"/>
</j-form-item>
<j-form-item v-if="provider === 'snap7'" label="机架号" :name="['configuration', 'rack']" :rules="LeftTreeRules.rack">
<j-input-number style="width: 100%" v-model:value="formData.configuration.rack" autocomplete="off" placeholder="请输入机架号" :maxlength="64" />