Merge remote-tracking branch 'origin/master'

src/views/engine/engine/list.vue

@@ -55,6 +55,7 @@
                 <template slot="label"><i class="el-icon-user"></i>描述</template>
                 {{ customer.engineMaintenanceId }}
               </el-descriptions-item>
+
             </el-descriptions>
             <el-divider content-position="left">规则引擎版本</el-divider>
           </div>

src/views/type/index.vue

@@ -1,15 +1,7 @@
 <template>
   <div>
 
-
-
-
-
     <!-- 添加或修改规则引擎对话框 -->
-
-
-
-
     <el-button type="text" @click="dialogFormVisible = true">添加规则类型</el-button>
 
     <el-dialog title="添加规则" :visible.sync="dialogFormVisible">
@@ -18,7 +10,7 @@
 
         <el-form-item label="规则名称" :label-width="formLabelWidth">
 
-          <el-input v-model="form.name" autocomplete="off"></el-input>
+          <el-input v-model="type.name" autocomplete="off"></el-input>
 
         </el-form-item>
 
@@ -75,16 +67,6 @@ export default {
         name: [{required: true, message: '请输入规则名称', trigger: 'blur'}]
       },
       dialogFormVisible:false,
-      form: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
-      },
       formLabelWidth: '120px'
     };
   },
@@ -102,7 +84,6 @@ export default {
       }
     },
     submitForm(){
-      this.type = {}
       this.dialogFormVisible=true
       insert(this.type).then(res =>{
         this.$message.success(res.msg || "添加成功")