diff --git a/src/views/ruleengine/engineVersion/index.vue b/src/views/ruleengine/engineVersion/index.vue
index a65fd09..570df8a 100644
--- a/src/views/ruleengine/engineVersion/index.vue
+++ b/src/views/ruleengine/engineVersion/index.vue
@@ -220,22 +220,57 @@
               </el-select>
             </el-card>
           </el-col>
-          <el-col :span="24">
-            <el-card class="box-card" v-if="assets != null">
+          <el-col :span="24" v-if="assets != null">
+
+            <el-card class="box-card" v-if="this.ruleEngineInfo.ruleengine.level === 'dataSetContext'">
+
               <div slot="header" class="clearfix">
                 <span>选择资产模型</span>
+                <el-button style="float: right; padding: 3px 0" type="text" @click="dataModelRandom">随机数据</el-button>
               </div>
-<!--              <el-descriptions direction="vertical" :column="3" border>-->
+              <el-descriptions direction="vertical" :column="3" border>
+                <el-descriptions-item v-for="_dataModel in dataModelList"
+                                      :label='_dataModel.name + "("+_dataModel.comment+")"'>
+
+                  <el-radio v-model="dataMode" :label="_dataModel.name" :value="_dataModel.id">{{dataModelList[dataModeMapIndex][_dataModel.name]}}</el-radio>
+                </el-descriptions-item>
+
+              </el-descriptions>
+            </el-card>
+            <el-card class="box-card" v-if="this.ruleEngineInfo.level !== 'dataSetContext'">
+              <div slot="header" class="clearfix">
+                <span>{{this.ruleEngineInfo.ruleengine.level === "data-set" ? "选择资产集" : "选择资产记录"}}</span>
+                <el-table :data="dataModeMapList" max-height="200px"
+                      @selection-change="changeDataRow">
+
+                </el-table>
+              </div>
+<!--                        @selection-change="changeDataRow">-->
+<!--                <el-table-column type="selection" width="55" v-if="this.ruleEngineInfo.level === 'data-set'"/>-->
+<!--                <el-table-column v-for="dataModel in dataModelList" :label="dataModel.comment" :prop="dataModel.name"/>-->
+<!--                <el-table-column label="操作" v-if="this.ruleEngineInfo.level !== 'data-set'">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    <el-button type="text" @click="dataRecordSelect(scope.row)">选择</el-button>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--              </el-table>-->
+<!--              <el-descriptions title="选择行数据" direction="vertical" :column="3" border style="margin-top: 20px" v-if="dataRecordSelectData != null">-->
+<!--                <el-descriptions-item v-for="(val, key) in dataRecordSelectData"-->
+<!--                                      :label='key'>-->
+<!--                  <el-checkbox v-model="dataRecordSelectKeyList" :label="key" :value="key">{{val}}</el-checkbox>-->
+<!--                </el-descriptions-item>-->
+<!--              </el-descriptions>-->
+<!--              <el-descriptions title="选择模型" :column="3" border style="margin-top: 20px" v-if="changeDataList.length !== 0">-->
 <!--                <el-descriptions-item v-for="_dataModel in dataModelList"-->
-<!--                                      :label='_dataModel.name + "("+_dataModel.comment+")"'>-->
-<!--                  <el-radio v-model="dataMode" :label="_dataModel.name" :value="_dataModel.id">{{dataModeMap[_dataModel.name]}}</el-radio>-->
+<!--                                      :label='_dataModel.comment'>-->
+<!--                  <el-checkbox v-model="dataRecordSelectKeyList" :label="_dataModel.name" :value="_dataModel.id"></el-checkbox>-->
 <!--                </el-descriptions-item>-->
 <!--              </el-descriptions>-->
             </el-card>
           </el-col>
-<!--          <el-col :span="24" style="margin-top: 10px" v-if="dataMode != null">-->
-<!--            <el-button>测试</el-button>-->
-<!--            <el-input style="margin-top: 10px" v-model="testResult" type="textarea" placeholder="请点击测试" />-->
+<!--          <el-col :span="24" style="margin-top: 10px" v-if="dataMode != null || dataRecordSelectKeyList.length > 0">-->
+<!--            <el-button @click="dataTest">测试</el-button>-->
+<!--            <el-input style="margin-top: 10px" v-model="testResult" type="textarea" placeholder="请点击测试" disabled/>-->
 <!--          </el-col>-->
         </el-col>
       </el-row>
@@ -269,6 +304,7 @@ export default {
         },
         engineVersionList:[],
       },
+      dataModeMapIndex:0,
       // 新增版本
       addVersionStatus: false,
       engineVersionForm: {
@@ -284,6 +320,8 @@ export default {
       },
       assetStructure:null,
       assets:null,
+      //数据模型
+      dataMode: null,
       //结构集合
       assetStructureList:[],
       //表集合
@@ -296,6 +334,15 @@ export default {
       ruleEngineVersionInfoAndTest:{},
       //返回的编译数据
       ruleContentReq: {},
+      //测试返回的汉字
+      testResult: "",
+      //数据库
+      dataSource:{},
+      //表
+      databaseTableInformationList:[],
+      //表信息
+      dataModelList:[],
+      dataModeMapList:[],
     }
   },
   created() {
@@ -305,16 +352,17 @@ export default {
   watch:{
     "assetStructure":{
       handler(val){
+        this.assetsList=[]
         console.log("assetStructure监听",val)
         this.assetStructureList.forEach(res => {
-          if (res.dataSource.accessSourceName === val) {
-            res.databaseTableInformationList.forEach(value=>{
-              if (res.dataSource.databaseName === value.databaseName) {
-                this.assetsList = res.databaseTableInformationList
-                console.log("this.assetsList",this.assetsList)
+          console.log("循环的值",res)
+          if (res.dataSource.accessSourceName === val){
+            res.databaseTableInformationList.forEach(values=>{
+              if (res.dataSource.databaseName === values.databaseName) {
+                this.assetsList.push(values);
+                console.log(this.assetsList)
               }
             })
-
           }
         })
       }
@@ -322,11 +370,43 @@ export default {
     "assets":{
       handler(val){
         console.log("assets监听",val)
+        this.assetsList.forEach(res=>{
+          console.log("遍历",res)
+          if (res.name === val) {
 
+            console.log("过滤后的数据",res)
+            this.dataModelList = res.databaseTables
+            console.log("表信息赋值完成",this.dataModelList)
+            console.log(this.ruleEngineInfo.ruleengine.level)
+          }
+        })
       }
     }
   },
   methods: {
+    //测试
+    dataTest(){
+      let number = Math.floor(Math.random()*3);
+      if (number === 0){
+        this.testResult = "测试正常，无异常数据返回";
+      }else if (number === 1){
+        this.testResult = "测试失败：触发*****异常条例，数据发生动作【移除/忽略/记录】";
+      }else if (number === 2){
+        this.testResult = "程序异常：*******异常";
+      }
+    },
+    // 记录选中
+    dataRecordSelect(row){
+      this.dataRecordSelectKeyList = [];
+      this.dataRecordSelectData = row;
+    },
+    // 选择数据行
+    changeDataRow(val){
+      this.changeDataList = val;
+    },
+    dataModelRandom(){
+
+    },
     //保存代码
     saveCoding: function() {
       this.ruleEngineVersionInfoAndTest.status = "1"