flx:修改样式问题
This commit is contained in:
parent
da49e10d32
commit
717e9e8822
@ -38,7 +38,7 @@
|
|||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
<div class="table_wrap whiteBlock">
|
<div class="table_wrap whiteBlock">
|
||||||
<el-table ref="multipleTable" class="tables" :data="rulesList">
|
<el-table height="calc(100% - 64px)" max-height="calc(100% - 64px)" ref="multipleTable" class="tables" :data="rulesList">
|
||||||
<el-table-column type="selection" align="center" width="55"></el-table-column>
|
<el-table-column type="selection" align="center" width="55"></el-table-column>
|
||||||
<el-table-column align="center" prop="groupName" label="考勤组名称">
|
<el-table-column align="center" prop="groupName" label="考勤组名称">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@ -487,7 +487,8 @@
|
|||||||
</el-form>
|
</el-form>
|
||||||
<el-table
|
<el-table
|
||||||
ref="selectworkerTable"
|
ref="selectworkerTable"
|
||||||
:height="330"
|
height="calc(100% - 64px - 58px)"
|
||||||
|
max-height="calc(100% - 64px - 58px)"
|
||||||
class="tables selectworkerTable"
|
class="tables selectworkerTable"
|
||||||
:data="selectWorkerList"
|
:data="selectWorkerList"
|
||||||
>
|
>
|
||||||
@ -1495,6 +1496,15 @@ export default {
|
|||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
|
.table_wrap {
|
||||||
|
position: relative;
|
||||||
|
.pagerBox {
|
||||||
|
margin-top: 0;
|
||||||
|
width: 100%;
|
||||||
|
position: absolute;
|
||||||
|
bottom: 16px;
|
||||||
|
}
|
||||||
|
}
|
||||||
.pagerBox1 {
|
.pagerBox1 {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -1510,6 +1520,7 @@ export default {
|
|||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
.main-table {
|
.main-table {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
|
height: calc(100% - 130px - 48px - 20px - 64px - 22px);
|
||||||
.el-input,
|
.el-input,
|
||||||
.el-select {
|
.el-select {
|
||||||
width: 192px;
|
width: 192px;
|
||||||
|
|||||||
@ -189,7 +189,7 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<el-table :data="tableData" :key="itemKey" max-height="500" width="100%" border>
|
<el-table :data="tableData" :key="itemKey" :max-height="570" width="100%" border>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="workerName"
|
prop="workerName"
|
||||||
:label="$t('message.laborMange.compellation')"
|
:label="$t('message.laborMange.compellation')"
|
||||||
@ -334,7 +334,7 @@
|
|||||||
:label="$t('message.laborMange.compellation')"
|
:label="$t('message.laborMange.compellation')"
|
||||||
align="center"
|
align="center"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<el-table-column
|
<!-- <el-table-column
|
||||||
prop="temperature"
|
prop="temperature"
|
||||||
:label="$t('message.laborMange.temperature') + '(℃)'"
|
:label="$t('message.laborMange.temperature') + '(℃)'"
|
||||||
align="center"
|
align="center"
|
||||||
@ -381,7 +381,7 @@
|
|||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ vaccinationFrequencyltsList[scope.row.vaccinateState] || "无" }}
|
{{ vaccinationFrequencyltsList[scope.row.vaccinateState] || "无" }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column> -->
|
||||||
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="passType"
|
prop="passType"
|
||||||
@ -1373,9 +1373,10 @@ export default {
|
|||||||
padding: 24px 20px 0;
|
padding: 24px 20px 0;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
margin-bottom: 7px;
|
// margin-bottom: 7px;
|
||||||
.el-form-item {
|
.el-form-item {
|
||||||
margin-right: 30px;
|
margin-right: 30px;
|
||||||
|
margin-bottom: 20px;
|
||||||
}
|
}
|
||||||
.el-select,
|
.el-select,
|
||||||
.el-date-editor,
|
.el-date-editor,
|
||||||
@ -1387,7 +1388,7 @@ export default {
|
|||||||
.table_content {
|
.table_content {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
// background: #fff;
|
// background: #fff;
|
||||||
padding: 15px 0 0;
|
// padding: 15px 0 0;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
// .left {
|
// .left {
|
||||||
|
|||||||
@ -69,7 +69,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="table_wrap whiteBlock">
|
<div class="table_wrap whiteBlock">
|
||||||
<el-table class="tables" :data="workerList">
|
<el-table height="calc(100% - 64px)" max-height="calc(100% - 64px)" class="tables" :data="workerList">
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center"
|
align="center"
|
||||||
prop="planName"
|
prop="planName"
|
||||||
@ -949,6 +949,16 @@ export default {
|
|||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
|
.table_wrap {
|
||||||
|
position: relative;
|
||||||
|
.pagerBox {
|
||||||
|
margin-top: 0;
|
||||||
|
width: 100%;
|
||||||
|
position: absolute;
|
||||||
|
bottom: 16px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/deep/ .el-dialog {
|
/deep/ .el-dialog {
|
||||||
margin-top: 2vh !important;
|
margin-top: 2vh !important;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -111,21 +111,23 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" plain @click="handleQuery">查询</el-button>
|
<el-button type="primary" plain @click="handleQuery">查询</el-button>
|
||||||
<el-button type="warning" plain @click="handleRefresh">刷新</el-button>
|
<el-button type="warning" plain @click="handleRefresh">刷新</el-button>
|
||||||
<el-button @click="handleCommandExport(1)" type="primary" plain
|
<el-button @click="handleCommandExport(1)" type="primary"
|
||||||
>导出</el-button
|
>导出</el-button
|
||||||
>
|
>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
<div class="table-header">
|
||||||
<div class="table-header">
|
|
||||||
{{ $store.state.currentProDetail.projectName }}项目异常工时统计表
|
{{ $store.state.currentProDetail.projectName }}项目异常工时统计表
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<el-table
|
<el-table
|
||||||
ref="multipleTable"
|
ref="multipleTable"
|
||||||
:data="tableData"
|
:data="tableData"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:height="450"
|
|
||||||
class="new-tables"
|
class="new-tables"
|
||||||
|
height="calc(100% - 128px - 4px)"
|
||||||
|
max-height="calc(100% - 128px)"
|
||||||
border
|
border
|
||||||
>
|
>
|
||||||
<!-- <el-table-column type="selection" align="center" width="55"></el-table-column> -->
|
<!-- <el-table-column type="selection" align="center" width="55"></el-table-column> -->
|
||||||
@ -446,16 +448,21 @@ export default {
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
font-weight: 800;
|
font-weight: 800;
|
||||||
font-size: 32px;
|
font-size: 26px;
|
||||||
color: #333333;
|
color: #333333;
|
||||||
|
position: absolute;
|
||||||
|
bottom: 20px;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
}
|
}
|
||||||
.new-tables {
|
.new-tables {
|
||||||
width: calc(100% - 32px);
|
width: calc(100% - 32px);
|
||||||
margin: 20px 16px 0;
|
margin: 0 16px 0;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
border-color: #e9e9e9;
|
border-color: #e9e9e9;
|
||||||
/deep/ .el-table__cell {
|
/deep/ .el-table__cell {
|
||||||
border-color: #e9e9e9 !important;
|
border-color: #e9e9e9 !important;
|
||||||
|
padding: 11px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
:deep(.el-dialog__body) {
|
:deep(.el-dialog__body) {
|
||||||
@ -547,8 +554,10 @@ export default {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
padding-bottom: 64px;
|
||||||
.header_title {
|
.header_title {
|
||||||
padding: 20px 20px 0 20px;
|
padding: 16px 20px 0 20px;
|
||||||
|
position: relative;
|
||||||
:deep(.el-cascader__search-input) {
|
:deep(.el-cascader__search-input) {
|
||||||
min-width: 10px;
|
min-width: 10px;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -83,20 +83,22 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" plain @click="handleQuery">查询</el-button>
|
<el-button type="primary" plain @click="handleQuery">查询</el-button>
|
||||||
<el-button type="warning" plain @click="handleRefresh">刷新</el-button>
|
<el-button type="warning" plain @click="handleRefresh">刷新</el-button>
|
||||||
<el-button @click="handleCommandExport(1)" type="primary" plain
|
<el-button @click="handleCommandExport(1)" type="primary"
|
||||||
>导出</el-button
|
>导出</el-button
|
||||||
>
|
>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
<div class="table-header">{{ $store.state.currentProDetail.projectName }}项目工时统计表({{daterangeUp}})</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="table-header">{{ $store.state.currentProDetail.projectName }}项目工时统计表({{daterangeUp}})</div>
|
|
||||||
<el-table
|
<el-table
|
||||||
ref="multipleTable"
|
ref="multipleTable"
|
||||||
:data="tableData"
|
:data="tableData"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:height="450"
|
|
||||||
class="new-tables"
|
class="new-tables"
|
||||||
border
|
border
|
||||||
|
height="calc(100% - 128px - 32px - 32px)"
|
||||||
|
max-height="calc(100% - 128px - 32px - 32px)"
|
||||||
:key="itemKey"
|
:key="itemKey"
|
||||||
>
|
>
|
||||||
<!-- <el-table-column type="selection" align="center" width="55"></el-table-column> -->
|
<!-- <el-table-column type="selection" align="center" width="55"></el-table-column> -->
|
||||||
@ -141,7 +143,7 @@
|
|||||||
v-for="(item, index) in showTime"
|
v-for="(item, index) in showTime"
|
||||||
:key="index"
|
:key="index"
|
||||||
align="center"
|
align="center"
|
||||||
width="60"
|
width="100"
|
||||||
>
|
>
|
||||||
<template slot="header">
|
<template slot="header">
|
||||||
<div>
|
<div>
|
||||||
@ -449,16 +451,22 @@ export default {
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
font-weight: 800;
|
font-weight: 800;
|
||||||
font-size: 32px;
|
font-size: 26px;
|
||||||
color: #333333;
|
color: #333333;
|
||||||
|
position: absolute;
|
||||||
|
bottom: 20px;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
}
|
}
|
||||||
.new-tables {
|
.new-tables {
|
||||||
width: calc(100% - 32px);
|
width: calc(100% - 32px);
|
||||||
margin: 20px 16px 0;
|
// height: calc(100% - 128px - 32px - 32px);
|
||||||
|
margin: 0 16px 0;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
border-color: #e9e9e9;
|
border-color: #e9e9e9;
|
||||||
/deep/ .el-table__cell {
|
/deep/ .el-table__cell {
|
||||||
border-color: #e9e9e9 !important;
|
border-color: #e9e9e9 !important;
|
||||||
|
padding: 11px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
:deep(.el-dialog__body) {
|
:deep(.el-dialog__body) {
|
||||||
@ -551,7 +559,8 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
.header_title {
|
.header_title {
|
||||||
padding: 20px 20px 0 20px;
|
padding: 16px 20px 0 20px;
|
||||||
|
position: relative;
|
||||||
:deep(.el-cascader__search-input) {
|
:deep(.el-cascader__search-input) {
|
||||||
min-width: 10px;
|
min-width: 10px;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user