Merge branch 'fix/attribute-distribution' into 'main_dev'

fix: 修改属性下发数字精度问题

See merge request yunteng/thingskit-front!797

@@ -90,6 +90,14 @@
     return array;
     return array;
   };
   };
 
 
+  // 获取小数
+  const getFloatPart = (number): any => {
+    number = number.toString();
+    const floatPartStartIndex = number.indexOf('.');
+    const value = ~floatPartStartIndex ? `0.${number.substring(floatPartStartIndex + 1)}` : '0';
+    return value;
+  };
+
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
   const loading = ref(false);
   const loading = ref(false);
   const handleSend = async () => {
   const handleSend = async () => {
@@ -110,8 +118,12 @@
         const oldValue = getFieldsValue()[unref(formField)];
         const oldValue = getFieldsValue()[unref(formField)];
         modBUSForm.value.registerNumber = 1;
         modBUSForm.value.registerNumber = 1;
         modBUSForm.value.registerValues = [oldValue];
         modBUSForm.value.registerValues = [oldValue];
+
         if (unref(isShowMultiply) && unref(modBUSForm).method == '06') {
         if (unref(isShowMultiply) && unref(modBUSForm).method == '06') {
-          if (String(oldValue * unref(zoomFactorValue)).indexOf('.') > -1) {
+          const newValue =
+            Math.floor(oldValue) * unref(zoomFactorValue) +
+            getFloatPart(oldValue) * unref(zoomFactorValue);
+          if (newValue % 1 != 0) {
             createMessage.warning(`属性下发类型必须是整数,缩放因子为${unref(zoomFactorValue)}`);
             createMessage.warning(`属性下发类型必须是整数,缩放因子为${unref(zoomFactorValue)}`);
             return;
             return;
           }
           }
@@ -121,13 +133,19 @@
             return;
             return;
           }
           }
           //bool类型的就不用去乘缩放因子了
           //bool类型的就不用去乘缩放因子了
-          modBUSForm.value.registerValues = [oldValue * unref(zoomFactorValue)];
+          modBUSForm.value.registerValues = [newValue];
         }
         }
 
 
         if (unref(modBUSForm).method == '16' || unref(modBUSForm).method == '10') {
         if (unref(modBUSForm).method == '16' || unref(modBUSForm).method == '10') {
-          const newValue = getArray(
-            SingleToHex(unref(isShowMultiply) ? oldValue * unref(zoomFactorValue) : oldValue)
-          );
+          const regex = /^-?\d+(\.\d{0,2})?$/;
+          const values =
+            Math.floor(oldValue) * unref(zoomFactorValue) +
+            getFloatPart(oldValue) * unref(zoomFactorValue);
+          if (!regex.test(values as any)) {
+            createMessage.warning(`属性下发值精确到两位小数,缩放因子是${unref(zoomFactorValue)}`);
+            return;
+          }
+          const newValue = getArray(SingleToHex(unref(isShowMultiply) ? values : oldValue));
           modBUSForm.value.registerValues = newValue;
           modBUSForm.value.registerValues = newValue;
           modBUSForm.value.registerNumber = 2;
           modBUSForm.value.registerNumber = 2;
           modBUSForm.value.method = '10';
           modBUSForm.value.method = '10';