From f7f26533e939d69f67de624052882e713eaf104d Mon Sep 17 00:00:00 2001
From: rouchen <3133657697@qq.com>
Date: Wed, 15 May 2024 22:34:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/rule_engine/engine.js                    |  2 +-
 src/views/ruleEngine/engineMaintenance/index.vue |  9 +++++++++
 src/views/ruleEngine/engineVersion/index.vue     | 15 +++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/api/rule_engine/engine.js b/src/api/rule_engine/engine.js
index 260b958..28d6550 100644
--- a/src/api/rule_engine/engine.js
+++ b/src/api/rule_engine/engine.js
@@ -28,7 +28,7 @@ export function permissionsUserAdd(data) {
 // 新增规则引擎
 export function addEngine(data) {
   return request({
-    url: '/rule_engine/engine',
+    url: '/rule_engine/engine/add',
     method: 'post',
     data: data
   })
diff --git a/src/views/ruleEngine/engineMaintenance/index.vue b/src/views/ruleEngine/engineMaintenance/index.vue
index 4137149..ed61a34 100644
--- a/src/views/ruleEngine/engineMaintenance/index.vue
+++ b/src/views/ruleEngine/engineMaintenance/index.vue
@@ -105,6 +105,7 @@
         </template>
       </el-table-column>
       <el-table-column label="文件名称" align="center" prop="writeCode" />
+      <el-table-column label="引擎编码" align="center" prop="engineCode" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -215,6 +216,11 @@
                 <el-input v-model="form.writeCode" placeholder="请输入文件名称" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="引擎编码" prop="status">
+                <el-input v-model="form.engineCode" placeholder="请输入引擎编码" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -323,6 +329,9 @@ export default {
         createTime: [
           { required: true, message: "创建时间不能为空", trigger: "blur" }
         ],
+        engineCode: [
+          { required: true, message: "引擎编码不能为空", trigger: "change" }
+        ],
       },
       cc:{}
     };
diff --git a/src/views/ruleEngine/engineVersion/index.vue b/src/views/ruleEngine/engineVersion/index.vue
index 1d3ff2a..866809a 100644
--- a/src/views/ruleEngine/engineVersion/index.vue
+++ b/src/views/ruleEngine/engineVersion/index.vue
@@ -227,10 +227,10 @@
               <br>
               <br>
               {{dataModeMapList}}
-              <el-descriptions direction="vertical" :column="3" border>
+              <el-descriptions direction="vertical" :column="3" border v-if="this.ruleEngineInfo.level !=='data-set' ">
                 <el-descriptions-item v-for="_dataModel in dataModelList"
                                       :label='_dataModel.name + "("+_dataModel.comment+")"'>
-                  <el-radio v-model="dataMode" :label="_dataModel.name" :value="_dataModel.id">{{dataModeMapList[dataModeMapIndex][_dataModel.name]}}</el-radio>
+                  <el-radio v-model="dataMode" :label="_dataModel.name" :value="_dataModel.id" >{{dataModeMapList[dataModeMapIndex][_dataModel.name]}}</el-radio>
                 </el-descriptions-item>
               </el-descriptions>
             </el-card>
@@ -941,8 +941,11 @@ export default {
      },
     // 获取代码模板
     getCodeIng(){
+
+      let version=this.engineVersionForm.versionCode.substring(0,1).toUpperCase();
+     let versionCode = this.engineVersionForm.versionCode.replace(this.engineVersionForm.versionCode.substring(0,1),version)
       let packageName = "com.muyu.engine";
-      let customName = "custom";
+      let customName = "java";
       let templateName = "template";
       let parentClass =null;
       //数据字段
@@ -973,7 +976,7 @@ import com.muyu.engine.scope.${parentClass};
  * @Description: ${this.engineVersionForm.name}-${this.engineVersionForm.code}
  * @Version: 1.0
  */
-public class ${this.engineVersionForm.versionCode} extends ${parentClass} {
+public class ${versionCode} extends ${parentClass} {
     @Override
     public void execution () {
         Object value = getValue();
@@ -1001,7 +1004,7 @@ import com.muyu.engine.scope.${parentClass};
  * @Description: ${this.engineVersionForm.name}-${this.engineVersionForm.code}
  * @Version: 1.0
  */
-public class ${this.engineVersionForm.versionCode} extends ${parentClass} {
+public class ${versionCode} extends ${parentClass} {
 
     private final DataSetContext dataSetContext;
 
@@ -1027,7 +1030,7 @@ import com.muyu.engine.scope.${parentClass};
  * @Description: ${this.engineVersionForm.name}-${this.engineVersionForm.code}
  * @Version: 1.0
  */
-public class ${this.engineVersionForm.versionCode} extends ${parentClass} {
+public class ${versionCode} extends ${parentClass} {
 
      private final TaskContext taskContext;