样式修改

src/api/onlineDeclartion/declareAddContent.js

@@ -5,7 +5,6 @@ export function getTemplateInfo(query) {
   return request({
     url: `/system/templateInfo/${query.templateId}`,
     method: 'get',
-    params: query
   })
 }
 
@@ -14,7 +13,6 @@ export function getBasicInfo(query) {
   return request({
     url: `/system/enterpriseBasicInfo/${query.enterpriseId}`,
     method: 'get',
-    params: query
   })
 }
 
@@ -49,7 +47,6 @@ export function getDeclarationRecords(query) {
   return request({
     url: `/system/declarationRecords/${query.id}`,
     method: 'get',
-    params: query
   })
 }
 

src/assets/styles/ruoyi.scss

@@ -228,7 +228,7 @@
   border-color: #20B2AA;
   color: #FFFFFF;
 }
-.el-form {
+.el-form,.operate_btn {
   .el-button--primary.is-active,
   .el-button--primary:active {
     background: oklab(.88 0 .1/.5);
@@ -285,6 +285,9 @@
       }
     }
   }
+}
+.operate_btn {
+
 }
 /* text color */
 .text-navy {

src/views/onlineDeclaration/declarationManagement/index.vue

@@ -228,7 +228,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
     },
     /** 查询菜单列表 */
     getList() {

src/views/onlineDeclaration/declareAddContent/index.vue

@@ -2080,9 +2080,9 @@ list-style: none; /* 清除列表项前的标记 */
   flex-wrap: wrap;
   align-content: space-between;
   .upload_li {
-    width: 45%;
+    // width: 45%;
     display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
     align-items: center;
     padding: 0 5px;
     color: inherit;

src/views/onlineDeclaration/declareDetailContent/index.vue

@@ -1578,12 +1578,6 @@
             </div>
           </div>
         </el-form>
-        <div class="operate_btn">
-          <el-button @click="goBack">返回</el-button>
-          <el-button v-if="pageType == 'edit'" @click="submitForm">暂存</el-button>
-          <el-button v-if="pageType == 'edit'" type="success" @click="submitForm">提交</el-button>
-          <el-button v-if="pageType == 'detail'" @click="printOutpdf" class="btn">导出申报信息</el-button>
-        </div>
       </div>
       <div class="right_content">
         <div class="left_title">
@@ -1606,10 +1600,10 @@
                   暂无审批流程
                 </p>
                 <div v-if="pageType == 'detail'">
-                    <div class="step_contain" v-for="item in approvalInfoList" :key="item.id">
+                    <div class="step_contain" :class="item.approvalStatus == 0 ? 'step_contain_one' : 'step_contain'" v-for="item in approvalInfoList" :key="item.id">
                       <span class="drop_style">
                       </span>
-                      <span class="out_drop_style">
+                      <span class="out_drop_style" :class="item.approvalStatus == 0 ? 'out_drop_style_one' : ''">
                       </span>
                       <div class="contain_main">
                         <div>{{ item.approvalByName }}</div>
@@ -1660,12 +1654,12 @@
         </div>
       </div>
     </div>
-    <!-- <div class="operate_btn">
+    <div class="operate_btn">
       <el-button @click="goBack">返回</el-button>
       <el-button v-if="pageType == 'edit'" @click="submitForm">暂存</el-button>
       <el-button v-if="pageType == 'edit'" type="success" @click="submitForm">提交</el-button>
       <el-button v-if="pageType == 'detail'" @click="printOutpdf" class="btn">导出申报信息</el-button>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -1867,6 +1861,12 @@ export default {
     })
     this.getDetailInfo(detailId)
   },
