From c9268d6be2baae3e9c3a97ee6ed6684482b0574e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 01 八月 2023 17:55:26 +0800
Subject: [PATCH] 设备日志界面的持续时间的显示处理,设备数据对比分析界面调取接口,渲染,设备工作日历界面的班制接口的修改

---
 src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index 7c32682..cdf0548 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -345,13 +345,34 @@
       }
       this.checkedList = checkedList
     },
+    // searchQuery() {
+    //   if(this.queryParam.typeTree == "1"){
+    //     // this.queryParam.TreeIDTwo = ""
+    //     this.queryParam.parentId =  this.queryParamEquip.parentId
+    //     this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+    //   }else{
+    //     // this.queryParam.TreeIDOne = ""
+    //     this.queryParam.parentId = this.queryParamPeople.parentId
+    //     this.queryParam.equipmentId = ""
+    //   }
+    //   this.loadData()
+    //   // this.onClearSelected()
+    // },
+    // searchReset() {
+    //   this.typeTree = this.queryParam.typeTree
+    //   this.typeParent =  this.queryParams.parentId
+    //   this.queryParam = {}
+    //   this.dates = []
+    //   this.queryParam.typeTree = this.typeTree
+    //   this.queryParam.parentId = this.typeParent
+    //   this.loadData()
+    //   // this.onClearSelected()
+    // },
     searchQuery() {
       if(this.queryParam.typeTree == "1"){
-        // this.queryParam.TreeIDTwo = ""
         this.queryParam.parentId =  this.queryParamEquip.parentId
         this.queryParam.equipmentId = this.queryParamEquip.equipmentId
       }else{
-        // this.queryParam.TreeIDOne = ""
         this.queryParam.parentId = this.queryParamPeople.parentId
         this.queryParam.equipmentId = ""
       }
@@ -360,12 +381,18 @@
     },
     searchReset() {
       this.typeTree = this.queryParam.typeTree
-      this.typeParent =  this.queryParams.parentId
+      this.typeParent =  this.queryParam.parentId
+      this.typeEquipment = this.queryParam.equipmentId
       this.queryParam = {}
       this.dates = []
       this.queryParam.typeTree = this.typeTree
       this.queryParam.parentId = this.typeParent
-      this.loadData()
+      this.queryParam.equipmentId =  this.typeEquipment
+      // this.ipagination.current = 1
+      this.loadData();
+      // this.queryParam = {}
+      // this.dates = []
+      // this.loadData()
       // this.onClearSelected()
     },
     loadData() {
@@ -379,7 +406,7 @@
           this.checkSameData1(this.dataList)
           this.checkSameData2(this.dataList)
           this.combineCell();
-          this.initDeviceType(this.dataList)
+          // this.initDeviceType(this.dataList)
 
         }
       })

--
Gitblit v1.9.3