From 4352df5f1ed72024d1c6ecd665951eb99b0228f0 Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Sun, 1 Sep 2024 20:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=88=97=E8=A1=A8=20=20?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=BC=95=E6=93=8E=20=20=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=BC=95=E6=93=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/engine/engine.js         | 10 +++----
 src/views/engine/engine/list.vue | 51 ++++++++++++++------------------
 2 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js
index a3e8703..fd60229 100644
--- a/src/api/engine/engine.js
+++ b/src/api/engine/engine.js
@@ -39,18 +39,16 @@ export  function del(id){
 //开启
 export  function onEngine(id){
   return request({
-    url: "/engine/engine/activateEngine/" + id,
-    method: "post",
-    data:id
+    url: "/engine/version/open/" + id,
+    method: "post"
   })
 }
 
 //禁用
 export  function forbiddenEngine(id){
   return request({
-    url: "/engine/engine/closeEngine/" + id,
-    method: "post",
-    data:id
+    url: "/engine/version/close/" + id,
+    method: "post"
   })
 }
 
diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index bed10f3..f27af45 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -60,21 +60,21 @@
       <el-table-column prop="versionCode" label="版本编码"></el-table-column>
       <el-table-column prop="isActivate" label="是否激活">
         <template v-slot="scope">
-          <span v-if="scope.row.isActivate==1">停用</span>
-          <span v-if="scope.row.isActivate==2">正常</span>
+          <span v-if="scope.row.isActivate==1">正常</span>
+          <span v-if="scope.row.isActivate==2">停用</span>
         </template>
       </el-table-column>
       <el-table-column prop="status" label="版本状态">
         <template v-slot="scope">
-          <span v-if="scope.row.status==1">正常</span>
-          <span v-if="scope.row.status==2">异常</span>
+          <span v-if="scope.row.status===1">正常</span>
+          <span v-if="scope.row.status===2">异常</span>
         </template>
       </el-table-column>
       <el-table-column prop="testStatus" label="版本测试状态">
         <template v-slot="scope">
-          <span v-if="scope.row.status==1">数据字段</span>
-          <span v-if="scope.row.status==2">数据类型</span>
-          <span v-if="scope.row.status==3">数据格式</span>
+          <span v-if="scope.row.testStatus===1">数据字段</span>
+          <span v-if="scope.row.testStatus===2">数据类型</span>
+          <span v-if="scope.row.testStatus===3">数据格式</span>
         </template>
       </el-table-column>
       <el-table-column prop="ruleContent" label="规则内容"></el-table-column>
@@ -85,8 +85,14 @@
       <el-table-column fixed="right" label="操作" width="120">
         <template slot-scope="scope">
           <el-button @click.native.prevent="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">关闭引擎</el-button>
+
+
+            <el-button v-show="scope.row.isActivate==2" @click="onEngines(scope.row.id)" type="text" size="small">开启引擎</el-button>
+
         </template>
       </el-table-column>
 
@@ -98,21 +104,6 @@
         </template>
       </el-table-column>
 
-      <el-table-column fixed="right" label="操作" width="120">
-        <template slot-scope="scope">
-          <el-button @click.native.prevent="forbiddenEngine(scope.row.id)" type="text" size="small">
-            关闭引擎
-          </el-button>
-        </template>
-      </el-table-column>
-
-      <el-table-column fixed="right" label="操作" width="120">
-        <template slot-scope="scope">
-          <el-button @click.native.prevent="onEngine(scope.row.id)" type="text" size="small">
-            开启引擎
-          </el-button>
-        </template>
-      </el-table-column>
 
     </el-table>
 
@@ -122,7 +113,7 @@
 
 <script>
 
-import {add, dels, findById, onEngine, selectEngineById} from "@/api/engine/engine";
+import {add, dels, findById, forbiddenEngine, onEngine, selectEngineById} from "@/api/engine/engine";
 
 
 export default {
@@ -186,22 +177,24 @@ export default {
 
     },
 
-    onEngine(id) {
+    onEngines(id) {
 
       onEngine(id).then(res => {
 
-        this.$modal.msgSuccess("开启成功")
+        this.$message.success(res.msg || "开启成功")
 
       })
+      this.List();
 
     },
-    forbiddenEngine(id) {
+    forbiddenEngines(id) {
 
-      onEngine(id).then(res => {
+      forbiddenEngine(id).then(res => {
 
-        this.$modal.msgSuccess("关闭成功")
+        this.$message.success(res.msg || "关闭成功")
 
       })
+      this.List();
 
     },