Explorar o código

Merge branch 'master' of git.sagacloud.cn:web/ibms

zhangyu %!s(int64=5) %!d(string=hai) anos
pai
achega
99ca5a4baf

+ 1 - 0
src/components/business_space/business/handsontable.vue

@@ -351,6 +351,7 @@ export default {
         })
         param.data.Content.push(item);
 			})
+      param.Projection = []
 			updateZone(param, (res) => {})
     },
     //获取被筛选掉的行号

+ 1 - 0
src/components/dialogs/list/firm.vue

@@ -106,6 +106,7 @@ export default {
       if (!!this.radio) {
         this.$emit("changeFirm", this.radio)
         this.dialog.firm = false
+        this.radio = ''
       } else {
         this.$message("请选择型号")
       }

+ 1 - 0
src/components/dialogs/list/insurerDialog.vue

@@ -146,6 +146,7 @@ export default {
       if (!!this.radio) {
         this.$emit("changeInsurer", this.radio)
         this.dialog.insurer = false
+        this.radio = ''
       } else {
         this.$message("请选择一个生产厂商")
       }

+ 1 - 1
src/components/dialogs/list/maintainerDialog.vue

@@ -143,9 +143,9 @@ export default {
     //发生修改
     getChange() {
       if (!!this.radio) {
-        console.log(this.radio, "radio")
         this.$emit("changeMaintainer", this.radio)
         this.dialog.maintainer = false
+        this.radio = ''
       } else {
         this.$message("请选择一个生产厂商")
       }

+ 1 - 0
src/components/dialogs/list/supplierDialog.vue

@@ -145,6 +145,7 @@ export default {
       if (!!this.radio) {
         this.$emit("changeSupplier", this.radio)
         this.dialog.supplier = false
+        this.radio = ''
       } else {
         this.$message("请选择一个生产厂商")
       }

+ 1 - 0
src/components/ledger/handsontables/assets.vue

@@ -647,6 +647,7 @@ export default {
         });
         param.Content.push(item)
       })
+      param.Projection = []
       updateProperty(param, res => { })
     },
     //修改资产类型

+ 2 - 0
src/components/ledger/handsontables/device.vue

@@ -578,6 +578,8 @@ export default {
         });
         param.Content.push(item);
       });
+      param.Projection = []
+      debugger
       updateEquip(param, res => { });
     },
     //修改设备类型

+ 1 - 0
src/components/ledger/handsontables/system.vue

@@ -466,6 +466,7 @@ export default {
         });
         param.Content.push(item);
       });
+      param.Projection = []
       updateGeneralSys(param, res => { });
     },
     //获取到了正确的信息

+ 14 - 8
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>
@@ -54,7 +55,7 @@
     </el-table>
     <span slot="footer" class="dialog-footer">
       <span style="font-size:12px;color:red;" v-show="finished">请处理所有冲突</span>
-      <el-button size="small">取消</el-button>
+      <el-button size="small" @click="handleClose">取消</el-button>
       <el-button size="small" type="primary" @click="userSelected">使用选择的表号功能号</el-button>
     </span>
   </el-dialog>
@@ -75,6 +76,7 @@ export default {
       tableData: [],
       activeName: "first", //当前所在tab页
       finished: false, //未处理所有冲突提示文字
+      force: false, //请求冲突-默认false
     };
   },
   methods: {
@@ -87,7 +89,10 @@ export default {
       }
     },
     handleClick() { },
-    handleClose(done) { },
+    handleClose() {
+      this.dialogVisible = false;
+      this.$emit('cancel')
+    },
     //检查是否处理完所有冲突
     userSelected() {
       let flag = true;
@@ -136,7 +141,7 @@ export default {
       })
     },
     //确认冲突
-    confirmClash(){
+    confirmClash() {
       // let selectedRows = this.tableData.filter(item => {
       //   return item.checked == 'Old'
       // })
@@ -144,8 +149,8 @@ export default {
       let param = [];
       selectedRows.map(t => {
         let tempObj = {
-          Objs:[t],
-          Points:[t]
+          Objs: [t],
+          Points: [t]
         }
         param.push(tempObj)
       })
@@ -154,7 +159,7 @@ export default {
       })
     },
     //执行规则
-    rulesConfirm(){
+    rulesConfirm() {
       let param = {
         Force: this.force
       }
@@ -162,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)
       })
     }
   },

+ 1 - 1
src/components/point/dynamicdata/equipRules.vue

