Browse Source

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

zhangyu 5 years ago
parent
commit
f7b203475d
1 changed files with 13 additions and 13 deletions
  1. 13 13
      src/components/config_point/step3_point/3_temps.vue

+ 13 - 13
src/components/config_point/step3_point/3_temps.vue

@@ -431,7 +431,7 @@ export default {
               seq: 1,
               ruletype: 'type1',
               content: [{
-                from: other.unit[0] + '-' + other.unit[1],
+                from: t.other.unit[0] + '-' + t.other.unit[1],
                 to: this.unitObj.unit
               }]
             }])
@@ -442,11 +442,11 @@ export default {
             // }
             break
           case '需按设置枚举转换':
-            let DataRuleContent2 = other.pointArr.length ?
+            let DataRuleContent2 = t.other.pointArr.length ?
               JSON.stringify([{
                 seq: 1,
                 ruletype: 'type2',
-                content: other.pointArr
+                content: t.other.pointArr
               }]) :
               undefined
             eachData.DataRuleContent = DataRuleContent2;
@@ -456,28 +456,28 @@ export default {
             // }
             break
           case '需按公式转换':
-            let subRule = other.from ? {
+            let subRule = t.other.from ? {
               seq: 1,
               ruletype: 'type4',
               content: [{
-                from: other.from,
-                to: other.to
+                from: t.other.from,
+                to: t.other.to
               }]
             } :
               undefined
             let extractRule = {
               seq: 2,
               ruletype: 'type5',
-              content: other.extract ? [{
+              content: t.other.extract ? [{
                 extract: 'number'
               }] : []
             }
-            let countRule = other.mark ? {
+            let countRule = t.other.mark ? {
               seq: 3,
               ruletype: 'type6',
               content: [{
-                calculationtype: other.mark,
-                value: other.markValue
+                calculationtype: t.other.mark,
+                value: t.other.markValue
               }]
             } :
               undefined
@@ -497,14 +497,14 @@ export default {
             // }
             break
           case '需拆分处理':
-            let SplitPoints = other.devArr.length ? other.devArr : undefined
+            let SplitPoints = t.other.devArr.length ? t.other.devArr : undefined
             let DataRuleContent4 = undefined
             var enum5 = null
-            if (other.tranfVal) {
+            if (t.other.tranfVal) {
               enum5 = {
                 seq: 2,
                 ruletype: 'type2',
-                content: other.pointArr
+                content: t.other.pointArr
               }
             } else {
               enum5 = {