From 5cbba170e270e6f1c99a91e27dbb7951a27d596a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 24 十一月 2023 16:41:32 +0800
Subject: [PATCH] 故障报修验收

---
 src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue |  120 ++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index 7c32682..eeda3d2 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="efficiency_list" style="width: 100%">
-    <a-card :bordered="false">
+    <div :bordered="false">
       <!-- 鏌ヨ鍖哄煙 -->
       <div>
         <div class="table-page-search-wrapper">
@@ -29,7 +29,7 @@
             </a-row>
           </a-form>
         </div>
-        <div style="width: 530px;position: absolute;top: 20px; right: 1.5%;">
+        <div style="width: 530px;position: absolute;top: 0; right: 1.5%;">
           <table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
             <tr>
               <td v-for="(item, index) in identifying">{{item.title}}</td>
@@ -50,9 +50,9 @@
           <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap">
             <thead>
             <tr class="thead fixed equipname">
-              <th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
-              <th  class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
-              <th  class="thgu dong3 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
+              <th class="thgu dong1 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;"></th>
+              <th  class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;"></th>
+              <th  class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;"></th>
               <th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿</th>
               <th class="thgu dong5 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">璁惧鍚嶇О</th>
               <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷</th>
@@ -74,9 +74,9 @@
             </thead>
             <tbody>
             <tr class="mathData" v-for="(item, index) in dataList">
-              <td  class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis}"  v-show="!item.level1dis">{{item.level1}}</td>
-              <td  class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis}"  v-show="!item.level2dis">{{item.level2}}</td>
-              <td  class="tdgu2 kaitou" :rowspan="item.level3span" :class="{hidden: item.level3dis}"  v-show="!item.level3dis">{{item.level3}}</td>
+              <td  class="tdgu kaitou wenzi" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}"  v-show="!item.level1dis">{{item.level1}}</td>
+              <td  class="tdgu1 kaitou wenzi" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}"  v-show="!item.level2dis">{{item.level2}}</td>
+              <td  class="tdgu2 kaitou wenzi" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}"  v-show="!item.level3dis">{{item.level3}}</td>
               <td  class="tdgu3  kaitou">{{item.equipmentId}}</td>
               <td  class="tdgu4 kaitou">{{item.equipmentName}}</td>
               <td  class="tdgu5 kaitou">{{item.equipmentType}}</td>
@@ -103,7 +103,7 @@
           </table>
         </div>
       </div>
-    </a-card>
+    </div>
   </div>
 </template>
 
@@ -142,7 +142,7 @@
       dataList: [],
       url: {
         list: '/mdc/efficiencyReport/efficiencyList',
-        listByType: '/mdc/MdcUtilizationRate/getByType'
+        listByType: '/mdc/MdcUtilizationRate/getByType',
       },
       tableHeads: [],
 
@@ -319,7 +319,7 @@
       $("#Efficiency").table2excel({
         exclude: ".noExl",
         name: "Excel Document Name",
-        filename: "鍒╃敤鐜�",
+        filename: "璁惧鍒╃敤鐜�",
         exclude_img: true,
         fileext: ".xls",
         exclude_links: true,
@@ -336,36 +336,77 @@
     dateParamChange(v1, v2) {
       this.queryParam.startTime = v2[0]
       this.queryParam.endTime = v2[1]
+      // 鐐瑰嚮鏃堕棿閫夋嫨鍣ㄧ殑娓呯┖鎸夐挳鏃朵細瑙﹀彂姝ゅ垽鏂�(鐐瑰嚮閲嶇疆鎸夐挳涓嶄細瑙﹀彂)锛屽疄鐜伴噸缃垪琛ㄥ姛鑳斤紝鍒囧疄鏀瑰彉鍒楄〃鏄剧ず鏁堟灉
+      if(!this.queryParam.startTime&&!this.queryParam.endTime)this.searchReset()
     },
     efficiencyOptionsOnChange(checkedList) {
       let index = checkedList.indexOf('lyl')
       if (index < 0) {
-        this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
+        // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ寮�鍔ㄧ巼')
+        this.$notification.warning({
+          message:'娑堟伅',
+          description:"涓嶈兘鍙栨秷鏌ヨ寮�鍔ㄧ巼"
+        })
+
         return false
       }
       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
+      if(this.dates != ''){
+        if(this.queryParam.typeTree == "1"){
+          this.queryParam.parentId =  this.queryParamEquip.parentId
+          this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+        }else{
+          this.queryParam.parentId = this.queryParamPeople.parentId
+          this.queryParam.equipmentId = ""
+        }
+        this.loadData()
       }else{
-        // this.queryParam.TreeIDOne = ""
-        this.queryParam.parentId = this.queryParamPeople.parentId
-        this.queryParam.equipmentId = ""
+        this.$notification.warning({
+          message:'娑堟伅',
+          description:"璇烽�夋嫨鏃堕棿"
+        });
       }
-      this.loadData()
       // this.onClearSelected()
     },
     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 +420,7 @@
           this.checkSameData1(this.dataList)
           this.checkSameData2(this.dataList)
           this.combineCell();
-          this.initDeviceType(this.dataList)
+          // this.initDeviceType(this.dataList)
 
         }
       })
@@ -399,33 +440,40 @@
   left: 0;
   z-index: 1;
 }
+.table tbody tr .wenzi{
+  /*writing-mode: vertical-lr;*/
+  /*text-orientation: upright;*/
+  transform: rotate(360deg);
+  writing-mode: vertical-lr;
+  letter-spacing: 2px;
+}
 .table tbody tr .kaitou{
   z-index: 1;
   background-color: white;
 }
 .table tbody tr .tdgu1{
   position: sticky;
-  left: 150px;
+  left: 50px;
   z-index: 2;
 }
 .table tbody tr .tdgu2{
   position: sticky;
-  left: 300px;
+  left: 100px;
   z-index: 2;
 }
 .table tbody tr .tdgu3{
   position: sticky;
-  left: 450px;
+  left: 150px;
   z-index: 2;
 }
 .table tbody tr .tdgu4{
   position: sticky;
-  left: 550px;
+  left: 250px;
   z-index: 2;
 }
 .table tbody tr .tdgu5{
   position: sticky;
-  left: 700px;
+  left: 400px;
   z-index: 2;
 }
 .table2 thead tr .timeth,
@@ -449,23 +497,23 @@
 }
 .table2 thead .equipname .dong2{
   z-index: 5;
-  left: 150px;
+  left: 50px;
 }
 .table2 thead .equipname .dong3{
   z-index: 5;
-  left: 300px;
+  left: 100px;
 }
 .table2 thead .equipname .dong4{
   z-index: 5;
-  left: 450px;
+  left: 150px;
 }
 .table2 thead .equipname .dong5{
   z-index: 5;
-  left: 550px;
+  left: 250px;
 }
 .table2 thead .equipname .dong6{
   z-index: 5;
-  left: 700px;
+  left: 400px;
 }
 
 @media screen and (min-width: 1920px){
@@ -544,9 +592,9 @@
   /*width: auto;*/
 }
 
-.dataContent tr td {
-  height: 35px;
-}
+/*.dataContent tr td {*/
+  /*height: 35px;*/
+/*}*/
 
 .dataContent .mathData td {
   padding: 10px;

--
Gitblit v1.9.3