From b82cf6ea881a2d6b8f76f38bb0cef35c69bf5da5 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期二, 15 八月 2023 11:00:00 +0800
Subject: [PATCH] 提示调整
---
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 111 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 26 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index 5b9905b..4c8fd2f 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -29,7 +29,7 @@
</a-row>
</a-form>
</div>
- <div style="width: 400px;position: absolute;top: 20px; right: 0px;">
+ <div style="width: 530px;position: absolute;top: 20px; 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,12 +50,12 @@
<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: 100px; max-width: 100px;width: 100px;"></th>
- <th class="thgu dong1 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;"></th>
- <th class="thgu dong1 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;"></th>
- <th class="thgu dong1 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿</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: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷</th>
+ <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 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>
<!--<th rowspan="2">缁勫埆</th>-->
<template v-for="(tableHead, index) in tableHeads">
<th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -74,12 +74,12 @@
</thead>
<tbody>
<tr class="mathData" v-for="(item, index) in dataList">
- <td :rowspan="item.level1span" :class="{hidden: item.level1dis}" v-show="!item.level1dis">{{item.level1}}</td>
- <td :rowspan="item.level2span" :class="{hidden: item.level2dis}" v-show="!item.level2dis">{{item.level2}}</td>
- <td :rowspan="item.level3span" :class="{hidden: item.level3dis}" v-show="!item.level3dis">{{item.level3}}</td>
- <td class="tdgu kaitou">{{item.equipmentId}}</td>
- <td class="tdgu1 kaitou">{{item.equipmentName}}</td>
- <td class="tdgu2 kaitou">{{item.equipmentType}}</td>
+ <td class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}" v-show="!item.level1dis">{{item.level1}}</td>
+ <td class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}" v-show="!item.level2dis">{{item.level2}}</td>
+ <td class="tdgu2 kaitou" :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>
<template v-for="(tableHead, index) in item.dataList">
<td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1">
@@ -142,7 +142,7 @@
dataList: [],
url: {
list: '/mdc/efficiencyReport/efficiencyList',
- listByType: '/mdc/MdcUtilizationRate/listByType'
+ listByType: '/mdc/MdcUtilizationRate/getByType'
},
tableHeads: [],
@@ -323,7 +323,7 @@
exclude_img: true,
fileext: ".xls",
exclude_links: true,
- exclude_inputs: true
+ exclude_inputs: false
});
},
showIdentifying() {
@@ -340,18 +340,44 @@
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
}else{
- // this.queryParam.TreeIDOne = ""
this.queryParam.parentId = this.queryParamPeople.parentId
this.queryParam.equipmentId = ""
}
@@ -360,12 +386,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 +411,7 @@
this.checkSameData1(this.dataList)
this.checkSameData2(this.dataList)
this.combineCell();
- this.initDeviceType(this.dataList)
+ // this.initDeviceType(this.dataList)
}
})
@@ -405,12 +437,27 @@
}
.table tbody tr .tdgu1{
position: sticky;
- left: 100px;
+ left: 150px;
z-index: 2;
}
.table tbody tr .tdgu2{
position: sticky;
- left: 250px;
+ left: 300px;
+ z-index: 2;
+}
+.table tbody tr .tdgu3{
+ position: sticky;
+ left: 450px;
+ z-index: 2;
+}
+.table tbody tr .tdgu4{
+ position: sticky;
+ left: 550px;
+ z-index: 2;
+}
+.table tbody tr .tdgu5{
+ position: sticky;
+ left: 700px;
z-index: 2;
}
.table2 thead tr .timeth,
@@ -434,11 +481,23 @@
}
.table2 thead .equipname .dong2{
z-index: 5;
- left: 100px;
+ left: 150px;
}
.table2 thead .equipname .dong3{
z-index: 5;
- left: 250px;
+ left: 300px;
+}
+.table2 thead .equipname .dong4{
+ z-index: 5;
+ left: 450px;
+}
+.table2 thead .equipname .dong5{
+ z-index: 5;
+ left: 550px;
+}
+.table2 thead .equipname .dong6{
+ z-index: 5;
+ left: 700px;
}
@media screen and (min-width: 1920px){
@@ -489,7 +548,7 @@
.dataContent {
white-space: nowrap;
/*margin: 0;*/
- border: none;
+ /*border: none;*/
border-collapse: separate;
border-spacing: 0;
/*table-layout: fixed;*/
--
Gitblit v1.9.3