diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue index 71ccb285..05822b99 100644 --- a/src/views/DataCollect/Collector/Tree/Save/index.vue +++ b/src/views/DataCollect/Collector/Tree/Save/index.vue @@ -39,7 +39,7 @@ placeholder="请输入采集器名称" v-model:value="formData.name" /> - + @@ -163,6 +163,7 @@ v-if="provider !== 'snap7'" :name="['configuration', 'requestTimeout']" :rules="LeftTreeRules.requestTimeout" + label='请求超时时间' > 123 @@ -47,4 +47,4 @@ const getMapData = async () => { getMapData(); \ No newline at end of file + diff --git a/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue b/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue index 2f7f7adf..31d09bdf 100644 --- a/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue +++ b/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue @@ -50,7 +50,7 @@ const handleOk = async () => { loading.value = true const res = await savePluginData( 'device', - props.pluginId!, + props.accessId!, route.params.id as string, checkKey.value ).catch(() => ({ success: false })) @@ -71,4 +71,4 @@ const handleCancel = () => { \ No newline at end of file + diff --git a/src/views/device/Instance/Detail/Running/Event/index.vue b/src/views/device/Instance/Detail/Running/Event/index.vue index ec1f7295..eca939e7 100644 --- a/src/views/device/Instance/Detail/Running/Event/index.vue +++ b/src/views/device/Instance/Detail/Running/Event/index.vue @@ -83,6 +83,7 @@ watchEffect(() => { type: i?.valueType?.type || 'string', rename: i.id }, + ellipsis: true, }); }); } else { @@ -124,4 +125,4 @@ const detail = (_info: any) => { padding: 0 20px; } } - \ No newline at end of file + diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue b/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue index 9bda45a6..ebb41ec4 100644 --- a/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue +++ b/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue @@ -81,8 +81,11 @@ const queryChartsAggList = async () => { from: prop.time[0], to: prop.time[1], }, - }); - loading.value = false; + }).finally( + ()=>{ + loading.value = false; + } + ) if (resp.status === 200) { const dataList: any[] = [ { @@ -127,8 +130,12 @@ const queryChartsList = async () => { ], sorts: [{ name: 'timestamp', order: 'asc' }], }, - ); - loading.value = false; + ).finally( + ()=>{ + loading.value = false; + } + ) + if (resp.status === 200) { const dataList: any[] = [ { @@ -216,4 +223,4 @@ watchEffect(() => { getOptions(chartsList.value); } }); - \ No newline at end of file + diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue b/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue index 50cf5938..cf62afe0 100644 --- a/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue +++ b/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue @@ -65,8 +65,10 @@ const query = async () => { }, sorts: { timestamp: 'asc' }, }), - ); - loading.value = false; + ).finally(()=>{ + loading.value = false; + } + ) if (resp.status === 200) { const list: any[] = []; ((resp.result as any)?.data || []).forEach((item: any) => { @@ -93,4 +95,4 @@ watch( \ No newline at end of file + diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue index 74e0cb62..e1cf0c34 100644 --- a/src/views/system/Menu/Detail/BasicInfo.vue +++ b/src/views/system/Menu/Detail/BasicInfo.vue @@ -66,7 +66,7 @@ required: true, message: '请输入页面地址', }, - { max: 128, message: '最多可输入128字符' }, + { max: 128, message: '最多可输入128个字符' }, { pattern: /^\//, message: '请正确填写地址,以/开头' }, ]" :validateFirst="true" label="页面地址" name="url">