Merge remote-tracking branch 'origin/master'

src/views/engine/engine/list.vue

@@ -62,7 +62,7 @@
 
       <div slot="footer" class="dialog-footer">
 
-<!--        <el-button @click="dialogFormVisible = false">取 消</el-button>-->
+        <el-button @click=closes()>取 消</el-button>
 
         <el-button type="primary" @click=handleInsert()>确 定</el-button>
 
@@ -122,6 +122,12 @@
 
         <template slot-scope="scope">
 
+          <el-button v-show="scope.row.isActivate==1" @click="del(scope.row.id)" type="text" size="small">
+
+            删除引擎
+
+          </el-button>
+
           <el-button v-show="scope.row.isActivate==1" @click="forbiddenEngines(scope.row.id)" type="text" size="small">
 
             关闭引擎
@@ -303,8 +309,16 @@ export default {
 
   methods: {
 
+    closes(){
+
+      this.dialogFormVisible = false;
+
+    },
+
     showCode() {
 
+      this.opens=true
+
       this.versions.isActivate = 1
 
       this.versions.testStatus = 1
@@ -315,14 +329,12 @@ export default {
 
       generate(this.versions).then(res =>{
 
-        this.versions.ruleContent = res.ruleContent;
+        this.versions.ruleContent=res.ruleContent;
 
         this.$message.success(res.msg || "成功");
 
       })
 
-      this.opens=true
-
     },
 
     //添加弹窗
@@ -388,9 +400,11 @@ export default {
         this.$message.success(res.msg || "开启成功")
 
       })
+
       this.findById();
 
     },
+
     forbiddenEngines(id) {
 
       forbiddenEngine(id).then(res => {
@@ -398,6 +412,7 @@ export default {
         this.$message.success(res.msg || "关闭成功")
 
       })
+
       this.List();
 
     },
@@ -413,9 +428,13 @@ export default {
     },
 
     selectEngine() {
+
       selectEngineById(this.maintenance.id).then(res => {
+
         this.arr = res.data
+
       })
+
     },
 
     del(id) {