+  filters: {
+    dealURL : (value)=>{
+      let arr = value.split("/")
+      return arr[arr.length - 1]
+    }
+  },
   methods: {
     goBack() {
       this.$router.go(-1)
@@ -2877,9 +2877,9 @@ list-style: none; /* 清除列表项前的标记 */
   flex-wrap: wrap;
   align-content: space-between;
   .upload_li {
-    width: 45%;
+    // width: 45%;
     display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
     align-items: center;
     padding: 0 5px;
     color: inherit;
@@ -2926,9 +2926,9 @@ list-style: none; /* 清除列表项前的标记 */
     flex: 1;
     padding: 0 15px;
     .upload_li {
-      width: 45%;
+      // width: 45%;
       display: flex;
-      justify-content: space-between;
+      // justify-content: space-between;
       align-items: center;
       padding: 0 30px 0 5px;
       color: inherit;
@@ -2964,22 +2964,27 @@ list-style: none; /* 清除列表项前的标记 */
 </style>
 <style lang="scss" scoped>
 .addContent {
-  height: calc(100vh - 100px);
+  // height: calc(100vh - 100px);
+  // height: calc(100% - 10px);
+  height: 100%;
   // padding: 10px 10px 0 10px;
   background-color: #f6f7f9;
   .detail_content {
     display: flex;
     justify-content: space-between;
-    height: calc(100vh - 140px);
+    // height: calc(100vh - 160px);
+    height: calc(100% - 40px);
     .left_content {
-      height: calc(100vh - 140px);
+      // height: calc(100vh - 160px);
+      height: 100%;
       width: 69.5%;
       overflow: auto;
       background-color: #fff;
       padding: 20px;
     }
     .right_content {
-      height: calc(100vh - 140px);
+      // height: calc(100vh - 160px);
+      height: 100%;
       width: 30%;
       background-color: #fff;
       .left_main {
@@ -3003,12 +3008,23 @@ list-style: none; /* 清除列表项前的标记 */
         margin-bottom: 4px;
       }
       .tab_content {
-        height: calc(100vh - 220px);
+        // height: calc(100vh - 240px);
+        height: calc(100% - 77px);
         // overflow: auto;
         background-color: #fff;
         padding: 0 20px;
+        ::v-deep .el-tabs__content {
+          padding: 0;
+          height: calc(100% - 50px);
+          .el-tab-pane {
+            height: 100%;
+          }
+        }
         .empty {
-          height: calc(100vh - 260px);
+          // height: calc(100vh - 300px);
+          // height: calc(100% - 100px);
+          height: 100%;
+          padding: 10px 15px 0 15px;
           overflow: auto;
           .top {
             font-size: 12px;
@@ -3036,16 +3052,20 @@ list-style: none; /* 清除列表项前的标记 */
               box-shadow: 0 0 10px #ccc;
               z-index: 2;
             }
+            
             .out_drop_style {
-                position: absolute;
-                width: 6px;
-                height: 6px;
-                top: 6px;
-                left: -3px;
-                background-color: #4eb997;
-                border-radius: 3px;
-                z-index: 2;
-              }
+              position: absolute;
+              width: 6px;
+              height: 6px;
+              top: 6px;
+              left: -3px;
+              background-color: #4eb997;
+              border-radius: 3px;
+              z-index: 2;
+            }
+            .out_drop_style_one {
+              background-color: #000;
+            }
             .contain_main {
               background-color: #f8fafb;
               color: #192A92;
@@ -3102,14 +3122,20 @@ list-style: none; /* 清除列表项前的标记 */
               height: 80px;
             }
           }
+          .step_contain_one {
+            border: none;
+          }
         }
       }
     }
   }
   .operate_btn {
     text-align: center;
-    background-color: #fff;
-    padding-bottom: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding-top: 10px;
+    // padding-bottom: 20px;
   }
 
   .form {
@@ -3165,6 +3191,8 @@ list-style: none; /* 清除列表项前的标记 */
   border: none;
   box-shadow: none;
   -webkit-box-shadow: none;
+  // height: calc(100vh - 240px);
+  height: 100%;
 }
 
 .btn {
@@ -3173,17 +3201,17 @@ list-style: none; /* 清除列表项前的标记 */
   color: #000;
 }
 /* 悬浮 */
-::v-deep .el-button:hover {
-  /* background: linear-gradient(#0165eb, #018ff2, #00b7f9) !important; */
-  background: linear-gradient(100deg, #f1d78c, #f1c19d) !important;
-  font-weight: bold;
-  color: #606266;
-}
+// ::v-deep .el-button:hover {
+//   /* background: linear-gradient(#0165eb, #018ff2, #00b7f9) !important; */
+//   background: linear-gradient(100deg, #f1d78c, #f1c19d) !important;
+//   font-weight: bold;
+//   color: #606266;
+// }
 /*按钮点击*/
-::v-deep .el-button:focus {
-  background: linear-gradient(100deg, #f1d78c, #f1c19d) !important;
-  /* background: linear-gradient(#0165eb, #018ff2, #00b7f9) !important; */
-  font-weight: bold;
-  color: #606266;
-}
+// ::v-deep .el-button:focus {
+//   background: linear-gradient(100deg, #f1d78c, #f1c19d) !important;
+//   /* background: linear-gradient(#0165eb, #018ff2, #00b7f9) !important; */
+//   font-weight: bold;
+//   color: #606266;
+// }
 </style>

src/views/onlineDeclaration/enterpriseDirectory/index.vue

@@ -338,7 +338,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
     },
     /** 查询菜单列表 */
     getList() {

src/views/onlineDeclaration/pendingReview/index.vue

@@ -259,7 +259,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
     },
     /** 查询审批列表 */
     getList() {
@@ -366,9 +366,9 @@ list-style: none; /* 清除列表项前的标记 */
   flex-wrap: wrap;
   align-content: space-between;
   .upload_li {
-    width: 45%;
+    // width: 45%;
     display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
     align-items: center;
     padding: 0 5px;
     // margin: 10px 10px 10px 0;

src/views/onlineDeclaration/records/index.vue

@@ -388,9 +388,9 @@ export default {
       if(this.userType == '02') {
         const headerThree = document.getElementById('I-rowTwo'); // 通过元素的 ID 获取元素
         const headerTHeight = headerThree.offsetHeight;
-        this.tabHeader = elementHeight - headerHeight - headerOHeight - headerTHeight - paginationtHeight - 140;
+        this.tabHeader = elementHeight - headerHeight - headerOHeight - headerTHeight - paginationtHeight - 100;
       } else {
-        this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+        this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
       }
       
     },
@@ -460,6 +460,7 @@ export default {
     },
     /** 查看审核详情操作 */
     handleDetail(row){
+      console.log(row);
       this.$router.push({name: 'declareDetailContent',query: {
         templateId: row.templateId,
         templateRecordId: row.templateRecordId,

src/views/onlineDeclaration/supplementary/index.vue

@@ -2098,9 +2098,9 @@ list-style: none; /* 清除列表项前的标记 */
   flex-wrap: wrap;
   align-content: space-between;
   .upload_li {
-    width: 45%;
+    // width: 45%;
     display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
     align-items: center;
     padding: 0 5px;
     color: inherit;

src/views/onlineDeclaration/template/index.vue

@@ -155,7 +155,7 @@ export default {
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 100;
     },
     /** 查询模版列表 */
     getList() {

src/views/onlineDeclaration/templateDetail/index.vue

@@ -309,10 +309,10 @@
               </div>
             </div>
           </div>
-          <div class="operate_btn">
+          <!-- <div class="operate_btn">
             <el-button @click="goBack">返回</el-button>
             <el-button @click="print" class="btn">导出模版详情</el-button>
-          </div>
+          </div> -->
         </el-form>
       </div>
       <div class="right_content">
@@ -341,10 +341,10 @@
         </div>
       </div>
     </div>
-    <!-- <div class="operate_btn">
+    <div class="operate_btn">
       <el-button @click="goBack">返回</el-button>
-      <el-button @click="print" class="btn">导出模版详情</el-button>
-    </div> -->
+      <el-button @click="print" class="btn" type="primary">导出模版详情</el-button>
+    </div>
   </div>
 </template>
 
@@ -544,9 +544,9 @@ list-style: none; /* 清除列表项前的标记 */
   flex-wrap: wrap;
   align-content: space-between;
   .upload_li {
-    width: 45%;
+    // width: 45%;
     display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
     align-items: center;
     padding: 0 5px;
     color: inherit;
@@ -584,17 +584,17 @@ list-style: none; /* 清除列表项前的标记 */
 </style>
 <style lang="scss" scoped>
 .addContent {
-  // height: 100% !important;
-  height: calc(100vh - 100px);
+  height: 100% ;
+  // height: calc(100vh - 100px);
   // padding: 10px 10px 0 10px;
   background-color: #f6f7f9;
   .detail_content {
     display: flex;
     justify-content: space-between;
-    height: calc(100vh - 140px);
+    height: calc(100% - 40px);
     // height: calc(100vh - 200px);
     .left_content {
-      height: calc(100vh - 140px);
+      height: 100%;
       // height: calc(100vh - 160px);
       box-sizing: border-box;
       width: 69.5%;
@@ -603,7 +603,7 @@ list-style: none; /* 清除列表项前的标记 */
       padding: 20px;
     }
     .right_content {
-      height: calc(100vh - 140px);
+      height: 100%;
       width: 30%;
       background-color: #fff;
       .left_main {
@@ -624,8 +624,8 @@ list-style: none; /* 清除列表项前的标记 */
   }
   .operate_btn {
     text-align: center;
-    background-color: #fff;
-    padding-bottom: 20px;
+    // background-color: #fff;
+    padding-top: 10px;
   }
 
   .form {
@@ -668,6 +668,7 @@ list-style: none; /* 清除列表项前的标记 */
   border: none;
   box-shadow: none;
   -webkit-box-shadow: none;
+  height: 100%;
 }
 
 // .btn {

src/views/project/index.vue

@@ -415,7 +415,7 @@ export default {
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 100;
     }
   }
 };

src/views/system/config/index.vue

@@ -255,7 +255,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
     },
     /** 查询参数列表 */
     getList() {

src/views/system/dict/index.vue

@@ -259,7 +259,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
     },
     /** 查询字典类型列表 */
     getList() {

src/views/system/logininfor/index.vue

@@ -186,7 +186,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
     },
     /** 查询登录日志列表 */
     getList() {

src/views/system/notice/index.vue

@@ -239,7 +239,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
     },
     /** 查询公告列表 */
     getList() {

src/views/system/operlog/index.vue

@@ -250,7 +250,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
     },
     /** 查询登录日志 */
     getList() {

src/views/system/post/index.vue

@@ -229,7 +229,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
     },
     /** 查询岗位列表 */
     getList() {

src/views/system/role/index.vue

@@ -364,7 +364,7 @@ export default {
       const headerHeight = header.offsetHeight;
       const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
     },
     /** 查询角色列表 */
     getList() {

src/views/system/user/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
       <el-col :span="4" :xs="24">
@@ -80,7 +80,7 @@
           </el-form-item>
         </el-form>
 
-        <el-row :gutter="10" class="mb8">
+        <el-row id="I-rowOne" :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button
               type="primary"
@@ -136,7 +136,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table :height="tabHeader" v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
@@ -193,6 +193,7 @@
         </el-table>
 
         <pagination
+          id="L-pagination"
           v-show="total>0"
           :total="total"
           :page.sync="queryParams.pageNum"
@@ -488,6 +489,7 @@ export default {
       },
       // 企业数组
       enterpriseList: [],
+      tabHeader: undefined,
     };
   },
   watch: {
@@ -496,6 +498,13 @@ export default {
       this.$refs.tree.filter(val);
     }
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
     this.getDeptTree();
@@ -507,6 +516,16 @@ export default {
     })
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;