feat()修改部分不足

src/api/goods/edition.js

@@ -42,10 +42,27 @@ export function updateEdition(data) {
   })
 }
 
+//  测试
+export function updRuleSsTest(id, ruleIsTest) {
+  return request({
+    url: '/rule/edition/updRuleSsTest?id=' + id + "&ruleIsTest=" + ruleIsTest,
+    method: 'post'
+  })
+}
+
+//  激活
+export function updRuleStatus(id, ruleStatus) {
+  return request({
+    url: '/rule/edition/updRuleStatus?id=' + id + "&ruleStatus=" + ruleStatus,
+    method: 'post'
+  })
+}
+
+// 发布版本
 export function updEditionStatus(id) {
   return request({
     url: '/rule/edition/updEditionStatus?id=' + id,
-    method: 'post'
+    method: 'put'
   })
 }
 

src/views/engine/edition/index.vue

@@ -14,17 +14,34 @@
         <el-descriptions-item label="规则名称">{{ruleInfo.ruleName}}</el-descriptions-item>
         <el-descriptions-item label="引擎编码">{{ruleInfo.ruleCode}}</el-descriptions-item>
         <el-descriptions-item label="规则级别">
-          <dict-tag :options="dict.type.rule_engine_level" :value="ruleInfo.ruleLevel"></dict-tag>
+          <el-tag>
+            <dict-tag :options="dict.type.rule_engine_level" :value="ruleInfo.ruleLevel"/>
+          </el-tag>
         </el-descriptions-item>
         <el-descriptions-item label="规则类型">
-          <dict-tag :options="dict.type.rule_engine_type" :value="ruleInfo.ruleType"></dict-tag>
+          <el-tag>
+            <dict-tag :options="dict.type.rule_engine_type" :value="ruleInfo.ruleType"/>
+          </el-tag>
         </el-descriptions-item>
         <el-descriptions-item label="是否激活">
-            <dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleInfo.ruleIsActivate"></dict-tag>
+          <span v-if="ruleInfo.ruleIsActivate === 'Y' ">
+            <el-tag type="success"><dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleInfo.ruleIsActivate"/></el-tag>
+          </span>
+          <span v-if="ruleInfo.ruleIsActivate === 'N' ">
+            <el-tag type="danger"><dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleInfo.ruleIsActivate"/></el-tag>
+          </span>
         </el-descriptions-item>
         <el-descriptions-item label="规则状态">
-          <span v-if="ruleInfo.ruleStatus === 'Y'">在用</span>
-          <span v-if="ruleInfo.ruleStatus === 'N'">停用</span>
+            <span v-if="ruleInfo.ruleStatus === 'Y'">
+              <el-tag type="success">
+                在用
+              </el-tag>
+            </span>
+            <span v-if="ruleInfo.ruleStatus === 'N'">
+              <el-tag type="danger">
+                停用
+              </el-tag>
+            </span>
         </el-descriptions-item>
       </el-descriptions>
 
@@ -47,12 +64,11 @@
                   <el-dropdown-item :command="{event: 'test', rule: edition}"
                                     :disabled="edition.editionStatus === '-1'"
                   >测试规则</el-dropdown-item>
-                  <el-dropdown-item :command="{event: 'status', rule: edition}" :disabled="edition.editionStatus !== '1'">
-                    {{editionList.ruleIsTest !== '0' ? "禁用" : "激活"}}规则
+                  <el-dropdown-item :command="{event: 'status', rule: edition}" :disabled="edition.editionStatus !== 1">
+                    {{edition.ruleStatus === 'Y' ? "禁用" : "激活"}}规则
                   </el-dropdown-item>
-                  <el-dropdown-item
-                    :command="{event: 'publish', rule: editionList}"
-                    v-if="editionList.editionStatus === '1' && edition.ruleIsTest === '1'">
+                  <el-dropdown-item :command="{event: 'publish', rule: edition.id}"
+                    v-if="edition.editionStatus === 0 && edition.ruleIsTest === 1">
                     发布规则
                   </el-dropdown-item>
                   <el-dropdown-item :command="{event: 'delete', rule: edition}">规则删除</el-dropdown-item>
@@ -64,13 +80,40 @@
             <el-descriptions-item label="版本名称">{{edition.name}}</el-descriptions-item>
             <el-descriptions-item label="版本编码">{{edition.versionCode}}</el-descriptions-item>
             <el-descriptions-item label="是否激活">
-              <dict-tag :options="dict.type.rule_engine_activate_status" :value="edition.ruleStatus"></dict-tag>
+              <span v-if="edition.ruleStatus === 'Y'"><el-tag type="success">
+                <dict-tag :options="dict.type.rule_engine_activate_status" :value="edition.ruleStatus"></dict-tag>
+              </el-tag></span>
+              <span v-if="edition.ruleStatus === 'N'"><el-tag type="danger">
+                <dict-tag :options="dict.type.rule_engine_activate_status" :value="edition.ruleStatus"></dict-tag>
+              </el-tag></span>
             </el-descriptions-item>
             <el-descriptions-item label="规则状态">
