From f50ed8366fef1a64a6d97364feb5019739776d5a Mon Sep 17 00:00:00 2001
From: rouchen <3133657697@qq.com>
Date: Thu, 16 May 2024 21:34:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/rule_engine/engine.js                 |  8 ++
 .../dashboard/OverallSpecificAssets.vue       |  4 +-
 src/views/ruleEngine/engineVersion/index.vue  | 78 ++++++++++++-------
 3 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/src/api/rule_engine/engine.js b/src/api/rule_engine/engine.js
index 28d6550..2654afa 100644
--- a/src/api/rule_engine/engine.js
+++ b/src/api/rule_engine/engine.js
@@ -110,5 +110,13 @@ export function updataEngineVersionStatus(data) {
     data
   })
 }
+// 测试
+export function unit(data) {
+  return request({
+    url: '/rule_engine/engine/testData' ,
+    method: 'post',
+    data
+  })
+}
 
 
diff --git a/src/views/kvt/analysisData/dashboard/OverallSpecificAssets.vue b/src/views/kvt/analysisData/dashboard/OverallSpecificAssets.vue
index aa80214..b6b9690 100644
--- a/src/views/kvt/analysisData/dashboard/OverallSpecificAssets.vue
+++ b/src/views/kvt/analysisData/dashboard/OverallSpecificAssets.vue
@@ -143,11 +143,13 @@ import bes from '@/api/bes'
 
 export default {
   props: [
+    'bb',
     'selectAll',
     'dictName',
-    'bb',
     'shu',
     'title'
+
+
   ],
   // watch:{
   //    activeTab(newVal,oldVal){
diff --git a/src/views/ruleEngine/engineVersion/index.vue b/src/views/ruleEngine/engineVersion/index.vue
index 866809a..5bf4317 100644
--- a/src/views/ruleEngine/engineVersion/index.vue
+++ b/src/views/ruleEngine/engineVersion/index.vue
@@ -227,7 +227,7 @@
               <br>
               <br>
               {{dataModeMapList}}
-              <el-descriptions direction="vertical" :column="3" border v-if="this.ruleEngineInfo.level !=='data-set' ">
+              <el-descriptions direction="vertical" :column="3" border v-if="this.ruleEngineInfo.level ==='data-field' ">
                 <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>
@@ -275,7 +275,7 @@
 <script>
 import {
   ruleEngineVersionAdd,
-  selectRuleEngineVersion, updataEngineVersionStatus,
+  selectRuleEngineVersion, unit, updataEngineVersionStatus,
   updateRuleEngineVersionIsActivate,
   updateRuleEngineVersionStates
 } from '@/api/rule_engine/engine'
@@ -595,9 +595,17 @@ export default {
       dataRecordSelectKeyList: [],
       // 选择行记录List
       changeDataList: [],
-      dataField: {},
-      recording:{},
-      dataSet:[]
+      dataModel: {},
+      dataStandard:{},
+      dataSetModel:{},
+      engineVersionReq:{
+        level:null,
+        ruleEngineId:0,
+        keys:null,
+        dataModel:null,
+        dataStandard:null,
+        dataSetModel:null
+      }
     }
   },
   created() {
@@ -641,28 +649,31 @@ export default {
       console.log("test",this.dataMode)
         console.log("aaaa",  this.ruleEngineInfo.level)
       //数据字段
-      this.dataField=[]
+      this.engineVersionReq.level=this.ruleEngineInfo.level
+
+      this.engineVersionReq.ruleEngineId =this.ruleEngineInfo.id
+
+      this.engineVersionReq.dataModel={}
       if(this.ruleEngineInfo.level === "data-field"){
         console.log( this.dataModeMapList[this.dataModeMapIndex])
         for (let dataModeMapListElementKey in this.dataModeMapList[this.dataModeMapIndex]) {
+          console.log("dataModeMapListElementKey",dataModeMapListElementKey)
           if (dataModeMapListElementKey == this.dataMode){
-            const ss= this.dataModeMapList[this.dataModeMapIndex][dataModeMapListElementKey]
-            this.dataField=ss
+            let aa={}
+            aa[this.dataMode]=this.dataModeMapList[this.dataModeMapIndex][dataModeMapListElementKey]
+            this.engineVersionReq.dataModel=aa
+
           }
         }
+        console.log("this.dataField",this.dataModel)
+        unit(this.engineVersionReq).then(res => {})
       }
       //数据集
+      this.engineVersionReq.dataSetModel=[]
       if(this.ruleEngineInfo.level==="data-set") {
         console.log("数据集this.dataRecordSelectKeyList", this.dataRecordSelectKeyList)
         console.log("changeDataList",this.changeDataList)
-        // this.changeDataList.forEach((dataModelListElementKey) => {
-        //   this.dataRecordSelectKeyList.forEach((dataRecordSelectKeyListElementKey) => {
-        //     if (dataRecordSelectKeyListElementKey === dataModelListElementKey){
-        //       this.dataSet.push(dataModelListElementKey[dataRecordSelectKeyListElementKey])
-        //     }
-        //   })
-        // })
-        this.dataSet=[]
+
         this.changeDataList.forEach((ElementKey) => {
           console.log("ElementKey",ElementKey)
           this.dataRecordSelectKeyList.forEach((KeyListElementKey) => {
@@ -674,30 +685,37 @@ export default {
                   let aa={}
                    aa.key= KeyListElementKey
                    aa.value = ss
-                  this.dataSet.push(aa)
+                  this.engineVersionReq.dataSetModel.push(aa)
                 }
               })
           })
-        })
 
-        console.log("this,dataSet", this.dataSet)
+        })
+        unit(this.engineVersionReq).then(res => {})
+        console.log("this,dataSet", this.dataSetModel)
       }
       //记录
+      this.engineVersionReq.dataStandard=[]
       if(this.ruleEngineInfo.level ==="recording"){
             console.log("记录this.dataRecordSelectKeyList",this.dataRecordSelectKeyList)
              console.log("记录this.dataRecordSelectData",this.dataRecordSelectData)
-        this.recording=[]
-        for (let dataRecordSelectDataKey in this.dataRecordSelectData) {
-                this.dataRecordSelectKeyList.forEach((dataRecordSelectKeyListElementKey) => {
-                  if (dataRecordSelectDataKey == dataRecordSelectKeyListElementKey){
-                    const ss= this.dataRecordSelectData[dataRecordSelectDataKey]
-                    this.recording=ss
-                  }
-                })
-        }
-        console.log(this.recording)
-      }
 
+        Object.keys(this.dataRecordSelectData).forEach((ElementKey) => {
+          console.log("ElementKey",ElementKey)
+          this.dataRecordSelectKeyList.forEach((KeyListElementKey) => {
+            console.log("KeyListElementKey",KeyListElementKey)
+            if (ElementKey === KeyListElementKey){
+              let aa={}
+              aa.key= KeyListElementKey
+              aa.value = this.dataRecordSelectData[ElementKey]
+              this.engineVersionReq.dataStandard.push(aa)
+            }
+          })
+        })
+
+        console.log("jjj",this.dataStandard)
+        unit(this.engineVersionReq).then(res => {})
+      }
 
       let number = Math.floor(Math.random()*3);
       if (number === 0){