整体布局调整

src/views/assessChecks/assistedViewing.vue

@@ -915,12 +915,6 @@ h3 {
     border-radius: 5px;
   }
 }
-.setscroll {
-  width: 100%;
-  height: 650px;
-  position: relative;
-  overflow: auto;
-}
 .setscrolldialog {
   width: 100%;
   height: 300px;

src/views/assessChecks/auxiliaryInspection.vue

@@ -1225,12 +1225,6 @@ export default {
 /deep/ .el-table__cell {
   text-align: center;
 }
-.setscroll {
-  width: 100%;
-  height: 650px;
-  position: relative;
-  overflow: auto;
-}
 .dialog {
   .eltable {
     height: 650px;

src/views/assessChecks/auxiliarySelection.vue

@@ -80,7 +80,7 @@
         </el-button>
       </el-form-item>
     </el-form>
-    <div class="setscroll">
+    <div class="setscrollOne">
       <el-table
         @selection-change="handleSelectionChange"
         ref="multipleTable"
@@ -1519,12 +1519,6 @@ export default {
 /deep/ .el-table__cell {
   text-align: center;
 }
-.setscroll {
-  width: 100%;
-  height: 650px;
-  position: relative;
-  overflow: auto;
-}
 .setscrolldialog {
   width: 100%;
   height: 450px;

src/views/assessChecks/confirmRelease.vue

@@ -70,7 +70,7 @@
         </el-button>
       </el-form-item>
     </el-form>
-    <div class="setscroll">
+    <div class="setscrollOne">
       <el-table
         @selection-change="handleSelectionChange"
         ref="multipleTable"
@@ -1395,12 +1395,6 @@ export default {
   box-sizing: border-box;
   overflow-y: auto;
 }
-.setscroll {
-  width: 100%;
-  height: 650px;
-  position: relative;
-  overflow: auto;
-}
 .setscrolldialog {
   // width: 100%;
   height: 400px;

src/views/assessChecks/materialAcquisition.vue

@@ -1275,12 +1275,6 @@ export default {
 /deep/ .el-table__cell {
   text-align: center;
 }
-.setscroll {
-  width: 100%;
-  height: 650px;
-  position: relative;
-  overflow: auto;
-}
 .setscrolldialog {
   width: 100%;
   height: 290px;

src/views/assessChecks/mianHome.vue

@@ -152,10 +152,10 @@ export default {
   font-size: 14px;
   position: relative;
   min-height: 87vh !important;
+  height: 100%;
   width: 100%;
   box-sizing: border-box;
   overflow-x: hidden;
-  /* background: red; */
   background-image: url("../../assets/mainbcg.png");
   background-size: cover;
   .querytj {

src/views/assessZC/assistedViewing.vue

@@ -914,12 +914,6 @@ h3 {
     border-radius: 5px;
   }
 }
-.setscroll {
-  width: 100%;
-  height: 650px;
-  position: relative;
-  overflow: auto;
-}
 .setscrolldialog {
   width: 100%;
   height: 300px;

src/views/assessZC/auxiliaryInspection.vue

@@ -1225,12 +1225,6 @@ export default {
 /deep/ .el-table__cell {
   text-align: center;
 }
-.setscroll {
-  width: 100%;
-  height: 650px;
-  position: relative;
-  overflow: auto;
-}
 .dialog {
   .eltable {
     height: 650px;

src/views/assessZC/auxiliarySelection.vue

@@ -80,7 +80,7 @@
         </el-button>
       </el-form-item>
     </el-form>
-    <div class="setscroll">
+    <div class="setscrollOne">
       <el-table
         @selection-change="handleSelectionChange"
         ref="multipleTable"
@@ -1523,12 +1523,7 @@ export default {
 /deep/ .el-table__cell {
   text-align: center;
 }
-.setscroll {
-  width: 100%;
-  height: 55vh;
-  position: relative;
-  overflow: auto;
-}
+
 .setscrolldialog {
   width: 100%;
   height: 320px;

src/views/assessZC/confirmRelease.vue

@@ -70,7 +70,7 @@
         </el-button>
       </el-form-item>
     </el-form>
-    <div class="setscroll">
+    <div class="setscrollOne">
       <el-table
         @selection-change="handleSelectionChange"
         ref="multipleTable"
@@ -1394,12 +1394,6 @@ export default {
   box-sizing: border-box;
   overflow-y: auto;
 }
-.setscroll {
-  width: 100%;
-  height: 650px;
-  position: relative;
-  overflow: auto;
-}
 .setscrolldialog {
   // width: 100%;
   height: 400px;

src/views/assessZC/materialAcquisition.vue

@@ -1275,12 +1275,7 @@ export default {
 /deep/ .el-table__cell {
   text-align: center;
 }
-.setscroll {
-  width: 100%;
-  height: 650px;
-  position: relative;
-  overflow: auto;
-}
+
 .setscrolldialog {
   width: 100%;
   height: 290px;

src/views/assessZC/projectView.vue

@@ -1209,7 +1209,7 @@ export default {
 }
 .setscroll {
   width: 100%;
-  height: 55vh;
+  // height: 55vh;
   position: relative;
   overflow-y: auto;
   overflow-x: hidden;

src/views/layout/continerView.vue

 <template>
-  <div class="main"> 
+  <div > 
     <TagsView></TagsView> 
-    <router-view></router-view>
+    <div class="app-section">
+      <router-view class=""></router-view>
+    </div>
+   
   </div>
 </template>
 
@@ -29,14 +32,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.main{
-    min-height:80vh;
-    padding: 10px;
-    padding-top:5px;
-    padding-bottom: 0;
-    overflow-y: auto;
-    overflow-x: hidden;
-    // overflow: auto;
-}
+
+.app-section {
+    background-color: #fff;
+    margin-top: 10px;
+    width: 100%;
+    height: calc(100% - 55px);
+    position: relative;
+    padding: 15px;
+  }
 
 </style>
\ No newline at end of file

src/views/layout/index.vue

 <template>
   <div class="mian">
-     <div class="head-container">
+     <!-- <div class="head-container">
       <div class="logo" style="z-index: 10">
         <div class="logo-inner">
           <img src="../../assets/logo.png" alt="" />
@@ -46,7 +46,7 @@
           </div>
         </div>
       </div>
-    </div>
+    </div> -->
     <router-view></router-view>	
     <!-- <MainLayout class="continer">
       <router-view></router-view>
@@ -130,10 +130,9 @@ export default {
   -moz-osx-font-smoothing: grayscale;
 }
 .layout {
-  width: 100%;
-  height: 100%;
-  // display: flex;
-  background-color: #fff;
+  // width: 100%;
+  // height: 100%;
+  // background-color: #fff;
   .header {
     width: 100%;
     height: 100px;
@@ -340,8 +339,9 @@ export default {
 .mian{
   // width: 100%;
   // height: 100vh;
+  height: 100vh;
   overflow: hidden;
-  height: 100%;
+
   
 }
 

src/views/layout/mainLayout.vue

@@ -199,26 +199,33 @@ export default {
 </script>
 <style lang="scss" scoped>
 .layout {
-  width: 100%;
-  // height: 100%;
-  // height: 100vh;
-  display: flex;
-  padding: 15px;
-  background-color: #fff;
-  position: relative;
-  overflow: hidden;
+    width: 100%;
+    height: 100%;
+    position: relative;
+    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 {
     width: 235px !important;
     height: 100%;
     flex-shrink: 0;
   }
   .continer {
-    width: 100%;
-    height: 100%;
-    // flex: 1;
-    box-sizing: border-box;
+    flex: 1;
+    position: relative;
     overflow: hidden;
-    // overflow: auto;
+    // width: 100%;
+    // height: 100%;
+    // box-sizing: border-box;
+    // overflow: hidden;
   }
   .changeqx {
     position: absolute;
@@ -252,13 +259,22 @@ export default {
   font-size:17px;
 }
 .el-form{
-  height: 17vh  !important;
   margin: 0 !important;
 }
+.el-form .button{
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
 .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>
\ No newline at end of file

vue.config.js

@@ -39,16 +39,16 @@ module.exports = defineConfig({
   },
 
   chainWebpack: (config) => {
-  // 更改字体的输出路径
-    // config.module
-    // .rule('fonts')
-    // .test(/\.(woff2?|eot|ttf|otf)(\?.*)?$/i)
-    // .use('url-loader')
-    // .loader('url-loader')
-    // .tap(options => {
-    //  options.name = 'custom-fonts/[name].[hash:8].[ext]';
+  // // 更改字体的输出路径
+  //   config.module
+  //   .rule('fonts')
+  //   .test(/\.(woff2?|eot|ttf|otf)(\?.*)?$/i)
+  //   .use('url-loader')
+  //   .loader('url-loader')
+  //   .tap(options => {
+  //      name = 'custom-fonts/[name].[hash:8].[ext]';
       
-    // });   
+  //   });   
     config.plugin('html').tap((args) => {
       args[0].title = '数字化项目全过程管控平台'
       return args