Browse Source

modify point config feedback param

haojianlong 5 years ago
parent
commit
b158738ece

+ 8 - 6
src/components/point/dynamicdata/applyRulesDialog.vue

@@ -5,7 +5,8 @@
       <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;min-height:200px;" 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>
@@ -140,7 +141,7 @@ export default {
       })
     },
     //确认冲突
-    confirmClash(){
+    confirmClash() {
       // let selectedRows = this.tableData.filter(item => {
       //   return item.checked == 'Old'
       // })
@@ -148,8 +149,8 @@ export default {
       let param = [];
       selectedRows.map(t => {
         let tempObj = {
-          Objs:[t],
-          Points:[t]
+          Objs: [t],
+          Points: [t]
         }
         param.push(tempObj)
       })
@@ -158,7 +159,7 @@ export default {
       })
     },
     //执行规则
-    rulesConfirm(){
+    rulesConfirm() {
       let param = {
         Force: this.force
       }
@@ -166,7 +167,8 @@ export default {
         this.$message.success('执行成功');
         this.dialogVisible = false;
         this.tableData = []
-        this.$emit('refresh')
+        let missionID = res.Content[0].Id
+        this.$emit('refresh', missionID)
       })
     }
   },

+ 11 - 8
src/views/point/dynamicdata/index.vue

@@ -110,7 +110,7 @@ export default {
       //对象类型
       this.getTypeNames();
       //获取 执行反馈
-      this.getExecuteFeedback();
+      this.getPrompt();
     },
     //获取提示消息
     getPrompt() {
@@ -190,16 +190,19 @@ export default {
     //   console.log('右键事件')
     // },
     //获取执行反馈
-    getExecuteFeedback() {
-      setTimeout(() =>{
-        dynamicExecuteFeedback('', res => {
+    getExecuteFeedback(missionID) {
+      let param = {
+        Id: missionID
+      }
+      setTimeout(() => {
+        dynamicExecuteFeedback(param, res => {
           this.allApplyClose()
           let response = res.Content[0]
-          if (response.Completed == 'Processing') {
+          if (response.Completed == 'Waiting' || response.Completed == 'Pending') {
             this.isPending = true;
             this.tipsType = 0;
             setTimeout(() => {
-              this.getExecuteFeedback()
+              this.getExecuteFeedback(missionID)
             }, 2000)
           } else {
             setTimeout(() => {
@@ -208,10 +211,10 @@ export default {
             }, 2000)
           }
         })
-      },2000)
+      }, 2000)
     },
     //取消执行
-    cancelApply(x){
+    cancelApply(x) {
       this.isPending = false;
       this.tipsType = 1;
     }