@@ -185,7 +185,7 @@ export default {
       dynamicQuery(param, res => {
         this.loading = false;
         this.tableData = res.Content;
-        this.page.total = res.PageSize < 50 ? res.pageSize : res.Total;
+        this.page.total = res.PageSize < 50 ? res.PageSize : res.Total;
       });
     },
     //刷新列表

+ 1 - 0
src/views/ledger/cenotelist/index.vue

@@ -190,6 +190,7 @@ export default {
         // }
         param.Content.push(item);
       })
+      param.Projection = []
 
       await updataCenoteTableData(param, (res) => {
         

+ 1 - 0
src/views/ledger/facility/partsmanage/index.vue

@@ -265,6 +265,7 @@ export default {
         // }
         param.data.Content.push(item);
       });
+      param.Projection = []
       await updateParts(param, res => { });
     },
     // 删除表格数据

+ 1 - 0
src/views/ledger/rentlist/index.vue

@@ -207,6 +207,7 @@ export default {
         param.Content.push(item);
       });
 
+      param.Projection = []
       await updataRentTableData(param, (res) => {
         
       })

+ 2 - 2
src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -368,7 +368,7 @@ export default {
       }
       this.lTableLoading = true;
       dynamicPendingPoint(param, res => {
-        this.lPage.total = res.PageSize < 50 ? res.pageSize : res.Total;
+        this.lPage.total = res.PageSize < 50 ? res.PageSize : res.Total;
         if (this.lPage.pageNumber == 1) {
           this.LtableData = res.Content;
         } else {
@@ -411,7 +411,7 @@ export default {
       }
       this.rTableLoading = true;
       dynamicPendingobjs(param, res => {
-        this.rPage.total = res.PageSize < 50 ? res.pageSize : res.Total;
+        this.rPage.total = res.PageSize < 50 ? res.PageSize : res.Total;
         if (this.rPage.pageNumber == 1) {
           this.RtableData = res.Content;
         } else {

+ 29 - 17
src/views/point/dynamicdata/index.vue

@@ -29,7 +29,7 @@
     <equip-rules v-if="curType=='设备'" ref="equip" :typeName="curType" @refresh="equipRefresh" :isPending="isPending"></equip-rules>
     <!-- <parts-rules v-if="!curType=='设备'" ref="parts" :typeName="'设备'"></parts-rules> -->
     <!-- 应用规则弹窗 -->
-    <apply-rules-dialog ref="apply" @refresh="getExecuteFeedback"></apply-rules-dialog>
+    <apply-rules-dialog ref="apply" @refresh="getExecuteFeedback" @cancel="cancelApply"></apply-rules-dialog>
     <!-- 规则更新提示 -->
     <el-dialog title="提示" :visible.sync="ruleDialogShow" width="25%" @close="rulesClose">
       <span>{{tipCon}}</span>
@@ -110,7 +110,7 @@ export default {
       //对象类型
       this.getTypeNames();
       //获取 执行反馈
-      this.getExecuteFeedback();
+      this.getPrompt();
     },
     //获取提示消息
     getPrompt() {
@@ -190,21 +190,33 @@ export default {
     //   console.log('右键事件')
     // },
     //获取执行反馈
-    getExecuteFeedback() {
-      dynamicExecuteFeedback('', res => {
-        this.allApplyClose()
-        this.isPending = false;
-        let response = res.Content[0]
-        if (response.Completed == 'Processing') {
-          this.isPending = true;
-          this.tipsType = 0;
-          setTimeout(() => {
-            this.getExecuteFeedback()
-          }, 2000)
-        } else {
-          this.getPrompt()
-        }
-      })
+    getExecuteFeedback(missionID) {
+      let param = {
+        Id: missionID
+      }
+      setTimeout(() => {
+        dynamicExecuteFeedback(param, res => {
+          this.allApplyClose()
+          let response = res.Content[0]
+          if (response.Completed == 'Waiting' || response.Completed == 'Pending') {
+            this.isPending = true;
+            this.tipsType = 0;
+            setTimeout(() => {
+              this.getExecuteFeedback(missionID)
+            }, 2000)
+          } else {
+            setTimeout(() => {
+              this.isPending = false;
+              this.getPrompt()
+            }, 2000)
+          }
+        })
+      }, 2000)
+    },
+    //取消执行
+    cancelApply(x) {
+      this.isPending = false;
+      this.tipsType = 1;
     }
   },
   watch: {