modify apply rules dialog

src/components/point/dynamicdata/applyRulesDialog.vue

@@ -82,9 +82,7 @@ export default {
       if (this.tableData.length) {
         this.dialogVisible = true;
       } else {
-        dynamicExecute('', res => {
-          this.$message.success('执行成功');
-        })
+        this.rulesConfirm()
       }
     },
     handleClick() { },
@@ -98,151 +96,11 @@ export default {
         }
       })
       this.finished = !flag;
+      flag && this.confirmClash()
     },
     //查询是否有冲突
     getPromptobjs() {
       dynamicPromptobjs('', res => {
-        res.Content = [{
-          BuildLocalName: "string",
-          CreateTime: "2019-03-01 10:10:10",
-          EquipLocalName: "string",
-          EquipmentMark: "string",
-          FloorLocalName: "string",
-          Id: "string",
-          InstallLocation: "string",
-          LastUpdate: "2019-03-01 10:10:10",
-          New: "1002-102",
-          ObjectID: "string",
-          Old: "1002-102",
-          ProjectId: "string",
-          InfomationPoint: '123123',
-          RoomLocalName: "string",
-          SpaceType: "string",
-          SubTypeCode: "string",
-          SubTypeName: "string",
-          TypeCode: "string",
-          TypeName: "string"
-        }, {
-          BuildLocalName: "string",
-          CreateTime: "2019-03-01 10:10:10",
-          EquipLocalName: "string",
-          EquipmentMark: "string",
-          FloorLocalName: "string",
-          Id: "string",
-          InstallLocation: "string",
-          LastUpdate: "2019-03-01 10:10:10",
-          New: "string",
-          ObjectID: "string",
-          Old: "string",
-          ProjectId: "string",
-          InfomationPoint: '123123',
-          RoomLocalName: "string",
-          SpaceType: "string",
-          SubTypeCode: "string",
-          SubTypeName: "string",
-          TypeCode: "string",
-          TypeName: "string"
-        }, {
-          BuildLocalName: "string",
-          CreateTime: "2019-03-01 10:10:10",
-          EquipLocalName: "string",
-          EquipmentMark: "string",
-          FloorLocalName: "string",
-          Id: "string",
-          InstallLocation: "string",
-          LastUpdate: "2019-03-01 10:10:10",
-          New: "string",
-          ObjectID: "string",
-          Old: "string",
-          ProjectId: "string",
-          InfomationPoint: '123123',
-          RoomLocalName: "string",
-          SpaceType: "string",
-          SubTypeCode: "string",
-          SubTypeName: "string",
-          TypeCode: "string",
-          TypeName: "string"
-        }, {
-          BuildLocalName: "string",
-          CreateTime: "2019-03-01 10:10:10",
-          EquipLocalName: "string",
-          EquipmentMark: "string",
-          FloorLocalName: "string",
-          Id: "string",
-          InstallLocation: "string",
-          LastUpdate: "2019-03-01 10:10:10",
-          New: "string",
-          ObjectID: "string",
-          Old: "string",
-          ProjectId: "string",
-          InfomationPoint: '123123',
-          RoomLocalName: "string",
-          SpaceType: "string",
-          SubTypeCode: "string",
-          SubTypeName: "string",
-          TypeCode: "string",
-          TypeName: "string"
-        }, {
-          BuildLocalName: "string",
-          CreateTime: "2019-03-01 10:10:10",
-          EquipLocalName: "string",
-          EquipmentMark: "string",
-          FloorLocalName: "string",
-          Id: "string",
-          InstallLocation: "string",
-          LastUpdate: "2019-03-01 10:10:10",
-          New: "string",
-          ObjectID: "string",
-          Old: "string",
-          ProjectId: "string",
-          InfomationPoint: '123123',
-          RoomLocalName: "string",
-          SpaceType: "string",
-          SubTypeCode: "string",
-          SubTypeName: "string",
-          TypeCode: "string",
-          TypeName: "string"
-        }, {
-          BuildLocalName: "string",
-          CreateTime: "2019-03-01 10:10:10",
-          EquipLocalName: "string",
-          EquipmentMark: "string",
-          FloorLocalName: "string",
-          Id: "string",
-          InstallLocation: "string",
-          LastUpdate: "2019-03-01 10:10:10",
-          New: "string",
-          ObjectID: "string",
-          Old: "string",
-          ProjectId: "string",
-          InfomationPoint: '123123',
-          RoomLocalName: "string",
-          SpaceType: "string",
-          SubTypeCode: "string",
-          SubTypeName: "string",
-          TypeCode: "string",
-          TypeName: "string"
-        }, {
-          BuildLocalName: "string",
-          CreateTime: "2019-03-01 10:10:10",
-          EquipLocalName: "string",
-          EquipmentMark: "string",
-          FloorLocalName: "string",
-          Id: "string",
-          InstallLocation: "string",
-          LastUpdate: "2019-03-01 10:10:10",
-          New: "string",
-          ObjectID: "string",
-          Old: "string",
-          ProjectId: "string",
-          InfomationPoint: '123123',
-          RoomLocalName: "string",
-          SpaceType: "string",
-          SubTypeCode: "string",
-          SubTypeName: "string",
-          TypeCode: "string",
-          TypeName: "string"
-        }]
         this.tableData = res.Content.map((item) => {
           item.OldMsg = {}
           item.NewMsg = {}
@@ -273,6 +131,29 @@ export default {
         this.tableData[index] = row
       })
     },
+    //确认冲突
+    confirmClash(){
+      let selectedRows = this.tableData.filter(item => {
+        return item.checked == 'Old'
+      })
+      let param = [];
+      selectedRows.map(t => {
+        let tempObj = {
+          Objs:[t],
+          Points:[t]
+        }
+        param.push(tempObj)
+      })
+      dynamicClashConfirm(param, res => {
+        this.rulesConfirm();
+      })
+    },
+    //执行规则
+    rulesConfirm(){
+      dynamicExecute('', res => {
+        this.$message.success('执行成功');
+      })
+    }
   },
   mounted() { },
   created() {