fix add relation bug and apply rules

src/components/point/dynamicdata/applyRulesDialog.vue

@@ -5,7 +5,7 @@
       <el-tab-pane label="人工填写过表号功能号" name="first"></el-tab-pane>
       <!-- <el-tab-pane label="多个标识对应同一个信息点" name="second"></el-tab-pane> -->
     </el-tabs>
-    <el-table :data="tableData" style="width: 100%;max-height:400px;" height="calc(100% - 160px)" @expand-change="expandRow" ref="expandTable">
+    <el-table :data="tableData" style="width: 100%;max-height:400px;min-height:200px;" height="calc(100% - 160px)" @expand-change="expandRow" ref="expandTable">
       <el-table-column type="expand" class-name="bgf5">
         <template slot-scope="scope">
           <el-row>
@@ -152,6 +152,8 @@ export default {
     rulesConfirm(){
       dynamicExecute('', res => {
         this.$message.success('执行成功');
+        this.dialogVisible = false;
+        this.tableData = []
       })
     }
   },

src/components/point/dynamicdata/locationCascader.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-cascader placeholder="请选择所在位置" :options="LocationList" v-model="value" filterable size="small" @change="changeCascader" change-on-select
-      :props="props"></el-cascader>
+      :props="props" clearable></el-cascader>
   </div>
 </template>
 <script>

src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -345,10 +345,10 @@ export default {
         param.FloorLocalName = this.form.locationVal[1];
       }
       if (this.form.locationVal.length > 2) {
-        param.RoomLocalName = this.form.locationVal[2];
+        param.SpaceType = this.form.locationVal[2];
       }
       if (this.form.locationVal.length > 3) {
-        param.SpaceType = this.form.locationVal[3];
+        param.RoomLocalName = this.form.locationVal[3];
       }
       this.rTableLoading = true;
       dynamicPendingobjs(param, res => {
@@ -421,18 +421,19 @@ export default {
       //先清空,返回结果后赋值
       this.rightRecoList = [];
       clearTimeout(this.timer);
-      if(this.isSwitch&&n.length){
+      if (this.isSwitch && n.length) {
         this.timer = setTimeout(() => {
-          let param = [{}]
+          let param = []
-          param[0].Objs = n
+          n.map(item => {
+            param.push({ Points: [item] })
+          })
           dynamicQueryAI(param, res => {
             this.rightRecoList = res.Content[0].Objs;
             this.leftAI = !this.rightRecoList.length
-            console.log(this.rightRecoList)
           })
         }, 800)
-      }else{
+      } else {
-        this,rightRecoList = []
+        this.rightRecoList = []
         this.leftAI = true;
       }
     },
@@ -440,16 +441,18 @@ export default {
     rArray(n, o) {
       this.leftRecoList = [];
       clearTimeout(this.timer);
-      if(this.isSwitch&&n.length){
+      if (this.isSwitch && n.length) {
         this.timer = setTimeout(() => {
-          let param = [{}]
+          let param = []
-          param[0].Points = n
+          n.map(item => {
+            param.push({ Objs: [item] })
+          })
           dynamicQueryAI(param, res => {
             this.leftRecoList = res.Content[0].Points;
             this.leftAI = !!this.leftRecoList.length
           })
         }, 800)
-      }else{
+      } else {
         this.leftRecoList = []
         this.leftAI = false
       }
@@ -466,7 +469,7 @@ export default {
     text-align: right;
   }
   /deep/ .table-container {
-    height: calc(100% - 250px);
+    height: calc(100% - 160px);
     & > div {
       width: 49.5%;
       float: left;