@@ -1,7 +1,7 @@ | |||||
### | ### | ||||
# @Author: zhp | # @Author: zhp | ||||
# @Date: 2024-04-12 14:30:48 | # @Date: 2024-04-12 14:30:48 | ||||
# @LastEditTime: 2024-04-19 16:11:56 | |||||
# @LastEditTime: 2024-04-22 08:45:38 | |||||
# @LastEditors: zhp | # @LastEditors: zhp | ||||
# @Description: | # @Description: | ||||
### | ### | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2024-04-18 14:08:46 | * @Date: 2024-04-18 14:08:46 | ||||
* @LastEditTime: 2024-04-19 15:11:14 | |||||
* @LastEditTime: 2024-04-22 08:42:07 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -383,24 +383,24 @@ export default { | |||||
}, | }, | ||||
}; | }; | ||||
</script> | </script> | ||||
<style> | |||||
.baseTable .el-table__body tr.current-row>td.el-table__cell { | |||||
<style scoped> | |||||
::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell { | |||||
background-color: #EAF1FC; | background-color: #EAF1FC; | ||||
} | } | ||||
.baseTable .el-table .el-table__cell { | |||||
::v-deep .baseTable .el-table .el-table__cell { | |||||
padding: 0; | padding: 0; | ||||
height: 35px; | height: 35px; | ||||
} | } | ||||
.el-table thead.is-group th { | |||||
::v-deep.el-table thead.is-group th { | |||||
background: none; | background: none; | ||||
} | } | ||||
.el-table thead.is-group tr:first-of-type th:first-of-type { | |||||
::v-deep.el-table thead.is-group tr:first-of-type th:first-of-type { | |||||
border-bottom: none; | border-bottom: none; | ||||
} | } | ||||
.el-table thead.is-group tr:first-of-type th:first-of-type:before { | |||||
::v-deep.el-table thead.is-group tr:first-of-type th:first-of-type:before { | |||||
content: ''; | content: ''; | ||||
position: absolute; | position: absolute; | ||||
width: 1px; | width: 1px; | ||||
@@ -416,7 +416,7 @@ export default { | |||||
transform-origin: top; | transform-origin: top; | ||||
} | } | ||||
.el-table thead.is-group tr:last-of-type th:first-of-type:before { | |||||
::v-deep.el-table thead.is-group tr:last-of-type th:first-of-type:before { | |||||
content: ''; | content: ''; | ||||
position: absolute; | position: absolute; | ||||
width: 1px; | width: 1px; | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2024-04-18 14:08:46 | * @Date: 2024-04-18 14:08:46 | ||||
* @LastEditTime: 2024-04-19 15:48:59 | |||||
* @LastEditTime: 2024-04-22 08:48:08 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -117,7 +117,8 @@ export default { | |||||
codeList: ['sj1', 'sj2', 'sj3', 'sj4', 'sj5', 'sj7', 'sj8', 'sj10', 'sj11', 'sj12', 'sj13', 'sj14'], | codeList: ['sj1', 'sj2', 'sj3', 'sj4', 'sj5', 'sj7', 'sj8', 'sj10', 'sj11', 'sj12', 'sj13', 'sj14'], | ||||
tableData: [], | tableData: [], | ||||
listQuery: { | listQuery: { | ||||
"productionLineId": 1696716506443354114, "startTime": "2024-01-19 07:00:00" | |||||
productionLineId: 1696716506443354114, | |||||
startTime: "2024-01-19 07:00:00" | |||||
}, | }, | ||||
formConfig: [ | formConfig: [ | ||||
{ | { | ||||
@@ -369,8 +370,8 @@ export default { | |||||
buttonClick(val) { | buttonClick(val) { | ||||
switch (val.btnName) { | switch (val.btnName) { | ||||
case 'search': | case 'search': | ||||
this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined; | |||||
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined; | |||||
// this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined; | |||||
// this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined; | |||||
this.getDataList(); | this.getDataList(); | ||||
break; | break; | ||||
case 'export': | case 'export': | ||||