fix: bug#20763、20736、20731
This commit is contained in:
parent
9e59fd19bc
commit
262a591cfd
|
@ -163,6 +163,7 @@
|
||||||
v-if="provider !== 'snap7'"
|
v-if="provider !== 'snap7'"
|
||||||
:name="['configuration', 'requestTimeout']"
|
:name="['configuration', 'requestTimeout']"
|
||||||
:rules="LeftTreeRules.requestTimeout"
|
:rules="LeftTreeRules.requestTimeout"
|
||||||
|
label='请求超时时间'
|
||||||
>
|
>
|
||||||
<j-input-number
|
<j-input-number
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
clipOrigin: [459, 92],
|
clipOrigin: [459, 92],
|
||||||
clipSize: [50, 68],
|
clipSize: [50, 68],
|
||||||
}"
|
}"
|
||||||
>123</el-amap-label-marker
|
></el-amap-label-marker
|
||||||
>
|
>
|
||||||
</AmapComponent>
|
</AmapComponent>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -50,7 +50,7 @@ const handleOk = async () => {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
const res = await savePluginData(
|
const res = await savePluginData(
|
||||||
'device',
|
'device',
|
||||||
props.pluginId!,
|
props.accessId!,
|
||||||
route.params.id as string,
|
route.params.id as string,
|
||||||
checkKey.value
|
checkKey.value
|
||||||
).catch(() => ({ success: false }))
|
).catch(() => ({ success: false }))
|
||||||
|
|
|
@ -83,6 +83,7 @@ watchEffect(() => {
|
||||||
type: i?.valueType?.type || 'string',
|
type: i?.valueType?.type || 'string',
|
||||||
rename: i.id
|
rename: i.id
|
||||||
},
|
},
|
||||||
|
ellipsis: true,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -81,8 +81,11 @@ const queryChartsAggList = async () => {
|
||||||
from: prop.time[0],
|
from: prop.time[0],
|
||||||
to: prop.time[1],
|
to: prop.time[1],
|
||||||
},
|
},
|
||||||
});
|
}).finally(
|
||||||
|
()=>{
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
|
}
|
||||||
|
)
|
||||||
if (resp.status === 200) {
|
if (resp.status === 200) {
|
||||||
const dataList: any[] = [
|
const dataList: any[] = [
|
||||||
{
|
{
|
||||||
|
@ -127,8 +130,12 @@ const queryChartsList = async () => {
|
||||||
],
|
],
|
||||||
sorts: [{ name: 'timestamp', order: 'asc' }],
|
sorts: [{ name: 'timestamp', order: 'asc' }],
|
||||||
},
|
},
|
||||||
);
|
).finally(
|
||||||
|
()=>{
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
if (resp.status === 200) {
|
if (resp.status === 200) {
|
||||||
const dataList: any[] = [
|
const dataList: any[] = [
|
||||||
{
|
{
|
||||||
|
|
|
@ -65,8 +65,10 @@ const query = async () => {
|
||||||
},
|
},
|
||||||
sorts: { timestamp: 'asc' },
|
sorts: { timestamp: 'asc' },
|
||||||
}),
|
}),
|
||||||
);
|
).finally(()=>{
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
|
}
|
||||||
|
)
|
||||||
if (resp.status === 200) {
|
if (resp.status === 200) {
|
||||||
const list: any[] = [];
|
const list: any[] = [];
|
||||||
((resp.result as any)?.data || []).forEach((item: any) => {
|
((resp.result as any)?.data || []).forEach((item: any) => {
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
required: true,
|
required: true,
|
||||||
message: '请输入页面地址',
|
message: '请输入页面地址',
|
||||||
},
|
},
|
||||||
{ max: 128, message: '最多可输入128字符' },
|
{ max: 128, message: '最多可输入128个字符' },
|
||||||
{ pattern: /^\//, message: '请正确填写地址,以/开头' },
|
{ pattern: /^\//, message: '请正确填写地址,以/开头' },
|
||||||
]" :validateFirst="true" label="页面地址" name="url">
|
]" :validateFirst="true" label="页面地址" name="url">
|
||||||
<j-input v-model:value="form.data.url" placeholder="请输入页面地址" />
|
<j-input v-model:value="form.data.url" placeholder="请输入页面地址" />
|
||||||
|
|
Loading…
Reference in New Issue