Browse Source

fix tipstype bug

haojianlong 5 years ago
parent
commit
6d35bdf4a2

+ 1 - 0
src/components/point/dynamicdata/delRelationDialog.vue

@@ -89,6 +89,7 @@ export default {
     },
     handleClose(done) {
       this.dialogVisible = false;
+      this.deleDisabled = true
     },
     //确认清除对应关系
     handleDelete() {

+ 2 - 4
src/components/point/dynamicdata/equipRules.vue

@@ -181,10 +181,8 @@ export default {
       // 查询对应关系(P1)
       dynamicQuery(param, res => {
         this.loading = false;
-        if (res.Result == "success") {
-          this.tableData = res.Content;
-          this.page.total = res.Total;
-        }
+        this.tableData = res.Content;
+        this.page.total = res.PageSize < 50 ? res.pageSize : res.Total;
       });
     },
     //刷新列表

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

@@ -316,10 +316,10 @@ export default {
           }
         }
       }
-      if (this.LtableData.length < 20) {
+      if (this.LtableData.length < 20 && this.lPage.Total > 49) {
         this.queryLeftTable()
       }
-      if (this.RtableData.length < 20) {
+      if (this.RtableData.length < 20 && this.rPage.Total > 49) {
         this.queryRightTable()
       }
     },

+ 3 - 3
src/views/point/dynamicdata/index.vue

@@ -91,6 +91,7 @@ export default {
           if (res.Content.length) {
             for (let i = 0; i < res.Content.length; i++) {
               if (res.Content[i].Type == "最后一次执行时间") {
+                this.tipsType = this.tipsType > 1 ? this.tipsType : 1;
                 this.lastUpdateTime = res.Content[i].Content.substr(0, res.Content[i].Content.lastIndexOf('.'));
               }
               if (res.Content[i].Type == "原始点位增删") {
@@ -104,9 +105,6 @@ export default {
                 this.ruleDialogShow = true;
               }
             }
-            if (res.Content.length < 2) {
-              this.tipsType = 1;
-            }
           }
         }
       });
@@ -131,6 +129,7 @@ export default {
     //执行对应结果
     apply() {
       this.ruleDialogShow = false;
+      this.tipsType = 1;
       this.$refs.apply.showDialog();
     },
     //规则执行弹窗
@@ -159,6 +158,7 @@ export default {
   position: relative;
   .top-tab {
     position: relative;
+    height: 54px;
     .pos-right {
       position: absolute;
       right: 0;