From 90e466c3e52c189e802ad1898becba54c55d91e8 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 09 八月 2023 15:03:58 +0800
Subject: [PATCH] 部门产线的权限控制、设备工作日历界面的样式调整
---
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index 1815e4f..cdf0548 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>
@@ -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() {
@@ -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)
}
})
@@ -516,7 +543,7 @@
.dataContent {
white-space: nowrap;
/*margin: 0;*/
- border: none;
+ /*border: none;*/
border-collapse: separate;
border-spacing: 0;
/*table-layout: fixed;*/
--
Gitblit v1.9.3