Skip to content

Administrator / project_progress

Go to a project
Commit fc0d59ec by liangzhen
Options

整体布局调整

1 parent 306cc57d
Inline Side-by-side
Showing with 64 additions and 103 deletions
src/views/assessChecks/assistedViewing.vue
...@@ -915,12 +915,6 @@ h3 { ...@@ -915,12 +915,6 @@ h3 {
border-radius: 5px; border-radius: 5px;
} }
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.setscrolldialog { .setscrolldialog {
width: 100%; width: 100%;
height: 300px; height: 300px;
......
src/views/assessChecks/auxiliaryInspection.vue
...@@ -1225,12 +1225,6 @@ export default { ...@@ -1225,12 +1225,6 @@ export default {
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.dialog { .dialog {
.eltable { .eltable {
height: 650px; height: 650px;
......
src/views/assessChecks/auxiliarySelection.vue
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscrollOne">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -1519,12 +1519,6 @@ export default { ...@@ -1519,12 +1519,6 @@ export default {
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.setscrolldialog { .setscrolldialog {
width: 100%; width: 100%;
height: 450px; height: 450px;
......
src/views/assessChecks/confirmRelease.vue
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscrollOne">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -1395,12 +1395,6 @@ export default { ...@@ -1395,12 +1395,6 @@ export default {
box-sizing: border-box; box-sizing: border-box;
overflow-y: auto; overflow-y: auto;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.setscrolldialog { .setscrolldialog {
// width: 100%; // width: 100%;
height: 400px; height: 400px;
......
src/views/assessChecks/materialAcquisition.vue
...@@ -1275,12 +1275,6 @@ export default { ...@@ -1275,12 +1275,6 @@ export default {
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.setscrolldialog { .setscrolldialog {
width: 100%; width: 100%;
height: 290px; height: 290px;
......
src/views/assessChecks/mianHome.vue
...@@ -152,10 +152,10 @@ export default { ...@@ -152,10 +152,10 @@ export default {
font-size: 14px; font-size: 14px;
position: relative; position: relative;
min-height: 87vh !important; min-height: 87vh !important;
height: 100%;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
overflow-x: hidden; overflow-x: hidden;
/* background: red; */
background-image: url("../../assets/mainbcg.png"); background-image: url("../../assets/mainbcg.png");
background-size: cover; background-size: cover;
.querytj { .querytj {
......
src/views/assessZC/assistedViewing.vue
...@@ -914,12 +914,6 @@ h3 { ...@@ -914,12 +914,6 @@ h3 {
border-radius: 5px; border-radius: 5px;
} }
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.setscrolldialog { .setscrolldialog {
width: 100%; width: 100%;
height: 300px; height: 300px;
......
src/views/assessZC/auxiliaryInspection.vue
...@@ -1225,12 +1225,6 @@ export default { ...@@ -1225,12 +1225,6 @@ export default {
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.dialog { .dialog {
.eltable { .eltable {
height: 650px; height: 650px;
......
src/views/assessZC/auxiliarySelection.vue
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscrollOne">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -1523,12 +1523,7 @@ export default { ...@@ -1523,12 +1523,7 @@ export default {
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 55vh;
position: relative;
overflow: auto;
}
.setscrolldialog { .setscrolldialog {
width: 100%; width: 100%;
height: 320px; height: 320px;
......
src/views/assessZC/confirmRelease.vue
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscrollOne">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -1394,12 +1394,6 @@ export default { ...@@ -1394,12 +1394,6 @@ export default {
box-sizing: border-box; box-sizing: border-box;
overflow-y: auto; overflow-y: auto;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.setscrolldialog { .setscrolldialog {
// width: 100%; // width: 100%;
height: 400px; height: 400px;
......
src/views/assessZC/materialAcquisition.vue
...@@ -1275,12 +1275,7 @@ export default { ...@@ -1275,12 +1275,7 @@ export default {
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.setscrolldialog { .setscrolldialog {
width: 100%; width: 100%;
height: 290px; height: 290px;
......
src/views/assessZC/projectView.vue
...@@ -1209,7 +1209,7 @@ export default { ...@@ -1209,7 +1209,7 @@ export default {
} }
.setscroll { .setscroll {
width: 100%; width: 100%;
height: 55vh; // height: 55vh;
position: relative; position: relative;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
......
src/views/layout/continerView.vue
<template> <template>
<div class="main"> <div >
<TagsView></TagsView> <TagsView></TagsView>
<router-view></router-view> <div class="app-section">
<router-view class=""></router-view>
</div>
</div> </div>
</template> </template>
...@@ -29,14 +32,14 @@ export default { ...@@ -29,14 +32,14 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.main{
min-height:80vh; .app-section {
padding: 10px; background-color: #fff;
padding-top:5px; margin-top: 10px;
padding-bottom: 0; width: 100%;
overflow-y: auto; height: calc(100% - 55px);
overflow-x: hidden; position: relative;
// overflow: auto; padding: 15px;
} }
</style> </style>
\ No newline at end of file
src/views/layout/index.vue
<template> <template>
<div class="mian"> <div class="mian">
<div class="head-container"> <!-- <div class="head-container">
<div class="logo" style="z-index: 10"> <div class="logo" style="z-index: 10">
<div class="logo-inner"> <div class="logo-inner">
<img src="../../assets/logo.png" alt="" /> <img src="../../assets/logo.png" alt="" />
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
<router-view></router-view> <router-view></router-view>
<!-- <MainLayout class="continer"> <!-- <MainLayout class="continer">
<router-view></router-view> <router-view></router-view>
...@@ -130,10 +130,9 @@ export default { ...@@ -130,10 +130,9 @@ export default {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.layout { .layout {
width: 100%; // width: 100%;
height: 100%; // height: 100%;
// display: flex; // background-color: #fff;
background-color: #fff;
.header { .header {
width: 100%; width: 100%;
height: 100px; height: 100px;
...@@ -340,8 +339,9 @@ export default { ...@@ -340,8 +339,9 @@ export default {
.mian{ .mian{
// width: 100%; // width: 100%;
// height: 100vh; // height: 100vh;
height: 100vh;
overflow: hidden; overflow: hidden;
height: 100%;
} }
......
src/views/layout/mainLayout.vue
...@@ -200,25 +200,32 @@ export default { ...@@ -200,25 +200,32 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.layout { .layout {
width: 100%; width: 100%;
// height: 100%; height: 100%;
// height: 100vh;
display: flex;
padding: 15px;
background-color: #fff;
position: relative; position: relative;
overflow: hidden; background: #fff;
// background: rgb(241, 242, 244);
overflow:hidden;
display: flex;
flex-wrap: nowrap;
// width: 100%;
// display: flex;
// padding: 15px;
// background-color: #fff;
// position: relative;
// overflow: hidden;
.bar { .bar {
width: 235px !important; width: 235px !important;
height: 100%; height: 100%;
flex-shrink: 0; flex-shrink: 0;
} }
.continer { .continer {
width: 100%; flex: 1;
height: 100%; position: relative;
// flex: 1;
box-sizing: border-box;
overflow: hidden; overflow: hidden;
// overflow: auto; // width: 100%;
// height: 100%;
// box-sizing: border-box;
// overflow: hidden;
} }
.changeqx { .changeqx {
position: absolute; position: absolute;
...@@ -252,13 +259,22 @@ export default { ...@@ -252,13 +259,22 @@ export default {
font-size:17px; font-size:17px;
} }
.el-form{ .el-form{
height: 17vh !important;
margin: 0 !important; margin: 0 !important;
} }
.el-form .button{
margin-bottom: 0;
vertical-align: middle;
}
.setscroll{ .setscroll{
height: 55vh !important; height: calc(100% - 260px);
min-height: 300px;
}
.setscrollOne {
height: calc(100% - 220px);
min-height: 300px;
position: relative;
overflow: auto;
} }
/* .el-table .cell{
height: 24px !important;
} */
</style> </style>
\ No newline at end of file
vue.config.js
...@@ -39,14 +39,14 @@ module.exports = defineConfig({ ...@@ -39,14 +39,14 @@ module.exports = defineConfig({
}, },
chainWebpack: (config) => { chainWebpack: (config) => {
// 更改字体的输出路径 // // 更改字体的输出路径
// config.module // config.module
// .rule('fonts') // .rule('fonts')
// .test(/\.(woff2?|eot|ttf|otf)(\?.*)?$/i) // .test(/\.(woff2?|eot|ttf|otf)(\?.*)?$/i)
// .use('url-loader') // .use('url-loader')
// .loader('url-loader') // .loader('url-loader')
// .tap(options => { // .tap(options => {
// options.name = 'custom-fonts/[name].[hash:8].[ext]'; // name = 'custom-fonts/[name].[hash:8].[ext]';
// }); // });
config.plugin('html').tap((args) => { config.plugin('html').tap((args) => {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!