feat()将数据传递给后端

src/api/goods/edition.js

@@ -42,6 +42,13 @@ export function updateEdition(data) {
   })
 }
 
+export function updEditionStatus(id) {
+  return request({
+    url: '/rule/edition/updEditionStatus?id=' + id,
+    method: 'post'
+  })
+}
+
 // 删除规则引擎版本
 export function delEdition(id) {
   return request({

src/api/test/testData.js

@@ -14,3 +14,10 @@ export function getColumn(id,tableName,ruleLevel) {
         method: 'get'
     })
 }
+export function setColumn(data) {
+    return request({
+        url: '/test/extract/setColumn',
+        method: 'post',
+        data
+    })
+}

src/views/engine/edition/index.vue

@@ -215,9 +215,9 @@
                       <div slot="header" class="clearfix">
                           <span>数据集</span>
                       </div>
-                      <el-table ref="multipleTable" :data="columnOne2" max-height="200px" >
+                      <el-table ref="multipleTable" :data="columnOne2" max-height="200px" @selection-change="changeDataRow">
                         <el-table-column type="selection" width="55"></el-table-column>
-<!--                        <el-table-column v-for="dataModel in columnOne2" :label="dataModel.comment" :prop="dataModel.name"/>-->
+<!--                        <el-table-column v-for="dataModel in columnOne2" :label="dataModel.key" :prop="dataModel.val"/>-->
                         <el-table-column v-for="(val, key) in columnOne2[0]" :key="key" :label="key" :prop="key"></el-table-column>
                       </el-table>
                       <div style="margin-top: 20px">
@@ -245,7 +245,7 @@
                   <el-descriptions title="选择行数据" direction="vertical" :column="3" border style="margin-top: 20px" v-if="fieldd != null">
                     <el-descriptions-item v-for="(val, key) in fieldd"
                                           :label='key'>
-                      <el-checkbox v-model="dataRecordSelectKeyList" :label="key" :value="key">{{val}}</el-checkbox>
+                      <el-checkbox v-model="dataRecordSelectKeyList" :label="val" :value="val">{{val}}</el-checkbox>
                     </el-descriptions-item>
                   </el-descriptions>
                   </el-card>
@@ -259,6 +259,14 @@
                             <el-radio v-model="dataMode" :label="tab.val" :value="tab.val">{{tab.val}}</el-radio>
                           </el-descriptions-item>
                       </el-descriptions>
+<!--                    <el-descriptions direction="vertical" :column="3" border>-->
+<!--                      <el-descriptions-item v-for="_dataModel in dataModelList"-->
+<!--                                            :label='_dataModel.name + "("+_dataModel.comment+")"'>-->
+<!--                        <el-radio v-model="dataModel" :label="_dataModel.name" :value="_dataModel.id">-->
+<!--                          {{ newData[dataModelMapIndex][_dataModel.name] }}-->
+<!--                        </el-radio>-->
+<!--                      </el-descriptions-item>-->
+<!--                    </el-descriptions>-->
                   </el-card>
               </el-col>
             <el-col :span="24" style="margin-top: 10px" v-if="dataMode != null || dataRecordSelectKeyList.length > 0">
@@ -273,9 +281,9 @@
 
 <script>
 import { selectRuleEngineOne, updateRuleIsActivate, updateRuleStatus, spliceNameToCode  } from "@/api/goods/engine";
-import { selectListRuleId, getEdition, delEdition, addEdition, updateEdition } from "@/api/goods/edition";
+import { selectListRuleId, getEdition, delEdition, addEdition, updateEdition, updEditionStatus } from "@/api/goods/edition";
-import { selectFrimary } from "@/api/system/accredit";
+import { selectFrimary, selectTableList  } from "@/api/system/accredit";
-import { getRabdomData, getColumn } from "@/api/test/testData";
+import { getRabdomData, getColumn, setColumn } from "@/api/test/testData";
 import Encoding from "@/components/Encoding/index.vue";
 
 export default {
@@ -317,6 +325,15 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      //测试传输
+      testDataModelReq: {
+        ruleLevel: '',
+        editionId: '',
+        keys: [],
+        dataModel: {},
+        dataModelList: [],
+        dataModelLists: []
+      },
       //测试表单
       ruleEngineTest:{},
       primary: [],
@@ -332,11 +349,19 @@ export default {
       fieldd: [],
       //多选记录
       dataRecordSelectKeyList: [],
+      dataModelMapList: [],
+      dataModelMapIndex: 0,
       dataRecordSelectData: null,
       dataMode: null,
       //父类列
       primaryId: [],
       tableLisrs: null,
+      //记录数据集选择的列
+      changeDataList: [],
+      //记录使用
+      fieldDataModel: {},
+      recordDataModel: [],
+      dataSetDataModel: [],
       // 表单参数
       form: {
         versionClass: "",
@@ -352,6 +377,7 @@ export default {
       }
     };
   },
+  //监控
   watch: {
     // 监控conditionVar变量
     tableLisrs(newVal, oldVal) {
@@ -366,14 +392,70 @@ export default {
   methods: {
     // 测试
     dataTest(){
-      let number = Math.floor(Math.random()*3);
+      // console.log(this.dataRecordSelectKeyList)
-      if (number === 0){
+      // console.log(this.dataMode)
-        this.testResult = "测试正常，无异常数据返回";
+      if (this.ruleInfo.ruleLevel === 4){
-      }else if (number === 1){
+        this.fieldDataModel = null;
-        this.testResult = "测试失败：触发*****异常条例，数据发生动作【移除/忽略/记录】";
+        console.log(this.dataMode)
-      }else if (number === 2){
+        this.fields.forEach(dataModel => {
-        this.testResult = "程序异常：*******异常";
+          if (dataModel.val === this.dataMode){
+            this.fieldDataModel = dataModel
+          }
+        })
+      }else if (this.ruleInfo.ruleLevel === 3){
+        this.recordDataModel = []
+        this.columnOne.forEach(dataModel => {
+          const keys = Object.keys(this.fieldd)
+          const firstKey = keys[0];
+          const firsValue = this.fieldd[firstKey];
+          if (dataModel[0].val == firsValue) {
+            this.dataRecordSelectKeyList.forEach(dataRecordSelect => {
+              const foundDataModel = dataModel.find(dataModels => dataModels.key === dataRecordSelect);
+              this.recordDataModel.push(foundDataModel)
+            });
+          }
+        })
+      }else if (this.ruleInfo.ruleLevel === 2){
+        this.dataSetDataModel = []
+        this.changeDataList.forEach(changeData => {
+          const keys = Object.keys(changeData)
+          const firstKey = keys[0];
+          const firsValue = changeData[firstKey];
+          this.recordDataModel = [];
+          this.columnOne.forEach(dataModel => {
+            if (dataModel[0].val == firsValue) {
+              this.dataRecordSelectKeyList.forEach(dataRecordSelect => {
+                const foundDataModel = dataModel.find(dataModels => dataModels.key === dataRecordSelect);
+                this.recordDataModel.push(foundDataModel)
+              });
+            }
+          })
+          this.dataSetDataModel.push(this.recordDataModel)
+        })
       }
+      this.testDataModelReq = {
+        ruleLevel: this.ruleInfo.ruleLevel,
+        editionId: this.selectList.id,
+        keys: this.dataRecordSelectKeyList,
+        dataModel: this.fieldDataModel,
+        dataModelList: this.recordDataModel,
+        dataModelLists: this.dataSetDataModel
+      }
+      setColumn(this.testDataModelReq).then(res => {
+        this.testResult = res.data
+      })
+      // 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) {
+      this.changeDataList = val
     },
     // 关闭
     ruleEngineVersionInfoStatusClose(done) {
@@ -381,6 +463,7 @@ export default {
         .then(_ => {
           this.ruleEngineVersionInfoAndTest = {};
           done();
+          this.getList()
         })
         .catch(_ => {});
     },
@@ -389,12 +472,10 @@ export default {
      * @param id
      */
     dield(tableLisrs,ruleLevel) {
-        console.log(tableLisrs)
         var id = parseInt(tableLisrs.split('')[0]);
         var tableName = tableLisrs.slice(1)
       getRabdomData(id,tableName,ruleLevel).then(res => {
         this.fields = res.data;
-        console.log(res.data)
       })
     },
     //显示队列
@@ -412,10 +493,11 @@ export default {
           })
           list2.push(dict2)
         })
+        // list.forEach((item,index) => {
+        //   list2[index] = item
+        // })
+
         this.columnOne2 = list2;
-        console.log(list2)
-        console.log(res.data)
-        console.log(this.columnOne2)
       })
     },
     toggleSelection() {
@@ -423,7 +505,6 @@ export default {
     },
     //读取队列
     dataRecordSelect(row) {
-      console.log(row)
       this.dataRecordSelectKeyList = []
       this.fieldd = row
     },
@@ -451,6 +532,9 @@ export default {
       updateEdition(row).then(res => {
         this.$message.success(res.data)
       })
+      updEditionStatus(row.id).then(
+      )
+      this.getList()
     },
     // 执行操作
     playEngineVersion(slickType){