GuoYuFu123 5 anni fa
parent
commit
b9569cd63f

+ 2 - 2
src/components/config_point/step3_edit/formula_handle.vue

@@ -55,10 +55,10 @@ export default {
             rules: {
                 EquipmentMark: [{ required: true, message: '请输入设备标识', trigger: 'blur' }]
             },
-            subStrVal: true,
+            subStrVal: false,
             from: 1,
             to: 1,
-            valCountVal: true,
+            valCountVal: false,
             mark: 'plus',
             markValue: '',
             markArr: [

+ 1 - 1
src/components/config_point/step3_edit/split_handle.vue

@@ -77,7 +77,7 @@ export default {
                 ],
                 pointArr: []
             },
-            tranfVal: true
+            tranfVal: false
         }
     },
     props: {

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

@@ -47,7 +47,7 @@
                 <auto-handle :devFlag="false" ref='autoHandle' v-else-if='form2.DataRuleType == "需自动单位转换"' :unitObj='unitObj'></auto-handle>
                 <enum-handle :devFlag="false" ref='enumHandle' v-else-if='form2.DataRuleType == "需按设置枚举转换"'></enum-handle>
                 <formula-handle :devFlag="false" ref='formulaHandle' v-else-if='form2.DataRuleType == "需按公式转换"'></formula-handle>
-                <split-handle :devFlag="false" ref='splitHandle' v-else-if='form2.DataRuleType == "需按拆分枚举转换"'></split-handle>
+                <!-- <split-handle :devFlag="false" ref='splitHandle' v-else-if='form2.DataRuleType == "需按拆分枚举转换"'></split-handle> -->
             </el-form>
             <div class="center">
                 <el-button @click="undo">上一步</el-button>
@@ -134,10 +134,10 @@
                         label: '需按公式转换',
                         value: '需按公式转换'
                     },
-                    {
-                        label: '需按拆分枚举转换',
-                        value: '需按拆分枚举转换'
-                    }
+                    // {
+                    //     label: '需按拆分枚举转换',
+                    //     value: '需按拆分枚举转换'
+                    // }
                 ],
                 dealType: {}, //处理方式
                 form2: {
@@ -309,16 +309,16 @@
                                         }
                                     })
                                     break
-                                case '需按拆分枚举转换':
-                                    this.$refs.splitHandle.getForm(splitHandle => {
-                                        if (splitHandle) {
-                                            this.saveForm(this.form2, splitHandle)
-                                        } else {
-                                            isNext = false
-                                            this.errMsg()
-                                        }
-                                    })
-                                    break
+                                // case '需按拆分枚举转换':
+                                //     this.$refs.splitHandle.getForm(splitHandle => {
+                                //         if (splitHandle) {
+                                //             this.saveForm(this.form2, splitHandle)
+                                //         } else {
+                                //             isNext = false
+                                //             this.errMsg()
+                                //         }
+                                //     })
+                                //     break
                             }
                             if(isNext) {
                                 this.activeName += 1