fix: bug#20763、20736、20731

src/views/DataCollect/Collector/Tree/Save/index.vue

@@ -39,7 +39,7 @@
                     placeholder="请输入采集器名称"
                     v-model:value="formData.name"
                 />
-              
+
             </j-form-item>
             <j-form-item  v-if="provider === 'snap7'" label="IP" :name="['configuration', 'host']" :rules="LeftTreeRules.host" >
               <j-input v-model:value="formData.configuration.host" autocomplete="off" placeholder="请输入通道IP" :disabled="false"/>
@@ -163,6 +163,7 @@
                 v-if="provider !== 'snap7'"
                 :name="['configuration', 'requestTimeout']"
                 :rules="LeftTreeRules.requestTimeout"
+                label='请求超时时间'
             >
                 <j-input-number
                     style="width: 100%"

src/views/device/DashBoard/components/Amap.vue

@@ -26,7 +26,7 @@
                     clipOrigin: [459, 92],
                     clipSize: [50, 68],
                 }"
-                >123</el-amap-label-marker
+                ></el-amap-label-marker
             >
         </AmapComponent>
     </div>
@@ -47,4 +47,4 @@ const getMapData = async () => {
 getMapData();
 </script>
 <style scoped>
-</style>
+</style>

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 = () => {
 
 <style scoped>
 
-</style>
+</style>

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;
     }
 }
-</style>
+</style>

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],
         },
-    });
+    }).finally(
-    loading.value = false;
+       ()=>{
+        loading.value = false;
+       }
+    )
     if (resp.status === 200) {
         const dataList: any[] = [
             {
@@ -127,8 +130,12 @@ const queryChartsList = async () => {
             ],
             sorts: [{ name: 'timestamp', order: 'asc' }],
         },
-    );
+    ).finally(
-    loading.value = false;
+       ()=>{
+        loading.value = false;
+       }
+    )
+
     if (resp.status === 200) {
         const dataList: any[] = [
             {
@@ -216,4 +223,4 @@ watchEffect(() => {
         getOptions(chartsList.value);
     }
 });
-</script>
+</script>

src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue

@@ -65,8 +65,10 @@ const query = async () => {
             },
             sorts: { timestamp: 'asc' },
         }),
-    );
+    ).finally(()=>{
-    loading.value = false;
+        loading.value = false;
+    }
+    )
     if (resp.status === 200) {
         const list: any[] = [];
         ((resp.result as any)?.data || []).forEach((item: any) => {
@@ -93,4 +95,4 @@ watch(
 </script>
 
 <style lang="less" scoped>
-</style>
+</style>

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">
                                 <j-input v-model:value="form.data.url" placeholder="请输入页面地址" />