-              <dict-tag :options="dict.type.rule_engine_edition_status" :value="edition.editionStatus"></dict-tag>
+              <span v-if="edition.editionStatus == 0"><el-tag type="danger">
+                <dict-tag :options="dict.type.rule_engine_edition_status" :value="edition.editionStatus"></dict-tag>
+              </el-tag> </span>
+              <span v-if="edition.editionStatus == 1"><el-tag type="success">
+                <dict-tag :options="dict.type.rule_engine_edition_status" :value="edition.editionStatus"></dict-tag>
+              </el-tag> </span>
+              <span v-if="edition.editionStatus == -1"><el-tag type="info">
+                <dict-tag :options="dict.type.rule_engine_edition_status" :value="edition.editionStatus"></dict-tag>
+              </el-tag> </span>
             </el-descriptions-item>
             <el-descriptions-item label="是否测试">
-              <dict-tag :options="dict.type.rule_engine_is_test" :value="edition.ruleIsTest"></dict-tag>
+              <span v-if="edition.ruleIsTest == 0">
+                <el-tag type="danger">
+                  <dict-tag :options="dict.type.rule_engine_is_test" :value="edition.ruleIsTest"></dict-tag>
+                </el-tag>
+              </span>
+              <span v-if="edition.ruleIsTest == 1">
+                <el-tag type="success">
+                  <dict-tag :options="dict.type.rule_engine_is_test" :value="edition.ruleIsTest"></dict-tag>
+                </el-tag>
+              </span>
+              <span v-if="edition.ruleIsTest == -1">
+                <el-tag type="info">
+                  <dict-tag :options="dict.type.rule_engine_is_test" :value="edition.ruleIsTest"></dict-tag>
+                </el-tag>
+              </span>
             </el-descriptions-item>
             <editor style="margin-top: 10px" :read-only="true" v-model="edition.editionContent"></editor>
           </el-descriptions>
@@ -281,8 +324,8 @@
 
 <script>
 import { selectRuleEngineOne, updateRuleIsActivate, updateRuleStatus, spliceNameToCode  } from "@/api/goods/engine";
-import { selectListRuleId, getEdition, delEdition, addEdition, updateEdition, updEditionStatus } from "@/api/goods/edition";
-import { selectFrimary, selectTableList  } from "@/api/system/accredit";
+import { selectListRuleId, getEdition, delEdition, addEdition, updateEdition, updRuleStatus, updRuleSsTest, updEditionStatus } from "@/api/goods/edition";
+import { selectFrimary  } from "@/api/system/accredit";
 import { getRabdomData, getColumn, setColumn } from "@/api/test/testData";
 import Encoding from "@/components/Encoding/index.vue";
 
@@ -443,15 +486,12 @@ export default {
       }
       setColumn(this.testDataModelReq).then(res => {
         this.testResult = res.data
+        if (this.testResult === '正常，无需返回'){
+          updRuleSsTest(this.selectList.id,1)
+        }else{
+          updRuleSsTest(this.selectList.id,0)
+        }
       })
-      // let number = Math.floor(Math.random()*3);
-      // if (number === 0){
-      //   this.testResult = "测试正常，无异常数据返回";
-      // }else if (number === 1){
-      //   this.testResult = "测试失败：触发*****异常条例，数据发生动作【移除/忽略/记录】";
-      // }else if (number === 2){
-      //   this.testResult = "程序异常：*******异常";
-      // }
     },
     // 记录选中行
     changeDataRow(val) {
@@ -536,17 +576,6 @@ export default {
       )
       this.getList()
     },
-    // 执行操作
-    playEngineVersion(slickType){
-      switch (slickType.event){
-        case "update"://修改
-          this.form = slickType.rule
-          this.open = true
-          break;
-        case "status"://激活状态
-          break;
-      }
-    },
     // 引擎版本操作
     checkRuleEngineVersion(clickType) {
       switch (clickType.event){
@@ -556,6 +585,12 @@ export default {
           }
           this.getList()
           break;
+        case "publish"://版本发布
+          updEditionStatus(clickType.rule).then(res => {
+            this.$message.success(res.data)
+            this.getList()
+          })
+          break;
         case "select"://详情
           this.selectList = clickType.rule
           this.oppten = true
@@ -565,6 +600,21 @@ export default {
           this.selectList = clickType.rule
           break;
         case "status"://激活状态
+          console.log(clickType)
+          console.log(clickType.rule.ruleStatus)
+          console.log(clickType.rule.id)
+          if (clickType.rule.ruleStatus === "Y"){
+            updRuleStatus(clickType.rule.id,"N").then(res => {
+              this.$message.success(res.data)
+              this.getList()
+            })
+          }else if (clickType.rule.ruleStatus === "N"){
+            updRuleStatus(clickType.rule.id,"Y").then(res => {
+              this.$message.success(res.data)
+              this.getList()
+            })
+          }
+
         break;
       }
     },